From c995f7e0594555e25869f26e4c73cb5feefd535a Mon Sep 17 00:00:00 2001 From: mariaKt Date: Fri, 10 Apr 2026 09:18:00 -0500 Subject: [PATCH] Changed number of signers from 3 to 2. --- p-token/src/entrypoint-runtime-verification.rs | 8 ++++---- p-token/test-properties/proofs.md | 4 ++-- program/src/entrypoint-runtime-verification.rs | 4 ++-- specs/shared/test_process_revoke_multisig.rs | 6 +++--- specs/withdraw-p-token.rs | 8 ++++---- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/p-token/src/entrypoint-runtime-verification.rs b/p-token/src/entrypoint-runtime-verification.rs index 6090ca78..3218031b 100644 --- a/p-token/src/entrypoint-runtime-verification.rs +++ b/p-token/src/entrypoint-runtime-verification.rs @@ -382,8 +382,8 @@ fn inner_process_remaining_instruction( match accounts[1].data_len() { Multisig::LEN if accounts[1].is_owned_by(&ID) => match accounts.len() { - n if n >= 2 + MAX_SIGNERS as usize => { - test_process_revoke_multisig_3sig(accounts.first_chunk().unwrap()) + n if n >= 2 + 2 => { + test_process_revoke_multisig_2sig(accounts.first_chunk().unwrap()) } _ => test_process_revoke_multisig(accounts.first_chunk().unwrap()), }, @@ -630,8 +630,8 @@ fn inner_process_remaining_instruction( }, Multisig::LEN => match accounts[2].data_len() { Multisig::LEN if accounts[2].is_owned_by(&ID) => match accounts.len() { - n if n >= 3 + MAX_SIGNERS as usize => { - test_process_withdraw_excess_lamports_multisig_multisig_3sig( + n if n >= 3 + 2 => { + test_process_withdraw_excess_lamports_multisig_multisig_2sig( accounts.first_chunk().unwrap(), ) } diff --git a/p-token/test-properties/proofs.md b/p-token/test-properties/proofs.md index 372c99d7..dbf02eab 100644 --- a/p-token/test-properties/proofs.md +++ b/p-token/test-properties/proofs.md @@ -42,7 +42,7 @@ Proofs to run with `run-proofs.sh -m`: | m | test_process_withdraw_excess_lamports_account_multisig | | m | test_process_withdraw_excess_lamports_mint_multisig | | m | test_process_withdraw_excess_lamports_multisig_multisig | -| m | test_process_withdraw_excess_lamports_multisig_multisig_3sig | +| m | test_process_withdraw_excess_lamports_multisig_multisig_2sig | | m | test_process_transfer_multisig | | m | test_process_mint_to_multisig | | m | test_process_burn_multisig | @@ -50,7 +50,7 @@ Proofs to run with `run-proofs.sh -m`: | m | test_process_transfer_checked_multisig | | m | test_process_burn_checked_multisig | | m | test_process_revoke_multisig | -| m | test_process_revoke_multisig_3sig | +| m | test_process_revoke_multisig_2sig | | m | test_process_freeze_account_multisig | | m | test_process_thaw_account_multisig | | m | test_process_mint_to_checked_multisig | diff --git a/program/src/entrypoint-runtime-verification.rs b/program/src/entrypoint-runtime-verification.rs index b76ca414..e56396ae 100644 --- a/program/src/entrypoint-runtime-verification.rs +++ b/program/src/entrypoint-runtime-verification.rs @@ -127,8 +127,8 @@ fn inner_process_instruction( && accounts[1].data_len() == Multisig::LEN && accounts[1].owner == &crate::id() { - if accounts.len() >= 2 + MAX_SIGNERS { - test_process_revoke_multisig_3sig( + if accounts.len() >= 2 + 2 { + test_process_revoke_multisig_2sig( accounts.first_chunk().ok_or(TokenError::InvalidInstruction)?, ) } else { diff --git a/specs/shared/test_process_revoke_multisig.rs b/specs/shared/test_process_revoke_multisig.rs index 67997a0f..ae666bc5 100644 --- a/specs/shared/test_process_revoke_multisig.rs +++ b/specs/shared/test_process_revoke_multisig.rs @@ -59,12 +59,12 @@ fn test_process_revoke_multisig(accounts: &[AccountInfo; 3]) -> ProgramResult { result } -/// Same as test_process_revoke_multisig but with 3 tx_signers instead of 1. +/// Same as test_process_revoke_multisig but with 2 tx_signers instead of 1. /// accounts[0] // Source Account Info /// accounts[1] // Owner Info -/// accounts[2..13] // Signers (3 provided) +/// accounts[2..13] // Signers (2 provided) #[inline(never)] -fn test_process_revoke_multisig_3sig(accounts: &[AccountInfo; 5]) -> ProgramResult { +fn test_process_revoke_multisig_2sig(accounts: &[AccountInfo; 4]) -> ProgramResult { cheatcode_account!(&accounts[0]); // Source Account cheatcode_multisig!(&accounts[1]); // Owner diff --git a/specs/withdraw-p-token.rs b/specs/withdraw-p-token.rs index e34f756f..8830157e 100644 --- a/specs/withdraw-p-token.rs +++ b/specs/withdraw-p-token.rs @@ -487,14 +487,14 @@ fn test_process_withdraw_excess_lamports_multisig_multisig( result } -/// Same as test_process_withdraw_excess_lamports_multisig_multisig but with 3 tx_signers instead of 1. +/// Same as test_process_withdraw_excess_lamports_multisig_multisig but with 2 tx_signers instead of 1. /// accounts[0] // Source Account Info /// accounts[1] // Destination Info /// accounts[2] // Authority Info -/// accounts[3..14] // Signers (3 provided) +/// accounts[3..14] // Signers (2 provided) #[inline(never)] -fn test_process_withdraw_excess_lamports_multisig_multisig_3sig( - accounts: &[AccountInfo; 6], +fn test_process_withdraw_excess_lamports_multisig_multisig_2sig( + accounts: &[AccountInfo; 5], ) -> ProgramResult { cheatcode_is_multisig(&accounts[0]); // Source Account (Multisig) cheatcode_is_account(&accounts[1]); // Destination