Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions p-token/src/entrypoint-runtime-verification.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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()),
},
Expand Down Expand Up @@ -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(),
)
}
Expand Down
4 changes: 2 additions & 2 deletions p-token/test-properties/proofs.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@ 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 |
| m | test_process_close_account_multisig |
| 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 |
Expand Down
4 changes: 2 additions & 2 deletions program/src/entrypoint-runtime-verification.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions specs/shared/test_process_revoke_multisig.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions specs/withdraw-p-token.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading