Merge branch 'ccip-develop' into ccip-home

smartcontractkit · Sep 20, 2024 · f0a0f3b · f0a0f3b
2 parents a69addc + 2a08e17
commit f0a0f3b
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 6 deletions.
diff --git a/core/chains/evm/gas/fee_history_estimator.go b/core/chains/evm/gas/fee_history_estimator.go
@@ -252,7 +252,7 @@ func (f *FeeHistoryEstimator) RefreshDynamicPrice() error {
 	maxPriorityFeePerGas := assets.NewWeiI(0)
 	priorityFeeThresholdWei := assets.NewWeiI(0)
 	if f.config.BlockHistorySize > 0 {
-		var nonZeroRewardsLen int64 = 0
+		var nonZeroRewardsLen int64
 		priorityFee := big.NewInt(0)
 		priorityFeeThreshold := big.NewInt(0)
 		for _, reward := range feeHistory.Reward {
@@ -263,7 +263,7 @@ func (f *FeeHistoryEstimator) RefreshDynamicPrice() error {
 			// We'll calculate the average of non-zero priority fees
 			if reward[0].Cmp(big.NewInt(0)) > 0 {
 				priorityFee = priorityFee.Add(priorityFee, reward[0])
-				nonZeroRewardsLen += 1
+				nonZeroRewardsLen++
 			}
 			// We take the max value for the bumping threshold
 			if reward[1].Cmp(big.NewInt(0)) > 0 {

diff --git a/core/chains/evm/gas/helpers_test.go b/core/chains/evm/gas/helpers_test.go
@@ -157,7 +157,7 @@ type MockGasEstimatorConfig struct {
 	FeeCapDefaultF      *assets.Wei
 	LimitMaxF           uint64
 	ModeF               string
-	EstimateLimitF   bool
+	EstimateLimitF      bool
 }
 
 func NewMockGasConfig() *MockGasEstimatorConfig {

diff --git a/core/chains/evm/gas/models.go b/core/chains/evm/gas/models.go
@@ -407,7 +407,7 @@ func (e *evmFeeEstimator) estimateFeeLimit(ctx context.Context, feeLimit uint64,
 		e.lggr.Debugw("estimated gas limit with buffer exceeds the provided gas limit with multiplier. falling back to the provided gas limit with multiplier", "estimatedGasLimit", estimatedFeeLimit, "providedGasLimitWithMultiplier", providedGasLimit)
 		estimatedFeeLimit = providedGasLimit
 	}
-	
+
 	return
 }
 

diff --git a/core/chains/evm/gas/rollups/op_l1_oracle.go b/core/chains/evm/gas/rollups/op_l1_oracle.go
@@ -50,7 +50,6 @@ type optimismL1Oracle struct {
 	blobBaseFeeCalldata       []byte
 	blobBaseFeeScalarCalldata []byte
 	decimalsCalldata          []byte
-	tokenRatioCalldata        []byte
 	isEcotoneCalldata         []byte
 	isEcotoneMethodAbi        abi.ABI
 	isFjordCalldata           []byte

diff --git a/core/services/ocr/contract_tracker.go b/core/services/ocr/contract_tracker.go
@@ -399,7 +399,7 @@ func (t *OCRContractTracker) LatestBlockHeight(ctx context.Context) (blockheight
 		// care about the block height; we have no way of getting the L1 block
 		// height anyway
 		return 0, nil
-	case "", chaintype.ChainArbitrum, chaintype.ChainAstar, chaintype.ChainCelo, chaintype.ChainGnosis, chaintype.ChainHedera, chaintype.ChainKroma, chaintype.ChainOptimismBedrock, chaintype.ChainScroll, chaintype.ChainWeMix, chaintype.ChainXLayer, chaintype.ChainZkEvm, chaintype.ChainZkSync:
+	case "", chaintype.ChainArbitrum, chaintype.ChainAstar, chaintype.ChainCelo, chaintype.ChainGnosis, chaintype.ChainHedera, chaintype.ChainKroma, chaintype.ChainOptimismBedrock, chaintype.ChainScroll, chaintype.ChainWeMix, chaintype.ChainXLayer, chaintype.ChainZkEvm, chaintype.ChainZkSync, chaintype.ChainMantle:
 		// continue
 	}
 	latestBlockHeight := t.getLatestBlockHeight()

diff --git a/docs/CONFIG.md b/docs/CONFIG.md
@@ -2798,6 +2798,7 @@ LimitDefault = 8000000
 LimitMax = 8000000
 LimitMultiplier = '1'
 LimitTransfer = 21000
+EstimateLimit = false
 BumpMin = '5 gwei'
 BumpPercent = 20
 BumpThreshold = 3
@@ -2813,6 +2814,9 @@ CheckInclusionBlocks = 12
 CheckInclusionPercentile = 90
 TransactionPercentile = 60
 
+[GasEstimator.FeeHistory]
+CacheTimeout = '10s'
+
 [HeadTracker]
 HistoryDepth = 100
 MaxBufferSize = 3
@@ -4264,6 +4268,7 @@ LimitDefault = 8000000
 LimitMax = 8000000
 LimitMultiplier = '1'
 LimitTransfer = 21000
+EstimateLimit = false
 BumpMin = '5 gwei'
 BumpPercent = 20
 BumpThreshold = 3
@@ -4279,6 +4284,9 @@ CheckInclusionBlocks = 12
 CheckInclusionPercentile = 90
 TransactionPercentile = 60
 
+[GasEstimator.FeeHistory]
+CacheTimeout = '10s'
+
 [HeadTracker]
 HistoryDepth = 100
 MaxBufferSize = 3
@@ -4358,6 +4366,7 @@ LimitDefault = 8000000
 LimitMax = 8000000
 LimitMultiplier = '1'
 LimitTransfer = 21000
+EstimateLimit = false
 BumpMin = '100 wei'
 BumpPercent = 20
 BumpThreshold = 60
@@ -4374,6 +4383,9 @@ CheckInclusionPercentile = 90
 EIP1559FeeCapBufferBlocks = 0
 TransactionPercentile = 60
 
+[GasEstimator.FeeHistory]
+CacheTimeout = '10s'
+
 [HeadTracker]
 HistoryDepth = 300
 MaxBufferSize = 3
@@ -5431,6 +5443,7 @@ LimitDefault = 100000000
 LimitMax = 8000000
 LimitMultiplier = '1'
 LimitTransfer = 21000
+EstimateLimit = false
 BumpMin = '5 gwei'
 BumpPercent = 20
 BumpThreshold = 3
@@ -5447,6 +5460,9 @@ CheckInclusionPercentile = 90
 EIP1559FeeCapBufferBlocks = 0
 TransactionPercentile = 60
 
+[GasEstimator.FeeHistory]
+CacheTimeout = '10s'
+
 [HeadTracker]
 HistoryDepth = 600
 MaxBufferSize = 3
@@ -6017,6 +6033,7 @@ LimitDefault = 8000000
 LimitMax = 8000000
 LimitMultiplier = '1'
 LimitTransfer = 21000
+EstimateLimit = false
 BumpMin = '100 wei'
 BumpPercent = 20
 BumpThreshold = 60
@@ -6033,6 +6050,9 @@ CheckInclusionPercentile = 90
 EIP1559FeeCapBufferBlocks = 0
 TransactionPercentile = 60
 
+[GasEstimator.FeeHistory]
+CacheTimeout = '10s'
+
 [HeadTracker]
 HistoryDepth = 300
 MaxBufferSize = 3
@@ -6992,6 +7012,7 @@ LimitDefault = 8000000
 LimitMax = 8000000
 LimitMultiplier = '1'
 LimitTransfer = 21000
+EstimateLimit = false
 BumpMin = '5 gwei'
 BumpPercent = 20
 BumpThreshold = 3
@@ -7007,6 +7028,9 @@ CheckInclusionBlocks = 12
 CheckInclusionPercentile = 90
 TransactionPercentile = 60
 
+[GasEstimator.FeeHistory]
+CacheTimeout = '10s'
+
 [HeadTracker]
 HistoryDepth = 100
 MaxBufferSize = 3
@@ -7281,6 +7305,7 @@ LimitDefault = 8000000
 LimitMax = 8000000
 LimitMultiplier = '1'
 LimitTransfer = 21000
+EstimateLimit = false
 BumpMin = '100 wei'
 BumpPercent = 20
 BumpThreshold = 60
@@ -7297,6 +7322,9 @@ CheckInclusionPercentile = 90
 EIP1559FeeCapBufferBlocks = 0
 TransactionPercentile = 60
 
+[GasEstimator.FeeHistory]
+CacheTimeout = '10s'
+
 [HeadTracker]
 HistoryDepth = 300
 MaxBufferSize = 3
@@ -8262,6 +8290,7 @@ LimitDefault = 8000000
 LimitMax = 8000000
 LimitMultiplier = '1'
 LimitTransfer = 21000
+EstimateLimit = false
 BumpMin = '100 wei'
 BumpPercent = 20
 BumpThreshold = 60
@@ -8278,6 +8307,9 @@ CheckInclusionPercentile = 90
 EIP1559FeeCapBufferBlocks = 0
 TransactionPercentile = 60
 
+[GasEstimator.FeeHistory]
+CacheTimeout = '10s'
+
 [HeadTracker]
 HistoryDepth = 300
 MaxBufferSize = 3