chore: minor cleanup:

Author: 0xRigel-squads

programs/squads_smart_account_program/src/instructions/settings_transaction_sync.rs

@@ -1,7 +1,6 @@
-use account_events::{AddSpendingLimitEvent, RemoveSpendingLimitEvent};
 use anchor_lang::prelude::*;
 
-use crate::{ consensus::ConsensusAccount, consensus_trait::{Consensus, ConsensusAccountType}, errors::*, events::*, program::SquadsSmartAccountProgram, state::*, utils::*};
+use crate::{consensus::ConsensusAccount, consensus_trait::{Consensus, ConsensusAccountType}, errors::*, events::*, program::SquadsSmartAccountProgram, state::*, utils::*};
 
 #[derive(AnchorSerialize, AnchorDeserialize)]
 pub struct SyncSettingsTransactionArgs {

programs/squads_smart_account_program/src/instructions/transaction_close.rs

@@ -18,10 +18,8 @@ use crate::consensus_trait::ConsensusAccountType;
 use crate::errors::*;
 use crate::program::SquadsSmartAccountProgram;
 use crate::state::*;
-use crate::utils;
 use crate::LogAuthorityInfo;
 use crate::SmartAccountEvent;
-use crate::TransactionContent;
 use crate::TransactionEvent;
 use crate::TransactionEventType;
 
@@ -534,7 +532,7 @@ pub struct CloseEmptyPolicyTransaction<'info> {
     pub empty_policy: AccountInfo<'info>,
 
     /// CHECK: `seeds` and `bump` verify that the account is the canonical Proposal,
-    ///         the logic within `transaction_close` does the rest of the checks.
+    ///         the logic within `close_empty_policy_transaction` does the rest of the checks.
     #[account(
         mut,
         seeds = [
@@ -579,7 +577,7 @@ impl CloseEmptyPolicyTransaction<'_> {
     /// empty/deleted policies.
     ///
     /// Since a policy can never exist at the same address again after being
-    /// closed, any transaction & proposal associated with it can be closed.
+    /// closed, any transaction & proposal associated with it can be closed safely.
     pub fn close_empty_policy_transaction(ctx: Context<Self>) -> Result<()> {
         let proposal = &mut ctx.accounts.proposal;
         let proposal_rent_collector = &ctx.accounts.proposal_rent_collector;

programs/squads_smart_account_program/src/instructions/transaction_execute.rs

@@ -45,10 +45,16 @@ pub struct ExecuteTransaction<'info> {
 
     pub signer: Signer<'info>,
     pub program: Program<'info, SquadsSmartAccountProgram>,
-    // `remaining_accounts` must include the following accounts in the exact order:
+    // `remaining_accounts` must include the following accounts in the exact
+    // order:
+    // For transaction execution:
     // 1. AddressLookupTable accounts in the order they appear in `message.address_table_lookups`.
     // 2. Accounts in the order they appear in `message.account_keys`.
     // 3. Accounts in the order they appear in `message.address_table_lookups`.
+    //
+    // For policy execution:
+    // 1. Settings account if the policy has a settings state expiration
+    // 2. Any remaining accounts associated with the policy
 }
 
 impl<'info> ExecuteTransaction<'info> {

programs/squads_smart_account_program/src/instructions/transaction_execute_sync.rs

@@ -51,7 +51,11 @@ pub struct SyncTransaction<'info> {
     pub program: Program<'info, SquadsSmartAccountProgram>,
     // `remaining_accounts` must include the following accounts in the exact order:
     // 1. The exact amount of signers required to reach the threshold
-    // 2. Any remaining accounts associated with the instructions
+    // 2. For transaction execution:
+    //   2.1. Any remaining accounts associated with the instructions
+    // 3. For policy execution:
+    //   3.1 Settings account if the policy has a settings state expiration
+    //   3.2 Any remaining accounts associated with the policy
 }
 
 impl<'info> SyncTransaction<'info> {
@@ -189,7 +193,7 @@ impl<'info> SyncTransaction<'info> {
                 // Potentially remove the settings account for expiration from
                 // the remaining accounts
                 let remaining_accounts = &remaining_accounts[account_offset..];
-                
+
                 // Execute the policy
                 policy.execute(None, None, payload, &remaining_accounts)?;
 

programs/squads_smart_account_program/src/interface/consensus_trait.rs

@@ -1,7 +1,7 @@
 use anchor_lang::prelude::*;
 use borsh::{BorshDeserialize, BorshSerialize};
 
-use crate::{errors::SmartAccountError, Permission, SmartAccountSigner};
+use crate::{Permission, SmartAccountSigner};
 
 #[derive(BorshSerialize, BorshDeserialize, PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Debug)]
 pub enum ConsensusAccountType {

programs/squads_smart_account_program/src/state/policies/policy_core/policy.rs

@@ -1,9 +1,11 @@
 use anchor_lang::prelude::*;
 
+use super::{payloads::PolicyPayload, traits::PolicyTrait, PolicyExecutionContext};
+use crate::state::policies::implementations::InternalFundTransferPolicy;
 use crate::{
     errors::*,
     interface::consensus_trait::{Consensus, ConsensusAccountType},
-    InternalFundTransferExecutionArgs, Permission, ProgramInteractionExecutionArgs,
+    InternalFundTransferExecutionArgs, ProgramInteractionExecutionArgs,
     ProgramInteractionPolicy, Proposal, Settings, SettingsChangeExecutionArgs,
     SettingsChangePolicy, SmartAccountSigner, SpendingLimitExecutionArgs, SpendingLimitPolicy,
     Transaction, SEED_POLICY, SEED_PREFIX,
@@ -25,9 +27,6 @@ pub enum PolicyExpirationArgs {
     SettingsState,
 }
 
-use super::{payloads::PolicyPayload, traits::PolicyTrait, PolicyExecutionContext};
-use crate::state::policies::implementations::InternalFundTransferPolicy;
-
 #[account]
 pub struct Policy {
     /// The smart account this policy belongs to.