feat(proposals): stale config proposals can't be executed, vault and …

…batch proposals - can
Squads-Protocol · May 30, 2023 · dcc07dc · dcc07dc
1 parent cf34989
commit dcc07dc
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/programs/multisig/src/instructions/batch_execute_transaction.rs b/programs/multisig/src/instructions/batch_execute_transaction.rs
@@ -92,6 +92,8 @@ impl BatchExecuteTransaction<'_> {
             }
             _ => return err!(MultisigError::InvalidProposalStatus),
         };
+        // Stale batch transaction proposals CAN be executed if they were approved
+        // before becoming stale, hence no check for staleness here.
 
         // `batch` is validated by its seeds.
 

diff --git a/programs/multisig/src/instructions/config_transaction_execute.rs b/programs/multisig/src/instructions/config_transaction_execute.rs
@@ -87,6 +87,11 @@ impl<'info> ConfigTransactionExecute<'info> {
             }
             _ => return err!(MultisigError::InvalidProposalStatus),
         }
+        // Stale config transaction proposals CANNOT be executed even if approved.
+        require!(
+            proposal.transaction_index > multisig.stale_transaction_index,
+            MultisigError::StaleProposal
+        );
 
         // `transaction` is validated by its seeds.
 

diff --git a/programs/multisig/src/instructions/proposal_vote.rs b/programs/multisig/src/instructions/proposal_vote.rs
@@ -61,18 +61,20 @@ impl ProposalVote<'_> {
                     matches!(proposal.status, ProposalStatus::Active { .. }),
                     MultisigError::InvalidProposalStatus
                 );
+                // CANNOT approve or reject a stale proposal
+                require!(
+                    proposal.transaction_index > multisig.stale_transaction_index,
+                    MultisigError::StaleProposal
+                );
             }
             Vote::Cancel => {
                 require!(
                     matches!(proposal.status, ProposalStatus::Approved { .. }),
                     MultisigError::InvalidProposalStatus
                 );
+                // CAN cancel a stale proposal.
             }
         }
-        require!(
-            proposal.transaction_index > multisig.stale_transaction_index,
-            MultisigError::StaleProposal
-        );
 
         Ok(())
     }

diff --git a/programs/multisig/src/instructions/vault_transaction_execute.rs b/programs/multisig/src/instructions/vault_transaction_execute.rs
@@ -76,6 +76,8 @@ impl VaultTransactionExecute<'_> {
             }
             _ => return err!(MultisigError::InvalidProposalStatus),
         }
+        // Stale vault transaction proposals CAN be executed if they were approved
+        // before becoming stale, hence no check for staleness here.
 
         // `transaction` is validated by its seeds.