Merge pull request #156 from Squads-Protocol/permit-extra-signer-for-vault-execution

feat(cli): Add possibility to use an extra signer for vault tx execution

Author: sean-sqds

cli/Cargo.lock

@@ -1,5 +1,5 @@
-use squads_multisig::pda::get_vault_pda;
 use solana_sdk::pubkey::Pubkey;
+use squads_multisig::pda::get_vault_pda;
 use std::str::FromStr;
 
 use clap::Args;
@@ -27,13 +27,13 @@ impl DisplayVault {
             vault_index,
         } = self;
 
-        let program_id = program_id.unwrap_or_else(|| {
-            "SQDS4ep65T869zMMBKyuUq6aD6EgTu8psMjkvj52pCf".to_string()
-        });
+        let program_id =
+            program_id.unwrap_or_else(|| "SQDS4ep65T869zMMBKyuUq6aD6EgTu8psMjkvj52pCf".to_string());
 
         let program_id = Pubkey::from_str(&program_id).expect("Invalid program ID");
 
-        let multisig_address = Pubkey::from_str(&multisig_address).expect("Invalid multisig address");
+        let multisig_address =
+            Pubkey::from_str(&multisig_address).expect("Invalid multisig address");
 
         let vault_index = vault_index.unwrap_or(0);
 
@@ -43,4 +43,4 @@ impl DisplayVault {
 
         Ok(())
     }
-}
+}

cli/src/command/display_vault.rs

@@ -1,5 +1,6 @@
 use crate::command::config_transaction_create::ConfigTransactionCreate;
 use crate::command::config_transaction_execute::ConfigTransactionExecute;
+use crate::command::display_vault::DisplayVault;
 use crate::command::initiate_program_upgrade::InitiateProgramUpgrade;
 use crate::command::initiate_transfer::InitiateTransfer;
 use crate::command::multisig_create::MultisigCreate;
@@ -8,12 +9,12 @@ use crate::command::proposal_vote::ProposalVote;
 use crate::command::vault_transaction_accounts_close::VaultTransactionAccountsClose;
 use crate::command::vault_transaction_create::VaultTransactionCreate;
 use crate::command::vault_transaction_execute::VaultTransactionExecute;
-use crate::command::display_vault::DisplayVault;
 
 use clap::Subcommand;
 
 pub mod config_transaction_create;
 pub mod config_transaction_execute;
+pub mod display_vault;
 pub mod initiate_program_upgrade;
 pub mod initiate_transfer;
 pub mod multisig_create;
@@ -22,7 +23,6 @@ pub mod proposal_vote;
 pub mod vault_transaction_accounts_close;
 pub mod vault_transaction_create;
 pub mod vault_transaction_execute;
-pub mod display_vault;
 
 #[derive(Subcommand)]
 pub enum Command {

cli/src/command/mod.rs

@@ -52,6 +52,9 @@ pub struct VaultTransactionExecute {
 
     #[arg(long)]
     compute_unit_limit: Option<u32>,
+
+    #[arg(long)]
+    extra_keypair: Option<String>,
 }
 
 impl VaultTransactionExecute {
@@ -64,6 +67,7 @@ impl VaultTransactionExecute {
             transaction_index,
             priority_fee_lamports,
             compute_unit_limit,
+            extra_keypair,
         } = self;
 
         let program_id =
@@ -83,6 +87,9 @@ impl VaultTransactionExecute {
 
         let rpc_url = rpc_url.unwrap_or_else(|| "https://api.mainnet-beta.solana.com".to_string());
 
+        let transaction_extra_signer_keypair =
+            extra_keypair.map(|path| create_signer_from_path(path).unwrap());
+
         println!();
         println!(
             "{}",
@@ -174,11 +181,13 @@ impl VaultTransactionExecute {
         )
         .unwrap();
 
-        let transaction = VersionedTransaction::try_new(
-            VersionedMessage::V0(message),
-            &[&*transaction_creator_keypair],
-        )
-        .expect("Failed to create transaction");
+        let mut signers = vec![&*transaction_creator_keypair];
+        if let Some(ref extra_signer) = transaction_extra_signer_keypair {
+            signers.push(&**extra_signer);
+        }
+
+        let transaction = VersionedTransaction::try_new(VersionedMessage::V0(message), &signers)
+            .expect("Failed to create transaction");
 
         let signature = send_and_confirm_transaction(&transaction, &rpc_client).await?;