solana upgrade changeset

core/scripts/go.mod

@@ -350,7 +350,7 @@ require (
 	github.com/smartcontractkit/chainlink-protos/rmn/v1.6/go v0.0.0-20250131130834-15e0d4cde2a6 // indirect
 	github.com/smartcontractkit/chainlink-protos/svr v0.0.0-20250123084029-58cce9b32112 // indirect
 	github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250213203720-e15b1333a14a // indirect
-	github.com/smartcontractkit/chainlink-testing-framework/framework v0.4.7 // indirect
+	github.com/smartcontractkit/chainlink-testing-framework/framework v0.5.3 // indirect
 	github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 // indirect
 	github.com/smartcontractkit/mcms v0.10.0 // indirect
 	github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20241009055228-33d0c0bf38de // indirect

core/scripts/go.sum

@@ -1112,8 +1112,8 @@ 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.20250213203720-e15b1333a14a h1:C+XavZQ0rBOpOrh45LUhdOsvtI8OQ0XZKI5pi+GP6h4=
 github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250213203720-e15b1333a14a/go.mod h1:aFm1QC/n99mVeBDtv0SE0co56+IECY6Y1fR3OfNYy3c=
-github.com/smartcontractkit/chainlink-testing-framework/framework v0.4.7 h1:E7k5Sym9WnMOc4X40lLnQb6BMosxi8DfUBU9pBJjHOQ=
-github.com/smartcontractkit/chainlink-testing-framework/framework v0.4.7/go.mod h1:WYxCxAWpeXEHfhB0GaiV2sj21Ooh9r/Nf7tzmJgAibs=
+github.com/smartcontractkit/chainlink-testing-framework/framework v0.5.3 h1:CeZqFz/si4YBnYE1118mtc4FBLs2Za1qohYAeLZTI+o=
+github.com/smartcontractkit/chainlink-testing-framework/framework v0.5.3/go.mod h1:9b5ugzYeKkwbxZ9yMOoxUaPiONDLC/QLCncarDFnhwk=
 github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.22 h1:W3doYLVoZN8VwJb/kAZsbDjW+6cgZPgNTcQHJUH9JrA=
 github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.22/go.mod h1:70JLBXQncNHyW63ik4PvPQGjQGZ1xK67MKrDanVAk2w=
 github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 h1:12ijqMM9tvYVEm+nR826WsrNi6zCKpwBhuApq127wHs=

deployment/ccip/changeset/solana/cs_add_remote_chain.go

@@ -220,10 +220,15 @@ func doAddRemoteChainToSolana(
 		}
 	}
 
