Merge remote-tracking branch 'origin/ccip-develop' into base-merge

.github/workflows/integration-tests.yml

@@ -268,6 +268,12 @@ jobs:
             os: ubuntu20.04-16cores-64GB
             file: ccip
             run: -run ^TestSmokeCCIPRateLimit$
+          - name: ccip-smoke-multicall
+            nodes: 1
+            dir: ccip-tests/smoke
+            os: ubuntu20.04-16cores-64GB
+            file: ccip
+            run: -run ^TestSmokeCCIPMulticall$
           - name: cron
             nodes: 1
             os: ubuntu-latest

.github/workflows/solidity-foundry.yml

@@ -118,7 +118,7 @@ jobs:
         uses: foundry-rs/foundry-toolchain@v1
         with:
           # Has to match the `make foundry` version.
-          version: nightly-5be158ba6dc7c798a6f032026fe60fc01686b33b
+          version: nightly-09fe3e041369a816365a020f715ad6f94dbce9f2
 
       - name: Run Forge build
         run: |

contracts/GNUmakefile

@@ -43,7 +43,7 @@ mockery: $(mockery) ## Install mockery.
 
 .PHONY: foundry
 foundry: ## Install foundry.
-	foundryup --version nightly-5be158ba6dc7c798a6f032026fe60fc01686b33b
+	foundryup --version nightly-09fe3e041369a816365a020f715ad6f94dbce9f2
 
 .PHONY: foundry-refresh
 foundry-refresh: foundry

contracts/src/v0.8/ccip/onRamp/EVM2EVMOnRamp.sol

@@ -541,19 +541,21 @@ contract EVM2EVMOnRamp is IEVM2AnyOnRamp, ILinkAvailable, AggregateRateLimiter,
     premiumFee = premiumFee * feeTokenConfig.premiumMultiplierWeiPerEth;
 
     // Calculate execution gas fee on destination chain in USD with 36 decimals.
-    // We add the message gas limit, the overhead gas, and the data availability gas together.
-    // We then multiply this destination gas total with the gas multiplier and convert it into USD.
+    // We add the message gas limit, the overhead gas, the gas of passing message data to receiver, and token transfer gas together.
+    // We then multiply this gas total with the gas multiplier and gas price, converting it into USD with 36 decimals.
     uint256 executionCost = executionGasPrice *
       ((gasLimit +
         s_dynamicConfig.destGasOverhead +
         (message.data.length * s_dynamicConfig.destGasPerPayloadByte) +
         tokenTransferGas) * feeTokenConfig.gasMultiplierWeiPerEth);
 
