Move nonced tx helpers to SDK
This commit is contained in:
committed by
mergify[bot]
parent
caec631344
commit
65b868f4eb
@ -6,10 +6,13 @@ use crate::{
|
||||
hash::Hash,
|
||||
instruction::{CompiledInstruction, Instruction, InstructionError},
|
||||
message::Message,
|
||||
program_utils::limited_deserialize,
|
||||
pubkey::Pubkey,
|
||||
short_vec,
|
||||
signature::{Signature, SignerError},
|
||||
signers::Signers,
|
||||
system_instruction::SystemInstruction,
|
||||
system_program,
|
||||
};
|
||||
use std::result;
|
||||
use thiserror::Error;
|
||||
@ -395,6 +398,31 @@ impl Transaction {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn uses_durable_nonce(tx: &Transaction) -> Option<&CompiledInstruction> {
|
||||
let message = tx.message();
|
||||
message
|
||||
.instructions
|
||||
.get(0)
|
||||
.filter(|maybe_ix| {
|
||||
let prog_id_idx = maybe_ix.program_id_index as usize;
|
||||
match message.account_keys.get(prog_id_idx) {
|
||||
Some(program_id) => system_program::check_id(&program_id),
|
||||
_ => false,
|
||||
}
|
||||
} && matches!(limited_deserialize(&maybe_ix.data), Ok(SystemInstruction::AdvanceNonceAccount))
|
||||
)
|
||||
}
|
||||
|
||||
pub fn get_nonce_pubkey_from_instruction<'a>(
|
||||
ix: &CompiledInstruction,
|
||||
tx: &'a Transaction,
|
||||
) -> Option<&'a Pubkey> {
|
||||
ix.accounts.get(0).and_then(|idx| {
|
||||
let idx = *idx as usize;
|
||||
tx.message().account_keys.get(idx)
|
||||
})
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
@ -812,4 +840,99 @@ mod tests {
|
||||
vec![Signature::default(), Signature::default()]
|
||||
);
|
||||
}
|
||||
|
||||
fn nonced_transfer_tx() -> (Pubkey, Pubkey, Transaction) {
|
||||
let from_keypair = Keypair::new();
|
||||
let from_pubkey = from_keypair.pubkey();
|
||||
let nonce_keypair = Keypair::new();
|
||||
let nonce_pubkey = nonce_keypair.pubkey();
|
||||
let instructions = [
|
||||
system_instruction::advance_nonce_account(&nonce_pubkey, &nonce_pubkey),
|
||||
system_instruction::transfer(&from_pubkey, &nonce_pubkey, 42),
|
||||
];
|
||||
let message = Message::new(&instructions, Some(&nonce_pubkey));
|
||||
let tx = Transaction::new(&[&from_keypair, &nonce_keypair], message, Hash::default());
|
||||
(from_pubkey, nonce_pubkey, tx)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn tx_uses_nonce_ok() {
|
||||
let (_, _, tx) = nonced_transfer_tx();
|
||||
assert!(uses_durable_nonce(&tx).is_some());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn tx_uses_nonce_empty_ix_fail() {
|
||||
assert!(uses_durable_nonce(&Transaction::default()).is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn tx_uses_nonce_bad_prog_id_idx_fail() {
|
||||
let (_, _, mut tx) = nonced_transfer_tx();
|
||||
tx.message.instructions.get_mut(0).unwrap().program_id_index = 255u8;
|
||||
assert!(uses_durable_nonce(&tx).is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn tx_uses_nonce_first_prog_id_not_nonce_fail() {
|
||||
let from_keypair = Keypair::new();
|
||||
let from_pubkey = from_keypair.pubkey();
|
||||
let nonce_keypair = Keypair::new();
|
||||
let nonce_pubkey = nonce_keypair.pubkey();
|
||||
let instructions = [
|
||||
system_instruction::transfer(&from_pubkey, &nonce_pubkey, 42),
|
||||
system_instruction::advance_nonce_account(&nonce_pubkey, &nonce_pubkey),
|
||||
];
|
||||
let message = Message::new(&instructions, Some(&from_pubkey));
|
||||
let tx = Transaction::new(&[&from_keypair, &nonce_keypair], message, Hash::default());
|
||||
assert!(uses_durable_nonce(&tx).is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn tx_uses_nonce_wrong_first_nonce_ix_fail() {
|
||||
let from_keypair = Keypair::new();
|
||||
let from_pubkey = from_keypair.pubkey();
|
||||
let nonce_keypair = Keypair::new();
|
||||
let nonce_pubkey = nonce_keypair.pubkey();
|
||||
let instructions = [
|
||||
system_instruction::withdraw_nonce_account(
|
||||
&nonce_pubkey,
|
||||
&nonce_pubkey,
|
||||
&from_pubkey,
|
||||
42,
|
||||
),
|
||||
system_instruction::transfer(&from_pubkey, &nonce_pubkey, 42),
|
||||
];
|
||||
let message = Message::new(&instructions, Some(&nonce_pubkey));
|
||||
let tx = Transaction::new(&[&from_keypair, &nonce_keypair], message, Hash::default());
|
||||
assert!(uses_durable_nonce(&tx).is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn get_nonce_pub_from_ix_ok() {
|
||||
let (_, nonce_pubkey, tx) = nonced_transfer_tx();
|
||||
let nonce_ix = uses_durable_nonce(&tx).unwrap();
|
||||
assert_eq!(
|
||||
get_nonce_pubkey_from_instruction(&nonce_ix, &tx),
|
||||
Some(&nonce_pubkey),
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn get_nonce_pub_from_ix_no_accounts_fail() {
|
||||
let (_, _, tx) = nonced_transfer_tx();
|
||||
let nonce_ix = uses_durable_nonce(&tx).unwrap();
|
||||
let mut nonce_ix = nonce_ix.clone();
|
||||
nonce_ix.accounts.clear();
|
||||
assert_eq!(get_nonce_pubkey_from_instruction(&nonce_ix, &tx), None,);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn get_nonce_pub_from_ix_bad_acc_idx_fail() {
|
||||
let (_, _, tx) = nonced_transfer_tx();
|
||||
let nonce_ix = uses_durable_nonce(&tx).unwrap();
|
||||
let mut nonce_ix = nonce_ix.clone();
|
||||
nonce_ix.accounts[0] = 255u8;
|
||||
assert_eq!(get_nonce_pubkey_from_instruction(&nonce_ix, &tx), None,);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user