feedback

smartcontractkit · Oct 10, 2024 · e33bf1e · e33bf1e
1 parent 3ce1436
commit e33bf1e
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 24 deletions.
diff --git a/core/chains/evm/config/chain_scoped_gas_estimator.go b/core/chains/evm/config/chain_scoped_gas_estimator.go
@@ -123,7 +123,6 @@ func (g *gasEstimatorConfig) EstimateLimit() bool {
 	return *g.c.EstimateLimit
 }
 
-// ====== DAOracle ======
 type daOracleConfig struct {
 	c toml.DAOracle
 }
@@ -143,7 +142,6 @@ func (d *daOracleConfig) CustomGasPriceCalldata() string {
 	return ""
 }
 
-// ====== LimitJobType ======
 type limitJobTypeConfig struct {
 	c toml.GasLimitJobType
 }
@@ -172,7 +170,6 @@ func (l *limitJobTypeConfig) VRF() *uint32 {
 	return l.c.VRF
 }
 
-// ====== BlockHistory ======
 type blockHistoryConfig struct {
 	c             toml.BlockHistoryEstimator
 	blockDelay    *uint16
@@ -210,7 +207,6 @@ func (b *blockHistoryConfig) BlockDelay() uint16 {
 	return *b.blockDelay
 }
 
-// ====== FeeHistory ======
 type feeHistoryConfig struct {
 	c toml.FeeHistoryEstimator
 }

diff --git a/core/chains/evm/gas/rollups/l1_oracle.go b/core/chains/evm/gas/rollups/l1_oracle.go
@@ -64,14 +64,12 @@ func NewL1GasOracle(lggr logger.Logger, ethClient l1OracleClient, chainType chai
 		case toml.ZKSync:
 			l1Oracle = NewZkSyncL1GasOracle(lggr, ethClient)
 		default:
-			lggr.Warnf("Unsupported DA oracle type %s. Going forward all chain configs should specify an oracle type", daOracle.OracleType())
+			err = fmt.Errorf("unsupported DA oracle type %s. Going forward all chain configs should specify an oracle type", daOracle.OracleType())
 		}
 		if err != nil {
 			return nil, fmt.Errorf("failed to initialize L1 oracle for chaintype %s: %w", chainType, err)
 		}
-		if l1Oracle != nil {
-			return l1Oracle, nil
-		}
+		return l1Oracle, nil
 	}
 
 	// Going forward all configs should specify a DAOracle config. This is a fall back to maintain backwards compat.