-    // Calculate data availability cost in USD with 36 decimals.
+    // Calculate data availability cost in USD with 36 decimals. Data availability cost exists on rollups that need to post
+    // transaction calldata onto another storage layer, e.g. Eth mainnet, incurring additional storage gas costs.
     uint256 dataAvailabilityCost = 0;
     // Only calculate data availability cost if data availability multiplier is non-zero.
     // The multiplier should be set to 0 if destination chain does not charge data availability cost.
     if (s_dynamicConfig.destDataAvailabilityMultiplierBps > 0) {
+      // Parse the dava availability gas price stored in the higher-order 112 bits of encoded gas price.
       uint112 dataAvailabilityGasPrice = uint112(packedGasPrice >> Internal.GAS_PRICE_BITS);
 
       dataAvailabilityCost = _getDataAvailabilityCost(
@@ -583,17 +585,20 @@ contract EVM2EVMOnRamp is IEVM2AnyOnRamp, ILinkAvailable, AggregateRateLimiter,
     uint256 numberOfTokens,
     uint32 tokenTransferBytesOverhead
   ) internal view returns (uint256 dataAvailabilityCostUSD36Decimal) {
+    // dataAvailabilityLengthBytes sums up byte lengths of fixed message fields and dynamic message fields.
+    // Fixed message fields does account for the offset and length slot of the dynamic fields.
     uint256 dataAvailabilityLengthBytes = Internal.MESSAGE_FIXED_BYTES +
       messageDataLength +
       (numberOfTokens * Internal.MESSAGE_FIXED_BYTES_PER_TOKEN) +
       tokenTransferBytesOverhead;
 
     // destDataAvailabilityOverheadGas is a separate config value for flexibility to be updated independently of message cost.
+    // Its value is determined by CCIP lane implementation, e.g. the overhead data posted for OCR.
     uint256 dataAvailabilityGas = (dataAvailabilityLengthBytes * s_dynamicConfig.destGasPerDataAvailabilityByte) +
       s_dynamicConfig.destDataAvailabilityOverheadGas;
 
     // dataAvailabilityGasPrice is in 18 decimals, destDataAvailabilityMultiplierBps is in 4 decimals
-    // we pad 14 decimals to bring the result to 36 decimals, in line with token bps and execution fee.
+    // We pad 14 decimals to bring the result to 36 decimals, in line with token bps and execution fee.
     return
       ((dataAvailabilityGas * dataAvailabilityGasPrice) * s_dynamicConfig.destDataAvailabilityMultiplierBps) * 1e14;
   }

core/chains/evm/config/toml/defaults/Kroma_Mainnet.toml

@@ -0,0 +1,27 @@
+ChainID = '255'
+ChainType = 'kroma' # Kroma is based on the Optimism Bedrock architechture
+FinalityDepth = 400
+FinalityTagEnabled = true
+LogPollInterval = '2s'
+NoNewHeadsThreshold = '40s'
+MinIncomingConfirmations = 1
+
+[GasEstimator]
+EIP1559DynamicFees = true
+PriceMin = '1 wei'
+BumpMin = '100 wei'
+
+[GasEstimator.BlockHistory]
+BlockHistorySize = 24
+
+[Transactions]
+ResendAfterThreshold = '30s'
+
+[HeadTracker]
+HistoryDepth = 400
+
+[NodePool]
+SyncThreshold = 10
+
+[OCR]
+ContractConfirmations = 1

core/chains/evm/config/toml/defaults/Kroma_Sepolia.toml

@@ -0,0 +1,27 @@
+ChainID = '2358'
+ChainType = 'kroma' # Kroma is based on the Optimism Bedrock architechture
+FinalityDepth = 400
+FinalityTagEnabled = true
+LogPollInterval = '2s'
+NoNewHeadsThreshold = '40s'
+MinIncomingConfirmations = 1
+
+[GasEstimator]
+EIP1559DynamicFees = true
+PriceMin = '1 wei'
+BumpMin = '100 wei'
+
+[GasEstimator.BlockHistory]
+BlockHistorySize = 24
+
+[Transactions]
+ResendAfterThreshold = '30s'
+
+[HeadTracker]
+HistoryDepth = 400
+
+[NodePool]
+SyncThreshold = 10
+
+[OCR]
+ContractConfirmations = 1

core/chains/evm/config/toml/defaults/WeMix_Mainnet.toml

@@ -0,0 +1,14 @@
+ChainID = '1111'
+ChainType = 'wemix'
+FinalityDepth = 1
+MinIncomingConfirmations = 1
+# WeMix emits a block every 1 second, regardless of transactions
+LogPollInterval = '3s'
+NoNewHeadsThreshold = '30s'
+
+[OCR]
+ContractConfirmations = 1
+
+[GasEstimator]
+EIP1559DynamicFees = true
+TipCapDefault = '100 gwei'

core/chains/evm/config/toml/defaults/WeMix_Testnet.toml

@@ -0,0 +1,14 @@
+ChainID = '1112'
+ChainType = 'wemix'
+FinalityDepth = 1
+MinIncomingConfirmations = 1
+# WeMix emits a block every 1 second, regardless of transactions
+LogPollInterval = '3s'
+NoNewHeadsThreshold = '30s'
+
+[OCR]
+ContractConfirmations = 1
+
+[GasEstimator]
+EIP1559DynamicFees = true
+TipCapDefault = '100 gwei'

core/chains/evm/gas/block_history_estimator_test.go

@@ -1329,6 +1329,12 @@ func TestBlockHistoryEstimator_IsUsable(t *testing.T) {
 		assert.Equal(t, true, bhe.IsUsable(tx2, block, cfg.ChainType(), geCfg.PriceMin(), logger.TestLogger(t)))
 	})
 
