feat(instructions): add rent_payer account

Squads-Protocol · Sep 5, 2023 · 0f5dba5 · 0f5dba5
1 parent a46519a
commit 0f5dba5
Show file tree

Hide file tree

Showing 26 changed files with 258 additions and 54 deletions.
diff --git a/programs/multisig/src/instructions/batch_add_transaction.rs b/programs/multisig/src/instructions/batch_add_transaction.rs
@@ -21,10 +21,6 @@ pub struct BatchAddTransaction<'info> {
     )]
     pub multisig: Account<'info, Multisig>,
 
-    /// Member of the multisig.
-    #[account(mut)]
-    pub member: Signer<'info>,
-
     /// The proposal account associated with the batch.
     #[account(
         seeds = [
@@ -53,7 +49,7 @@ pub struct BatchAddTransaction<'info> {
     /// `VaultBatchTransaction` account to initialize and add to the `batch`.
     #[account(
         init,
-        payer = member,
+        payer = rent_payer,
         space = VaultBatchTransaction::size(args.ephemeral_signers, &args.transaction_message)?,
         seeds = [
             SEED_PREFIX,
@@ -67,6 +63,13 @@ pub struct BatchAddTransaction<'info> {
     )]
     pub transaction: Account<'info, VaultBatchTransaction>,
 
+    /// Member of the multisig.
+    pub member: Signer<'info>,
+
+    /// The payer for the batch transaction account rent.
+    #[account(mut)]
+    pub rent_payer: Signer<'info>,
+
     pub system_program: Program<'info, System>,
 }
 

diff --git a/programs/multisig/src/instructions/batch_create.rs b/programs/multisig/src/instructions/batch_create.rs
@@ -19,12 +19,9 @@ pub struct BatchCreate<'info> {
     )]
     pub multisig: Account<'info, Multisig>,
 
-    #[account(mut)]
-    pub creator: Signer<'info>,
-
     #[account(
         init,
-        payer = creator,
+        payer = rent_payer,
         space = 8 + Batch::INIT_SPACE,
         seeds = [
             SEED_PREFIX,
@@ -36,6 +33,13 @@ pub struct BatchCreate<'info> {
     )]
     pub batch: Account<'info, Batch>,
 
+    /// The member of the multisig that is creating the batch.
+    pub creator: Signer<'info>,
+
+    /// The payer for the batch account rent.
+    #[account(mut)]
+    pub rent_payer: Signer<'info>,
+
     pub system_program: Program<'info, System>,
 }
 

diff --git a/programs/multisig/src/instructions/config_transaction_create.rs b/programs/multisig/src/instructions/config_transaction_create.rs
@@ -21,7 +21,7 @@ pub struct ConfigTransactionCreate<'info> {
 
     #[account(
         init,
-        payer = creator,
+        payer = rent_payer,
         space = ConfigTransaction::size(&args.actions),
         seeds = [
             SEED_PREFIX,
@@ -33,9 +33,13 @@ pub struct ConfigTransactionCreate<'info> {
     )]
     pub transaction: Account<'info, ConfigTransaction>,
 
-    #[account(mut)]
+    /// The member of the multisig that is creating the transaction.
     pub creator: Signer<'info>,
 
+    /// The payer for the transaction account rent.
+    #[account(mut)]
+    pub rent_payer: Signer<'info>,
+
     pub system_program: Program<'info, System>,
 }
 

diff --git a/programs/multisig/src/instructions/proposal_create.rs b/programs/multisig/src/instructions/proposal_create.rs
@@ -22,7 +22,7 @@ pub struct ProposalCreate<'info> {
 
     #[account(
         init,
-        payer = creator,
+        payer = rent_payer,
         space = Proposal::size(multisig.members.len()),
         seeds = [
             SEED_PREFIX,
@@ -35,9 +35,13 @@ pub struct ProposalCreate<'info> {
     )]
     pub proposal: Account<'info, Proposal>,
 
-    #[account(mut)]
+    /// The member of the multisig that is creating the proposal.
     pub creator: Signer<'info>,
 
+    /// The payer for the proposal account rent.
+    #[account(mut)]
+    pub rent_payer: Signer<'info>,
+
     pub system_program: Program<'info, System>,
 }
 

