feat(multisig_set_time_lock, multisig_set_config_authority): implement ixs and sdk

Author: vovacodes

programs/multisig/src/events.rs

@@ -16,8 +16,8 @@ pub enum ConfigUpdateType {
     AddMember { reallocated: bool },
     RemoveMember,
     ChangeThreshold,
-    ChangeConfigAuthority,
-    ChangeAllowExternalExecute,
+    SetConfigAuthority,
+    SetTimeLock,
 }
 
 /// Multisig config is updated.

programs/multisig/src/instructions/multisig_config.rs

@@ -25,6 +25,20 @@ pub struct MultisigChangeThresholdArgs {
     pub memo: Option<String>,
 }
 
+#[derive(AnchorSerialize, AnchorDeserialize)]
+pub struct MultisigSetTimeLockArgs {
+    time_lock: u32,
+    /// Memo isn't used for anything, but is included in `ChangeThreshold` that can later be parsed and indexed.
+    pub memo: Option<String>,
+}
+
+#[derive(AnchorSerialize, AnchorDeserialize)]
+pub struct MultisigSetConfigAuthorityArgs {
+    config_authority: Pubkey,
+    /// Memo isn't used for anything, but is included in `ChangeThreshold` that can later be parsed and indexed.
+    pub memo: Option<String>,
+}
+
 #[derive(Accounts)]
 pub struct MultisigConfig<'info> {
     #[account(
@@ -37,6 +51,7 @@ 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.
@@ -143,4 +158,41 @@ impl MultisigConfig<'_> {
 
         Ok(())
     }
+
+    /// Set the `time_lock` config parameter for the multisig.
+    #[access_control(ctx.accounts.validate())]
+    pub fn multisig_set_time_lock(ctx: Context<Self>, args: MultisigSetTimeLockArgs) -> Result<()> {
+        let multisig = &mut ctx.accounts.multisig;
+        let multisig_key = multisig.key();
+
+        multisig.time_lock = args.time_lock;
+
+        multisig.invariant()?;
+
+        multisig.config_updated(multisig_key, ConfigUpdateType::SetTimeLock, args.memo);
+
+        Ok(())
+    }
+
+    /// Set the multisig `config_authority`.
+    #[access_control(ctx.accounts.validate())]
+    pub fn multisig_set_config_authority(
+        ctx: Context<Self>,
+        args: MultisigSetConfigAuthorityArgs,
+    ) -> Result<()> {
+        let multisig = &mut ctx.accounts.multisig;
+        let multisig_key = multisig.key();
+
+        multisig.config_authority = args.config_authority;
+
+        multisig.invariant()?;
+
+        multisig.config_updated(
+            multisig_key,
+            ConfigUpdateType::SetConfigAuthority,
+            args.memo,
+        );
+
+        Ok(())
+    }
 }

programs/multisig/src/instructions/multisig_create.rs

@@ -13,7 +13,7 @@ pub struct MultisigCreateArgs {
     /// The members of the multisig.
     pub members: Vec<Member>,
     /// How many seconds must pass between transaction voting settlement and execution.
-    pub time_lock: i32,
+    pub time_lock: u32,
     /// Memo isn't used for anything, but is included in `CreatedEvent` that can later be parsed and indexed.
     pub memo: Option<String>,
 }

programs/multisig/src/lib.rs

@@ -44,6 +44,22 @@ pub mod multisig {
         MultisigConfig::multisig_remove_member(ctx, args)
     }
 
+    /// Set the `time_lock` config parameter for the multisig.
+    pub fn multisig_set_time_lock(
+        ctx: Context<MultisigConfig>,
+        args: MultisigSetTimeLockArgs,
+    ) -> Result<()> {
+        MultisigConfig::multisig_set_time_lock(ctx, args)
+    }
+
+    /// Set the multisig `config_authority`.
+    pub fn multisig_set_config_authority(
+        ctx: Context<MultisigConfig>,
+        args: MultisigSetConfigAuthorityArgs,
+    ) -> Result<()> {
+        MultisigConfig::multisig_set_config_authority(ctx, args)
+    }
+
     /// Create a new config transaction.
     pub fn config_transaction_create(
         ctx: Context<ConfigTransactionCreate>,

programs/multisig/src/state/multisig.rs

@@ -23,11 +23,11 @@ pub struct Multisig {
     /// Threshold for signatures.
     pub threshold: u16,
     /// How many seconds must pass between transaction voting settlement and execution.
-    pub time_lock: i32,
+    pub time_lock: u32,
     /// Last transaction index. 0 means no transactions have been created.
     pub transaction_index: u64,
     /// Last stale transaction index. All transactions up until this index are stale.
-    /// This index is updated when multisig config (members/threshold) changes.
+    /// This index is updated when multisig config (members/threshold/time_lock) changes.
     pub stale_transaction_index: u64,
     /// Index to track the last created vault for this multisig.
     pub vault_index: u8,

sdk/multisig/idl/multisig.json

@@ -139,6 +139,100 @@
         }
       ]
     },
