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

test for debit of TX fees on full process_transaction() (#3643)

Browse Source 
* fix double debit of TX fees

* add test that fails when removing that line

* put that line back in

* comments
This commit is contained in:
Rob Walker
2019-04-05 16:55:58 -07:00
committed by GitHub
parent 42d8a7d9e7
commit d30049b8eb
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
runtime/src/bank.rs
View File

@ -711,7 +711,9 @@ impl Bank {
let message = tx.message(); let message = tx.message();
match *res { match *res {
Err(TransactionError::InstructionError(_, _)) => { Err(TransactionError::InstructionError(_, _)) => {
// Charge the transaction fee even in case of InstructionError // credit the transaction fee even in case of InstructionError
// necessary to withdraw from account[0] here because previous
// work of doing so (in accounts.load()) is ignored by store()
self.withdraw(&message.account_keys[0], fee)?; self.withdraw(&message.account_keys[0], fee)?;
fees += fee; fees += fee;
Ok(()) Ok(())
@ -1283,11 +1285,23 @@ mod tests {
bank.fee_calculator.lamports_per_signature = 1; bank.fee_calculator.lamports_per_signature = 1;
let tx = system_transaction::transfer(&key1, &key2.pubkey(), 1, genesis_block.hash(), 0); let tx = system_transaction::transfer(&key1, &key2.pubkey(), 1, genesis_block.hash(), 0);
assert_eq!(bank.process_transaction(&tx), Ok(())); assert_eq!(bank.process_transaction(&tx), Ok(()));
assert_eq!(bank.get_balance(&leader), initial_balance + 4); assert_eq!(bank.get_balance(&leader), initial_balance + 4);
assert_eq!(bank.get_balance(&key1.pubkey()), 0); assert_eq!(bank.get_balance(&key1.pubkey()), 0);
assert_eq!(bank.get_balance(&key2.pubkey()), 1); assert_eq!(bank.get_balance(&key2.pubkey()), 1);
assert_eq!(bank.get_balance(&mint_keypair.pubkey()), 100 - 5 - 3); assert_eq!(bank.get_balance(&mint_keypair.pubkey()), 100 - 5 - 3);
// verify that an InstructionError collects fees, too
let mut tx =
system_transaction::transfer(&mint_keypair, &key2.pubkey(), 1, genesis_block.hash(), 0);
// send a bogus instruction to system_program, cause an instruction error
tx.message.instructions[0].data[0] = 40;
bank.process_transaction(&tx).is_err(); // fails with an instruction error
assert_eq!(bank.get_balance(&leader), initial_balance + 5); // gots our bucks
assert_eq!(bank.get_balance(&key2.pubkey()), 1); // our fee ------V
assert_eq!(bank.get_balance(&mint_keypair.pubkey()), 100 - 5 - 3 - 1);
} }
#[test] #[test]