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

Migrate to TransactionBuilder

Browse Source 
This code wasn't updated after we started batching instructions.
The current code does allocations instead of using CreateAccount.
The runtime shouldn't allow that, so getting this code out of the
way before we lock down the runtime.
This commit is contained in:
Greg Fitzgerald
2019-03-06 22:12:14 -07:00
parent 10b16753af
commit a277f3e816
3 changed files with 57 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
programs/budget/src/budget_program.rs
View File

@@ -90,17 +90,15 @@ fn apply_debits(
keyed_accounts[0].account.lamports += payment.lamports;
Ok(())
} else {
let existing = BudgetState::deserialize(&keyed_accounts[1].account.userdata).ok();
let existing = BudgetState::deserialize(&keyed_accounts[0].account.userdata).ok();
if Some(true) == existing.map(|x| x.initialized) {
trace!("contract already exists");
Err(BudgetError::ContractAlreadyExists)
} else {
let mut budget_state = BudgetState::default();
budget_state.pending_budget = Some(expr);
keyed_accounts[1].account.lamports += keyed_accounts[0].account.lamports;
keyed_accounts[0].account.lamports = 0;
budget_state.initialized = true;
budget_state.serialize(&mut keyed_accounts[1].account.userdata)
budget_state.serialize(&mut keyed_accounts[0].account.userdata)
}
}
}
@@ -173,6 +171,7 @@ mod test {
use solana_sdk::signature::{Keypair, KeypairUtil};
use solana_sdk::transaction::Transaction;
// TODO: This is wrong and will only work with single-instruction transactions.
fn process_transaction(
tx: &Transaction,
tx_accounts: &mut [Account],