MCMS support

Author: PabloMansanet

deployment/ccip/changeset/ccip_attestation/cs_ops_solana.go

@@ -8,13 +8,58 @@ import (
 	"github.com/gagliardetto/solana-go"
 	signer_registry "github.com/smartcontractkit/ccip-base/chains/solana/go_bindings"
 	"github.com/smartcontractkit/chainlink/deployment/common/proposalutils"
+	"github.com/smartcontractkit/mcms"
+	mcmsTypes "github.com/smartcontractkit/mcms/types"
 
+	cldf_solana "github.com/smartcontractkit/chainlink-deployments-framework/chain/solana"
 	cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
 	cs_solana "github.com/smartcontractkit/chainlink/deployment/ccip/changeset/solana_v0_1_1"
 	"github.com/smartcontractkit/chainlink/deployment/ccip/shared"
 	solanastateview "github.com/smartcontractkit/chainlink/deployment/ccip/shared/stateview/solana"
 )
 
+// ExecuteOrBuildMCMSProposal handles the decision to execute instructions directly or build an MCMS proposal.
+// If mcmsConfig is nil, it executes the instructions directly on the chain.
+// If mcmsConfig is provided, it builds MCMS transactions and creates a proposal.
+func ExecuteOrBuildMCMSProposal(
+	e cldf.Environment,
+	chain *cldf_solana.Chain,
+	instructions []solana.Instruction,
+	programID string,
+	contractType cldf.ContractType,
+	mcmsConfig *proposalutils.TimelockConfig,
+	proposalDescription string,
+) (cldf.ChangesetOutput, error) {
+	if mcmsConfig == nil {
+		// Direct execution - confirm each instruction individually to avoid Tx size limits
+		for i, ixn := range instructions {
+			if err := chain.Confirm([]solana.Instruction{ixn}); err != nil {
+				return cldf.ChangesetOutput{}, fmt.Errorf("failed to confirm instruction %d: %w", i, err)
+			}
+		}
+		return cldf.ChangesetOutput{}, nil
+	}
+
+	mcmsTxns := make([]mcmsTypes.Transaction, 0, len(instructions))
+	for _, ixn := range instructions {
+		tx, err := cs_solana.BuildMCMSTxn(ixn, programID, contractType)
+		if err != nil {
+			return cldf.ChangesetOutput{}, fmt.Errorf("failed to create MCMS transaction: %w", err)
+		}
+		mcmsTxns = append(mcmsTxns, *tx)
+	}
+
+	proposal, err := cs_solana.BuildProposalsForTxns(
+		e, chain.Selector, proposalDescription, mcmsConfig.MinDelay, mcmsTxns)
+	if err != nil {
+		return cldf.ChangesetOutput{}, fmt.Errorf("failed to build proposal: %w", err)
+	}
+
+	return cldf.ChangesetOutput{
+		MCMSTimelockProposals: []mcms.TimelockProposal{*proposal},
+	}, nil
+}
+
 // use this changeset to rotate NOPs (entirely remove addresses or add new ones)
 var _ cldf.ChangeSet[RotateBaseSignerNopsConfig] = RotateBaseSignerNopsChangeset
 