diff --git a/programs/multisig/src/instructions/vault_transaction_create.rs b/programs/multisig/src/instructions/vault_transaction_create.rs
@@ -24,9 +24,9 @@ pub struct VaultTransactionCreate<'info> {
     )]
     pub multisig: Account<'info, Multisig>,
 
-    #[account(
+    #[account( 
         init,
-        payer = creator,
+        payer = rent_payer,
         space = VaultTransaction::size(args.ephemeral_signers, &args.transaction_message)?,
         seeds = [
             SEED_PREFIX,
@@ -38,9 +38,13 @@ pub struct VaultTransactionCreate<'info> {
     )]
     pub transaction: Account<'info, VaultTransaction>,
 
-    #[account(mut)]
+    /// The member of the multisig that is creating the transaction.
     pub creator: Signer<'info>,
 
+    /// The payer for the transaction account rent.
+    #[account(mut)]
+    pub rent_payer: Signer<'info>,
+
     pub system_program: Program<'info, System>,
 }
 

diff --git a/sdk/multisig/idl/multisig.json b/sdk/multisig/idl/multisig.json
@@ -347,8 +347,19 @@
         },
         {
           "name": "creator",
+          "isMut": false,
+          "isSigner": true,
+          "docs": [
+            "The member of the multisig that is creating the transaction."
+          ]
+        },
+        {
+          "name": "rentPayer",
           "isMut": true,
-          "isSigner": true
+          "isSigner": true,
+          "docs": [
+            "The payer for the transaction account rent."
+          ]
         },
         {
           "name": "systemProgram",
@@ -445,8 +456,19 @@
         },
         {
           "name": "creator",
+          "isMut": false,
+          "isSigner": true,
+          "docs": [
+            "The member of the multisig that is creating the transaction."
+          ]
+        },
+        {
+          "name": "rentPayer",
           "isMut": true,
-          "isSigner": true
+          "isSigner": true,
+          "docs": [
+            "The payer for the transaction account rent."
+          ]
         },
         {
           "name": "systemProgram",
@@ -511,14 +533,25 @@
           "isSigner": false
         },
         {
-          "name": "creator",
+          "name": "batch",
           "isMut": true,
-          "isSigner": true
+          "isSigner": false
         },
         {
-          "name": "batch",
+          "name": "creator",
+          "isMut": false,
+          "isSigner": true,
+          "docs": [
+            "The member of the multisig that is creating the batch."
+          ]
+        },
+        {
+          "name": "rentPayer",
           "isMut": true,
-          "isSigner": false
+          "isSigner": true,
+          "docs": [
+            "The payer for the batch account rent."
+          ]
         },
         {
           "name": "systemProgram",
@@ -549,14 +582,6 @@
             "Multisig account this batch belongs to."
           ]
         },
-        {
-          "name": "member",
-          "isMut": true,
-          "isSigner": true,
-          "docs": [
-            "Member of the multisig."
-          ]
-        },
         {
           "name": "proposal",
           "isMut": false,
@@ -578,6 +603,22 @@
             "`VaultBatchTransaction` account to initialize and add to the `batch`."
           ]
         },
+        {
+          "name": "member",
+          "isMut": false,
+          "isSigner": true,
+          "docs": [
+            "Member of the multisig."
+          ]
+        },
+        {
+          "name": "rentPayer",
+          "isMut": true,
+          "isSigner": true,
+          "docs": [
+            "The payer for the batch transaction account rent."
+          ]
+        },
         {
           "name": "systemProgram",
           "isMut": false,
@@ -658,8 +699,19 @@
         },
         {
           "name": "creator",
+          "isMut": false,
+          "isSigner": true,
+          "docs": [
+            "The member of the multisig that is creating the proposal."
+          ]
+        },
+        {
+          "name": "rentPayer",
           "isMut": true,
-          "isSigner": true
+          "isSigner": true,
+          "docs": [
+            "The payer for the proposal account rent."
+          ]
         },
         {
           "name": "systemProgram",

diff --git a/sdk/multisig/src/generated/instructions/batchAddTransaction.ts b/sdk/multisig/src/generated/instructions/batchAddTransaction.ts
diff --git a/sdk/multisig/src/generated/instructions/batchCreate.ts b/sdk/multisig/src/generated/instructions/batchCreate.ts
diff --git a/sdk/multisig/src/generated/instructions/configTransactionCreate.ts b/sdk/multisig/src/generated/instructions/configTransactionCreate.ts