comments

deployment/ccip/changeset/solana/cs_deploy_chain.go

@@ -319,15 +319,24 @@ func deployChainContractsSolana(
 		if err != nil {
 			return ixns, fmt.Errorf("failed to generate upgrade instruction: %w", err)
 		}
+		closeIxn, err := generateCloseBufferIxn(
+			&e,
+			bufferProgram,
+			config.UpgradeConfig.SpillAddress,
+			config.UpgradeConfig.UpgradeAuthority,
+		)
+		if err != nil {
+			return ixns, fmt.Errorf("failed to generate close buffer instruction: %w", err)
+		}
 		feeQuoterAddress = chainState.FeeQuoter
 		if config.UpgradeConfig.SignerKey != nil {
 			// if we're not using MCMS to upgrade, confirm txn with the signer key
-			if err := chain.Confirm([]solana.Instruction{upgradeIxn}, solCommonUtil.AddSigners(*config.UpgradeConfig.SignerKey)); err != nil {
+			if err := chain.Confirm([]solana.Instruction{upgradeIxn, closeIxn}, solCommonUtil.AddSigners(*config.UpgradeConfig.SignerKey)); err != nil {
 				return ixns, fmt.Errorf("failed to confirm upgradeFeeQuoter: %w", err)
 			}
 			e.Logger.Infow("Upgraded FeeQuoter", "addr", chainState.FeeQuoter.String(), "chain", chain.String())
 		} else {
-			ixns = append(ixns, upgradeIxn)
+			ixns = append(ixns, upgradeIxn, closeIxn)
 		}
 	} else {
 		e.Logger.Infow("Using existing fee quoter", "addr", chainState.FeeQuoter.String())
@@ -371,15 +380,24 @@ func deployChainContractsSolana(
 		if err != nil {
 			return ixns, fmt.Errorf("failed to generate upgrade instruction: %w", err)
 		}
+		closeIxn, err := generateCloseBufferIxn(
+			&e,
+			bufferProgram,
+			config.UpgradeConfig.SpillAddress,
+			config.UpgradeConfig.UpgradeAuthority,
+		)
+		if err != nil {
+			return ixns, fmt.Errorf("failed to generate close buffer instruction: %w", err)
+		}
 		ccipRouterProgram = chainState.Router
 		if config.UpgradeConfig.SignerKey != nil {
 			// if we're not using MCMS to upgrade, confirm txn with the signer key
-			if err := chain.Confirm([]solana.Instruction{upgradeIxn}, solCommonUtil.AddSigners(*config.UpgradeConfig.SignerKey)); err != nil {
+			if err := chain.Confirm([]solana.Instruction{upgradeIxn, closeIxn}, solCommonUtil.AddSigners(*config.UpgradeConfig.SignerKey)); err != nil {
 				return ixns, fmt.Errorf("failed to confirm upgradeRouter: %w", err)
 			}
 			e.Logger.Infow("Upgraded Router", "addr", chainState.Router.String(), "chain", chain.String())
 		} else {
-			ixns = append(ixns, upgradeIxn)
+			ixns = append(ixns, upgradeIxn, closeIxn)
 		}
 	} else {
 		e.Logger.Infow("Using existing router", "addr", chainState.Router.String())
@@ -623,24 +641,24 @@ func setUpgradeAuthority(
 	newUpgradeAuthority *solana.PublicKey,
 	isBuffer bool,
 ) error {
-	slice1 := solana.NewAccountMeta(programID, true, false)
+	// Buffers use the program account as the program data account
+	programDataSlice := solana.NewAccountMeta(programID, true, false)
 	if !isBuffer {
-		// Derive the program data address
+		// Actual program accounts use the program data account
 		programDataAddress, _, _ := solana.FindProgramAddress([][]byte{programID.Bytes()}, solana.BPFLoaderUpgradeableProgramID)
-		slice1 = solana.NewAccountMeta(programDataAddress, true, false)
+		programDataSlice = solana.NewAccountMeta(programDataAddress, true, false)
 	}
 
-	// Accounts involved in the transaction
 	keys := solana.AccountMetaSlice{
-		slice1, // Program account (writable)
+		programDataSlice, // Program account (writable)
 		solana.NewAccountMeta(currentUpgradeAuthority.PublicKey(), false, true), // Current upgrade authority (signer)
 		solana.NewAccountMeta(*newUpgradeAuthority, false, false),               // New upgrade authority
 	}
 
-	// Create the instruction
 	instruction := solana.NewInstruction(
 		solana.BPFLoaderUpgradeableProgramID,
 		keys,
+		// https://github.com/solana-playground/solana-playground/blob/2998d4cf381aa319d26477c5d4e6d15059670a75/vscode/src/commands/deploy/bpf-upgradeable/bpf-upgradeable.ts#L72
 		[]byte{4, 0, 0, 0}, // 4-byte SetAuthority instruction identifier
 	)
 
@@ -660,11 +678,11 @@ func generateUpgradeIxn(
 	upgradeAuthority solana.PublicKey,
 ) (solana.Instruction, error) {
 	// Derive the program data address
-	programDataAddress, _, _ := solana.FindProgramAddress([][]byte{programID.Bytes()}, solana.BPFLoaderUpgradeableProgramID)
+	programDataAccount, _, _ := solana.FindProgramAddress([][]byte{programID.Bytes()}, solana.BPFLoaderUpgradeableProgramID)
 
 	// Accounts involved in the transaction
 	keys := solana.AccountMetaSlice{
-		solana.NewAccountMeta(programDataAddress, true, false), // Program account (writable)
+		solana.NewAccountMeta(programDataAccount, true, false), // Program account (writable)
 		solana.NewAccountMeta(programID, true, false),
 		solana.NewAccountMeta(bufferAddress, true, false),             // Buffer account (writable)
 		solana.NewAccountMeta(spillAddress, true, false),              // Spill account (writable)
@@ -673,12 +691,35 @@ func generateUpgradeIxn(
 		solana.NewAccountMeta(upgradeAuthority, false, true),          // Current upgrade authority (signer)
 	}
 
-	// Create the instruction
 	instruction := solana.NewInstruction(
 		solana.BPFLoaderUpgradeableProgramID,
 		keys,
+		// https://github.com/solana-playground/solana-playground/blob/2998d4cf381aa319d26477c5d4e6d15059670a75/vscode/src/commands/deploy/bpf-upgradeable/bpf-upgradeable.ts#L66
 		[]byte{3, 0, 0, 0}, // 4-byte Upgrade instruction identifier
 	)
 
 	return instruction, nil
 }
+
+func generateCloseBufferIxn(
+	e *deployment.Environment,
+	bufferAddress solana.PublicKey,
+	recipient solana.PublicKey,
+	upgradeAuthority solana.PublicKey,
+) (solana.Instruction, error) {
+
+	keys := solana.AccountMetaSlice{
+		solana.NewAccountMeta(bufferAddress, true, false),
+		solana.NewAccountMeta(recipient, false, false),
+		solana.NewAccountMeta(upgradeAuthority, false, true),
+	}
+
+	instruction := solana.NewInstruction(
+		solana.BPFLoaderUpgradeableProgramID,
+		keys,
+		// https://github.com/solana-playground/solana-playground/blob/2998d4cf381aa319d26477c5d4e6d15059670a75/vscode/src/commands/deploy/bpf-upgradeable/bpf-upgradeable.ts#L78
+		[]byte{5, 0, 0, 0}, // 4-byte Close instruction identifier
+	)
+
+	return instruction, nil
+}

deployment/ccip/changeset/solana/cs_deploy_chain_test.go

@@ -192,6 +192,31 @@ func TestDeployChainContractsChangesetSolana(t *testing.T) {
 		)
 	}
 	require.NoError(t, err)
+	// Verify router and fee quoter upgraded in place
+	// and offramp had 2nd address added
+	addresses, err := e.ExistingAddresses.AddressesForChain(solChainSelectors[0])
+	numRouters := 0
+	numFeeQuoters := 0
+	numOffRamps := 0
+	for _, address := range addresses {
+		if address.Type == changeset.Router {
+			numRouters++
+		}
+		if address.Type == changeset.FeeQuoter {
+			numFeeQuoters++
+		}
+		if address.Type == changeset.OffRamp {
+			numOffRamps++
+		}
+	}
+	require.Equal(t, 1, numRouters)
+	require.Equal(t, 1, numFeeQuoters)
+	if ci {
+		require.Equal(t, 2, numOffRamps)
+	} else {
+		require.Equal(t, 1, numOffRamps)
+	}
+	require.NoError(t, err)
 	// solana verification
 	testhelpers.ValidateSolanaState(t, e, solChainSelectors)
 }

deployment/ccip/changeset/solana_state.go

@@ -52,13 +52,13 @@ type SolCCIPChainState struct {
 }
 
 func FetchOfframpLookupTable(ctx context.Context, chain deployment.SolChain, offRampAddress solana.PublicKey) (solana.PublicKey, error) {
-	var referenceAddresses solOffRamp.ReferenceAddresses
+	var referenceAddressesAccount solOffRamp.ReferenceAddresses
 	offRampReferenceAddressesPDA, _, _ := solState.FindOfframpReferenceAddressesPDA(offRampAddress)
-	err := chain.GetAccountDataBorshInto(ctx, offRampReferenceAddressesPDA, &referenceAddresses)
+	err := chain.GetAccountDataBorshInto(ctx, offRampReferenceAddressesPDA, &referenceAddressesAccount)
 	if err != nil {
 		return solana.PublicKey{}, fmt.Errorf("failed to get offramp reference addresses: %w", err)
 	}
-	return referenceAddresses.OfframpLookupTable, nil
+	return referenceAddressesAccount.OfframpLookupTable, nil
 }
 
 func LoadOnchainStateSolana(e deployment.Environment) (CCIPOnChainState, error) {

deployment/solana_chain.go

@@ -97,8 +97,10 @@ func (c SolChain) DeployProgram(logger logger.Logger, programName string, isUpgr
 	}
 
 	var cmd *exec.Cmd
+	// We need to specify the program ID on the inital deploy but not on upgrades
+	// Upgrades happen in place so we don't need to supply the keypair
+	// It will write the .so file to a buffer and then deploy it to the existing keypair
 	if !isUpgrade {
-		// Keypair exists, include program-id
 		logger.Infow("Deploying program with existing keypair",
 			"programFile", programFile,
 			"programKeyPair", programKeyPair)