solana transfer ownership (#1316)

* mcms registry

* tests

* tests

* tests

* tests

* tests

* get authority

* add transfer

* tests

* tests

* tests

* tests

* tests

Author: tt-cll

chains/evm/deployment/fastcurse_test.go

@@ -155,7 +155,7 @@ func TestFastCurse(t *testing.T) {
 	evmChain1 := env.BlockChains.EVMChains()[chain1]
 	evmChain2 := env.BlockChains.EVMChains()[chain2]
 	output, err := cs.Apply(*env, deploy.MCMSDeploymentConfig{
-		Version: semver.MustParse("1.0.0"),
+		AdapterVersion: semver.MustParse("1.0.0"),
 		Chains: map[uint64]deploy.MCMSDeploymentConfigPerChain{
 			chain1: {
 				Canceller:        testhelpers.SingleGroupMCMS(),

chains/evm/deployment/v1_0_0/adapters/deployer_test.go

@@ -38,7 +38,7 @@ func TestDeployMCMS(t *testing.T) {
 	dReg.RegisterDeployer(chainsel.FamilyEVM, deployops.MCMSVersion, evmDeployer)
 	cs := deployops.DeployMCMS(dReg)
 	output, err := cs.Apply(*env, deployops.MCMSDeploymentConfig{
-		Version: semver.MustParse("1.0.0"),
+		AdapterVersion: semver.MustParse("1.0.0"),
 		Chains: map[uint64]deployops.MCMSDeploymentConfigPerChain{
 			selector1: {
 				Canceller:        testhelpers.SingleGroupMCMS(),

chains/evm/deployment/v1_0_0/adapters/transfer_ownership_test.go

@@ -51,7 +51,7 @@ func TestTransferOwnership(t *testing.T) {
 	dReg.RegisterDeployer(chainsel.FamilyEVM, deploy.MCMSVersion, evmDeployer)
 	deployMCMS := deploy.DeployMCMS(dReg)
 	output, err := deployMCMS.Apply(*env, deploy.MCMSDeploymentConfig{
-		Version: semver.MustParse("1.0.0"),
+		AdapterVersion: semver.MustParse("1.0.0"),
 		Chains: map[uint64]deploy.MCMSDeploymentConfigPerChain{
 			selector1: {
 				Canceller:        testhelpers.SingleGroupMCMS(),
@@ -77,7 +77,7 @@ func TestTransferOwnership(t *testing.T) {
 
 	// deploy another timelock so that later we can transfer ownership to it from first timelock
 	output, err = deployMCMS.Apply(*env, deploy.MCMSDeploymentConfig{
-		Version: semver.MustParse("1.0.0"),
+		AdapterVersion: semver.MustParse("1.0.0"),
 		Chains: map[uint64]deploy.MCMSDeploymentConfigPerChain{
 			selector1: {
 				Canceller:        testhelpers.SingleGroupMCMS(),
@@ -195,7 +195,7 @@ func TestTransferOwnership(t *testing.T) {
 	cr := deploy.GetTransferOwnershipRegistry()
 	evmAdapter := &adapters.EVMTransferOwnershipAdapter{}
 	cr.RegisterAdapter(chainsel.FamilyEVM, transferOwnershipInput.AdapterVersion, evmAdapter)
-	mcmsRegistry := changesets.NewMCMSReaderRegistry()
+	mcmsRegistry := changesets.GetRegistry()
 	evmMCMSReader := &adapters.EVMMCMSReader{}
 	mcmsRegistry.RegisterMCMSReader(chainsel.FamilyEVM, evmMCMSReader)
 	transferOwnershipChangeset := deploy.TransferOwnershipChangeset(cr, mcmsRegistry)

chains/evm/deployment/v1_6_0/changesets/connect_chains_test.go

@@ -139,7 +139,7 @@ func TestConnectChains_EVM2EVM_NoMCMS(t *testing.T) {
 	require.NoError(t, err, "Failed to create test environment")
 	require.NotNil(t, e, "Environment should be created")
 
-	mcmsRegistry := cs_core.NewMCMSReaderRegistry()
+	mcmsRegistry := cs_core.GetRegistry()
 	dReg := deployops.GetRegistry()
 	version := semver.MustParse("1.6.0")
 	for _, chainSel := range chains {

chains/solana/deployment/utils/common.go

@@ -0,0 +1,194 @@
+package utils
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"math/big"
+	"time"
+
+	"github.com/gagliardetto/solana-go"
+	"github.com/gagliardetto/solana-go/rpc"
+	"github.com/smartcontractkit/chainlink-ccip/chains/solana/utils/state"
+	common_utils "github.com/smartcontractkit/chainlink-ccip/deployment/utils"
+	"github.com/smartcontractkit/chainlink-ccip/deployment/utils/datastore"
+	cldf_datastore "github.com/smartcontractkit/chainlink-deployments-framework/datastore"
+	cldf_deployment "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
+	mcms_solana "github.com/smartcontractkit/mcms/sdk/solana"
+	"github.com/smartcontractkit/mcms/types"
+)
+
+const (
+	TimelockProgramType cldf_deployment.ContractType = "RBACTimelockProgram"
+	McmProgramType      cldf_deployment.ContractType = "ManyChainMultiSigProgram"
+	// special type for Solana that encodes PDA seed usage
+	TimelockCompositeAddress cldf_deployment.ContractType = "RBACTimelockProgramCompositeAddress"
+)
+
+// Common parameters for transferring ownership of a program
+type TransferOwnershipParams struct {
+	Program      solana.PublicKey
+	CurrentOwner solana.PublicKey
+	NewOwner     solana.PublicKey
+}
+
+func BuildMCMSBatchOperation(
+	chainSelector uint64,
+	ixns []solana.Instruction,
+	programID string,
+	contractType string) (types.BatchOperation, error) {
+	txns := make([]types.Transaction, 0, len(ixns))
+	for _, ixn := range ixns {
+		data, err := ixn.Data()
+		if err != nil {
+			return types.BatchOperation{}, fmt.Errorf("failed to extract data: %w", err)
+		}
+		for _, account := range ixn.Accounts() {
+			if account.IsSigner {
+				account.IsSigner = false
+			}
+		}
+		tx, err := mcms_solana.NewTransaction(
+			programID,
+			data,
+			big.NewInt(0),  // e.g. value
+			ixn.Accounts(), // pass along needed accounts
+			contractType,   // some string identifying the target
+			[]string{},     // any relevant metadata
+		)
+		if err != nil {
+			return types.BatchOperation{}, fmt.Errorf("failed to create transaction: %w", err)
+		}
+		txns = append(txns, tx)
+	}
+	return types.BatchOperation{
+		ChainSelector: types.ChainSelector(chainSelector),
+		Transactions:  txns,
+	}, nil
+}
+
+func GetTimelockSignerPDA(
+	existingAddresses []cldf_datastore.AddressRef,
+	qualifier string) solana.PublicKey {
+	timelockProgram := datastore.GetAddressRef(
+		existingAddresses,
+		TimelockProgramType,
+		common_utils.Version_1_6_0,
+		"",
+	)
+	// timelock seeds stored as a separate program type
+	// qualifier will identify the correct timelock instance
+	timelockSeed := datastore.GetAddressRef(
+		existingAddresses,
+		common_utils.RBACTimelock,
+		common_utils.Version_1_6_0,
+		qualifier,
+	)
+	return state.GetTimelockSignerPDA(
+		solana.MustPublicKeyFromBase58(timelockProgram.Address),
+		state.PDASeed([]byte(timelockSeed.Address)),
+	)
+}
+
+func GetMCMSignerPDA(
+	existingAddresses []cldf_datastore.AddressRef,
+	qualifier string) solana.PublicKey {
+	mcmProgram := datastore.GetAddressRef(
+		existingAddresses,
+		McmProgramType,
+		common_utils.Version_1_6_0,
+		"",
+	)
+	// mcm seeds stored as a separate program type
+	// qualifier will identify the correct mcm instance
+	mcmSeed := datastore.GetAddressRef(
+		existingAddresses,
+		common_utils.ProposerManyChainMultisig,
+		common_utils.Version_1_6_0,
+		qualifier,
+	)
+	return state.GetMCMSignerPDA(
+		solana.MustPublicKeyFromBase58(mcmProgram.Address),
+		state.PDASeed([]byte(mcmSeed.Address)),
+	)
+}
+
+func GetTimelockCompositeAddress(
+	existingAddresses []cldf_datastore.AddressRef,
+	qualifier string) string {
+	timelockProgram := datastore.GetAddressRef(
+		existingAddresses,
+		TimelockProgramType,
+		common_utils.Version_1_6_0,
+		"",
+	)
+	// timelock seeds stored as a separate program type
+	// qualifier will identify the correct timelock instance
+	timelockSeed := datastore.GetAddressRef(
+		existingAddresses,
+		common_utils.RBACTimelock,
+		common_utils.Version_1_6_0,
+		qualifier,
+	)
+	return mcms_solana.ContractAddress(
+		solana.MustPublicKeyFromBase58(timelockProgram.Address),
+		mcms_solana.PDASeed([]byte(timelockSeed.Address)),
+	)
+}
+
+func FundSolanaAccounts(
+	ctx context.Context,
+	accounts []solana.PublicKey,
+	solAmount uint64,
+	solanaGoClient *rpc.Client,
+) error {
+	var sigs = make([]solana.Signature, 0, len(accounts))
+	for _, account := range accounts {
+		sig, err := solanaGoClient.RequestAirdrop(
+			ctx,
+			account,
+			solAmount*solana.LAMPORTS_PER_SOL,
+			rpc.CommitmentFinalized)
+		if err != nil {
+			return err
+		}
+		sigs = append(sigs, sig)
+	}
+
+	const timeout = 100 * time.Second
+	const pollInterval = 500 * time.Millisecond
+
+	timeoutCtx, cancel := context.WithTimeout(ctx, timeout)
+	defer cancel()
+
+	ticker := time.NewTicker(pollInterval)
+	defer ticker.Stop()
+
+	remaining := len(sigs)
+	for remaining > 0 {
+		select {
+		case <-timeoutCtx.Done():
+			return errors.New("unable to find transaction within timeout")
+		case <-ticker.C:
+			statusRes, sigErr := solanaGoClient.GetSignatureStatuses(ctx, true, sigs...)
+			if sigErr != nil {
+				return sigErr
+			}
+			if statusRes == nil {
+				return errors.New("Status response is nil")
+			}
+			if statusRes.Value == nil {
+				return errors.New("Status response value is nil")
+			}
+
+			unfinalizedCount := 0
+			for _, res := range statusRes.Value {
+				if res == nil || res.ConfirmationStatus == rpc.ConfirmationStatusFinalized {
+					unfinalizedCount++
+				}
+			}
+			remaining = unfinalizedCount
+		}
+	}
+	return nil
+}

chains/solana/deployment/v1_6_0/operations/fee_quoter/fee_quoter.go

@@ -15,6 +15,7 @@ import (
 	"github.com/smartcontractkit/chainlink-deployments-framework/datastore"
 	cldf_deployment "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
 	"github.com/smartcontractkit/chainlink-deployments-framework/operations"
+	"github.com/smartcontractkit/mcms/types"
 )
 
 var ContractType cldf_deployment.ContractType = "FeeQuoter"
@@ -51,17 +52,19 @@ var Initialize = operations.NewOperation(
 	Version,
 	"Initializes the FeeQuoter 1.6.0 contract",
 	func(b operations.Bundle, chain cldf_solana.Chain, input Params) (sequences.OnChainOutput, error) {
+		fee_quoter.SetProgramID(input.FeeQuoter)
 		programData, err := utils.GetSolProgramData(chain, input.FeeQuoter)
 		if err != nil {
 			return sequences.OnChainOutput{}, fmt.Errorf("failed to get program data: %w", err)
 		}
+		authority := GetAuthority(chain, input.FeeQuoter)
 		feeQuoterConfigPDA, _, _ := state.FindFqConfigPDA(input.FeeQuoter)
 		instruction, err := fee_quoter.NewInitializeInstruction(
 			input.MaxFeeJuelsPerMsg,
 			input.Router,
 			feeQuoterConfigPDA,
 			input.LinkToken,
-			chain.DeployerKey.PublicKey(),
+			authority,
 			solana.SystemProgramID,
 			input.FeeQuoter,
 			programData.Address,
@@ -82,6 +85,7 @@ var AddPriceUpdater = operations.NewOperation(
 	Version,
 	"Adds a price updater to the FeeQuoter 1.6.0 contract",
 	func(b operations.Bundle, chain cldf_solana.Chain, input Params) (sequences.OnChainOutput, error) {
+		fee_quoter.SetProgramID(input.FeeQuoter)
 		authority := GetAuthority(chain, input.FeeQuoter)
 		feeQuoterConfigPDA, _, _ := state.FindFqConfigPDA(input.FeeQuoter)
 		offRampBillingSignerPDA, _, _ := state.FindOfframpBillingSignerPDA(input.OffRamp)
@@ -109,6 +113,7 @@ var ConnectChains = operations.NewOperation(
 	Version,
 	"Connects the FeeQuoter 1.6.0 contract to other chains",
 	func(b operations.Bundle, chain cldf_solana.Chain, input ConnectChainsParams) (sequences.OnChainOutput, error) {
+		fee_quoter.SetProgramID(input.FeeQuoter)
 		isUpdate := false
 		authority := GetAuthority(chain, input.FeeQuoter)
 		feeQuoterConfigPDA, _, _ := state.FindFqConfigPDA(input.FeeQuoter)
@@ -126,7 +131,7 @@ var ConnectChains = operations.NewOperation(
 				input.DestChainConfig,
 				feeQuoterConfigPDA,
 				fqRemoteChainPDA,
-				chain.DeployerKey.PublicKey(),
+				authority,
 			).ValidateAndBuild()
 			if err != nil {
 				return sequences.OnChainOutput{}, fmt.Errorf("failed to build update dest chain instruction: %w", err)
@@ -156,8 +161,89 @@ var ConnectChains = operations.NewOperation(
 	},
 )
 
+var TransferOwnership = operations.NewOperation(
+	"fee-quoter:transfer-ownership",
+	Version,
+	"Transfers ownership of the FeeQuoter 1.6.0 contract to a new authority",
+	func(b operations.Bundle, chain cldf_solana.Chain, input utils.TransferOwnershipParams) (sequences.OnChainOutput, error) {
+		fee_quoter.SetProgramID(input.Program)
+		authority := GetAuthority(chain, input.Program)
+		if authority != input.CurrentOwner {
+			return sequences.OnChainOutput{}, fmt.Errorf("current owner %s does not match on-chain authority %s", input.CurrentOwner.String(), authority.String())
+		}
+		configPDA, _, _ := state.FindConfigPDA(input.Program)
+		ixn, err := fee_quoter.NewTransferOwnershipInstruction(
+			input.NewOwner,
+			configPDA,
+			authority,
+		).ValidateAndBuild()
+		if err != nil {
+			return sequences.OnChainOutput{}, fmt.Errorf("failed to build add dest chain instruction: %w", err)
+		}
+		if authority != chain.DeployerKey.PublicKey() {
+			batches, err := utils.BuildMCMSBatchOperation(
+				chain.Selector,
+				[]solana.Instruction{ixn},
+				input.Program.String(),
+				ContractType.String(),
+			)
+			if err != nil {
+				return sequences.OnChainOutput{}, fmt.Errorf("failed to execute or create batch: %w", err)
+			}
+			return sequences.OnChainOutput{BatchOps: []types.BatchOperation{batches}}, nil
+		}
+
+		err = chain.Confirm([]solana.Instruction{ixn})
+		if err != nil {
+			return sequences.OnChainOutput{}, fmt.Errorf("failed to confirm add price updater: %w", err)
+		}
+		return sequences.OnChainOutput{}, nil
+	},
+)
+
+var AcceptOwnership = operations.NewOperation(
+	"fee-quoter:accept-ownership",
+	Version,
+	"Accepts ownership of the FeeQuoter 1.6.0 contract",
+	func(b operations.Bundle, chain cldf_solana.Chain, input utils.TransferOwnershipParams) (sequences.OnChainOutput, error) {
+		fee_quoter.SetProgramID(input.Program)
+		configPDA, _, _ := state.FindConfigPDA(input.Program)
+		ixn, err := fee_quoter.NewAcceptOwnershipInstruction(
+			configPDA,
+			input.NewOwner,
+		).ValidateAndBuild()
+		if err != nil {
+			return sequences.OnChainOutput{}, fmt.Errorf("failed to build add dest chain instruction: %w", err)
+		}
+		if input.NewOwner != chain.DeployerKey.PublicKey() {
+			batches, err := utils.BuildMCMSBatchOperation(
+				chain.Selector,
+				[]solana.Instruction{ixn},
+				input.Program.String(),
+				ContractType.String(),
+			)
+			if err != nil {
+				return sequences.OnChainOutput{}, fmt.Errorf("failed to execute or create batch: %w", err)
+			}
+			return sequences.OnChainOutput{BatchOps: []types.BatchOperation{batches}}, nil
+		}
+
+		err = chain.Confirm([]solana.Instruction{ixn})
+		if err != nil {
+			return sequences.OnChainOutput{}, fmt.Errorf("failed to confirm add price updater: %w", err)
+		}
+		return sequences.OnChainOutput{}, nil
+	},
+)
+
 func GetAuthority(chain cldf_solana.Chain, program solana.PublicKey) solana.PublicKey {
-	return chain.DeployerKey.PublicKey()
+	programData := fee_quoter.Config{}
+	feeQuoterConfigPDA, _, _ := state.FindFqConfigPDA(program)
+	err := chain.GetAccountDataBorshInto(context.Background(), feeQuoterConfigPDA, &programData)
+	if err != nil {
+		return chain.DeployerKey.PublicKey()
+	}
+	return programData.Owner
 }
 
 type Params struct {