+    {
+      "name": "multisigSetTimeLock",
+      "docs": [
+        "Set the `time_lock` config parameter for the multisig."
+      ],
+      "accounts": [
+        {
+          "name": "multisig",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "configAuthority",
+          "isMut": false,
+          "isSigner": true,
+          "docs": [
+            "Multisig `config_authority` that must authorize the configuration change."
+          ]
+        },
+        {
+          "name": "rentPayer",
+          "isMut": true,
+          "isSigner": true,
+          "docs": [
+            "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."
+          ]
+        },
+        {
+          "name": "systemProgram",
+          "isMut": false,
+          "isSigner": false,
+          "docs": [
+            "We might need it in case reallocation is needed."
+          ]
+        }
+      ],
+      "args": [
+        {
+          "name": "args",
+          "type": {
+            "defined": "MultisigSetTimeLockArgs"
+          }
+        }
+      ]
+    },
+    {
+      "name": "multisigSetConfigAuthority",
+      "docs": [
+        "Set the multisig `config_authority`."
+      ],
+      "accounts": [
+        {
+          "name": "multisig",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "configAuthority",
+          "isMut": false,
+          "isSigner": true,
+          "docs": [
+            "Multisig `config_authority` that must authorize the configuration change."
+          ]
+        },
+        {
+          "name": "rentPayer",
+          "isMut": true,
+          "isSigner": true,
+          "docs": [
+            "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."
+          ]
+        },
+        {
+          "name": "systemProgram",
+          "isMut": false,
+          "isSigner": false,
+          "docs": [
+            "We might need it in case reallocation is needed."
+          ]
+        }
+      ],
+      "args": [
+        {
+          "name": "args",
+          "type": {
+            "defined": "MultisigSetConfigAuthorityArgs"
+          }
+        }
+      ]
+    },
     {
       "name": "configTransactionCreate",
       "docs": [
@@ -547,7 +641,7 @@
             "docs": [
               "How many seconds must pass between transaction voting settlement and execution."
             ],
-            "type": "i32"
+            "type": "u32"
           },
           {
             "name": "transactionIndex",
@@ -560,7 +654,7 @@
             "name": "staleTransactionIndex",
             "docs": [
               "Last stale transaction index. All transactions up until this index are stale.",
-              "This index is updated when multisig config (members/threshold) changes."
+              "This index is updated when multisig config (members/threshold/time_lock) changes."
             ],
             "type": "u64"
           },
@@ -828,6 +922,48 @@
         ]
       }
     },
+    {
+      "name": "MultisigSetTimeLockArgs",
+      "type": {
+        "kind": "struct",
+        "fields": [
+          {
+            "name": "timeLock",
+            "type": "u32"
+          },
+          {
+            "name": "memo",
+            "docs": [
+              "Memo isn't used for anything, but is included in `ChangeThreshold` that can later be parsed and indexed."
+            ],
+            "type": {
+              "option": "string"
+            }
+          }
+        ]
+      }
+    },
+    {
+      "name": "MultisigSetConfigAuthorityArgs",
+      "type": {
+        "kind": "struct",
+        "fields": [
+          {
+            "name": "configAuthority",
+            "type": "publicKey"
+          },
+          {
+            "name": "memo",
+            "docs": [
+              "Memo isn't used for anything, but is included in `ChangeThreshold` that can later be parsed and indexed."
+            ],
+            "type": {
+              "option": "string"
+            }
+          }
+        ]
+      }
+    },
     {
       "name": "MultisigCreateArgs",
       "type": {
@@ -866,7 +1002,7 @@
             "docs": [
               "How many seconds must pass between transaction voting settlement and execution."
             ],
-            "type": "i32"
+            "type": "u32"
           },
           {
             "name": "memo",
@@ -1128,10 +1264,10 @@
             "name": "ChangeThreshold"
           },
           {
-            "name": "ChangeConfigAuthority"
+            "name": "SetConfigAuthority"
           },
           {
-            "name": "ChangeAllowExternalExecute"
+            "name": "SetTimeLock"
           }
         ]
       }