@@ -54,7 +99,8 @@ type PromoteKeysConfig struct {
 type SetUpgradeAuthorityConfig struct {
 	ChainSelector       uint64
 	NewUpgradeAuthority solana.PublicKey
-	MCMS                *proposalutils.TimelockConfig // if set, assumes current upgrade authority is the timelock
+	// if set, assumes current upgrade authority is the timelock
+	MCMS *proposalutils.TimelockConfig
 }
 
 func RotateBaseSignerNopsChangeset(e cldf.Environment, c RotateBaseSignerNopsConfig) (cldf.ChangesetOutput, error) {
@@ -66,29 +112,35 @@ func RotateBaseSignerNopsChangeset(e cldf.Environment, c RotateBaseSignerNopsCon
 	signersPda, _, _ := solana.FindProgramAddress([][]byte{[]byte("signers")}, signer_registry.ProgramID)
 	eventAuthorityPda, _, _ := solana.FindProgramAddress([][]byte{[]byte("__event_authority")}, signer_registry.ProgramID)
 
+	var instructions []solana.Instruction
+
 	for _, hexKey := range c.NopKeysToRemove {
 		key, _ := parseEVMAddress(hexKey)
 
 		ix, err := signer_registry.NewRemoveSignerInstruction(key, chain.DeployerKey.PublicKey(), configPda, signersPda, eventAuthorityPda, signer_registry.ProgramID)
 		if err != nil {
 			return cldf.ChangesetOutput{}, fmt.Errorf("Failed to remove signer: %w", err)
 		}
-		if err := chain.Confirm([]solana.Instruction{ix}); err != nil {
-			return cldf.ChangesetOutput{}, fmt.Errorf("Failed to remove signer: %w", err)
-		}
+		instructions = append(instructions, ix)
 	}
 	for _, hexKey := range c.NopKeysToAdd {
 		key, _ := parseEVMAddress(hexKey)
 		ix, err := signer_registry.NewAddSignerInstruction(key, chain.DeployerKey.PublicKey(), configPda, signersPda, eventAuthorityPda, signer_registry.ProgramID)
 		if err != nil {
 			return cldf.ChangesetOutput{}, fmt.Errorf("Failed to add signer: %w", err)
 		}
-		if err := chain.Confirm([]solana.Instruction{ix}); err != nil {
-			return cldf.ChangesetOutput{}, fmt.Errorf("Failed to add signer: %w", err)
-		}
+		instructions = append(instructions, ix)
 	}
 
-	return cldf.ChangesetOutput{}, nil
+	return ExecuteOrBuildMCMSProposal(
+		e,
+		&chain,
+		instructions,
+		signer_registry.ProgramID.String(),
+		cldf.ContractType("BaseSignerRegistry"),
+		c.MCMS,
+		"proposal to rotate attestation signer NOPs in Solana",
+	)
 }
 
 func (c RotateBaseSignerNopsConfig) Validate(e cldf.Environment) error {
@@ -160,6 +212,8 @@ func AddGreenKeysChangeset(e cldf.Environment, c AddGreenKeysConfig) (cldf.Chang
 	signersPda, _, _ := solana.FindProgramAddress([][]byte{[]byte("signers")}, signer_registry.ProgramID)
 	eventAuthorityPda, _, _ := solana.FindProgramAddress([][]byte{[]byte("__event_authority")}, signer_registry.ProgramID)
 
+	var instructions []solana.Instruction
+
 	for _, keyPair := range c.BlueGreenKeys {
 		blue, _ := parseEVMAddress(keyPair[0])
 		green, _ := parseEVMAddress(keyPair[1])
@@ -168,12 +222,18 @@ func AddGreenKeysChangeset(e cldf.Environment, c AddGreenKeysConfig) (cldf.Chang
 		if err != nil {
 			return cldf.ChangesetOutput{}, fmt.Errorf("Failed to add green key: %w", err)
 		}
-		if err := chain.Confirm([]solana.Instruction{ix}); err != nil {
-			return cldf.ChangesetOutput{}, fmt.Errorf("Failed to add green key: %w", err)
-		}
+		instructions = append(instructions, ix)
 	}
 
-	return cldf.ChangesetOutput{}, nil
+	return ExecuteOrBuildMCMSProposal(
+		e,
+		&chain,
+		instructions,
+		signer_registry.ProgramID.String(),
+		cldf.ContractType("BaseSignerRegistry"),
+		c.MCMS,
+		"proposal to add green keys for rotation in Solana",
+	)
 }
 
 func (c AddGreenKeysConfig) Validate(e cldf.Environment) error {
@@ -239,19 +299,27 @@ func PromoteKeysChangeset(e cldf.Environment, c PromoteKeysConfig) (cldf.Changes
 	signersPda, _, _ := solana.FindProgramAddress([][]byte{[]byte("signers")}, signer_registry.ProgramID)
 	eventAuthorityPda, _, _ := solana.FindProgramAddress([][]byte{[]byte("__event_authority")}, signer_registry.ProgramID)
 
+	var instructions []solana.Instruction
+
 	for _, keyHex := range c.KeysToPromote {
 		key, _ := parseEVMAddress(keyHex)
 
 		ix, err := signer_registry.NewPromoteSignerAddressInstruction(key, chain.DeployerKey.PublicKey(), configPda, signersPda, eventAuthorityPda, signer_registry.ProgramID)
 		if err != nil {
 			return cldf.ChangesetOutput{}, fmt.Errorf("Failed to promote key: %w", err)
 		}
-		if err := chain.Confirm([]solana.Instruction{ix}); err != nil {
-			return cldf.ChangesetOutput{}, fmt.Errorf("Failed to promote key: %w", err)
-		}
+		instructions = append(instructions, ix)
 	}
 
-	return cldf.ChangesetOutput{}, nil
+	return ExecuteOrBuildMCMSProposal(
+		e,
+		&chain,
+		instructions,
+		signer_registry.ProgramID.String(),
+		cldf.ContractType("BaseSignerRegistry"),
+		c.MCMS,
+		"proposal to promote green keys in Solana",
+	)
 }
 
 func (c PromoteKeysConfig) Validate(e cldf.Environment) error {
@@ -303,11 +371,18 @@ func SetUpgradeAuthorityChangeset(
 	chain := e.BlockChains.SolanaChains()[config.ChainSelector]
 	currentAuthority := chain.DeployerKey.PublicKey()
 	e.Logger.Infow("Setting upgrade authority", "newUpgradeAuthority", config.NewUpgradeAuthority.String())
+
 	ixn := cs_solana.SetUpgradeAuthority(&e, &chain, signer_registry.ProgramID, currentAuthority, config.NewUpgradeAuthority, false)
-	if err := chain.Confirm([]solana.Instruction{ixn}); err != nil {
-		return cldf.ChangesetOutput{}, fmt.Errorf("failed to confirm instructions: %w", err)
-	}
-	return cldf.ChangesetOutput{}, nil
+
+	return ExecuteOrBuildMCMSProposal(
+		e,
+		&chain,
+		[]solana.Instruction{ixn},
+		solana.BPFLoaderUpgradeableProgramID.String(),
+		cldf.ContractType(solana.BPFLoaderUpgradeableProgramID.String()),
+		config.MCMS,
+		"proposal to SetUpgradeAuthority in Solana",
+	)
 }
 
 func parseEVMAddress(addr string) ([20]uint8, error) {