Ccip-4110 migration test

.github/integration-in-memory-tests.yml

@@ -7,6 +7,13 @@
 #
 runner-test-matrix:
   # START: CCIPv1.6 tests
+  - id: smoke/ccip/ccip_migration_to_v_1_6_test.go:*
+    path: integration-tests/smoke/ccip/ccip_migration_to_v_1_6_test.go.go
+    test_env_type: in-memory
+    runs_on: ubuntu-latest
+    triggers:
+      - PR Integration CCIP Tests
+    test_cmd: cd integration-tests/smoke/ccip && go test ccip_migration_to_v_1_6_test.go -timeout 12m -test.parallel=1 -count=1 -json
 
   - id: smoke/ccip/ccip_fees_test.go:*
     path: integration-tests/smoke/ccip/ccip_fees_test.go

core/scripts/go.mod

@@ -300,7 +300,7 @@ require (
 	github.com/shirou/gopsutil/v3 v3.24.3 // indirect
 	github.com/smartcontractkit/ccip-owner-contracts v0.0.0-salt-fix // indirect
 	github.com/smartcontractkit/chain-selectors v1.0.36 // indirect
-	github.com/smartcontractkit/chainlink-ccip v0.0.0-20250109124515-ff9d86b874ba // indirect
+	github.com/smartcontractkit/chainlink-ccip v0.0.0-20250109175726-b72c6bfaec00 // indirect
 	github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250103152858-8973fd0c912b // indirect
 	github.com/smartcontractkit/chainlink-cosmos v0.5.2-0.20241202195413-82468150ac1e // indirect
 	github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20241216163550-fa030d178ba3 // indirect

core/scripts/go.sum

@@ -1111,8 +1111,8 @@ github.com/smartcontractkit/chain-selectors v1.0.36 h1:KSpO8I+JOiuyN4FuXsV471sPo
 github.com/smartcontractkit/chain-selectors v1.0.36/go.mod h1:xsKM0aN3YGcQKTPRPDDtPx2l4mlTN1Djmg0VVXV40b8=
 github.com/smartcontractkit/chainlink-automation v0.8.1 h1:sTc9LKpBvcKPc1JDYAmgBc2xpDKBco/Q4h4ydl6+UUU=
 github.com/smartcontractkit/chainlink-automation v0.8.1/go.mod h1:Iij36PvWZ6blrdC5A/nrQUBuf3MH3JvsBB9sSyc9W08=
-github.com/smartcontractkit/chainlink-ccip v0.0.0-20250109124515-ff9d86b874ba h1:gisAer1YxKKui6LhxDgfuZ3OyrHVjHm/oK/0idusFeI=
-github.com/smartcontractkit/chainlink-ccip v0.0.0-20250109124515-ff9d86b874ba/go.mod h1:ncjd6mPZSRlelEqH/2KeLE1pU3UlqzBSn8RYkEoECzY=
+github.com/smartcontractkit/chainlink-ccip v0.0.0-20250109175726-b72c6bfaec00 h1:w/KQPjK1sqRggWO87ntSNmYTNhLfgIspii4VpCqZkfU=
+github.com/smartcontractkit/chainlink-ccip v0.0.0-20250109175726-b72c6bfaec00/go.mod h1:ncjd6mPZSRlelEqH/2KeLE1pU3UlqzBSn8RYkEoECzY=
 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250103152858-8973fd0c912b h1:UBXi9Yj8YSMHDDaxQLu273x1fWjyEL9xP58nuJsqZfg=
 github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20250103152858-8973fd0c912b/go.mod h1:Bmwq4lNb5tE47sydN0TKetcLEGbgl+VxHEWp4S0LI60=
 github.com/smartcontractkit/chainlink-common v0.4.1-0.20250108194320-2ebd63bbb16e h1:8BStiP1F4W8AvjBRga0TYtjvAtkwN8oHYnHJztAlSF4=

core/services/ocr2/plugins/ccip/testhelpers/integration/jobspec.go

@@ -156,7 +156,7 @@ type JobType string
 const (
 	Commit    JobType = "commit"
 	Execution JobType = "exec"
-	Boostrap  JobType = "bootstrap"
+	Bootstrap JobType = "bootstrap"
 )
 
 func JobName(jobType JobType, source string, destination, version string) string {
@@ -323,7 +323,7 @@ func (params CCIPJobSpecParams) BootstrapJob(contractID string) *OCR2TaskJobSpec
 		},
 	}
 	return &OCR2TaskJobSpec{
-		Name:           fmt.Sprintf("%s-%s", Boostrap, params.DestChainName),
+		Name:           fmt.Sprintf("%s-%s-%s", Bootstrap, params.SourceChainName, params.DestChainName),
 		JobType:        "bootstrap",
 		OCR2OracleSpec: bootstrapSpec,
 	}

