Add program and runtime support for Durable Transaction Nonces (#6845)
* Rework transaction processing result forwarding Durable nonce prereq * Add Durable Nonce program API * Add runtime changes for Durable Nonce program * Register Durable Nonce program * Concise comments and bad math * Fix c/p error * Add rent sysvar to withdraw ix * Remove rent exempt required balance from Meta struct * Use the helper
This commit is contained in:
195
runtime/src/nonce_utils.rs
Normal file
195
runtime/src/nonce_utils.rs
Normal file
@@ -0,0 +1,195 @@
|
||||
use solana_sdk::{
|
||||
account::Account, account_utils::State, hash::Hash, instruction::CompiledInstruction,
|
||||
instruction_processor_utils::limited_deserialize, nonce_instruction::NonceInstruction,
|
||||
nonce_program, nonce_state::NonceState, pubkey::Pubkey, transaction::Transaction,
|
||||
};
|
||||
|
||||
pub fn transaction_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) => nonce_program::check_id(&program_id),
|
||||
_ => false,
|
||||
}
|
||||
})
|
||||
.filter(|maybe_ix| match limited_deserialize(&maybe_ix.data) {
|
||||
Ok(NonceInstruction::Nonce) => true,
|
||||
_ => false,
|
||||
})
|
||||
}
|
||||
|
||||
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)
|
||||
})
|
||||
}
|
||||
|
||||
pub fn verify_nonce(acc: &Account, hash: &Hash) -> bool {
|
||||
match acc.state() {
|
||||
Ok(NonceState::Initialized(_meta, ref nonce)) => hash == nonce,
|
||||
_ => false,
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use solana_sdk::{
|
||||
hash::Hash,
|
||||
nonce_instruction,
|
||||
nonce_state::{with_test_keyed_account, NonceAccount},
|
||||
pubkey::Pubkey,
|
||||
signature::{Keypair, KeypairUtil},
|
||||
system_instruction,
|
||||
sysvar::{recent_blockhashes::create_test_recent_blockhashes, rent::Rent},
|
||||
};
|
||||
use std::collections::HashSet;
|
||||
|
||||
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 tx = Transaction::new_signed_instructions(
|
||||
&[&from_keypair, &nonce_keypair],
|
||||
vec![
|
||||
nonce_instruction::nonce(&nonce_pubkey),
|
||||
system_instruction::transfer(&from_pubkey, &nonce_pubkey, 42),
|
||||
],
|
||||
Hash::default(),
|
||||
);
|
||||
(from_pubkey, nonce_pubkey, tx)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn tx_uses_nonce_ok() {
|
||||
let (_, _, tx) = nonced_transfer_tx();
|
||||
assert!(transaction_uses_durable_nonce(&tx).is_some());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn tx_uses_nonce_empty_ix_fail() {
|
||||
let tx =
|
||||
Transaction::new_signed_instructions(&[&Keypair::new(); 0], vec![], Hash::default());
|
||||
assert!(transaction_uses_durable_nonce(&tx).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!(transaction_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 tx = Transaction::new_signed_instructions(
|
||||
&[&from_keypair, &nonce_keypair],
|
||||
vec![
|
||||
system_instruction::transfer(&from_pubkey, &nonce_pubkey, 42),
|
||||
nonce_instruction::nonce(&nonce_pubkey),
|
||||
],
|
||||
Hash::default(),
|
||||
);
|
||||
assert!(transaction_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 tx = Transaction::new_signed_instructions(
|
||||
&[&from_keypair, &nonce_keypair],
|
||||
vec![
|
||||
nonce_instruction::withdraw(&nonce_pubkey, &from_pubkey, 42),
|
||||
system_instruction::transfer(&from_pubkey, &nonce_pubkey, 42),
|
||||
],
|
||||
Hash::default(),
|
||||
);
|
||||
assert!(transaction_uses_durable_nonce(&tx).is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn get_nonce_pub_from_ix_ok() {
|
||||
let (_, nonce_pubkey, tx) = nonced_transfer_tx();
|
||||
let nonce_ix = transaction_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 = transaction_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 = transaction_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,);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn verify_nonce_ok() {
|
||||
with_test_keyed_account(42, true, |nonce_account| {
|
||||
let mut signers = HashSet::new();
|
||||
signers.insert(nonce_account.signer_key().unwrap().clone());
|
||||
let state: NonceState = nonce_account.state().unwrap();
|
||||
// New is in Uninitialzed state
|
||||
assert_eq!(state, NonceState::Uninitialized);
|
||||
let recent_blockhashes = create_test_recent_blockhashes(0);
|
||||
nonce_account
|
||||
.nonce(&recent_blockhashes, &Rent::default(), &signers)
|
||||
.unwrap();
|
||||
assert!(verify_nonce(&nonce_account.account, &recent_blockhashes[0]));
|
||||
});
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn verify_nonce_bad_acc_state_fail() {
|
||||
with_test_keyed_account(42, true, |nonce_account| {
|
||||
assert!(!verify_nonce(&nonce_account.account, &Hash::default()));
|
||||
});
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn verify_nonce_bad_query_hash_fail() {
|
||||
with_test_keyed_account(42, true, |nonce_account| {
|
||||
let mut signers = HashSet::new();
|
||||
signers.insert(nonce_account.signer_key().unwrap().clone());
|
||||
let state: NonceState = nonce_account.state().unwrap();
|
||||
// New is in Uninitialzed state
|
||||
assert_eq!(state, NonceState::Uninitialized);
|
||||
let recent_blockhashes = create_test_recent_blockhashes(0);
|
||||
nonce_account
|
||||
.nonce(&recent_blockhashes, &Rent::default(), &signers)
|
||||
.unwrap();
|
||||
assert!(!verify_nonce(
|
||||
&nonce_account.account,
|
||||
&recent_blockhashes[1]
|
||||
));
|
||||
});
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user