Merge remote-tracking branch 'origin/develop' into tt/solanaUpgrades

deployment/ccip/changeset/solana/cs_deploy_chain_test.go

@@ -18,7 +18,9 @@ import (
 	commontypes "github.com/smartcontractkit/chainlink/deployment/common/types"
 )
 
-func TestDeployAndUpgradeChainContractsChangesetSolana(t *testing.T) {
+// This test will not work locally on Mac because the arm64 validator we use does not support upgrades
+// https://solana.stackexchange.com/questions/17478/solana-localnet-error-while-upgrading-a-program-loaded-at-genesis-using-solan
+func TestDeployChainContractsChangesetSolana(t *testing.T) {
 	t.Parallel()
 	lggr := logger.TestLogger(t)
 	e := memory.NewMemoryEnvironment(t, lggr, zapcore.InfoLevel, memory.MemoryEnvironmentConfig{
@@ -87,10 +89,10 @@ func TestDeployAndUpgradeChainContractsChangesetSolana(t *testing.T) {
 				HomeChainSelector:      homeChainSel,
 				ContractParamsPerChain: contractParams,
 			},
-		},
-		{
-			Changeset: commonchangeset.WrapChangeSet(solana.DeployChainContractsChangesetSolana),
-			Config: solana.DeployChainContractsConfigSolana{
+		),
+		commonchangeset.Configure(
+			deployment.CreateLegacyChangeSet(solana.DeployChainContractsChangesetSolana),
+			solana.DeployChainContractsConfigSolana{
 				DeployChainContractsConfig: changeset.DeployChainContractsConfig{
 					HomeChainSelector: homeChainSel,
 					ContractParamsPerChain: map[uint64]changeset.ChainContractParams{
@@ -108,19 +110,19 @@ func TestDeployAndUpgradeChainContractsChangesetSolana(t *testing.T) {
 	testhelpers.ValidateSolanaState(t, e, solChainSelectors)
 
 	// Verify upgrade flow
-	e, err = commonchangeset.ApplyChangesets(t, e, nil, []commonchangeset.ChangesetApplication{
-		{
-			Changeset: commonchangeset.WrapChangeSet(solana.BuildSolanaChangeset),
-			Config: solana.BuildSolanaConfig{
+	e, err = commonchangeset.Apply(t, e, nil,
+		commonchangeset.Configure(
+			deployment.CreateLegacyChangeSet(solana.BuildSolanaChangeset),
+			solana.BuildSolanaConfig{
 				ChainSelector:       solChainSelectors[0],
 				GitCommitSha:        "9a0ab24a17ac44d4a58b77db28e13a5f31fd2ca4",
 				DestinationDir:      e.SolChains[solChainSelectors[0]].ProgramsPath,
 				CleanDestinationDir: true,
 			},
-		},
-		{
-			Changeset: commonchangeset.WrapChangeSet(solana.DeployChainContractsChangesetSolana),
-			Config: solana.DeployChainContractsConfigSolana{
+		),
+		commonchangeset.Configure(
+			deployment.CreateLegacyChangeSet(solana.DeployChainContractsChangesetSolana),
+			solana.DeployChainContractsConfigSolana{
 				DeployChainContractsConfig: changeset.DeployChainContractsConfig{
 					HomeChainSelector: homeChainSel,
 					ContractParamsPerChain: map[uint64]changeset.ChainContractParams{
@@ -137,8 +139,8 @@ func TestDeployAndUpgradeChainContractsChangesetSolana(t *testing.T) {
 					NewOffRampVersion:   &deployment.Version1_1_0,
 				},
 			},
-		},
-	})
+		),
+	)
 	require.NoError(t, err)
 	// solana verification
 	testhelpers.ValidateSolanaState(t, e, solChainSelectors)

deployment/ccip/changeset/testhelpers/test_environment.go

@@ -576,9 +576,11 @@ func AddCCIPContractsToEnvironment(t *testing.T, allChains []uint64, tEnv TestEn
 		),
 		commonchangeset.Configure(
 			deployment.CreateLegacyChangeSet(solana.DeployChainContractsChangesetSolana),
-			changeset.DeployChainContractsConfig{
-				HomeChainSelector:      e.HomeChainSel,
-				ContractParamsPerChain: solContractParams,
+			solana.DeployChainContractsConfigSolana{
+				DeployChainContractsConfig: changeset.DeployChainContractsConfig{
+					HomeChainSelector:      e.HomeChainSel,
+					ContractParamsPerChain: evmContractParams,
+				},
 			},
 		),
 	}...)

deployment/go.mod

@@ -328,6 +328,7 @@ require (
 	github.com/pierrec/lz4/v4 v4.1.21 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
+	github.com/pressly/goose/v3 v3.21.1 // indirect
 	github.com/prometheus/client_golang v1.20.5 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
 	github.com/prometheus/common v0.60.1 // indirect

deployment/go.sum

@@ -1153,10 +1153,6 @@ github.com/smartcontractkit/chainlink-protos/svr v0.0.0-20250123084029-58cce9b32
 github.com/smartcontractkit/chainlink-protos/svr v0.0.0-20250123084029-58cce9b32112/go.mod h1:TcOliTQU6r59DwG4lo3U+mFM9WWyBHGuFkkxQpvSujo=
 github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250211201734-3ea6680f8db5 h1:fvXy2UGCaFWxufcq9OTcdrmxjPxav6hN7CXvT8Jwm+Q=
 github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250211201734-3ea6680f8db5/go.mod h1:8vwwY6hz++9D0rdmmc9HoyF1noI1pX6Grgz9yvhzUvQ=
-github.com/smartcontractkit/chainlink-testing-framework/framework v0.5.2-0.20250213162413-ff52a86896aa h1:z/ozMwxM25tbbF3iZqPAb8Lgwy/goJFjzSP3LILrJZE=
-github.com/smartcontractkit/chainlink-testing-framework/framework v0.5.2-0.20250213162413-ff52a86896aa/go.mod h1:WYxCxAWpeXEHfhB0GaiV2sj21Ooh9r/Nf7tzmJgAibs=
-github.com/smartcontractkit/chainlink-testing-framework/framework v0.5.2-0.20250213163123-c94846a5ac62 h1:9WgitgIr8Sy8ddRSQgySup5ofomWvFmoV0YKj3BoCts=
-github.com/smartcontractkit/chainlink-testing-framework/framework v0.5.2-0.20250213163123-c94846a5ac62/go.mod h1:WYxCxAWpeXEHfhB0GaiV2sj21Ooh9r/Nf7tzmJgAibs=
 github.com/smartcontractkit/chainlink-testing-framework/framework v0.5.2-0.20250213163657-dc72707c3adb h1:IJt/mviprpDroafBnY34Lu+T+rVGjOpjcu7Oj6jSlTk=
 github.com/smartcontractkit/chainlink-testing-framework/framework v0.5.2-0.20250213163657-dc72707c3adb/go.mod h1:WYxCxAWpeXEHfhB0GaiV2sj21Ooh9r/Nf7tzmJgAibs=
 github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.22 h1:W3doYLVoZN8VwJb/kAZsbDjW+6cgZPgNTcQHJUH9JrA=