[CCIP-3376] refactoring

core/services/ocr2/plugins/ccip/estimatorconfig/interceptors/mantle/interceptor.go

@@ -3,7 +3,6 @@ package mantle
 import (
 	"context"
 	"fmt"
-	"log"
 	"math/big"
 	"strings"
 	"time"
@@ -31,21 +30,21 @@ type Interceptor struct {
 	tokenRatioLastUpdate time.Time
 }
 
-func NewInterceptor(_ context.Context, client evmClient.Client) *Interceptor {
+func NewInterceptor(_ context.Context, client evmClient.Client) (*Interceptor, error) {
 	// Encode calldata for tokenRatio method
 	tokenRatioMethodAbi, err := abi.JSON(strings.NewReader(mantleTokenRatioAbiString))
 	if err != nil {
-		log.Panicf("failed to parse GasPriceOracle %s() method ABI for Mantle; %v", tokenRatioMethod, err)
+		return nil, fmt.Errorf("failed to parse GasPriceOracle %s() method ABI for Mantle; %v", tokenRatioMethod, err)
 	}
 	tokenRatioCallData, err := tokenRatioMethodAbi.Pack(tokenRatioMethod)
 	if err != nil {
-		log.Panicf("failed to parse GasPriceOracle %s() calldata for Mantle; %v", tokenRatioMethod, err)
+		return nil, fmt.Errorf("failed to parse GasPriceOracle %s() calldata for Mantle; %v", tokenRatioMethod, err)
 	}
 
 	return &Interceptor{
 		client:             client,
 		tokenRatioCallData: tokenRatioCallData,
-	}
+	}, nil
 }
 
 // ModifyGasPriceComponents returns modified gasPrice.

core/services/ocr2/plugins/ccip/estimatorconfig/interceptors/mantle/interceptor_test.go

@@ -18,7 +18,8 @@ func TestInterceptor(t *testing.T) {
 	ctx := context.Background()
 
 	tokenRatio := big.NewInt(10)
-	interceptor := NewInterceptor(ctx, ethClient)
+	interceptor, err := NewInterceptor(ctx, ethClient)
+	require.NoError(t, err)
 
 	// request token ratio
 	ethClient.On("CallContract", ctx, mock.IsType(ethereum.CallMsg{}), mock.IsType(&big.Int{})).
@@ -79,7 +80,8 @@ func TestModifyGasPriceComponents(t *testing.T) {
 			ethClient := mocks.NewClient(t)
 			ctx := context.Background()
 
-			interceptor := NewInterceptor(ctx, ethClient)
+			interceptor, err := NewInterceptor(ctx, ethClient)
+			require.NoError(t, err)
 
 			// request token ratio
 			ethClient.On("CallContract", ctx, mock.IsType(ethereum.CallMsg{}), mock.IsType(&big.Int{})).

core/services/ocr2/plugins/ccip/prices/da_price_estimator.go

@@ -38,10 +38,11 @@ func NewDAGasPriceEstimator(
 }
 
 func (g DAGasPriceEstimator) GetGasPrice(ctx context.Context) (*big.Int, error) {
-	gasPrice, err := g.execEstimator.GetGasPrice(ctx)
+	execGasPrice, err := g.execEstimator.GetGasPrice(ctx)
 	if err != nil {
 		return nil, err
 	}
+	var gasPrice *big.Int = execGasPrice
 
 	if gasPrice.BitLen() > int(g.priceEncodingLength) {
 		return nil, fmt.Errorf("native gas price exceeded max range %+v", gasPrice)

core/services/relay/evm/evm.go

@@ -410,8 +410,15 @@ func (r *Relayer) NewCCIPCommitProvider(rargs commontypes.RelayArgs, pargs commo
 	destStartBlock := commitPluginConfig.DestStartBlock
 
 	feeEstimatorConfig := estimatorconfig.NewFeeEstimatorConfigService()
+
+	// CCIPCommit reads only when source chain is Mantle, then reports to dest chain
+	// to minimize misconfigure risk, might make sense to wire Mantle only when Commit + Mantle + IsSourceProvider
 	if r.chain.Config().EVM().ChainType() == chaintype.ChainMantle && commitPluginConfig.IsSourceProvider {
-		feeEstimatorConfig.AddGasPriceInterceptor(mantle.NewInterceptor(ctx, r.chain.Client()))
+		mantleInterceptor, err := mantle.NewInterceptor(ctx, r.chain.Client())
+		if err != nil {
+			return nil, err
+		}
+		feeEstimatorConfig.AddGasPriceInterceptor(mantleInterceptor)
 	}
 
 	// The src chain implementation of this provider does not need a configWatcher or contractTransmitter;
@@ -484,8 +491,15 @@ func (r *Relayer) NewCCIPExecProvider(rargs commontypes.RelayArgs, pargs commont
 	usdcConfig := execPluginConfig.USDCConfig
 
 	feeEstimatorConfig := estimatorconfig.NewFeeEstimatorConfigService()
+
+	// CCIPExec reads when dest chain is mantle, and uses it to calc boosting in batching
+	// to minimize misconfigure risk, make sense to wire Mantle only when Exec + Mantle + !IsSourceProvider
 	if r.chain.Config().EVM().ChainType() == chaintype.ChainMantle && !execPluginConfig.IsSourceProvider {
-		feeEstimatorConfig.AddGasPriceInterceptor(mantle.NewInterceptor(ctx, r.chain.Client()))
+		mantleInterceptor, err := mantle.NewInterceptor(ctx, r.chain.Client())
+		if err != nil {
+			return nil, err
+		}
+		feeEstimatorConfig.AddGasPriceInterceptor(mantleInterceptor)
 	}
 
 	// The src chain implementation of this provider does not need a configWatcher or contractTransmitter;