OEV-699 Introduce relayConfig.GasLimit to override gas limit on job level (#302)

Author: cll-gg

pkg/.mockery.yaml

@@ -24,6 +24,7 @@ packages:
       ChainScopedConfig:
       EVM:
       Workflow:
+      LimitJobType:
   github.com/smartcontractkit/chainlink-evm/pkg/gas:
     interfaces:
       EvmFeeEstimator:

pkg/config/mocks/limit_job_type.go

@@ -205,6 +205,9 @@ type RelayConfig struct {
 	// DualTransmission specific
 	EnableDualTransmission bool                    `json:"enableDualTransmission" toml:"enableDualTransmission"`
 	DualTransmissionConfig *DualTransmissionConfig `json:"dualTransmission" toml:"dualTransmission"`
+
+	// GasLimit is the gas limit to use for transactions, it has a higher precedence than the gas limit in the node toml config
+	GasLimit *uint32 `json:"gasLimit"`
 }
 
 var ErrBadRelayConfig = errors.New("bad relay config")

pkg/config/types.go

@@ -32,11 +32,13 @@ func Test_RelayConfig(t *testing.T) {
 	cid := testutils.NewRandomEVMChainID()
 	fromBlock := uint64(2222)
 	feedID := utils.NewHash()
+	gasLimit := uint32(444444)
 	rawToml := fmt.Sprintf(`
 ChainID = "%s"
 FromBlock = %d
 FeedID = "0x%x"
-`, cid, fromBlock, feedID[:])
+GasLimit = %d
+`, cid, fromBlock, feedID[:], gasLimit)
 
 	var rc RelayConfig
 	err := toml.Unmarshal([]byte(rawToml), &rc)
@@ -45,6 +47,7 @@ FeedID = "0x%x"
 	assert.Equal(t, cid.String(), rc.ChainID.String())
 	assert.Equal(t, fromBlock, rc.FromBlock)
 	assert.Equal(t, feedID.Hex(), rc.FeedID.Hex())
+	assert.Equal(t, gasLimit, *rc.GasLimit)
 }
 
 func Test_ChainReaderConfig(t *testing.T) {

pkg/config/types_test.go

@@ -1,6 +1,7 @@
 package transmitter
 
 import (
+	"cmp"
 	"context"
 	"encoding/json"
 
@@ -134,15 +135,7 @@ func generateTransmitterFrom(ctx context.Context, rargs types.RelayArgs, ethKeys
 		checker.CheckerType = evmtxmgr.TransmitCheckerTypeSimulate
 	}
 
-	gasLimit := chain.Config().EVM().GasEstimator().LimitDefault()
-	ocr2Limit := chain.Config().EVM().GasEstimator().LimitJobType().OCR2()
-	if ocr2Limit != nil {
-		gasLimit = uint64(*ocr2Limit)
-	}
-	if opts.PluginGasLimit != nil {
-		gasLimit = uint64(*opts.PluginGasLimit)
-	}
-
+	gasLimit := getGasLimitFrom(chain.Config().EVM().GasEstimator(), opts, relayConfig.GasLimit)
 	var transmitter Transmitter
 	var err error
 
@@ -186,3 +179,12 @@ func generateTransmitterFrom(ctx context.Context, rargs types.RelayArgs, ethKeys
 	}
 	return transmitter, nil
 }
+
+func getGasLimitFrom(gasEstimator config.GasEstimator, opts ConfigTransmitterOpts, relayConfigGasLimit *uint32) uint64 {
+	gasLimit := gasEstimator.LimitDefault()
+	override := cmp.Or(opts.PluginGasLimit, relayConfigGasLimit, gasEstimator.LimitJobType().OCR2())
+	if override != nil {
+		gasLimit = uint64(*override)
+	}
+	return gasLimit
+}