+	addressLookupTable, err := cs.FetchOfframpLookupTable(e.GetContext(), chain, offRampID)
+	if err != nil {
+		return fmt.Errorf("failed to get offramp reference addresses: %w", err)
+	}
+
 	if err := solCommonUtil.ExtendLookupTable(
 		e.GetContext(),
 		chain.Client,
-		s.SolChains[chainSel].OfframpAddressLookupTable,
+		addressLookupTable,
 		*chain.DeployerKey,
 		lookUpTableEntries,
 	); err != nil {

deployment/ccip/changeset/solana/cs_billing.go

@@ -97,10 +97,15 @@ func AddBillingToken(e deployment.Environment, cfg BillingTokenConfig) (deployme
 		return deployment.ChangesetOutput{}, fmt.Errorf("failed to confirm instructions: %w", err)
 	}
 
+	addressLookupTable, err := cs.FetchOfframpLookupTable(e.GetContext(), chain, chainState.OffRamp)
+	if err != nil {
+		return deployment.ChangesetOutput{}, fmt.Errorf("failed to get offramp reference addresses: %w", err)
+	}
+
 	if err := solCommonUtil.ExtendLookupTable(
 		e.GetContext(),
 		chain.Client,
-		chainState.OfframpAddressLookupTable,
+		addressLookupTable,
 		*chain.DeployerKey,
 		[]solana.PublicKey{tokenBillingPDA},
 	); err != nil {
@@ -170,10 +175,15 @@ func AddBillingTokenForRemoteChain(e deployment.Environment, cfg BillingTokenFor
 		return deployment.ChangesetOutput{}, fmt.Errorf("failed to confirm instructions: %w", err)
 	}
 
+	addressLookupTable, err := cs.FetchOfframpLookupTable(e.GetContext(), chain, chainState.OffRamp)
+	if err != nil {
+		return deployment.ChangesetOutput{}, fmt.Errorf("failed to get offramp reference addresses: %w", err)
+	}
+
 	if err := solCommonUtil.ExtendLookupTable(
 		e.GetContext(),
 		chain.Client,
-		chainState.OfframpAddressLookupTable,
+		addressLookupTable,
 		*chain.DeployerKey,
 		[]solana.PublicKey{remoteBillingPDA},
 	); err != nil {

deployment/ccip/changeset/solana/cs_build_solana.go

@@ -38,19 +38,32 @@ func runCommand(command string, args []string, workDir string) (string, error) {
 
 // Clone and checkout the specific revision of the repo
 func cloneRepo(e deployment.Environment, revision string) error {
-	// Remove the clone directory if it already exists
-	if _, err := os.Stat(cloneDir); !os.IsNotExist(err) {
-		os.RemoveAll(cloneDir)
-	}
+	// Check if the repository already exists
+	if _, err := os.Stat(filepath.Join(cloneDir, ".git")); err == nil {
+		e.Logger.Debugw("Repository already exists, discarding local changes and updating", "dir", cloneDir)
 
-	e.Logger.Debugw("Cloning repository", "url", repoURL, "revision", revision)
-	_, err := runCommand("git", []string{"clone", repoURL, cloneDir}, ".")
-	if err != nil {
-		return fmt.Errorf("failed to clone repository: %w", err)
+		// Discard any local changes
+		_, err := runCommand("git", []string{"reset", "--hard"}, cloneDir)
+		if err != nil {
+			return fmt.Errorf("failed to discard local changes: %w", err)
+		}
+
+		// Fetch the latest changes from the remote
+		_, err = runCommand("git", []string{"fetch", "origin"}, cloneDir)
+		if err != nil {
+			return fmt.Errorf("failed to fetch origin: %w", err)
+		}
+	} else {
+		// Repository does not exist, clone it
+		e.Logger.Debugw("Cloning repository", "url", repoURL, "revision", revision)
+		_, err := runCommand("git", []string{"clone", repoURL, cloneDir}, ".")
+		if err != nil {
+			return fmt.Errorf("failed to clone repository: %w", err)
+		}
 	}
 
 	e.Logger.Debugw("Checking out revision", "revision", revision)
-	_, err = runCommand("git", []string{"checkout", revision}, cloneDir)
+	_, err := runCommand("git", []string{"checkout", revision}, cloneDir)
 	if err != nil {
 		return fmt.Errorf("failed to checkout revision %s: %w", revision, err)
 	}
@@ -93,7 +106,6 @@ type BuildSolanaConfig struct {
 	ChainSelector        uint64
 	GitCommitSha         string
 	DestinationDir       string
-	IsUpgrade            bool
 	CleanDestinationDir  bool
 	CreateDestinationDir bool
 }
@@ -116,11 +128,8 @@ func BuildSolanaChangeset(e deployment.Environment, config BuildSolanaConfig) (d
 		return deployment.ChangesetOutput{}, fmt.Errorf("error cloning repo: %w", err)
 	}
 
-	// Upgrades don't need to generate keys, we upgrade the program in place
-	if !config.IsUpgrade {
-		if err := replaceKeys(e); err != nil {
-			return deployment.ChangesetOutput{}, fmt.Errorf("error replacing keys: %w", err)
-		}
+	if err := replaceKeys(e); err != nil {
+		return deployment.ChangesetOutput{}, fmt.Errorf("error replacing keys: %w", err)
 	}
 
 	// Build the project with Anchor