gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Boot BudgetState::last_error

Browse Source
This commit is contained in:
Greg Fitzgerald
2018-09-24 17:00:55 -06:00
parent bb99fd40de
commit 747ba6a8d3
1 changed files with 13 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/budget_program.rs
View File

@ -27,7 +27,6 @@ pub enum BudgetError {
pub struct BudgetState { pub struct BudgetState {
pub initialized: bool, pub initialized: bool,
pub pending_budget: Option<Budget>, pub pending_budget: Option<Budget>,
pub last_error: Option<BudgetError>,
} }
pub const BUDGET_PROGRAM_ID: [u8; 32] = [ pub const BUDGET_PROGRAM_ID: [u8; 32] = [
@ -222,7 +221,7 @@ impl BudgetState {
return Err(Box::new(bincode::ErrorKind::SizeLimit)); return Err(Box::new(bincode::ErrorKind::SizeLimit));
} }
let len: u64 = deserialize(&input[..8]).unwrap(); let len: u64 = deserialize(&input[..8]).unwrap();
if len < 3 { if len < 2 {
return Err(Box::new(bincode::ErrorKind::SizeLimit)); return Err(Box::new(bincode::ErrorKind::SizeLimit));
} }
if input.len() < 8 + len as usize { if input.len() < 8 + len as usize {
@ -231,16 +230,6 @@ impl BudgetState {
deserialize(&input[8..8 + len as usize]) deserialize(&input[8..8 + len as usize])
} }
fn save_error_to_budget_state(e: BudgetError, accounts: &mut [Account]) -> () {
if let Ok(mut state) = BudgetState::deserialize(&accounts[1].userdata) {
trace!("saved error {:?}", e);
state.last_error = Some(e);
state.serialize(&mut accounts[1].userdata).unwrap();
} else {
trace!("error in uninitialized contract {:?}", e,);
}
}
/// Budget DSL contract interface /// Budget DSL contract interface
/// * tx - the transaction /// * tx - the transaction
/// * accounts[0] - The source of the tokens /// * accounts[0] - The source of the tokens
@ -254,11 +243,6 @@ impl BudgetState {
trace!("process_transaction: {:?}", instruction); trace!("process_transaction: {:?}", instruction);
Self::apply_debits_to_budget_state(tx, accounts, &instruction) Self::apply_debits_to_budget_state(tx, accounts, &instruction)
.and_then(|_| Self::apply_credits_to_budget_state(tx, accounts, &instruction)) .and_then(|_| Self::apply_credits_to_budget_state(tx, accounts, &instruction))
.map_err(|e| {
trace!("saving error {:?}", e);
Self::save_error_to_budget_state(e.clone(), accounts);
e
})
} else { } else {
info!("Invalid transaction userdata: {:?}", tx.userdata); info!("Invalid transaction userdata: {:?}", tx.userdata);
Err(BudgetError::UserdataDeserializeFailure) Err(BudgetError::UserdataDeserializeFailure)
@ -355,7 +339,6 @@ mod test {
assert_eq!(accounts[from_account].tokens, 0); assert_eq!(accounts[from_account].tokens, 0);
assert_eq!(accounts[contract_account].tokens, 1); assert_eq!(accounts[contract_account].tokens, 1);
let state = BudgetState::deserialize(&accounts[contract_account].userdata).unwrap(); let state = BudgetState::deserialize(&accounts[contract_account].userdata).unwrap();
assert_eq!(state.last_error, None);
assert!(state.is_pending()); assert!(state.is_pending());
// Attack! Try to payout to a rando key // Attack! Try to payout to a rando key
@ -366,16 +349,15 @@ mod test {
dt, dt,
Hash::default(), Hash::default(),
); );
assert!(BudgetState::process_transaction(&tx, &mut accounts).is_err()); assert_eq!(
BudgetState::process_transaction(&tx, &mut accounts),
Err(BudgetError::DestinationMissing(to.pubkey()))
);
assert_eq!(accounts[from_account].tokens, 0); assert_eq!(accounts[from_account].tokens, 0);
assert_eq!(accounts[contract_account].tokens, 1); assert_eq!(accounts[contract_account].tokens, 1);
assert_eq!(accounts[to_account].tokens, 0); assert_eq!(accounts[to_account].tokens, 0);
let state = BudgetState::deserialize(&accounts[contract_account].userdata).unwrap(); let state = BudgetState::deserialize(&accounts[contract_account].userdata).unwrap();
assert_eq!(
state.last_error,
Some(BudgetError::DestinationMissing(to.pubkey()))
);
assert!(state.is_pending()); assert!(state.is_pending());
// Now, acknowledge the time in the condition occurred and // Now, acknowledge the time in the condition occurred and
@ -396,15 +378,13 @@ mod test {
assert!(!state.is_pending()); assert!(!state.is_pending());
// try to replay the timestamp contract // try to replay the timestamp contract
assert!(BudgetState::process_transaction(&tx, &mut accounts).is_err()); assert_eq!(
BudgetState::process_transaction(&tx, &mut accounts),
Err(BudgetError::ContractNotPending(contract.pubkey()))
);
assert_eq!(accounts[from_account].tokens, 0); assert_eq!(accounts[from_account].tokens, 0);
assert_eq!(accounts[contract_account].tokens, 0); assert_eq!(accounts[contract_account].tokens, 0);
assert_eq!(accounts[to_account].tokens, 1); assert_eq!(accounts[to_account].tokens, 1);
let state = BudgetState::deserialize(&accounts[contract_account].userdata).unwrap();
assert_eq!(
state.last_error,
Some(BudgetError::ContractNotPending(contract.pubkey()))
);
} }
#[test] #[test]
fn test_cancel_transfer() { fn test_cancel_transfer() {
@ -432,7 +412,6 @@ mod test {
assert_eq!(accounts[from_account].tokens, 0); assert_eq!(accounts[from_account].tokens, 0);
assert_eq!(accounts[contract_account].tokens, 1); assert_eq!(accounts[contract_account].tokens, 1);
let state = BudgetState::deserialize(&accounts[contract_account].userdata).unwrap(); let state = BudgetState::deserialize(&accounts[contract_account].userdata).unwrap();
assert_eq!(state.last_error, None);
assert!(state.is_pending()); assert!(state.is_pending());
// Attack! try to put the tokens into the wrong account with cancel // Attack! try to put the tokens into the wrong account with cancel
@ -466,16 +445,13 @@ mod test {
from.pubkey(), from.pubkey(),
Hash::default(), Hash::default(),
); );
assert!(BudgetState::process_transaction(&tx, &mut accounts).is_err()); assert_eq!(
BudgetState::process_transaction(&tx, &mut accounts),
Err(BudgetError::ContractNotPending(contract.pubkey()))
);
assert_eq!(accounts[from_account].tokens, 0); assert_eq!(accounts[from_account].tokens, 0);
assert_eq!(accounts[contract_account].tokens, 0); assert_eq!(accounts[contract_account].tokens, 0);
assert_eq!(accounts[pay_account].tokens, 1); assert_eq!(accounts[pay_account].tokens, 1);
let state = BudgetState::deserialize(&accounts[contract_account].userdata).unwrap();
assert_eq!(
state.last_error,
Some(BudgetError::ContractNotPending(contract.pubkey()))
);
} }
#[test] #[test]