[DPA-1519]: feat(solana): allow override authority on Configurer (#329)

When executing SetConfig via MCMS, the authority has to be the timelock
signer, the current implementation does not allow any override and only
accepts the `auth` or deploykey as the authority.

JIRA: https://smartcontract-it.atlassian.net/browse/DPA-1519

Author: graham-chainlink

.changeset/wise-gorillas-care.md

@@ -0,0 +1,5 @@
+---
+"@smartcontractkit/mcms": minor
+---
+
+feat(solana): override authority on Configurer

sdk/solana/configurer.go

@@ -21,26 +21,32 @@ var _ sdk.Configurer = &Configurer{}
 // Configurer configures the MCM contract for Solana chains.
 type Configurer struct {
 	instructionCollection
-	chainSelector types.ChainSelector
-	client        *rpc.Client
-	auth          solana.PrivateKey
-	skipSend      bool
+	chainSelector    types.ChainSelector
+	client           *rpc.Client
+	auth             solana.PrivateKey
+	skipSend         bool
+	authorityAccount solana.PublicKey
 }
 
 // NewConfigurer creates a new Configurer for Solana chains.
 //
 // options:
 //
 //	WithDoNotSendInstructionsOnChain: when selected, the Configurer instance will not
-//		send the Solana instructions to the blockchain.
+//			send the Solana instructions to the blockchain.
+//
+//	WithAuthorityAccount: sets the authorityAccount for the MCM contract. Defaults to the `auth` field if unset.
+//		Main use case is to allow authorityAccount to be overridden when processing the SetConfig with MCMS where
+//		the authorityAccount has to be the timelock signer.
 func NewConfigurer(
 	client *rpc.Client, auth solana.PrivateKey, chainSelector types.ChainSelector, options ...configurerOption,
 ) *Configurer {
 	configurer := &Configurer{
-		client:        client,
-		auth:          auth,
-		chainSelector: chainSelector,
-		skipSend:      false,
+		client:           client,
+		auth:             auth,
+		chainSelector:    chainSelector,
+		skipSend:         false,
+		authorityAccount: auth.PublicKey(),
 	}
 	for _, opt := range options {
 		opt(configurer)
@@ -57,6 +63,12 @@ func WithDoNotSendInstructionsOnChain() configurerOption {
 	}
 }
 
+func WithAuthorityAccount(authorityAccount solana.PublicKey) configurerOption {
+	return func(c *Configurer) {
+		c.authorityAccount = authorityAccount
+	}
+}
+
 // SetConfig sets the configuration for the MCM contract on the Solana chain.
 //
 // The list of instructions needed to set the configuration is returned in the
@@ -120,7 +132,7 @@ func (c *Configurer) SetConfig(
 		configSignersPDA,
 		rootMetadataPDA,
 		expiringRootAndOpCountPDA,
-		c.auth.PublicKey(),
+		c.authorityAccount,
 		solana.SystemProgramID))
 	if err != nil {
 		return types.TransactionResult{}, err
@@ -148,21 +160,21 @@ func (c *Configurer) preloadSigners(
 	configSignersPDA solana.PublicKey,
 ) error {
 	err := c.addInstruction("initSigners", bindings.NewInitSignersInstruction(mcmName, uint8(len(signerAddresses)), //nolint:gosec
-		configPDA, configSignersPDA, c.auth.PublicKey(), solana.SystemProgramID))
+		configPDA, configSignersPDA, c.authorityAccount, solana.SystemProgramID))
 	if err != nil {
 		return err
 	}
 
 	for i, chunkIndex := range chunkIndexes(len(signerAddresses), config.MaxAppendSignerBatchSize) {
 		err = c.addInstruction(fmt.Sprintf("appendSigners%d", i), bindings.NewAppendSignersInstruction(mcmName,
-			signerAddresses[chunkIndex[0]:chunkIndex[1]], configPDA, configSignersPDA, c.auth.PublicKey()))
+			signerAddresses[chunkIndex[0]:chunkIndex[1]], configPDA, configSignersPDA, c.authorityAccount))
 		if err != nil {
 			return err
 		}
 	}
 
 	err = c.addInstruction("finalizeSigners", bindings.NewFinalizeSignersInstruction(mcmName, configPDA,
-		configSignersPDA, c.auth.PublicKey()))
+		configSignersPDA, c.authorityAccount))
 	if err != nil {
 		return err
 	}

