Merge branch 'main' into fix-fq2.0-init-size

Author: finleydecker

.github/workflows/ccip-integration-test.yml

@@ -66,15 +66,14 @@ jobs:
             file: ccip_messaging_test.go
             run: "^Test_CCIPMessaging_EVM2EVM$"
             timeout: 20m
-          # Tests broken as of 2026-02-20
-          # - name: "Messaging Test Test_CCIPMessaging_EVM2Solana"
-          #   file: ccip_messaging_test.go
-          #   run: "^Test_CCIPMessaging_EVM2Solana$"
-          #   timeout: 30m
-          # - name: "Messaging Test Test_CCIPMessaging_Solana2EVM"
-          #   file: ccip_messaging_test.go
-          #   run: "^Test_CCIPMessaging_Solana2EVM$"
-          #   timeout: 30m
+          - name: "Messaging Test Test_CCIPMessaging_EVM2Solana"
+            file: ccip_messaging_test.go
+            run: "^Test_CCIPMessaging_EVM2Solana$"
+            timeout: 30m
+          - name: "Messaging Test Test_CCIPMessaging_Solana2EVM"
+            file: ccip_messaging_test.go
+            run: "^Test_CCIPMessaging_Solana2EVM$"
+            timeout: 30m
           - name: "Messaging Test Test_CCIPMessaging_EVM2SolanaMultiExecReports"
             file: ccip_messaging_test.go
             run: "^Test_CCIPMessaging_EVM2SolanaMultiExecReports$"
@@ -243,21 +242,13 @@ jobs:
         run: |
           cd $GITHUB_WORKSPACE/chainlink
           go build -o ccip.test .
-      # TEMP: workaround issues with db schema pinning (https://github.com/smartcontractkit/capabilities/pull/234)
-      # - name: Setup DB
-      #  run: |
-      #    cd $GITHUB_WORKSPACE/chainlink
-      #    ./ccip.test local db preparetest
-      #  env:
-      #    CL_DATABASE_URL: ${{ env.DB_URL }}
       - name: Setup DB
         shell: bash
         run: |
-          go get github.com/smartcontractkit/chainlink/v2/core/store/cmd/preparetest@5b5d3f204863e43445685cb2f569f37514bb84f5
+          go get github.com/smartcontractkit/chainlink/v2/core/store/cmd/preparetest@latest
           go run github.com/smartcontractkit/chainlink/v2/core/store/cmd/preparetest
         env:
           CL_DATABASE_URL: ${{ env.DB_URL }}
-
       - name: Install gotestsum
         run: go install gotest.tools/gotestsum@latest
       - name: ${{ matrix.type.name }}

ccv/chains/evm/deployment/go.mod