deployment/ccip/changeset/accept_ownership_test.go

@@ -14,7 +14,7 @@ import (
 
 func Test_NewAcceptOwnershipChangeset(t *testing.T) {
 	t.Parallel()
-	e := NewMemoryEnvironment(t)
+	e, _ := NewMemoryEnvironment(t)
 	state, err := LoadOnchainState(e.Env)
 	require.NoError(t, err)
 

deployment/ccip/changeset/cs_active_candidate_test.go

@@ -9,6 +9,7 @@ import (
 	"golang.org/x/exp/maps"
 
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/utils/testcontext"
+
 	"github.com/smartcontractkit/chainlink/deployment/ccip/changeset/internal"
 	commonchangeset "github.com/smartcontractkit/chainlink/deployment/common/changeset"
 
@@ -25,7 +26,7 @@ func Test_ActiveCandidate(t *testing.T) {
 	// We want to have the active instance execute a few messages
 	// and then setup a candidate instance. The candidate instance
 	// should not be able to transmit anything until we make it active.
-	tenv := NewMemoryEnvironment(t,
+	tenv, _ := NewMemoryEnvironment(t,
 		WithChains(2),
 		WithNodes(4))
 	state, err := LoadOnchainState(tenv.Env)

deployment/ccip/changeset/cs_add_lane_test.go

@@ -1,106 +1,26 @@
 package changeset
 
 import (
-	"math/big"
 	"testing"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/stretchr/testify/require"
 
 	"github.com/smartcontractkit/chainlink-testing-framework/lib/utils/testcontext"
 
-	commoncs "github.com/smartcontractkit/chainlink/deployment/common/changeset"
-	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/fee_quoter"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/router"
 )
 
 func TestAddLanesWithTestRouter(t *testing.T) {
 	t.Parallel()
-	e := NewMemoryEnvironment(t)
+	e, _ := NewMemoryEnvironment(t)
 	// Here we have CR + nodes set up, but no CCIP contracts deployed.
 	state, err := LoadOnchainState(e.Env)
 	require.NoError(t, err)
 
 	selectors := e.Env.AllChainSelectors()
 	chain1, chain2 := selectors[0], selectors[1]
-
-	stateChain1 := state.Chains[chain1]
-	e.Env, err = commoncs.ApplyChangesets(t, e.Env, e.TimelockContracts(t), []commoncs.ChangesetApplication{
-		{
-			Changeset: commoncs.WrapChangeSet(UpdateOnRampsDests),
-			Config: UpdateOnRampDestsConfig{
-				UpdatesByChain: map[uint64]map[uint64]OnRampDestinationUpdate{
-					chain1: {
-						chain2: {
-							IsEnabled:        true,
-							TestRouter:       true,
-							AllowListEnabled: false,
-						},
-					},
-				},
-			},
-		},
-		{
-			Changeset: commoncs.WrapChangeSet(UpdateFeeQuoterPricesCS),
-			Config: UpdateFeeQuoterPricesConfig{
-				PricesByChain: map[uint64]FeeQuoterPriceUpdatePerSource{
-					chain1: {
-						TokenPrices: map[common.Address]*big.Int{
-							stateChain1.LinkToken.Address(): DefaultLinkPrice,
-							stateChain1.Weth9.Address():     DefaultWethPrice,
-						},
-						GasPrices: map[uint64]*big.Int{
-							chain2: DefaultGasPrice,
-						},
-					},
-				},
-			},
-		},
-		{
-			Changeset: commoncs.WrapChangeSet(UpdateFeeQuoterDests),
-			Config: UpdateFeeQuoterDestsConfig{
-				UpdatesByChain: map[uint64]map[uint64]fee_quoter.FeeQuoterDestChainConfig{
-					chain1: {
-						chain2: DefaultFeeQuoterDestChainConfig(),
-					},
-				},
-			},
-		},
-		{
-			Changeset: commoncs.WrapChangeSet(UpdateOffRampSources),
-			Config: UpdateOffRampSourcesConfig{
-				UpdatesByChain: map[uint64]map[uint64]OffRampSourceUpdate{
-					chain2: {
-						chain1: {
-							IsEnabled:  true,
-							TestRouter: true,
-						},
-					},
-				},
-			},
-		},
-		{
-			Changeset: commoncs.WrapChangeSet(UpdateRouterRamps),
-			Config: UpdateRouterRampsConfig{
-				TestRouter: true,
-				UpdatesByChain: map[uint64]RouterUpdates{
-					// onRamp update on source chain
-					chain1: {
-						OnRampUpdates: map[uint64]bool{
-							chain2: true,
-						},
-					},
-					// offramp update on dest chain
-					chain2: {
-						OffRampUpdates: map[uint64]bool{
-							chain1: true,
-						},
-					},
-				},
-			},
-		},
-	})
-	require.NoError(t, err)
+	AddLaneWithDefaultPricesAndFeeQuoterConfig(t, &e, state, chain1, chain2, true)
 	// Need to keep track of the block number for each chain so that event subscription can be done from that block.
 	startBlocks := make(map[uint64]*uint64)
 	// Send a message from each chain to every other chain.

deployment/ccip/changeset/cs_ccip_home_test.go

@@ -38,7 +38,7 @@ func Test_PromoteCandidate(t *testing.T) {
 	} {
 		t.Run(tc.name, func(t *testing.T) {
 			ctx := testcontext.Get(t)
-			tenv := NewMemoryEnvironment(t,
+			tenv, _ := NewMemoryEnvironment(t,
 				WithChains(2),
 				WithNodes(4))
 			state, err := LoadOnchainState(tenv.Env)
@@ -130,7 +130,7 @@ func Test_SetCandidate(t *testing.T) {
 	} {
 		t.Run(tc.name, func(t *testing.T) {
 			ctx := testcontext.Get(t)
-			tenv := NewMemoryEnvironment(t,
+			tenv, _ := NewMemoryEnvironment(t,
 				WithChains(2),
 				WithNodes(4))
 			state, err := LoadOnchainState(tenv.Env)
@@ -251,7 +251,7 @@ func Test_RevokeCandidate(t *testing.T) {
 	} {
 		t.Run(tc.name, func(t *testing.T) {
 			ctx := testcontext.Get(t)
-			tenv := NewMemoryEnvironment(t,
+			tenv, _ := NewMemoryEnvironment(t,
 				WithChains(2),
 				WithNodes(4))
 			state, err := LoadOnchainState(tenv.Env)
@@ -442,7 +442,7 @@ func Test_UpdateChainConfigs(t *testing.T) {
 		},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
-			tenv := NewMemoryEnvironment(t, WithChains(3))
+			tenv, _ := NewMemoryEnvironment(t, WithChains(3))
 			state, err := LoadOnchainState(tenv.Env)
 			require.NoError(t, err)
 

deployment/ccip/changeset/cs_chain_contracts.go

@@ -792,8 +792,14 @@ func (cfg UpdateRouterRampsConfig) Validate(e deployment.Environment) error {
 		if chainState.OffRamp == nil {
 			return fmt.Errorf("missing onramp onramp for chain %d", chainSel)
 		}
-		if err := commoncs.ValidateOwnership(e.GetContext(), cfg.MCMS != nil, e.Chains[chainSel].DeployerKey.From, chainState.Timelock.Address(), chainState.Router); err != nil {
-			return err
+		if cfg.TestRouter {
+			if err := commoncs.ValidateOwnership(e.GetContext(), cfg.MCMS != nil, e.Chains[chainSel].DeployerKey.From, chainState.Timelock.Address(), chainState.TestRouter); err != nil {
+				return err
+			}
+		} else {
+			if err := commoncs.ValidateOwnership(e.GetContext(), cfg.MCMS != nil, e.Chains[chainSel].DeployerKey.From, chainState.Timelock.Address(), chainState.Router); err != nil {
+				return err
+			}
 		}
 
 		for source := range update.OffRampUpdates {

deployment/ccip/changeset/cs_chain_contracts_test.go

@@ -32,7 +32,7 @@ func TestUpdateOnRampsDests(t *testing.T) {
 			ctx := testcontext.Get(t)
 			// Default env just has 2 chains with all contracts
 			// deployed but no lanes.
-			tenv := NewMemoryEnvironment(t)
+			tenv, _ := NewMemoryEnvironment(t)
 			state, err := LoadOnchainState(tenv.Env)
 			require.NoError(t, err)
 
@@ -106,7 +106,7 @@ func TestUpdateOffRampsSources(t *testing.T) {
 	} {
 		t.Run(tc.name, func(t *testing.T) {
 			ctx := testcontext.Get(t)
-			tenv := NewMemoryEnvironment(t)
+			tenv, _ := NewMemoryEnvironment(t)
 			state, err := LoadOnchainState(tenv.Env)
 			require.NoError(t, err)
 
@@ -176,7 +176,7 @@ func TestUpdateFQDests(t *testing.T) {
 	} {
 		t.Run(tc.name, func(t *testing.T) {
 			ctx := testcontext.Get(t)
-			tenv := NewMemoryEnvironment(t)
+			tenv, _ := NewMemoryEnvironment(t)
 			state, err := LoadOnchainState(tenv.Env)
 			require.NoError(t, err)
 
@@ -244,7 +244,7 @@ func TestUpdateRouterRamps(t *testing.T) {
 	} {
 		t.Run(tc.name, func(t *testing.T) {
 			ctx := testcontext.Get(t)
-			tenv := NewMemoryEnvironment(t)
+			tenv, _ := NewMemoryEnvironment(t)
 			state, err := LoadOnchainState(tenv.Env)
 			require.NoError(t, err)
 
@@ -320,7 +320,7 @@ func TestUpdateNonceManagersCS(t *testing.T) {
 		},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
-			tenv := NewMemoryEnvironment(t)
+			tenv, _ := NewMemoryEnvironment(t)
 			state, err := LoadOnchainState(tenv.Env)
 			require.NoError(t, err)
 

deployment/ccip/changeset/cs_deploy_chain_test.go

@@ -101,7 +101,7 @@ func TestDeployChainContractsChangeset(t *testing.T) {
 
 func TestDeployCCIPContracts(t *testing.T) {
 	t.Parallel()
-	e := NewMemoryEnvironment(t)
+	e, _ := NewMemoryEnvironment(t)
 	// Deploy all the CCIP contracts.
 	state, err := LoadOnchainState(e.Env)
 	require.NoError(t, err)

deployment/ccip/changeset/cs_home_chain_test.go

@@ -62,7 +62,7 @@ func TestDeployHomeChain(t *testing.T) {
 }
 
 func TestRemoveDonsValidate(t *testing.T) {
-	e := NewMemoryEnvironment(t)
+	e, _ := NewMemoryEnvironment(t)
 	s, err := LoadOnchainState(e.Env)
 	require.NoError(t, err)
 	homeChain := s.Chains[e.HomeChainSel]
@@ -117,7 +117,7 @@ func TestRemoveDonsValidate(t *testing.T) {
 }
 
 func TestRemoveDons(t *testing.T) {
-	e := NewMemoryEnvironment(t)
+	e, _ := NewMemoryEnvironment(t)
 	s, err := LoadOnchainState(e.Env)
 	require.NoError(t, err)
 	homeChain := s.Chains[e.HomeChainSel]

deployment/ccip/changeset/cs_update_rmn_config_test.go

@@ -65,7 +65,7 @@ func TestUpdateRMNConfig(t *testing.T) {
 }
 
 func updateRMNConfig(t *testing.T, tc updateRMNConfigTestCase) {
-	e := NewMemoryEnvironment(t)
+	e, _ := NewMemoryEnvironment(t)
 
 	state, err := LoadOnchainState(e.Env)
 	require.NoError(t, err)
@@ -220,7 +220,7 @@ func buildRMNRemoteAddressPerChain(e deployment.Environment, state CCIPOnChainSt
 
 func TestSetRMNRemoteOnRMNProxy(t *testing.T) {
 	t.Parallel()
-	e := NewMemoryEnvironment(t, WithNoJobsAndContracts())
+	e, _ := NewMemoryEnvironment(t, WithNoJobsAndContracts())
 	allChains := e.Env.AllChainSelectors()
 	mcmsCfg := make(map[uint64]commontypes.MCMSWithTimelockConfig)
 	var err error
@@ -265,6 +265,8 @@ func TestSetRMNRemoteOnRMNProxy(t *testing.T) {
 			CallProxy: state.Chains[chain].CallProxy,
 		}
 	}
+	envNodes, err := deployment.NodeInfo(e.Env.NodeIDs, e.Env.Offchain)
+	require.NoError(t, err)
 	e.Env, err = commonchangeset.ApplyChangesets(t, e.Env, timelockContractsPerChain, []commonchangeset.ChangesetApplication{
 		// transfer ownership of RMNProxy to timelock
 		{
@@ -274,6 +276,19 @@ func TestSetRMNRemoteOnRMNProxy(t *testing.T) {
 				MinDelay:         0,
 			},
 		},
+
+		{
+			Changeset: commonchangeset.WrapChangeSet(DeployHomeChain),
+			Config: DeployHomeChainConfig{
+				HomeChainSel:     e.HomeChainSel,
+				RMNDynamicConfig: NewTestRMNDynamicConfig(),
+				RMNStaticConfig:  NewTestRMNStaticConfig(),
+				NodeOperators:    NewTestNodeOperator(e.Env.Chains[e.HomeChainSel].DeployerKey.From),
+				NodeP2PIDsPerNodeOpAdmin: map[string][][32]byte{
+					"NodeOperator": envNodes.NonBootstraps().PeerIDs(),
+				},
+			},
+		},
 		{
 			Changeset: commonchangeset.WrapChangeSet(DeployChainContracts),
 			Config: DeployChainContractsConfig{

deployment/ccip/changeset/state_test.go

@@ -7,7 +7,7 @@ import (
 )
 
 func TestSmokeState(t *testing.T) {
-	tenv := NewMemoryEnvironment(t, WithChains(3))
+	tenv, _ := NewMemoryEnvironment(t, WithChains(3))
 	state, err := LoadOnchainState(tenv.Env)
 	require.NoError(t, err)
 	_, err = state.View(tenv.Env.AllChainSelectors())