sdk/solana/configurer_test.go

@@ -26,24 +26,36 @@ func Test_NewConfigurer(t *testing.T) {
 	auth := solana.MustPrivateKeyFromBase58("DmPfeHBC8Brf8s5qQXi25bmJ996v6BHRtaLc6AH51yFGSqQpUMy1oHkbbXobPNBdgGH2F29PAmoq9ZZua4K9vCc")
 	chainSelector := types.ChainSelector(cselectors.SOLANA_DEVNET.Selector)
 
+	newAuthorityAccount := solana.NewWallet().PublicKey()
+
 	tests := []struct {
-		name                string
-		constructorFn       func() *Configurer
-		wantSkipTransaction bool
+		name                 string
+		constructorFn        func() *Configurer
+		wantSkipTransaction  bool
+		wantAuthorityAccount solana.PublicKey
 	}{
 		{
 			name: "standard args",
 			constructorFn: func() *Configurer {
 				return NewConfigurer(client, auth, chainSelector)
 			},
-			wantSkipTransaction: false,
+			wantSkipTransaction:  false,
+			wantAuthorityAccount: auth.PublicKey(),
 		},
 		{
 			name: "skip transaction option",
 			constructorFn: func() *Configurer {
 				return NewConfigurer(client, auth, chainSelector, WithDoNotSendInstructionsOnChain())
 			},
-			wantSkipTransaction: true,
+			wantSkipTransaction:  true,
+			wantAuthorityAccount: auth.PublicKey(),
+		},
+		{
+			name: "override authorityAccount",
+			constructorFn: func() *Configurer {
+				return NewConfigurer(client, auth, chainSelector, WithAuthorityAccount(newAuthorityAccount))
+			},
+			wantAuthorityAccount: newAuthorityAccount,
 		},
 	}
 
@@ -54,6 +66,7 @@ func Test_NewConfigurer(t *testing.T) {
 
 			require.NotNil(t, configurer)
 			require.Equal(t, tt.wantSkipTransaction, configurer.skipSend)
+			require.Equal(t, tt.wantAuthorityAccount, configurer.authorityAccount)
 		})
 	}
 }
@@ -67,6 +80,7 @@ func TestConfigurer_SetConfig(t *testing.T) {
 	require.NoError(t, err)
 	defaultMcmConfig := &types.Config{Quorum: 1, Signers: []common.Address{common.HexToAddress("0x1")}}
 	clearRoot := false
+	newAuthorityAccount := solana.NewWallet().PublicKey()
 
 	tests := []struct {
 		name             string
@@ -118,6 +132,20 @@ func TestConfigurer_SetConfig(t *testing.T) {
 				bindings.NewSetConfigInstructionBuilder().Build(),
 			},
 		},
+		{
+			name:      "success - override authorityAccount acciybt",
+			auth:      auth,
+			options:   []configurerOption{WithDoNotSendInstructionsOnChain(), WithAuthorityAccount(newAuthorityAccount)},
+			mcmConfig: defaultMcmConfig,
+			setup:     func(t *testing.T, configurer *Configurer, mockJSONRPCClient *mocks.JSONRPCClient) { t.Helper() },
+			wantHash:  "",
+			wantInstructions: []solana.Instruction{
+				bindings.NewInitSignersInstructionBuilder().Build(),
+				bindings.NewAppendSignersInstructionBuilder().Build(),
+				bindings.NewFinalizeSignersInstructionBuilder().Build(),
+				bindings.NewSetConfigInstructionBuilder().Build(),
+			},
+		},
 		{
 			name:      "failure: too many signers",
 			auth:      auth,