diff --git a/core/chains/evm/gas/rollups/l1_oracle_test.go b/core/chains/evm/gas/rollups/l1_oracle_test.go
@@ -21,12 +21,7 @@ import (
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/chaintype"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/config/toml"
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/gas/rollups/mocks"
-)
-
-const (
-	OPGasOracleAddress     = "0x420000000000000000000000000000000000000F"
-	KromaGasOracleAddress  = "0x4200000000000000000000000000000000000005"
-	ScrollGasOracleAddress = "0x5300000000000000000000000000000000000002"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/utils"
 )
 
 func TestL1Oracle(t *testing.T) {
@@ -35,7 +30,7 @@ func TestL1Oracle(t *testing.T) {
 	t.Run("Unsupported ChainType returns nil", func(t *testing.T) {
 		ethClient := mocks.NewL1OracleClient(t)
 
-		daOracle := CreateTestDAOracle(t, toml.OPStack, OPGasOracleAddress, "")
+		daOracle := CreateTestDAOracle(t, toml.OPStack, utils.RandomAddress().String(), "")
 		oracle, err := NewL1GasOracle(logger.Test(t), ethClient, chaintype.ChainCelo, daOracle)
 		require.NoError(t, err)
 		assert.Nil(t, oracle)
@@ -48,7 +43,7 @@ func TestL1Oracle_GasPrice(t *testing.T) {
 	t.Run("Calling GasPrice on unstarted L1Oracle returns error", func(t *testing.T) {
 		ethClient := mocks.NewL1OracleClient(t)
 
-		daOracle := CreateTestDAOracle(t, toml.OPStack, OPGasOracleAddress, "")
+		daOracle := CreateTestDAOracle(t, toml.OPStack, utils.RandomAddress().String(), "")
 		oracle, err := NewL1GasOracle(logger.Test(t), ethClient, chaintype.ChainOptimismBedrock, daOracle)
 		require.NoError(t, err)
 
@@ -89,7 +84,8 @@ func TestL1Oracle_GasPrice(t *testing.T) {
 		l1GasPriceMethodAbi, err := abi.JSON(strings.NewReader(L1BaseFeeAbiString))
 		require.NoError(t, err)
 
-		ethClient := setupUpgradeCheck(t, KromaGasOracleAddress, false, false) // Ecotone, Fjord disabled
+		oracleAddress := utils.RandomAddress().String()
+		ethClient := setupUpgradeCheck(t, oracleAddress, false, false) // Ecotone, Fjord disabled
 
 		ethClient.On("CallContract", mock.Anything, mock.IsType(ethereum.CallMsg{}), mock.IsType(&big.Int{})).Run(func(args mock.Arguments) {
 			callMsg := args.Get(1).(ethereum.CallMsg)
@@ -101,7 +97,7 @@ func TestL1Oracle_GasPrice(t *testing.T) {
 			assert.Nil(t, blockNumber)
 		}).Return(common.BigToHash(l1BaseFee).Bytes(), nil)
 
-		daOracle := CreateTestDAOracle(t, toml.OPStack, KromaGasOracleAddress, "")
+		daOracle := CreateTestDAOracle(t, toml.OPStack, oracleAddress, "")
 		oracle, err := NewL1GasOracle(logger.Test(t), ethClient, chaintype.ChainKroma, daOracle)
 		require.NoError(t, err)
 		servicetest.RunHealthy(t, oracle)
@@ -118,7 +114,8 @@ func TestL1Oracle_GasPrice(t *testing.T) {
 		l1GasPriceMethodAbi, err := abi.JSON(strings.NewReader(L1BaseFeeAbiString))
 		require.NoError(t, err)
 
-		ethClient := setupUpgradeCheck(t, OPGasOracleAddress, false, false) // Ecotone, Fjord disabled
+		oracleAddress := utils.RandomAddress().String()
+		ethClient := setupUpgradeCheck(t, oracleAddress, false, false) // Ecotone, Fjord disabled
 
 		ethClient.On("CallContract", mock.Anything, mock.IsType(ethereum.CallMsg{}), mock.IsType(&big.Int{})).Run(func(args mock.Arguments) {
 			callMsg := args.Get(1).(ethereum.CallMsg)
@@ -130,7 +127,7 @@ func TestL1Oracle_GasPrice(t *testing.T) {
 			assert.Nil(t, blockNumber)
 		}).Return(common.BigToHash(l1BaseFee).Bytes(), nil)
 
-		daOracle := CreateTestDAOracle(t, toml.OPStack, OPGasOracleAddress, "")
+		daOracle := CreateTestDAOracle(t, toml.OPStack, oracleAddress, "")
 		oracle, err := NewL1GasOracle(logger.Test(t), ethClient, chaintype.ChainOptimismBedrock, daOracle)
 		require.NoError(t, err)
 		servicetest.RunHealthy(t, oracle)
@@ -146,7 +143,8 @@ func TestL1Oracle_GasPrice(t *testing.T) {
 		l1GasPriceMethodAbi, err := abi.JSON(strings.NewReader(L1BaseFeeAbiString))
 		require.NoError(t, err)
 
-		ethClient := setupUpgradeCheck(t, ScrollGasOracleAddress, false, false) // Ecotone, Fjord disabled
+		oracleAddress := utils.RandomAddress().String()
+		ethClient := setupUpgradeCheck(t, oracleAddress, false, false) // Ecotone, Fjord disabled
 
 		ethClient.On("CallContract", mock.Anything, mock.IsType(ethereum.CallMsg{}), mock.IsType(&big.Int{})).Run(func(args mock.Arguments) {
 			callMsg := args.Get(1).(ethereum.CallMsg)
@@ -158,7 +156,7 @@ func TestL1Oracle_GasPrice(t *testing.T) {
 			assert.Nil(t, blockNumber)
 		}).Return(common.BigToHash(l1BaseFee).Bytes(), nil)
 
-		daOracle := CreateTestDAOracle(t, toml.OPStack, ScrollGasOracleAddress, "")
+		daOracle := CreateTestDAOracle(t, toml.OPStack, oracleAddress, "")
 		oracle, err := NewL1GasOracle(logger.Test(t), ethClient, chaintype.ChainScroll, daOracle)
 		require.NoError(t, err)
 		servicetest.RunHealthy(t, oracle)

diff --git a/core/config/docs/chains-evm.toml b/core/config/docs/chains-evm.toml
@@ -268,7 +268,7 @@ TipCapMin = '1 wei' # Default
 OracleType = 'opstack' # Example
 # OracleAddress is the address of the oracle contract.
 OracleAddress = '0x420000000000000000000000000000000000000F' # Example
-# CustomGasPriceCalldata is optional and can be set to call a custom gas price API at the given OracleAddress.
+# CustomGasPriceCalldata is optional and can be set to call a custom gas price function at the given OracleAddress.
 CustomGasPriceCalldata = '' # Default
 
 [EVM.GasEstimator.LimitJobType]

diff --git a/docs/CONFIG.md b/docs/CONFIG.md
@@ -9333,7 +9333,7 @@ OracleAddress is the address of the oracle contract.
 ```toml
 CustomGasPriceCalldata = '' # Default
 ```
-CustomGasPriceCalldata is optional and can be set to call a custom gas price API at the given OracleAddress.
+CustomGasPriceCalldata is optional and can be set to call a custom gas price function at the given OracleAddress.
 
 ## EVM.GasEstimator.LimitJobType
 ```toml