From bd9feb468f23258784d017febc7a2b6f25b4e0a8 Mon Sep 17 00:00:00 2001 From: Calvin Wang Date: Tue, 12 Sep 2023 11:34:33 +1000 Subject: [PATCH 1/2] rename fee token to gas token --- core/chains/cosmos/chain.go | 2 +- core/chains/cosmos/config.go | 8 ++++---- core/chains/cosmos/cosmostxm/txm.go | 2 +- core/chains/cosmos/cosmostxm/txm_internal_test.go | 6 +++--- core/chains/cosmos/cosmostxm/txm_test.go | 12 ++++++------ core/cmd/cosmos_transaction_commands_test.go | 10 +++++----- core/config/docs/chains-cosmos.toml | 4 ++-- core/scripts/go.mod | 2 +- core/scripts/go.sum | 4 ++-- core/services/chainlink/config_test.go | 4 ++-- .../chainlink/relayer_chain_interoperators_test.go | 4 ++-- core/services/chainlink/testdata/config-full.toml | 2 +- .../testdata/config-multi-chain-effective.toml | 4 ++-- core/web/cosmos_chains_controller_test.go | 2 +- core/web/cosmos_transfer_controller.go | 4 ++-- core/web/resolver/testdata/config-full.toml | 2 +- .../testdata/config-multi-chain-effective.toml | 4 ++-- core/web/resolver/testdata/config-multi-chain.toml | 4 ++-- docs/CONFIG.md | 8 ++++---- go.mod | 2 +- go.sum | 4 ++-- integration-tests/go.mod | 2 +- integration-tests/go.sum | 4 ++-- 23 files changed, 50 insertions(+), 50 deletions(-) diff --git a/core/chains/cosmos/chain.go b/core/chains/cosmos/chain.go index c2c7f25f843..6323806cc1f 100644 --- a/core/chains/cosmos/chain.go +++ b/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) diff --git a/core/chains/cosmos/config.go b/core/chains/cosmos/config.go index 21a46505255..fda791d0dc2 100644 --- a/core/chains/cosmos/config.go +++ b/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 { diff --git a/core/chains/cosmos/cosmostxm/txm.go b/core/chains/cosmos/cosmostxm/txm.go index 84118b9381b..de741e8934f 100644 --- a/core/chains/cosmos/cosmostxm/txm.go +++ b/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") } diff --git a/core/chains/cosmos/cosmostxm/txm_internal_test.go b/core/chains/cosmos/cosmostxm/txm_internal_test.go index 17eeb74421a..2f0b4fda06f 100644 --- a/core/chains/cosmos/cosmostxm/txm_internal_test.go +++ b/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), ), diff --git a/core/chains/cosmos/cosmostxm/txm_test.go b/core/chains/cosmos/cosmostxm/txm_test.go index 9966ff44a5b..a3322ed2744 100644 --- a/core/chains/cosmos/cosmostxm/txm_test.go +++ b/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,8 +77,8 @@ 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) @@ -86,7 +86,7 @@ func TestTxm_Integration(t *testing.T) { // 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, diff --git a/core/cmd/cosmos_transaction_commands_test.go b/core/cmd/cosmos_transaction_commands_test.go index 11b89c5232a..04858d2956a 100644 --- a/core/cmd/cosmos_transaction_commands_test.go +++ b/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()) diff --git a/core/config/docs/chains-cosmos.toml b/core/config/docs/chains-cosmos.toml index 3281c6c27a6..bcdb040a680 100644 --- a/core/config/docs/chains-cosmos.toml +++ b/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. diff --git a/core/scripts/go.mod b/core/scripts/go.mod index cfdcdf648e1..0914efe98d1 100644 --- a/core/scripts/go.mod +++ b/core/scripts/go.mod @@ -298,7 +298,7 @@ require ( github.com/shirou/gopsutil/v3 v3.23.8 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 // indirect - github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20230831132059-42af68994512 // indirect + github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20230912003938-aadb8356baf0 // indirect github.com/smartcontractkit/chainlink-relay v0.1.7-0.20230908162043-e2f9fcf758d8 // indirect github.com/smartcontractkit/chainlink-solana v1.0.3-0.20230831134610-680240b97aca // indirect github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20230901115736-bbabe542a918 // indirect diff --git a/core/scripts/go.sum b/core/scripts/go.sum index 8ef1604eecb..178ac8aac51 100644 --- a/core/scripts/go.sum +++ b/core/scripts/go.sum @@ -1375,8 +1375,8 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumvbfM1u/etVq42Afwq/jtNSBSOA8n5jntnNPo= github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M= -github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20230831132059-42af68994512 h1:DojChlaudA1HAxwQPKmt/EDf36OUeFJ0LJBYClauMyU= -github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20230831132059-42af68994512/go.mod h1:xMwqRdj5vqYhCJXgKVqvyAwdcqM6ZAEhnwEQ4Khsop8= +github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20230912003938-aadb8356baf0 h1:SFXDVyJ6IAnxH11/63dGkFJmPQT5UT8SudJAFn25O4M= +github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20230912003938-aadb8356baf0/go.mod h1:xMwqRdj5vqYhCJXgKVqvyAwdcqM6ZAEhnwEQ4Khsop8= github.com/smartcontractkit/chainlink-relay v0.1.7-0.20230908162043-e2f9fcf758d8 h1:JRXkI/eE1S0E3VatXVc24vD5e8Zu+YwSV6uSvOh23xU= github.com/smartcontractkit/chainlink-relay v0.1.7-0.20230908162043-e2f9fcf758d8/go.mod h1:gWclxGW7rLkbjXn7FGizYlyKhp/boekto4MEYGyiMG4= github.com/smartcontractkit/chainlink-solana v1.0.3-0.20230831134610-680240b97aca h1:x7M0m512gtXw5Z4B1WJPZ52VgshoIv+IvHqQ8hsH4AE= diff --git a/core/services/chainlink/config_test.go b/core/services/chainlink/config_test.go index e2e12545613..61ba9594e04 100644 --- a/core/services/chainlink/config_test.go +++ b/core/services/chainlink/config_test.go @@ -614,7 +614,7 @@ func TestConfig_Marshal(t *testing.T) { BlocksUntilTxTimeout: ptr[int64](12), ConfirmPollPeriod: relayutils.MustNewDuration(time.Second), FallbackGasPrice: mustDecimal("0.001"), - FeeToken: ptr("ucosm"), + GasToken: ptr("ucosm"), GasLimitMultiplier: mustDecimal("1.2"), MaxMsgsPerBatch: ptr[int64](17), OCR2CachePollPeriod: relayutils.MustNewDuration(time.Minute), @@ -962,7 +962,7 @@ BlockRate = '1m0s' BlocksUntilTxTimeout = 12 ConfirmPollPeriod = '1s' FallbackGasPrice = '0.001' -FeeToken = 'ucosm' +GasToken = 'ucosm' GasLimitMultiplier = '1.2' MaxMsgsPerBatch = 17 OCR2CachePollPeriod = '1m0s' diff --git a/core/services/chainlink/relayer_chain_interoperators_test.go b/core/services/chainlink/relayer_chain_interoperators_test.go index 5a6e3cbcfb3..9cfe354fe91 100644 --- a/core/services/chainlink/relayer_chain_interoperators_test.go +++ b/core/services/chainlink/relayer_chain_interoperators_test.go @@ -140,7 +140,7 @@ func TestCoreRelayerChainInteroperators(t *testing.T) { Chain: coscfg.Chain{ GasLimitMultiplier: ptr(decimal.RequireFromString("1.55555")), Bech32Prefix: ptr("wasm"), - FeeToken: ptr("cosm"), + GasToken: ptr("cosm"), }, Nodes: cosmos.CosmosNodes{ &coscfg.Node{ @@ -155,7 +155,7 @@ func TestCoreRelayerChainInteroperators(t *testing.T) { Chain: coscfg.Chain{ GasLimitMultiplier: ptr(decimal.RequireFromString("0.777")), Bech32Prefix: ptr("wasm"), - FeeToken: ptr("cosm"), + GasToken: ptr("cosm"), }, Nodes: cosmos.CosmosNodes{ &coscfg.Node{ diff --git a/core/services/chainlink/testdata/config-full.toml b/core/services/chainlink/testdata/config-full.toml index 4279cc729f9..f10d12f35ee 100644 --- a/core/services/chainlink/testdata/config-full.toml +++ b/core/services/chainlink/testdata/config-full.toml @@ -325,7 +325,7 @@ BlockRate = '1m0s' BlocksUntilTxTimeout = 12 ConfirmPollPeriod = '1s' FallbackGasPrice = '0.001' -FeeToken = 'ucosm' +GasToken = 'ucosm' GasLimitMultiplier = '1.2' MaxMsgsPerBatch = 17 OCR2CachePollPeriod = '1m0s' diff --git a/core/services/chainlink/testdata/config-multi-chain-effective.toml b/core/services/chainlink/testdata/config-multi-chain-effective.toml index d6b38349b83..876591c65e2 100644 --- a/core/services/chainlink/testdata/config-multi-chain-effective.toml +++ b/core/services/chainlink/testdata/config-multi-chain-effective.toml @@ -456,7 +456,7 @@ BlockRate = '6s' BlocksUntilTxTimeout = 30 ConfirmPollPeriod = '1s' FallbackGasPrice = '0.015' -FeeToken = 'ucosm' +GasToken = 'ucosm' GasLimitMultiplier = '1.5' MaxMsgsPerBatch = 13 OCR2CachePollPeriod = '4s' @@ -474,7 +474,7 @@ BlockRate = '6s' BlocksUntilTxTimeout = 20 ConfirmPollPeriod = '1s' FallbackGasPrice = '0.015' -FeeToken = 'ucosm' +GasToken = 'ucosm' GasLimitMultiplier = '1.5' MaxMsgsPerBatch = 100 OCR2CachePollPeriod = '4s' diff --git a/core/web/cosmos_chains_controller_test.go b/core/web/cosmos_chains_controller_test.go index f670076d748..3fc42f3d860 100644 --- a/core/web/cosmos_chains_controller_test.go +++ b/core/web/cosmos_chains_controller_test.go @@ -48,7 +48,7 @@ BlockRate = '6s' BlocksUntilTxTimeout = 30 ConfirmPollPeriod = '1s' FallbackGasPrice = '9.999' -FeeToken = 'ucosm' +GasToken = 'ucosm' GasLimitMultiplier = '1.55555' MaxMsgsPerBatch = 100 OCR2CachePollPeriod = '4s' diff --git a/core/web/cosmos_transfer_controller.go b/core/web/cosmos_transfer_controller.go index 2409a05e6a4..afe0fe16d1e 100644 --- a/core/web/cosmos_transfer_controller.go +++ b/core/web/cosmos_transfer_controller.go @@ -58,9 +58,9 @@ func (tc *CosmosTransfersController) Create(c *gin.Context) { jsonAPIError(c, http.StatusUnprocessableEntity, errors.Errorf("withdrawal source address is missing: %v", tr.FromAddress)) return } - coin, err := denom.ConvertDecCoinToDenom(sdk.NewDecCoinFromDec(tr.Token, tr.Amount), chain.Config().FeeToken()) + coin, err := denom.ConvertDecCoinToDenom(sdk.NewDecCoinFromDec(tr.Token, tr.Amount), chain.Config().GasToken()) if err != nil { - jsonAPIError(c, http.StatusBadRequest, errors.Errorf("unable to convert %s to %s: %v", tr.Token, chain.Config().FeeToken(), err)) + jsonAPIError(c, http.StatusBadRequest, errors.Errorf("unable to convert %s to %s: %v", tr.Token, chain.Config().GasToken(), err)) return } else if !coin.Amount.IsPositive() { jsonAPIError(c, http.StatusBadRequest, errors.Errorf("amount must be greater than zero: %s", coin.Amount)) diff --git a/core/web/resolver/testdata/config-full.toml b/core/web/resolver/testdata/config-full.toml index 96f24b1955c..ceb3849c3ab 100644 --- a/core/web/resolver/testdata/config-full.toml +++ b/core/web/resolver/testdata/config-full.toml @@ -324,7 +324,7 @@ BlockRate = '1m0s' BlocksUntilTxTimeout = 12 ConfirmPollPeriod = '1s' FallbackGasPrice = '0.001' -FeeToken = 'ucosm' +GasToken = 'ucosm' GasLimitMultiplier = '1.2' MaxMsgsPerBatch = 17 OCR2CachePollPeriod = '1m0s' diff --git a/core/web/resolver/testdata/config-multi-chain-effective.toml b/core/web/resolver/testdata/config-multi-chain-effective.toml index d6b38349b83..876591c65e2 100644 --- a/core/web/resolver/testdata/config-multi-chain-effective.toml +++ b/core/web/resolver/testdata/config-multi-chain-effective.toml @@ -456,7 +456,7 @@ BlockRate = '6s' BlocksUntilTxTimeout = 30 ConfirmPollPeriod = '1s' FallbackGasPrice = '0.015' -FeeToken = 'ucosm' +GasToken = 'ucosm' GasLimitMultiplier = '1.5' MaxMsgsPerBatch = 13 OCR2CachePollPeriod = '4s' @@ -474,7 +474,7 @@ BlockRate = '6s' BlocksUntilTxTimeout = 20 ConfirmPollPeriod = '1s' FallbackGasPrice = '0.015' -FeeToken = 'ucosm' +GasToken = 'ucosm' GasLimitMultiplier = '1.5' MaxMsgsPerBatch = 100 OCR2CachePollPeriod = '4s' diff --git a/core/web/resolver/testdata/config-multi-chain.toml b/core/web/resolver/testdata/config-multi-chain.toml index eee786e69bf..543fb3156bd 100644 --- a/core/web/resolver/testdata/config-multi-chain.toml +++ b/core/web/resolver/testdata/config-multi-chain.toml @@ -72,7 +72,7 @@ WSURL = 'wss://web.socket/test/bar' [[Cosmos]] ChainID = 'Ibiza-808' Bech32Prefix = 'wasm' -FeeToken = 'ucosm' +GasToken = 'ucosm' MaxMsgsPerBatch = 13 [[Cosmos.Nodes]] @@ -83,7 +83,7 @@ TendermintURL = 'http://columbus.cosmos.com' ChainID = 'Malaga-420' Bech32Prefix = 'wasm' BlocksUntilTxTimeout = 20 -FeeToken = 'ucosm' +GasToken = 'ucosm' [[Cosmos.Nodes]] Name = 'secondary' diff --git a/docs/CONFIG.md b/docs/CONFIG.md index 2bda2c9160a..16021193172 100644 --- a/docs/CONFIG.md +++ b/docs/CONFIG.md @@ -5140,7 +5140,7 @@ BlockRate = '6s' # Default BlocksUntilTxTimeout = 30 # Default ConfirmPollPeriod = '1s' # Default FallbackGasPrice = '0.015' # Default -FeeToken = 'ucosm' # Default +GasToken = 'ucosm' # Default GasLimitMultiplier = '1.5' # Default MaxMsgsPerBatch = 100 # Default OCR2CachePollPeriod = '4s' # Default @@ -5191,11 +5191,11 @@ FallbackGasPrice = '0.015' # Default ``` FallbackGasPrice sets a fallback gas price to use when the estimator is not available. -### FeeToken +### GasToken ```toml -FeeToken = 'ucosm' # Default +GasToken = 'ucosm' # Default ``` -FeeToken is the token denomination which is being used to pay gas fees on this chain. +GasToken is the token denomination which is being used to pay gas fees on this chain. ### GasLimitMultiplier ```toml diff --git a/go.mod b/go.mod index 24bf77eebf1..71c839bdd7e 100644 --- a/go.mod +++ b/go.mod @@ -66,7 +66,7 @@ require ( github.com/shirou/gopsutil/v3 v3.23.8 github.com/shopspring/decimal v1.3.1 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 - github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20230831132059-42af68994512 + github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20230912003938-aadb8356baf0 github.com/smartcontractkit/chainlink-relay v0.1.7-0.20230908162043-e2f9fcf758d8 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20230831134610-680240b97aca github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20230901115736-bbabe542a918 diff --git a/go.sum b/go.sum index b1ec22c6350..de6f4ea5a5f 100644 --- a/go.sum +++ b/go.sum @@ -1375,8 +1375,8 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumvbfM1u/etVq42Afwq/jtNSBSOA8n5jntnNPo= github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M= -github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20230831132059-42af68994512 h1:DojChlaudA1HAxwQPKmt/EDf36OUeFJ0LJBYClauMyU= -github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20230831132059-42af68994512/go.mod h1:xMwqRdj5vqYhCJXgKVqvyAwdcqM6ZAEhnwEQ4Khsop8= +github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20230912003938-aadb8356baf0 h1:SFXDVyJ6IAnxH11/63dGkFJmPQT5UT8SudJAFn25O4M= +github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20230912003938-aadb8356baf0/go.mod h1:xMwqRdj5vqYhCJXgKVqvyAwdcqM6ZAEhnwEQ4Khsop8= github.com/smartcontractkit/chainlink-relay v0.1.7-0.20230908162043-e2f9fcf758d8 h1:JRXkI/eE1S0E3VatXVc24vD5e8Zu+YwSV6uSvOh23xU= github.com/smartcontractkit/chainlink-relay v0.1.7-0.20230908162043-e2f9fcf758d8/go.mod h1:gWclxGW7rLkbjXn7FGizYlyKhp/boekto4MEYGyiMG4= github.com/smartcontractkit/chainlink-solana v1.0.3-0.20230831134610-680240b97aca h1:x7M0m512gtXw5Z4B1WJPZ52VgshoIv+IvHqQ8hsH4AE= diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 21ee3231280..f0cf8a15427 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -383,7 +383,7 @@ require ( github.com/shopspring/decimal v1.3.1 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 // indirect - github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20230831132059-42af68994512 // indirect + github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20230912003938-aadb8356baf0 // indirect github.com/smartcontractkit/chainlink-relay v0.1.7-0.20230908162043-e2f9fcf758d8 // indirect github.com/smartcontractkit/chainlink-solana v1.0.3-0.20230831134610-680240b97aca // indirect github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20230901115736-bbabe542a918 // indirect diff --git a/integration-tests/go.sum b/integration-tests/go.sum index e1a781be190..fa14ed9a294 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -2248,8 +2248,8 @@ github.com/slack-go/slack v0.12.2 h1:x3OppyMyGIbbiyFhsBmpf9pwkUzMhthJMRNmNlA4LaQ github.com/slack-go/slack v0.12.2/go.mod h1:hlGi5oXA+Gt+yWTPP0plCdRKmjsDxecdHxYQdlMQKOw= github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumvbfM1u/etVq42Afwq/jtNSBSOA8n5jntnNPo= github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M= -github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20230831132059-42af68994512 h1:DojChlaudA1HAxwQPKmt/EDf36OUeFJ0LJBYClauMyU= -github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20230831132059-42af68994512/go.mod h1:xMwqRdj5vqYhCJXgKVqvyAwdcqM6ZAEhnwEQ4Khsop8= +github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20230912003938-aadb8356baf0 h1:SFXDVyJ6IAnxH11/63dGkFJmPQT5UT8SudJAFn25O4M= +github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20230912003938-aadb8356baf0/go.mod h1:xMwqRdj5vqYhCJXgKVqvyAwdcqM6ZAEhnwEQ4Khsop8= github.com/smartcontractkit/chainlink-env v0.36.0 h1:CFOjs0c0y3lrHi/fl5qseCH9EQa5W/6CFyOvmhe2VnA= github.com/smartcontractkit/chainlink-env v0.36.0/go.mod h1:NbRExHmJGnKSYXmvNuJx5VErSx26GtE1AEN/CRzYOg8= github.com/smartcontractkit/chainlink-relay v0.1.7-0.20230908162043-e2f9fcf758d8 h1:JRXkI/eE1S0E3VatXVc24vD5e8Zu+YwSV6uSvOh23xU= From c064cafd95574d0c7fcd097146db20d9657b312a Mon Sep 17 00:00:00 2001 From: Calvin Wang Date: Wed, 13 Sep 2023 13:32:14 +1000 Subject: [PATCH 2/2] bump chainlink-cosmos version --- core/scripts/go.mod | 2 +- core/scripts/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- integration-tests/go.mod | 2 +- integration-tests/go.sum | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/core/scripts/go.mod b/core/scripts/go.mod index 774f6439ac7..adf4f65f519 100644 --- a/core/scripts/go.mod +++ b/core/scripts/go.mod @@ -298,7 +298,7 @@ require ( github.com/shirou/gopsutil/v3 v3.23.8 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 // indirect - github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20230912003938-aadb8356baf0 // indirect + github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20230913032705-f924d753cc47 // indirect github.com/smartcontractkit/chainlink-relay v0.1.7-0.20230912195355-fec1da7953fc // indirect github.com/smartcontractkit/chainlink-solana v1.0.3-0.20230831134610-680240b97aca // indirect github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20230901115736-bbabe542a918 // indirect diff --git a/core/scripts/go.sum b/core/scripts/go.sum index 492112fc617..dcc236cec24 100644 --- a/core/scripts/go.sum +++ b/core/scripts/go.sum @@ -1375,8 +1375,8 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumvbfM1u/etVq42Afwq/jtNSBSOA8n5jntnNPo= github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M= -github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20230912003938-aadb8356baf0 h1:SFXDVyJ6IAnxH11/63dGkFJmPQT5UT8SudJAFn25O4M= -github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20230912003938-aadb8356baf0/go.mod h1:xMwqRdj5vqYhCJXgKVqvyAwdcqM6ZAEhnwEQ4Khsop8= +github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20230913032705-f924d753cc47 h1:vdieOW3CZGdD2R5zvCSMS+0vksyExPN3/Fa1uVfld/A= +github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20230913032705-f924d753cc47/go.mod h1:xMwqRdj5vqYhCJXgKVqvyAwdcqM6ZAEhnwEQ4Khsop8= github.com/smartcontractkit/chainlink-relay v0.1.7-0.20230912195355-fec1da7953fc h1:mQCCjnDz2I1XlYv/fDyFnEB8ryAchlpz12Eg0f7n/N0= github.com/smartcontractkit/chainlink-relay v0.1.7-0.20230912195355-fec1da7953fc/go.mod h1:gWclxGW7rLkbjXn7FGizYlyKhp/boekto4MEYGyiMG4= github.com/smartcontractkit/chainlink-solana v1.0.3-0.20230831134610-680240b97aca h1:x7M0m512gtXw5Z4B1WJPZ52VgshoIv+IvHqQ8hsH4AE= diff --git a/go.mod b/go.mod index cd9ae7ce415..2e580e19dc8 100644 --- a/go.mod +++ b/go.mod @@ -66,7 +66,7 @@ require ( github.com/shirou/gopsutil/v3 v3.23.8 github.com/shopspring/decimal v1.3.1 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 - github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20230912003938-aadb8356baf0 + github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20230913032705-f924d753cc47 github.com/smartcontractkit/chainlink-relay v0.1.7-0.20230912195355-fec1da7953fc github.com/smartcontractkit/chainlink-solana v1.0.3-0.20230831134610-680240b97aca github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20230901115736-bbabe542a918 diff --git a/go.sum b/go.sum index ed83596eb65..3db218d6c93 100644 --- a/go.sum +++ b/go.sum @@ -1375,8 +1375,8 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumvbfM1u/etVq42Afwq/jtNSBSOA8n5jntnNPo= github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M= -github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20230912003938-aadb8356baf0 h1:SFXDVyJ6IAnxH11/63dGkFJmPQT5UT8SudJAFn25O4M= -github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20230912003938-aadb8356baf0/go.mod h1:xMwqRdj5vqYhCJXgKVqvyAwdcqM6ZAEhnwEQ4Khsop8= +github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20230913032705-f924d753cc47 h1:vdieOW3CZGdD2R5zvCSMS+0vksyExPN3/Fa1uVfld/A= +github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20230913032705-f924d753cc47/go.mod h1:xMwqRdj5vqYhCJXgKVqvyAwdcqM6ZAEhnwEQ4Khsop8= github.com/smartcontractkit/chainlink-relay v0.1.7-0.20230912195355-fec1da7953fc h1:mQCCjnDz2I1XlYv/fDyFnEB8ryAchlpz12Eg0f7n/N0= github.com/smartcontractkit/chainlink-relay v0.1.7-0.20230912195355-fec1da7953fc/go.mod h1:gWclxGW7rLkbjXn7FGizYlyKhp/boekto4MEYGyiMG4= github.com/smartcontractkit/chainlink-solana v1.0.3-0.20230831134610-680240b97aca h1:x7M0m512gtXw5Z4B1WJPZ52VgshoIv+IvHqQ8hsH4AE= diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 8804c152474..99bb5ee28f8 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -383,7 +383,7 @@ require ( github.com/shopspring/decimal v1.3.1 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 // indirect - github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20230912003938-aadb8356baf0 // indirect + github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20230913032705-f924d753cc47 // indirect github.com/smartcontractkit/chainlink-relay v0.1.7-0.20230912195355-fec1da7953fc // indirect github.com/smartcontractkit/chainlink-solana v1.0.3-0.20230831134610-680240b97aca // indirect github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20230901115736-bbabe542a918 // indirect diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 69ba2f64e4b..004c5d02bea 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -2248,8 +2248,8 @@ github.com/slack-go/slack v0.12.2 h1:x3OppyMyGIbbiyFhsBmpf9pwkUzMhthJMRNmNlA4LaQ github.com/slack-go/slack v0.12.2/go.mod h1:hlGi5oXA+Gt+yWTPP0plCdRKmjsDxecdHxYQdlMQKOw= github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumvbfM1u/etVq42Afwq/jtNSBSOA8n5jntnNPo= github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M= -github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20230912003938-aadb8356baf0 h1:SFXDVyJ6IAnxH11/63dGkFJmPQT5UT8SudJAFn25O4M= -github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20230912003938-aadb8356baf0/go.mod h1:xMwqRdj5vqYhCJXgKVqvyAwdcqM6ZAEhnwEQ4Khsop8= +github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20230913032705-f924d753cc47 h1:vdieOW3CZGdD2R5zvCSMS+0vksyExPN3/Fa1uVfld/A= +github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20230913032705-f924d753cc47/go.mod h1:xMwqRdj5vqYhCJXgKVqvyAwdcqM6ZAEhnwEQ4Khsop8= github.com/smartcontractkit/chainlink-env v0.36.0 h1:CFOjs0c0y3lrHi/fl5qseCH9EQa5W/6CFyOvmhe2VnA= github.com/smartcontractkit/chainlink-env v0.36.0/go.mod h1:NbRExHmJGnKSYXmvNuJx5VErSx26GtE1AEN/CRzYOg8= github.com/smartcontractkit/chainlink-relay v0.1.7-0.20230912195355-fec1da7953fc h1:mQCCjnDz2I1XlYv/fDyFnEB8ryAchlpz12Eg0f7n/N0=