+	t.Run("returns false if transaction is of type 0x16 only on WeMix", func(t *testing.T) {
+		cfg.ChainTypeF = "wemix"
+		tx := evmtypes.Transaction{Type: 0x16, GasPrice: assets.NewWeiI(10), GasLimit: 42, Hash: utils.NewHash()}
+		assert.Equal(t, false, bhe.IsUsable(tx, block, cfg.ChainType(), geCfg.PriceMin(), logger.TestLogger(t)))
+	})
+
 	t.Run("returns false if transaction has base fee higher than the gas price only on Celo", func(t *testing.T) {
 		cfg.ChainTypeF = "celo"
 		tx := evmtypes.Transaction{Type: 0x0, GasPrice: assets.NewWeiI(10), GasLimit: 42, Hash: utils.NewHash()}

core/chains/evm/gas/chain_specific.go

@@ -19,7 +19,7 @@ func chainSpecificIsUsable(tx evmtypes.Transaction, baseFee *assets.Wei, chainTy
 			return false
 		}
 	}
-	if chainType == config.ChainOptimismBedrock {
+	if chainType == config.ChainOptimismBedrock || chainType == config.ChainKroma {
 		// This is a special deposit transaction type introduced in Bedrock upgrade.
 		// This is a system transaction that it will occur at least one time per block.
 		// We should discard this type before even processing it to avoid flooding the
@@ -42,5 +42,12 @@ func chainSpecificIsUsable(tx evmtypes.Transaction, baseFee *assets.Wei, chainTy
 			return false
 		}
 	}
+	if chainType == config.ChainWeMix {
+		// WeMix specific transaction types that enables fee delegation.
+		// https://docs.wemix.com/v/en/design/fee-delegation
+		if tx.Type == 0x16 {
+			return false
+		}
+	}
 	return true
 }

core/chains/evm/gas/rollups/l1_gas_price_oracle.go

@@ -56,11 +56,18 @@ const (
 	// `function l1BaseFee() external view returns (uint256);`
 	OPGasOracle_l1BaseFee = "519b4bd3"
 
+	// GasOracleAddress is the address of the precompiled contract that exists on Kroma chain.
+	// This is the case for Kroma.
+	KromaGasOracleAddress = "0x4200000000000000000000000000000000000005"
+	// GasOracle_l1BaseFee is the a hex encoded call to:
+	// `function l1BaseFee() external view returns (uint256);`
+	KromaGasOracle_l1BaseFee = "519b4bd3"
+
 	// Interval at which to poll for L1BaseFee. A good starting point is the L1 block time.
 	PollPeriod = 12 * time.Second
 )
 
-var supportedChainTypes = []config.ChainType{config.ChainArbitrum, config.ChainOptimismBedrock}
+var supportedChainTypes = []config.ChainType{config.ChainArbitrum, config.ChainOptimismBedrock, config.ChainKroma}
 
 func IsRollupWithL1Support(chainType config.ChainType) bool {
 	return slices.Contains(supportedChainTypes, chainType)
@@ -75,6 +82,9 @@ func NewL1GasPriceOracle(lggr logger.Logger, ethClient ethClient, chainType conf
 	case config.ChainOptimismBedrock:
 		address = OPGasOracleAddress
 		callArgs = OPGasOracle_l1BaseFee
+	case config.ChainKroma:
+		address = KromaGasOracleAddress
+		callArgs = KromaGasOracle_l1BaseFee
 	default:
 		panic(fmt.Sprintf("Received unspported chaintype %s", chainType))
 	}

core/chains/evm/gas/rollups/l1_gas_price_oracle_test.go

@@ -59,6 +59,28 @@ func TestL1GasPriceOracle(t *testing.T) {
 		assert.Equal(t, assets.NewWei(l1BaseFee), gasPrice)
 	})
 
+	t.Run("Calling GasPrice on started Kroma L1Oracle returns Kroma l1GasPrice", func(t *testing.T) {
+		l1BaseFee := big.NewInt(200)
+
+		ethClient := mocks.NewETHClient(t)
+		ethClient.On("CallContract", mock.Anything, mock.IsType(ethereum.CallMsg{}), mock.IsType(&big.Int{})).Run(func(args mock.Arguments) {
+			callMsg := args.Get(1).(ethereum.CallMsg)
+			blockNumber := args.Get(2).(*big.Int)
+			assert.Equal(t, KromaGasOracleAddress, callMsg.To.String())
+			assert.Equal(t, KromaGasOracle_l1BaseFee, fmt.Sprintf("%x", callMsg.Data))
+			assert.Nil(t, blockNumber)
+		}).Return(common.BigToHash(l1BaseFee).Bytes(), nil)
+
+		oracle := NewL1GasPriceOracle(logger.TestLogger(t), ethClient, config.ChainKroma)
+		require.NoError(t, oracle.Start(testutils.Context(t)))
+		t.Cleanup(func() { assert.NoError(t, oracle.Close()) })
+
+		gasPrice, err := oracle.GasPrice(testutils.Context(t))
+		require.NoError(t, err)
+
+		assert.Equal(t, assets.NewWei(l1BaseFee), gasPrice)
+	})
+
 	t.Run("Calling GasPrice on started OPStack L1Oracle returns OPStack l1GasPrice", func(t *testing.T) {
 		l1BaseFee := big.NewInt(200)
 

core/config/chaintype.go

@@ -15,16 +15,18 @@ const (
 	ChainOptimismBedrock ChainType = "optimismBedrock"
 	ChainXDai            ChainType = "xdai"
 	ChainCelo            ChainType = "celo"
+	ChainWeMix           ChainType = "wemix"
+	ChainKroma           ChainType = "kroma"
 )
 
 var ErrInvalidChainType = fmt.Errorf("must be one of %s or omitted", strings.Join([]string{
 	string(ChainArbitrum), string(ChainMetis), string(ChainXDai), string(ChainOptimismBedrock), string(ChainCelo),
-}, ", "))
+	string(ChainKroma), string(ChainWeMix)}, ", "))
 
 // IsValid returns true if the ChainType value is known or empty.
 func (c ChainType) IsValid() bool {
 	switch c {
-	case "", ChainArbitrum, ChainMetis, ChainOptimismBedrock, ChainXDai, ChainCelo:
+	case "", ChainArbitrum, ChainMetis, ChainOptimismBedrock, ChainXDai, ChainCelo, ChainKroma, ChainWeMix:
 		return true
 	}
 	return false

core/config/docs/chains-evm.toml

@@ -14,7 +14,7 @@ BlockBackfillDepth = 10 # Default
 # BlockBackfillSkip enables skipping of very long backfills.
 BlockBackfillSkip = false # Default
 # ChainType is automatically detected from chain ID. Set this to force a certain chain type regardless of chain ID.
-# Available types: arbitrum, metis, optimismBedrock, xdai
+# Available types: arbitrum, metis, optimismBedrock, xdai, celo, kroma, wemix
 ChainType = 'arbitrum' # Example
 # FinalityDepth is the number of blocks after which an ethereum transaction is considered "final". Note that the default is automatically set based on chain ID so it should not be necessary to change this under normal operation.
 # BlocksConsideredFinal determines how deeply we look back to ensure that transactions are confirmed onto the longest chain

core/scripts/go.mod

@@ -305,7 +305,7 @@ require (
 	github.com/shirou/gopsutil/v3 v3.23.9 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 // indirect
-	github.com/smartcontractkit/chain-selectors v1.0.2 // indirect
+	github.com/smartcontractkit/chain-selectors v1.0.3 // indirect
 	github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20230913032705-f924d753cc47 // indirect
 	github.com/smartcontractkit/chainlink-relay v0.1.7-0.20231020230319-2ede955d1dc9 // indirect
 	github.com/smartcontractkit/chainlink-solana v1.0.3-0.20231023133638-72f4e799ab05 // indirect

core/scripts/go.sum

@@ -1522,8 +1522,8 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704 h1:T3lFWumvbfM1u/etVq42Afwq/jtNSBSOA8n5jntnNPo=
 github.com/smartcontractkit/caigo v0.0.0-20230621050857-b29a4ca8c704/go.mod h1:2QuJdEouTWjh5BDy5o/vgGXQtR4Gz8yH1IYB5eT7u4M=
-github.com/smartcontractkit/chain-selectors v1.0.2 h1:IglJrBajHJ6uAFm1b2qwUcHZldcrnNnaqZbQtt+X6Wg=
-github.com/smartcontractkit/chain-selectors v1.0.2/go.mod h1:WBhLlODF5b95vvx2tdKK55vGACg1+qZpuBhOGu1UXVo=
+github.com/smartcontractkit/chain-selectors v1.0.3 h1:wVED4QEvATtSRi95Ow77C9Cu6GgSonze9oVjht0gG1E=
+github.com/smartcontractkit/chain-selectors v1.0.3/go.mod h1:WBhLlODF5b95vvx2tdKK55vGACg1+qZpuBhOGu1UXVo=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20230913032705-f924d753cc47 h1:vdieOW3CZGdD2R5zvCSMS+0vksyExPN3/Fa1uVfld/A=
 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20230913032705-f924d753cc47/go.mod h1:xMwqRdj5vqYhCJXgKVqvyAwdcqM6ZAEhnwEQ4Khsop8=
 github.com/smartcontractkit/chainlink-env v0.38.3 h1:ZtOnwkG622R0VCTxL5V09AnT/QXhlFwkGTjd0Lsfpfg=

core/services/chainlink/config_test.go

@@ -1144,7 +1144,7 @@ func TestConfig_Validate(t *testing.T) {
 		- 1: 6 errors:
 			- ChainType: invalid value (Foo): must not be set with this chain id
 			- Nodes: missing: must have at least one node
-			- ChainType: invalid value (Foo): must be one of arbitrum, metis, xdai, optimismBedrock, celo or omitted
+			- ChainType: invalid value (Foo): must be one of arbitrum, metis, xdai, optimismBedrock, celo, kroma, wemix or omitted
 			- HeadTracker.HistoryDepth: invalid value (30): must be equal to or greater than FinalityDepth
 			- GasEstimator: 2 errors:
 				- FeeCapDefault: invalid value (101 wei): must be equal to PriceMax (99 wei) since you are using FixedPrice estimation with gas bumping disabled in EIP1559 mode - PriceMax will be used as the FeeCap for transactions instead of FeeCapDefault
@@ -1153,7 +1153,7 @@ func TestConfig_Validate(t *testing.T) {
 		- 2: 5 errors:
 			- ChainType: invalid value (Arbitrum): only "optimismBedrock" can be used with this chain id
 			- Nodes: missing: must have at least one node
-			- ChainType: invalid value (Arbitrum): must be one of arbitrum, metis, xdai, optimismBedrock, celo or omitted
+			- ChainType: invalid value (Arbitrum): must be one of arbitrum, metis, xdai, optimismBedrock, celo, kroma, wemix or omitted
 			- FinalityDepth: invalid value (0): must be greater than or equal to 1
 			- MinIncomingConfirmations: invalid value (0): must be greater than or equal to 1
 		- 3.Nodes: 5 errors:

core/services/ocr/contract_tracker.go

@@ -400,7 +400,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 "", config.ChainArbitrum, config.ChainCelo, config.ChainOptimismBedrock, config.ChainXDai:
+	case "", config.ChainArbitrum, config.ChainCelo, config.ChainOptimismBedrock, config.ChainXDai, config.ChainKroma, config.ChainWeMix:
 		// continue
 	}
 	latestBlockHeight := t.getLatestBlockHeight()

core/services/ocr2/delegate.go

@@ -1358,10 +1358,15 @@ func (d *Delegate) newServicesCCIPCommit(lggr logger.SugaredLogger, jb job.Job,
 		ContractConfigTracker:        ccipProvider.ContractConfigTracker(),
 		Database:                     ocrDB,
 		LocalConfig:                  lc,
-		MonitoringEndpoint:           d.monitoringEndpointGen.GenMonitoringEndpoint(spec.ContractID, synchronization.OCR2CCIP, rid.Network, rid.ChainID),
-		OffchainConfigDigester:       ccipProvider.OffchainConfigDigester(),
-		OffchainKeyring:              kb,
-		OnchainKeyring:               kb,
+		MonitoringEndpoint: d.monitoringEndpointGen.GenMonitoringEndpoint(
+			spec.ContractID,
+			synchronization.OCR2CCIP,
+			rid.Network,
+			rid.ChainID,
+		),
+		OffchainConfigDigester: ccipProvider.OffchainConfigDigester(),
+		OffchainKeyring:        kb,
+		OnchainKeyring:         kb,
 	}
 	logError := func(msg string) {
 		lggr.ErrorIf(d.jobORM.RecordError(jb.ID, msg), "unable to record error")
@@ -1406,10 +1411,15 @@ func (d *Delegate) newServicesCCIPExecution(lggr logger.SugaredLogger, jb job.Jo
 		ContractConfigTracker:        ccipProvider.ContractConfigTracker(),
 		Database:                     ocrDB,
 		LocalConfig:                  lc,
-		MonitoringEndpoint:           d.monitoringEndpointGen.GenMonitoringEndpoint(spec.ContractID, synchronization.OCR2CCIP, rid.Network, rid.ChainID),
-		OffchainConfigDigester:       ccipProvider.OffchainConfigDigester(),
-		OffchainKeyring:              kb,
-		OnchainKeyring:               kb,
+		MonitoringEndpoint: d.monitoringEndpointGen.GenMonitoringEndpoint(
+			spec.ContractID,
+			synchronization.OCR2CCIP,
+			rid.Network,
+			rid.ChainID,
+		),
+		OffchainConfigDigester: ccipProvider.OffchainConfigDigester(),
+		OffchainKeyring:        kb,
+		OnchainKeyring:         kb,
 	}
 	logError := func(msg string) {
 		lggr.ErrorIf(d.jobORM.RecordError(jb.ID, msg), "unable to record error")

core/services/ocr2/plugins/ccip/config/config.go

@@ -28,12 +28,16 @@ type USDCConfig struct {
 	SourceTokenAddress              common.Address
 	SourceMessageTransmitterAddress common.Address
 	AttestationAPI                  string
+	AttestationAPITimeoutSeconds    int
 }
 
 func (uc *USDCConfig) ValidateUSDCConfig() error {
 	if uc.AttestationAPI == "" {
 		return errors.New("AttestationAPI is required")
 	}
+	if uc.AttestationAPITimeoutSeconds < 0 {
+		return errors.New("AttestationAPITimeoutSeconds must be non-negative")
+	}
 	if uc.SourceTokenAddress == utils.ZeroAddress {
 		return errors.New("SourceTokenAddress is required")
 	}

core/services/ocr2/plugins/ccip/execution_plugin.go

@@ -196,6 +196,7 @@ func getTokenDataProviders(lggr logger.Logger, pluginConfig ccipconfig.Execution
 				lggr,
 				usdcReader,
 				attestationURI,
+				pluginConfig.USDCConfig.AttestationAPITimeoutSeconds,
 			),
 		)
 	}