Merge branch 'develop' into move-2-1-automation-out-of-dev

contracts/src/v0.8/llo-feeds/dev/FeeManager.sol

@@ -32,16 +32,16 @@ contract FeeManager is IFeeManager, ConfirmedOwner, TypeAndVersionInterface {
   uint64 private constant PERCENTAGE_SCALAR = 1e18;
 
   /// @notice the LINK token address
-  address private immutable i_linkAddress;
+  address public immutable i_linkAddress;
 
   /// @notice the native token address
-  address private immutable i_nativeAddress;
+  address public immutable i_nativeAddress;
 
   /// @notice the proxy address
-  address private immutable i_proxyAddress;
+  address public immutable i_proxyAddress;
 
   /// @notice the reward manager address
-  IRewardManager private immutable i_rewardManager;
+  IRewardManager public immutable i_rewardManager;
 
   // @notice the mask to apply to get the report version
   bytes32 private constant REPORT_VERSION_MASK = 0xffff000000000000000000000000000000000000000000000000000000000000;
@@ -259,7 +259,7 @@ contract FeeManager is IFeeManager, ConfirmedOwner, TypeAndVersionInterface {
     uint256 linkQuantity;
     uint256 nativeQuantity;
     uint256 expiresAt;
-    (, , , linkQuantity, nativeQuantity, expiresAt) = abi.decode(
+    (, , , nativeQuantity, linkQuantity, expiresAt) = abi.decode(
       report,
       (bytes32, uint32, uint32, uint192, uint192, uint32)
     );

contracts/src/v0.8/llo-feeds/dev/RewardManager.sol

@@ -10,7 +10,7 @@ import {Common} from "../../libraries/Common.sol";
 import {SafeERC20} from "../../vendor/openzeppelin-solidity/v4.8.0/contracts/token/ERC20/utils/SafeERC20.sol";
 
 /**
- * @title FeeManager
+ * @title RewardManager
  * @author Michael Fletcher
  * @author Austin Born
  * @notice This contract will be used to reward any configured recipients within a pool. Recipients will receive a share of their pool relative to their configured weight.
@@ -34,7 +34,7 @@ contract RewardManager is IRewardManager, ConfirmedOwner, TypeAndVersionInterfac
   bytes32[] public s_registeredPoolIds;
 
   // @dev The address for the LINK contract
-  address private immutable i_linkAddress;
+  address public immutable i_linkAddress;
 
   // The total weight of all RewardRecipients. 1e18 = 100% of the pool fees
   uint64 private constant PERCENTAGE_SCALAR = 1e18;

contracts/src/v0.8/llo-feeds/test/fee-manager/BaseFeeManager.t.sol

@@ -197,8 +197,8 @@ contract BaseFeeManagerTest is Test {
         feedId,
         uint32(0),
         uint32(0),
-        uint192(DEFAULT_REPORT_LINK_FEE),
         uint192(DEFAULT_REPORT_NATIVE_FEE),
+        uint192(DEFAULT_REPORT_LINK_FEE),
         uint32(block.timestamp),
         int192(0)
       );
@@ -210,8 +210,8 @@ contract BaseFeeManagerTest is Test {
         feedId,
         uint32(0),
         uint32(0),
-        uint192(DEFAULT_REPORT_LINK_FEE),
         uint192(DEFAULT_REPORT_NATIVE_FEE),
+        uint192(DEFAULT_REPORT_LINK_FEE),
         uint32(block.timestamp),
         int192(0),
         int192(0),
@@ -230,8 +230,8 @@ contract BaseFeeManagerTest is Test {
         feedId,
         uint32(0),
         uint32(0),
-        uint192(linkFee),
         uint192(nativeFee),
+        uint192(linkFee),
         uint32(expiry),
         int192(0),
         int192(0),

contracts/src/v0.8/llo-feeds/test/verifier/BaseVerifierTest.t.sol

@@ -261,7 +261,7 @@ contract BaseTestWithConfiguredVerifierAndFeeManager is BaseTest {
   bytes32 internal v1ConfigDigest;
   bytes32 internal v3ConfigDigest;
 
-  struct V2Report {
+  struct V3Report {
     // The feed ID the report has data for
     bytes32 feedId;
     // The time the median value was observed on
@@ -321,14 +321,14 @@ contract BaseTestWithConfiguredVerifierAndFeeManager is BaseTest {
     rewardManager.setFeeManager(address(feeManager));
   }
 
-  function _encodeReport(V2Report memory report) internal pure returns (bytes memory) {
+  function _encodeReport(V3Report memory report) internal pure returns (bytes memory) {
     return
       abi.encode(
         report.feedId,
         report.observationsTimestamp,
         report.validFromTimestamp,
-        report.linkFee,
         report.nativeFee,
+        report.linkFee,
         report.expiresAt,
         report.benchmarkPrice,
         report.bid,
@@ -337,7 +337,7 @@ contract BaseTestWithConfiguredVerifierAndFeeManager is BaseTest {
   }
 
   function _generateEncodedBlobWithQuote(
-    V2Report memory report,
+    V3Report memory report,
     bytes32[3] memory reportContext,
     Signer[] memory signers,
     bytes memory quote
@@ -371,14 +371,14 @@ contract BaseTestWithConfiguredVerifierAndFeeManager is BaseTest {
       );
   }
 
-  function _generateV3Report() internal view returns (V2Report memory) {
+  function _generateV3Report() internal view returns (V3Report memory) {
     return
-      V2Report({
+      V3Report({
         feedId: FEED_ID_V3,
         observationsTimestamp: OBSERVATIONS_TIMESTAMP,
         validFromTimestamp: uint32(block.timestamp),
-        linkFee: uint192(DEFAULT_REPORT_LINK_FEE),
         nativeFee: uint192(DEFAULT_REPORT_NATIVE_FEE),
+        linkFee: uint192(DEFAULT_REPORT_LINK_FEE),
         expiresAt: uint32(block.timestamp),
         benchmarkPrice: MEDIAN,
         bid: BID,

contracts/src/v0.8/tests/StreamsLookupUpkeep.sol

@@ -93,7 +93,7 @@ contract StreamsLookupUpkeep is AutomationCompatibleInterface, StreamsLookupComp
       return (false, data);
     }
     uint256 timeParam;
-    if (keccak256(abi.encodePacked(timeParamKey)) == keccak256(abi.encodePacked("feedIdHex"))) {
+    if (keccak256(abi.encodePacked(feedParamKey)) == keccak256(abi.encodePacked("feedIdHex"))) {
       if (useArbBlock) {
         timeParam = ARB_SYS.arbBlockNumber();
       } else {

contracts/src/v0.8/tests/VerifiableLoadLogTriggerUpkeep.sol

@@ -55,7 +55,7 @@ contract VerifiableLoadLogTriggerUpkeep is VerifiableLoadBase, StreamsLookupComp
       }
 
       uint256 timeParam;
-      if (keccak256(abi.encodePacked(timeParamKey)) == keccak256(abi.encodePacked("feedIdHex"))) {
+      if (keccak256(abi.encodePacked(feedParamKey)) == keccak256(abi.encodePacked("feedIdHex"))) {
         timeParam = blockNum;
       } else {
         // assume this will be feedIDs for v0.3

contracts/src/v0.8/tests/VerifiableLoadStreamsLookupUpkeep.sol

@@ -35,7 +35,7 @@ contract VerifiableLoadStreamsLookupUpkeep is VerifiableLoadBase, StreamsLookupC
     }
 
     uint256 timeParam;
-    if (keccak256(abi.encodePacked(timeParamKey)) == keccak256(abi.encodePacked("feedIdHex"))) {
+    if (keccak256(abi.encodePacked(feedParamKey)) == keccak256(abi.encodePacked("feedIdHex"))) {
       timeParam = blockNum;
     } else {
       // assume this will be feedIDs for v0.3

core/chains/cosmos/chain.go

@@ -114,7 +114,7 @@ func newChain(id string, cfg *CosmosConfig, db *sqlx.DB, ks loop.Keystore, logCf
 	gpe := cosmosclient.NewMustGasPriceEstimator([]cosmosclient.GasPricesEstimator{
 		cosmosclient.NewClosureGasPriceEstimator(func() (map[string]sdk.DecCoin, error) {
 			return map[string]sdk.DecCoin{
-				cfg.FeeToken(): sdk.NewDecCoinFromDec(cfg.FeeToken(), cfg.FallbackGasPrice()),
+				cfg.GasToken(): sdk.NewDecCoinFromDec(cfg.GasToken(), cfg.FallbackGasPrice()),
 			}, nil
 		}),
 	}, lggr)

core/chains/cosmos/config.go

@@ -161,8 +161,8 @@ func setFromChain(c, f *coscfg.Chain) {
 	if f.FallbackGasPrice != nil {
 		c.FallbackGasPrice = f.FallbackGasPrice
 	}
-	if f.FeeToken != nil {
-		c.FeeToken = f.FeeToken
+	if f.GasToken != nil {
+		c.GasToken = f.GasToken
 	}
 	if f.GasLimitMultiplier != nil {
 		c.GasLimitMultiplier = f.GasLimitMultiplier
@@ -225,8 +225,8 @@ func (c *CosmosConfig) FallbackGasPrice() sdk.Dec {
 	return sdkDecFromDecimal(c.Chain.FallbackGasPrice)
 }
 
-func (c *CosmosConfig) FeeToken() string {
-	return *c.Chain.FeeToken
+func (c *CosmosConfig) GasToken() string {
+	return *c.Chain.GasToken
 }
 
 func (c *CosmosConfig) GasLimitMultiplier() float64 {

core/chains/cosmos/cosmostxm/txm.go

@@ -500,7 +500,7 @@ func (txm *Txm) GetMsgs(ids ...int64) (adapters.Msgs, error) {
 // GasPrice returns the gas price from the estimator in the configured fee token.
 func (txm *Txm) GasPrice() (sdk.DecCoin, error) {
 	prices := txm.gpe.GasPrices()
-	gasPrice, ok := prices[txm.cfg.FeeToken()]
+	gasPrice, ok := prices[txm.cfg.GasToken()]
 	if !ok {
 		return sdk.DecCoin{}, errors.New("unexpected empty gas price")
 	}

core/chains/cosmos/cosmostxm/txm_internal_test.go

@@ -78,15 +78,15 @@ func TestTxm(t *testing.T) {
 	logCfg := pgtest.NewQConfig(true)
 	chainID := cosmostest.RandomChainID()
 	two := int64(2)
-	feeToken := "ucosm"
+	gasToken := "ucosm"
 	cfg := &cosmos.CosmosConfig{Chain: coscfg.Chain{
 		MaxMsgsPerBatch: &two,
-		FeeToken:        &feeToken,
+		GasToken:        &gasToken,
 	}}
 	cfg.SetDefaults()
 	gpe := cosmosclient.NewMustGasPriceEstimator([]cosmosclient.GasPricesEstimator{
 		cosmosclient.NewFixedGasPriceEstimator(map[string]cosmostypes.DecCoin{
-			cfg.FeeToken(): cosmostypes.NewDecCoinFromDec(cfg.FeeToken(), cosmostypes.MustNewDecFromStr("0.01")),
+			cfg.GasToken(): cosmostypes.NewDecCoinFromDec(cfg.GasToken(), cosmostypes.MustNewDecFromStr("0.01")),
 		},
 			lggr.(logger.SugaredLogger),
 		),

core/chains/cosmos/cosmostxm/txm_test.go

@@ -38,7 +38,7 @@ func TestTxm_Integration(t *testing.T) {
 	chainID := cosmostest.RandomChainID()
 	cosmosChain := coscfg.Chain{}
 	cosmosChain.SetDefaults()
-	fallbackGasPrice := sdk.NewDecCoinFromDec(*cosmosChain.FeeToken, sdk.MustNewDecFromStr("0.01"))
+	fallbackGasPrice := sdk.NewDecCoinFromDec(*cosmosChain.GasToken, sdk.MustNewDecFromStr("0.01"))
 	chainConfig := cosmos.CosmosConfig{ChainID: &chainID, Enabled: ptr(true), Chain: cosmosChain}
 	cfg, db := heavyweight.FullTestDBNoFixturesV2(t, "cosmos_txm", func(c *chainlink.Config, s *chainlink.Secrets) {
 		c.Cosmos = cosmos.CosmosConfigs{&chainConfig}
@@ -47,7 +47,7 @@ func TestTxm_Integration(t *testing.T) {
 	logCfg := pgtest.NewQConfig(true)
 	gpe := cosmosclient.NewMustGasPriceEstimator([]cosmosclient.GasPricesEstimator{
 		cosmosclient.NewFixedGasPriceEstimator(map[string]sdk.DecCoin{
-			*cosmosChain.FeeToken: fallbackGasPrice,
+			*cosmosChain.GasToken: fallbackGasPrice,
 		},
 			lggr.(logger.SugaredLogger),
 		),
@@ -59,7 +59,7 @@ func TestTxm_Integration(t *testing.T) {
 	ks := keystore.New(db, utils.FastScryptParams, lggr, pgtest.NewQConfig(true))
 	zeConfig := sdk.GetConfig()
 	fmt.Println(zeConfig)
-	accounts, testdir, tendermintURL := cosmosclient.SetupLocalCosmosNode(t, chainID, *cosmosChain.FeeToken)
+	accounts, testdir, tendermintURL := cosmosclient.SetupLocalCosmosNode(t, chainID, *cosmosChain.GasToken)
 	tc, err := cosmosclient.NewClient(chainID, tendermintURL, cosmos.DefaultRequestTimeout, lggr)
 	require.NoError(t, err)
 
@@ -77,16 +77,16 @@ func TestTxm_Integration(t *testing.T) {
 	require.NoError(t, err)
 	an, sn, err := tc.Account(accounts[0].Address)
 	require.NoError(t, err)
-	resp, err := tc.SignAndBroadcast([]sdk.Msg{banktypes.NewMsgSend(accounts[0].Address, transmitterID, sdk.NewCoins(sdk.NewInt64Coin(*cosmosChain.FeeToken, 100000)))},
-		an, sn, gpe.GasPrices()[*cosmosChain.FeeToken], accounts[0].PrivateKey, txtypes.BroadcastMode_BROADCAST_MODE_SYNC)
+	resp, err := tc.SignAndBroadcast([]sdk.Msg{banktypes.NewMsgSend(accounts[0].Address, transmitterID, sdk.NewCoins(sdk.NewInt64Coin(*cosmosChain.GasToken, 100000)))},
+		an, sn, gpe.GasPrices()[*cosmosChain.GasToken], accounts[0].PrivateKey, txtypes.BroadcastMode_BROADCAST_MODE_SYNC)
 	tx, success := cosmosclient.AwaitTxCommitted(t, tc, resp.TxResponse.TxHash)
 	require.True(t, success)
 	require.Equal(t, types.CodeTypeOK, tx.TxResponse.Code)
 	require.NoError(t, err)
 
 	// TODO: find a way to pull this test artifact from
 	// the chainlink-cosmos repo instead of copying it to cores testdata
-	contractID := cosmosclient.DeployTestContract(t, tendermintURL, chainID, *cosmosChain.FeeToken, accounts[0], cosmosclient.Account{
+	contractID := cosmosclient.DeployTestContract(t, tendermintURL, chainID, *cosmosChain.GasToken, accounts[0], cosmosclient.Account{
 		Name:       "transmitter",
 		PrivateKey: cosmostxm.NewKeyWrapper(keystoreAdapter, transmitterAddress),
 		Address:    transmitterID,

core/cmd/cosmos_transaction_commands_test.go

@@ -50,7 +50,7 @@ func TestShell_SendCosmosCoins(t *testing.T) {
 	chainID := cosmostest.RandomChainID()
 	cosmosChain := coscfg.Chain{}
 	cosmosChain.SetDefaults()
-	accounts, _, url := cosmosclient.SetupLocalCosmosNode(t, chainID, *cosmosChain.FeeToken)
+	accounts, _, url := cosmosclient.SetupLocalCosmosNode(t, chainID, *cosmosChain.GasToken)
 	require.Greater(t, len(accounts), 1)
 	nodes := cosmos.CosmosNodes{
 		&coscfg.Node{
@@ -71,7 +71,7 @@ func TestShell_SendCosmosCoins(t *testing.T) {
 	require.NoError(t, err)
 
 	require.Eventually(t, func() bool {
-		coin, err := reader.Balance(from.Address, *cosmosChain.FeeToken)
+		coin, err := reader.Balance(from.Address, *cosmosChain.GasToken)
 		if !assert.NoError(t, err) {
 			return false
 		}
@@ -97,7 +97,7 @@ func TestShell_SendCosmosCoins(t *testing.T) {
 	} {
 		tt := tt
 		t.Run(tt.amount, func(t *testing.T) {
-			startBal, err := reader.Balance(from.Address, *cosmosChain.FeeToken)
+			startBal, err := reader.Balance(from.Address, *cosmosChain.GasToken)
 			require.NoError(t, err)
 
 			set := flag.NewFlagSet("sendcosmoscoins", 0)
@@ -156,11 +156,11 @@ func TestShell_SendCosmosCoins(t *testing.T) {
 			}
 
 			// Check balance
-			endBal, err := reader.Balance(from.Address, *cosmosChain.FeeToken)
+			endBal, err := reader.Balance(from.Address, *cosmosChain.GasToken)
 			require.NoError(t, err)
 			if assert.NotNil(t, startBal) && assert.NotNil(t, endBal) {
 				diff := startBal.Sub(*endBal).Amount
-				sent, err := denom.ConvertDecCoinToDenom(sdk.NewDecCoinFromDec(nativeToken, sdk.MustNewDecFromStr(tt.amount)), *cosmosChain.FeeToken)
+				sent, err := denom.ConvertDecCoinToDenom(sdk.NewDecCoinFromDec(nativeToken, sdk.MustNewDecFromStr(tt.amount)), *cosmosChain.GasToken)
 				require.NoError(t, err)
 				if assert.True(t, diff.IsInt64()) && assert.True(t, sent.Amount.IsInt64()) {
 					require.Greater(t, diff.Int64(), sent.Amount.Int64())

core/config/docs/chains-cosmos.toml

@@ -13,8 +13,8 @@ BlocksUntilTxTimeout = 30 # Default
 ConfirmPollPeriod = '1s' # Default
 # FallbackGasPrice sets a fallback gas price to use when the estimator is not available.
 FallbackGasPrice = '0.015' # Default
-# FeeToken is the token denomination which is being used to pay gas fees on this chain.
-FeeToken = 'ucosm' # Default
+# GasToken is the token denomination which is being used to pay gas fees on this chain.
+GasToken = 'ucosm' # Default
 # GasLimitMultiplier scales the estimated gas limit.
 GasLimitMultiplier = '1.5' # Default
 # MaxMsgsPerBatch limits the numbers of mesages per transaction batch.

core/gethwrappers/generation/generated-wrapper-dependency-versions-do-not-edit.txt

@@ -59,15 +59,15 @@ solidity_vrf_v08_verifier_wrapper: ../../contracts/solc/v0.8.6/VRFTestHelper.abi
 solidity_vrf_verifier_wrapper: ../../contracts/solc/v0.6/VRFTestHelper.abi ../../contracts/solc/v0.6/VRFTestHelper.bin 44c2b67d8d2990ab580453deb29d63508c6147a3dc49908a1db563bef06e6474
 solidity_vrf_wrapper: ../../contracts/solc/v0.6/VRF.abi ../../contracts/solc/v0.6/VRF.bin 04ede5b83c06ba5b76ef99c081c72928007d8a7aaefcf21449a46a07cbd4bfc2
 streams_lookup_compatible_interface: ../../contracts/solc/v0.8.16/StreamsLookupCompatibleInterface.abi ../../contracts/solc/v0.8.16/StreamsLookupCompatibleInterface.bin feb92cc666df21ea04ab9d7a588a513847b01b2f66fc167d06ab28ef2b17e015
-streams_lookup_upkeep_wrapper: ../../contracts/solc/v0.8.16/StreamsLookupUpkeep.abi ../../contracts/solc/v0.8.16/StreamsLookupUpkeep.bin a2c5a0ee6c85104609259ecdb09440f4eb115259f4283b2509e41e9c57aca265
+streams_lookup_upkeep_wrapper: ../../contracts/solc/v0.8.16/StreamsLookupUpkeep.abi ../../contracts/solc/v0.8.16/StreamsLookupUpkeep.bin b1a598963cacac51ed4706538d0f142bdc0d94b9a4b13e2d402131cdf05c9bcf
 test_api_consumer_wrapper: ../../contracts/solc/v0.6/TestAPIConsumer.abi ../../contracts/solc/v0.6/TestAPIConsumer.bin ed10893cb18894c18e275302329c955f14ea2de37ee044f84aa1e067ac5ea71e
 trusted_blockhash_store: ../../contracts/solc/v0.8.6/TrustedBlockhashStore.abi ../../contracts/solc/v0.8.6/TrustedBlockhashStore.bin a85d2899892aa9fd73fc99852ccba52c3983375113580673e6c5d655bfa79909
 type_and_version_interface_wrapper: ../../contracts/solc/v0.8.6/TypeAndVersionInterface.abi ../../contracts/solc/v0.8.6/TypeAndVersionInterface.bin bc9c3a6e73e3ebd5b58754df0deeb3b33f4bb404d5709bb904aed51d32f4b45e
 upkeep_counter_wrapper: ../../contracts/solc/v0.7/UpkeepCounter.abi ../../contracts/solc/v0.7/UpkeepCounter.bin 901961ebf18906febc1c350f02da85c7ea1c2a68da70cfd94efa27c837a48663
 upkeep_perform_counter_restrictive_wrapper: ../../contracts/solc/v0.7/UpkeepPerformCounterRestrictive.abi ../../contracts/solc/v0.7/UpkeepPerformCounterRestrictive.bin 8975a058fba528e16d8414dc6f13946d17a145fcbc66cf25a32449b6fe1ce878
 upkeep_transcoder: ../../contracts/solc/v0.8.6/UpkeepTranscoder.abi ../../contracts/solc/v0.8.6/UpkeepTranscoder.bin 336c92a981597be26508455f81a908a0784a817b129a59686c5b2c4afcba730a
-verifiable_load_log_trigger_upkeep_wrapper: ../../contracts/solc/v0.8.16/VerifiableLoadLogTriggerUpkeep.abi ../../contracts/solc/v0.8.16/VerifiableLoadLogTriggerUpkeep.bin 13f2238ad1ea1dfde87ea48d1d16a4939dc2c8ede399034c072b07deee9e642e
-verifiable_load_streams_lookup_upkeep_wrapper: ../../contracts/solc/v0.8.16/VerifiableLoadStreamsLookupUpkeep.abi ../../contracts/solc/v0.8.16/VerifiableLoadStreamsLookupUpkeep.bin c626fb01272895f2a87ddd0f038c99bf46e9bedd4abd8dc102fe89ff3cb87a9a
+verifiable_load_log_trigger_upkeep_wrapper: ../../contracts/solc/v0.8.16/VerifiableLoadLogTriggerUpkeep.abi ../../contracts/solc/v0.8.16/VerifiableLoadLogTriggerUpkeep.bin 99b6ac1c38e939af0772c6ad8f43bb6788007ab4da0ac77058ef2b4357bdecda
+verifiable_load_streams_lookup_upkeep_wrapper: ../../contracts/solc/v0.8.16/VerifiableLoadStreamsLookupUpkeep.abi ../../contracts/solc/v0.8.16/VerifiableLoadStreamsLookupUpkeep.bin 785f68c44bfff070505eaa65e38a1af94046e5f9afc1189bcf2c8cfcd1102d66
 verifiable_load_upkeep_wrapper: ../../contracts/solc/v0.8.16/VerifiableLoadUpkeep.abi ../../contracts/solc/v0.8.16/VerifiableLoadUpkeep.bin a3e02c43756ea91e7ce4b81e48c11648f1d12f6663c236780147e41dfa36ebee
 vrf_consumer_v2: ../../contracts/solc/v0.8.6/VRFConsumerV2.abi ../../contracts/solc/v0.8.6/VRFConsumerV2.bin 9ef258bf8e9f8d880fd229ceb145593d91e24fc89366baa0bf19169c5787d15f
 vrf_consumer_v2_plus_upgradeable_example: ../../contracts/solc/v0.8.6/VRFConsumerV2PlusUpgradeableExample.abi ../../contracts/solc/v0.8.6/VRFConsumerV2PlusUpgradeableExample.bin 3155c611e4d6882e9324b6e975033b31356776ea8b031ca63d63da37589d583b