@@ -17,12 +17,13 @@ require (
 	github.com/Masterminds/semver/v3 v3.4.0
 	github.com/ethereum/go-ethereum v1.17.1
 	github.com/smartcontractkit/chain-selectors v1.0.97
-	github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20260312195246-5144b4f20afb
-	github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260312182032-b2b38700f19b
-	github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment v0.0.0-20260312182032-b2b38700f19b
-	github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260312195246-5144b4f20afb
+	github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20260319162701-d96a00a71caf
+	github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260319162701-d96a00a71caf
+	github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment v0.0.0-20260319162701-d96a00a71caf
+	github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260319162701-d96a00a71caf
 	github.com/smartcontractkit/chainlink-common v0.10.1-0.20260310151336-c98a9c147ac0
 	github.com/smartcontractkit/chainlink-deployments-framework v0.80.2
+	github.com/smartcontractkit/chainlink-evm v0.3.3
 	github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20260119171452-39c98c3b33cd
 	github.com/smartcontractkit/mcms v0.36.0
 	github.com/stretchr/testify v1.11.1
@@ -227,7 +228,6 @@ require (
 	github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260121163256-85accaf3d28d // indirect
 	github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20250912190424-fd2e35d7deb5 // indirect
 	github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10 // indirect
-	github.com/smartcontractkit/chainlink-evm v0.3.3 // indirect
 	github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260226130359-963f935e0396 // indirect
 	github.com/smartcontractkit/chainlink-protos/job-distributor v0.17.0 // indirect
 	github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20251002192024-d2ad9222409b // indirect

ccv/chains/evm/deployment/latest/operations/erc20/erc20.go

@@ -34,7 +34,7 @@ contracts:
         access: public
 
   - contract_name: FactoryBurnMintERC20
-    version: "1.7.0"
+    version: "2.0.0"
     version_path: "latest"
     package_name: erc20
     abi_file: factory_burn_mint_erc20.json
@@ -44,9 +44,9 @@ contracts:
         access: public
       - name: balanceOf
         access: public
+
   - contract_name: AdvancedPoolHooks
     version: "2.0.0"
-    version_path: "latest"
     functions:
       - name: applyCCVConfigUpdates
         access: owner
@@ -79,7 +79,6 @@ contracts:
 
   - contract_name: OnRamp
     version: "2.0.0"
-    version_path: "latest"
     package_name: onramp
     functions:
       - name: applyDestChainConfigUpdates
@@ -97,7 +96,6 @@ contracts:
 
   - contract_name: OffRamp
     version: "2.0.0"
-    version_path: "latest"
     package_name: offramp
     functions:
       - name: applySourceChainConfigUpdates
@@ -111,7 +109,6 @@ contracts:
 
   - contract_name: MockReceiverV2
     version: "2.0.0"
-    version_path: "latest"
     functions:
       - name: getCCVsAndMinBlockConfirmations
         access: public
@@ -122,7 +119,6 @@ contracts:
 
   - contract_name: TokenPool
     version: "2.0.0"
-    version_path: "latest"
     abi_file: burn_mint_token_pool.json
     no_deployment: true
     functions:
@@ -171,39 +167,32 @@ contracts:
 
   - contract_name: BurnMintTokenPool
     version: "2.0.0"
-    version_path: "latest"
     functions: []
 
   - contract_name: BurnFromMintTokenPool
     version: "2.0.0"
-    version_path: "latest"
     functions: []
 
   - contract_name: BurnWithFromMintTokenPool
     version: "2.0.0"
-    version_path: "latest"
     functions: []
 
   - contract_name: BurnToAddressMintTokenPool
     version: "2.0.0"
-    version_path: "latest"
     functions: []
 
   - contract_name: BurnMintWithLockReleaseFlagTokenPool
     version: "2.0.0"
-    version_path: "latest"
     functions: []
 
   - contract_name: LockReleaseTokenPool
     version: "2.0.0"
-    version_path: "latest"
     functions:
       - name: getLockBox
         access: public
 
   - contract_name: SiloedLockReleaseTokenPool
     version: "2.0.0"
-    version_path: "latest"
     functions:
       - name: getLockBox
         access: public
@@ -212,7 +201,6 @@ contracts:
 
   - contract_name: SiloedUSDCTokenPool
     version: "2.0.0"
-    version_path: "latest"
     functions:
       - name: configureLockBoxes
         access: owner
@@ -225,7 +213,6 @@ contracts:
 
   - contract_name: LombardTokenPool
     version: "2.0.0"
-    version_path: "latest"
     functions:
       - name: setPath
         access: owner
@@ -234,14 +221,12 @@ contracts:
 
   - contract_name: CCTPThroughCCVTokenPool
     version: "2.0.0"
-    version_path: "latest"
     functions:
       - name: applyAuthorizedCallerUpdates
         access: owner
 
   - contract_name: USDCTokenPoolProxy
     version: "2.0.0"
-    version_path: "latest"
     functions:
       - name: getPools
         access: public
@@ -254,12 +239,10 @@ contracts:
 
   - contract_name: AdvancedPoolHooksExtractor
     version: "2.0.0"
-    version_path: "latest"
     functions: []
 
   - contract_name: CCTPMessageTransmitterProxy
     version: "2.0.0"
-    version_path: "latest"
     functions:
       - name: applyAuthorizedCallerUpdates
         access: owner
@@ -268,7 +251,6 @@ contracts:
 
   - contract_name: ERC20LockBox
     version: "2.0.0"
-    version_path: "latest"
     functions:
       - name: applyAuthorizedCallerUpdates
         access: owner
@@ -279,14 +261,12 @@ contracts:
 
   - contract_name: MockReceiverV2
     version: "2.0.0"
-    version_path: "latest"
     package_name: mock_receiver
     abi_file: mock_receiver_v2.json
     functions: []
 
   - contract_name: Executor
     version: "2.0.0"
-    version_path: "latest"
     functions:
       - name: setDynamicConfig
         access: owner
@@ -305,7 +285,6 @@ contracts:
 
   - contract_name: Proxy
     version: "2.0.0"
-    version_path: "latest"
     functions:
       - name: setTarget
         access: owner
@@ -320,7 +299,6 @@ contracts:
 
   - contract_name: LombardVerifier
     version: "2.0.0"
-    version_path: "latest"
     functions:
       - name: applyRemoteChainConfigUpdates
         access: owner
@@ -361,7 +339,6 @@ contracts:
 
   - contract_name: CCTPVerifier
     version: "2.0.0"
-    version_path: "latest"
     functions:
       - name: applyRemoteChainConfigUpdates
         access: owner
@@ -392,7 +369,6 @@ contracts:
 
   - contract_name: CommitteeVerifier
     version: "2.0.0"
-    version_path: "latest"
     functions:
       - name: setDynamicConfig
         access: owner

ccv/chains/evm/deployment/operations_gen_config.yaml

@@ -7,8 +7,8 @@ import (
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
 
-	"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/latest/operations/committee_verifier"
 	"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/v1_7_0/versioned_verifier_resolver"
+	"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/v2_0_0/operations/committee_verifier"
 	cv "github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/gobindings/generated/latest/committee_verifier"
 	dsutils "github.com/smartcontractkit/chainlink-ccip/deployment/utils/datastore"
 	"github.com/smartcontractkit/chainlink-ccip/deployment/v1_7_0/adapters"

ccv/chains/evm/deployment/v1_7_0/adapters/aggregator_config_adapter.go

@@ -13,10 +13,10 @@ import (
 	"github.com/smartcontractkit/chainlink-deployments-framework/datastore"
 	"github.com/smartcontractkit/chainlink-deployments-framework/operations"
 
-	"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/latest/operations/cctp_through_ccv_token_pool"
-	"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/latest/operations/cctp_message_transmitter_proxy"
-	"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/latest/operations/cctp_verifier"
 	"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/v1_7_0/sequences/cctp"
+	"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/v2_0_0/operations/cctp_message_transmitter_proxy"
+	"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/v2_0_0/operations/cctp_through_ccv_token_pool"
+	"github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm/deployment/v2_0_0/operations/cctp_verifier"
 )
 
 var _ adapters.CCTPChain = &CCTPChainAdapter{}