From 8176b1b7804ca464e68da78d4d42ef049f88253c Mon Sep 17 00:00:00 2001 From: Joe Huang Date: Tue, 5 Nov 2024 11:45:56 -0600 Subject: [PATCH 1/4] remove dependency of evmConfig in plugin oracle creator function --- core/capabilities/ccip/configs/evm/chain_writer.go | 9 --------- core/capabilities/ccip/delegate.go | 1 - core/capabilities/ccip/oraclecreator/plugin.go | 11 ----------- core/services/relay/evm/evm.go | 1 + 4 files changed, 1 insertion(+), 21 deletions(-) diff --git a/core/capabilities/ccip/configs/evm/chain_writer.go b/core/capabilities/ccip/configs/evm/chain_writer.go index f88bfce937b..ada135aecd8 100644 --- a/core/capabilities/ccip/configs/evm/chain_writer.go +++ b/core/capabilities/ccip/configs/evm/chain_writer.go @@ -8,7 +8,6 @@ import ( "github.com/smartcontractkit/chainlink-ccip/pkg/consts" - "github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets" evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types" "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/offramp" evmrelaytypes "github.com/smartcontractkit/chainlink/v2/core/services/relay/evm/types" @@ -21,19 +20,12 @@ var ( // ChainWriterConfigRaw returns a ChainWriterConfig that can be used to transmit commit and execute reports. func ChainWriterConfigRaw( fromAddress common.Address, - maxGasPrice *assets.Wei, commitGasLimit, execBatchGasLimit uint64, ) (evmrelaytypes.ChainWriterConfig, error) { if fromAddress == common.HexToAddress("0x0") { return evmrelaytypes.ChainWriterConfig{}, fmt.Errorf("fromAddress cannot be zero") } - if maxGasPrice == nil { - return evmrelaytypes.ChainWriterConfig{}, fmt.Errorf("maxGasPrice cannot be nil") - } - if maxGasPrice.Cmp(assets.NewWeiI(0)) <= 0 { - return evmrelaytypes.ChainWriterConfig{}, fmt.Errorf("maxGasPrice must be greater than zero") - } if commitGasLimit == 0 { return evmrelaytypes.ChainWriterConfig{}, fmt.Errorf("commitGasLimit must be greater than zero") } @@ -59,7 +51,6 @@ func ChainWriterConfigRaw( }, }, }, - MaxGasPrice: maxGasPrice, }, nil } diff --git a/core/capabilities/ccip/delegate.go b/core/capabilities/ccip/delegate.go index 7e5401ad5e6..09e3769627e 100644 --- a/core/capabilities/ccip/delegate.go +++ b/core/capabilities/ccip/delegate.go @@ -205,7 +205,6 @@ func (d *Delegate) ServicesForSpec(ctx context.Context, spec job.Job) (services bootstrapperLocators, hcr, cciptypes.ChainSelector(homeChainChainSelector), - d.evmConfigs, ) } else { oracleCreator = oraclecreator.NewBootstrapOracleCreator( diff --git a/core/capabilities/ccip/oraclecreator/plugin.go b/core/capabilities/ccip/oraclecreator/plugin.go index 2b4fae933a3..ccd32d0054e 100644 --- a/core/capabilities/ccip/oraclecreator/plugin.go +++ b/core/capabilities/ccip/oraclecreator/plugin.go @@ -73,7 +73,6 @@ type pluginOracleCreator struct { homeChainReader ccipreaderpkg.HomeChain homeChainSelector cciptypes.ChainSelector relayers map[types.RelayID]loop.Relayer - evmConfigs toml.EVMConfigs } func NewPluginOracleCreator( @@ -91,7 +90,6 @@ func NewPluginOracleCreator( bootstrapperLocators []commontypes.BootstrapperLocator, homeChainReader ccipreaderpkg.HomeChain, homeChainSelector cciptypes.ChainSelector, - evmConfigs toml.EVMConfigs, ) cctypes.OracleCreator { return &pluginOracleCreator{ ocrKeyBundles: ocrKeyBundles, @@ -108,7 +106,6 @@ func NewPluginOracleCreator( bootstrapperLocators: bootstrapperLocators, homeChainReader: homeChainReader, homeChainSelector: homeChainSelector, - evmConfigs: evmConfigs, } } @@ -365,7 +362,6 @@ func (i *pluginOracleCreator) createReadersAndWriters( cw, err1 := createChainWriter( chainID, - i.evmConfigs, relayer, i.transmitters, execBatchGasLimit) @@ -477,7 +473,6 @@ func isUSDCEnabled(chainID uint64, destChainID uint64, ofc offChainConfig) bool func createChainWriter( chainID *big.Int, - evmConfigs toml.EVMConfigs, relayer loop.Relayer, transmitters map[types.RelayID][]string, execBatchGasLimit uint64, @@ -489,14 +484,8 @@ func createChainWriter( fromAddress = common.HexToAddress(transmitter[0]) } - maxGasPrice := getKeySpecificMaxGasPrice(evmConfigs, chainID, fromAddress) - if maxGasPrice == nil { - return nil, fmt.Errorf("failed to find max gas price for chain %s", chainID.String()) - } - chainWriterRawConfig, err := evmconfig.ChainWriterConfigRaw( fromAddress, - maxGasPrice, defaultCommitGasLimit, execBatchGasLimit, ) diff --git a/core/services/relay/evm/evm.go b/core/services/relay/evm/evm.go index 43b8408d2ee..add499704ed 100644 --- a/core/services/relay/evm/evm.go +++ b/core/services/relay/evm/evm.go @@ -838,6 +838,7 @@ func (r *Relayer) NewChainWriter(_ context.Context, config []byte) (commontypes. return nil, fmt.Errorf("failed to unmarshall chain writer config err: %s", err) } + cfg.MaxGasPrice = r.chain.Config().EVM().GasEstimator().PriceMax() return NewChainWriterService(r.lggr, r.chain.Client(), r.chain.TxManager(), r.chain.GasEstimator(), cfg) } From 0372c3b334439913dce934b23d4ffca4facd4331 Mon Sep 17 00:00:00 2001 From: Joe Huang Date: Tue, 5 Nov 2024 11:57:07 -0600 Subject: [PATCH 2/4] fix make --- core/capabilities/ccip/configs/evm/chain_writer_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/capabilities/ccip/configs/evm/chain_writer_test.go b/core/capabilities/ccip/configs/evm/chain_writer_test.go index e24863866cc..17fdcedc35c 100644 --- a/core/capabilities/ccip/configs/evm/chain_writer_test.go +++ b/core/capabilities/ccip/configs/evm/chain_writer_test.go @@ -80,7 +80,7 @@ func TestChainWriterConfigRaw(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - config, err := evm.ChainWriterConfigRaw(tt.fromAddress, tt.maxGasPrice, tt.commitGasLimit, tt.execBatchGasLimit) + config, err := evm.ChainWriterConfigRaw(tt.fromAddress, tt.commitGasLimit, tt.execBatchGasLimit) if tt.expectedError != "" { assert.EqualError(t, err, tt.expectedError) } else { From 040245cf529957b9a9f9f2fc36a2219e42010c1d Mon Sep 17 00:00:00 2001 From: Joe Huang Date: Tue, 5 Nov 2024 12:13:39 -0600 Subject: [PATCH 3/4] add changeset --- .changeset/brave-frogs-greet.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/brave-frogs-greet.md diff --git a/.changeset/brave-frogs-greet.md b/.changeset/brave-frogs-greet.md new file mode 100644 index 00000000000..907e8f1ee75 --- /dev/null +++ b/.changeset/brave-frogs-greet.md @@ -0,0 +1,5 @@ +--- +"chainlink": minor +--- + +update plugin and evm chainwriter to remove evmConfig dependency #updated From 00ced560ab02d00166cafc28e75d681a7b2ebf7c Mon Sep 17 00:00:00 2001 From: Joe Huang Date: Tue, 5 Nov 2024 13:40:07 -0600 Subject: [PATCH 4/4] update test --- .../ccip/configs/evm/chain_writer_test.go | 33 ------------------- 1 file changed, 33 deletions(-) diff --git a/core/capabilities/ccip/configs/evm/chain_writer_test.go b/core/capabilities/ccip/configs/evm/chain_writer_test.go index 17fdcedc35c..a8851ab6e48 100644 --- a/core/capabilities/ccip/configs/evm/chain_writer_test.go +++ b/core/capabilities/ccip/configs/evm/chain_writer_test.go @@ -8,14 +8,12 @@ import ( "github.com/smartcontractkit/chainlink-ccip/pkg/consts" "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/configs/evm" - "github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets" ) func TestChainWriterConfigRaw(t *testing.T) { tests := []struct { name string fromAddress common.Address - maxGasPrice *assets.Wei commitGasLimit uint64 execBatchGasLimit uint64 expectedError string @@ -23,7 +21,6 @@ func TestChainWriterConfigRaw(t *testing.T) { { name: "valid input", fromAddress: common.HexToAddress("0x1234567890abcdef1234567890abcdef12345678"), - maxGasPrice: assets.NewWeiI(1000000000), commitGasLimit: 21000, execBatchGasLimit: 42000, expectedError: "", @@ -31,39 +28,13 @@ func TestChainWriterConfigRaw(t *testing.T) { { name: "zero fromAddress", fromAddress: common.HexToAddress("0x0"), - maxGasPrice: assets.NewWeiI(1000000000), commitGasLimit: 21000, execBatchGasLimit: 42000, expectedError: "fromAddress cannot be zero", }, - { - name: "nil maxGasPrice", - fromAddress: common.HexToAddress("0x1234567890abcdef1234567890abcdef12345678"), - maxGasPrice: nil, - commitGasLimit: 21000, - execBatchGasLimit: 42000, - expectedError: "maxGasPrice cannot be nil", - }, - { - name: "zero maxGasPrice", - fromAddress: common.HexToAddress("0x1234567890abcdef1234567890abcdef12345678"), - maxGasPrice: assets.NewWeiI(0), - commitGasLimit: 21000, - execBatchGasLimit: 42000, - expectedError: "maxGasPrice must be greater than zero", - }, - { - name: "negative maxGasPrice", - fromAddress: common.HexToAddress("0x1234567890abcdef1234567890abcdef12345678"), - maxGasPrice: assets.NewWeiI(-1), - commitGasLimit: 21000, - execBatchGasLimit: 42000, - expectedError: "maxGasPrice must be greater than zero", - }, { name: "zero commitGasLimit", fromAddress: common.HexToAddress("0x1234567890abcdef1234567890abcdef12345678"), - maxGasPrice: assets.NewWeiI(1000000000), commitGasLimit: 0, execBatchGasLimit: 42000, expectedError: "commitGasLimit must be greater than zero", @@ -71,7 +42,6 @@ func TestChainWriterConfigRaw(t *testing.T) { { name: "zero execBatchGasLimit", fromAddress: common.HexToAddress("0x1234567890abcdef1234567890abcdef12345678"), - maxGasPrice: assets.NewWeiI(1000000000), commitGasLimit: 21000, execBatchGasLimit: 0, expectedError: "execBatchGasLimit must be greater than zero", @@ -94,9 +64,6 @@ func TestChainWriterConfigRaw(t *testing.T) { assert.Equal(t, tt.execBatchGasLimit, config.Contracts[consts.ContractNameOffRamp].Configs[consts.MethodExecute].GasLimit) - assert.Equal(t, - tt.maxGasPrice, - config.MaxGasPrice) } }) }