feat(multisig_add_member): use opional accounts

programs/multisig/Cargo.toml

@@ -16,5 +16,5 @@ cpi = ["no-entrypoint"]
 default = []
 
 [dependencies]
-anchor-lang = "=0.27.0"
+anchor-lang = { version = "=0.27.0", features = ["allow-missing-optionals"] }
 solana-address-lookup-table-program = "=1.14.16"

programs/multisig/src/errors.rs

@@ -46,4 +46,6 @@ pub enum MultisigError {
     TimeLockNotReleased,
     #[msg("Config transaction must have at least one action")]
     NoActions,
+    #[msg("Missing account")]
+    MissingAccount,
 }

programs/multisig/src/instructions/multisig_config.rs

@@ -50,15 +50,14 @@ pub struct MultisigConfig<'info> {
     /// Multisig `config_authority` that must authorize the configuration change.
     pub config_authority: Signer<'info>,
 
-    // TODO: Since this account only needed for add_member, we should create a separate Accounts struct for it.
     /// The account that will be charged in case the multisig account needs to reallocate space,
     /// for example when adding a new member.
     /// This is usually the same as `config_authority`, but can be a different account if needed.
     #[account(mut)]
-    pub rent_payer: Signer<'info>,
+    pub rent_payer: Option<Signer<'info>>,
 
     /// We might need it in case reallocation is needed.
-    pub system_program: Program<'info, System>,
+    pub system_program: Option<Program<'info, System>>,
 }
 
 impl MultisigConfig<'_> {
@@ -77,8 +76,16 @@ impl MultisigConfig<'_> {
     pub fn multisig_add_member(ctx: Context<Self>, args: MultisigAddMemberArgs) -> Result<()> {
         let MultisigAddMemberArgs { new_member, .. } = args;
 
-        let system_program = &ctx.accounts.system_program;
-        let rent_payer = &ctx.accounts.rent_payer;
+        let system_program = &ctx
+            .accounts
+            .system_program
+            .as_ref()
+            .ok_or(MultisigError::MissingAccount)?;
+        let rent_payer = &ctx
+            .accounts
+            .rent_payer
+            .as_ref()
+            .ok_or(MultisigError::MissingAccount)?;
         let multisig = &mut ctx.accounts.multisig;
 
         // Check if we need to reallocate space.

sdk/multisig/idl/multisig.json

@@ -68,6 +68,7 @@
           "name": "rentPayer",
           "isMut": true,
           "isSigner": true,
+          "isOptional": true,
           "docs": [
             "The account that will be charged in case the multisig account needs to reallocate space,",
             "for example when adding a new member.",
@@ -78,6 +79,7 @@
           "name": "systemProgram",
           "isMut": false,
           "isSigner": false,
+          "isOptional": true,
           "docs": [
             "We might need it in case reallocation is needed."
           ]
@@ -115,6 +117,7 @@
           "name": "rentPayer",
           "isMut": true,
           "isSigner": true,
+          "isOptional": true,
           "docs": [
             "The account that will be charged in case the multisig account needs to reallocate space,",
             "for example when adding a new member.",
@@ -125,6 +128,7 @@
           "name": "systemProgram",
           "isMut": false,
           "isSigner": false,
+          "isOptional": true,
           "docs": [
             "We might need it in case reallocation is needed."
           ]
@@ -162,6 +166,7 @@
           "name": "rentPayer",
           "isMut": true,
           "isSigner": true,
+          "isOptional": true,
           "docs": [
             "The account that will be charged in case the multisig account needs to reallocate space,",
             "for example when adding a new member.",
@@ -172,6 +177,7 @@
           "name": "systemProgram",
           "isMut": false,
           "isSigner": false,
+          "isOptional": true,
           "docs": [
             "We might need it in case reallocation is needed."
           ]
@@ -209,6 +215,7 @@
           "name": "rentPayer",
           "isMut": true,
           "isSigner": true,
+          "isOptional": true,
           "docs": [
             "The account that will be charged in case the multisig account needs to reallocate space,",
             "for example when adding a new member.",
@@ -219,6 +226,7 @@
           "name": "systemProgram",
           "isMut": false,
           "isSigner": false,
+          "isOptional": true,
           "docs": [
             "We might need it in case reallocation is needed."
           ]
@@ -1797,6 +1805,11 @@
       "code": 6021,
       "name": "NoActions",
       "msg": "Config transaction must have at least one action"
+    },
+    {
+      "code": 6022,
+      "name": "MissingAccount",
+      "msg": "Missing account"
     }
   ],
   "metadata": {

sdk/multisig/package.json

@@ -22,7 +22,7 @@
     "invariant": "2.2.4"
   },
   "devDependencies": {
-    "@metaplex-foundation/solita": "0.19.3",
+    "@metaplex-foundation/solita": "0.19.4",
     "@types/invariant": "2.2.35",
     "@types/node": "18.11.17",
     "typescript": "*"