grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #107 from gavofyork/tx_gas

Browse Source 
proper gas calculation in executive
This commit is contained in:
Gav Wood 2016-01-14 02:31:04 +01:00
commit 76f617abac
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/executive.rs
View File

@ -104,6 +104,8 @@ impl<'a> Executive<'a> {
let sender = try!(t.sender()); let sender = try!(t.sender());
let nonce = self.state.nonce(&sender); let nonce = self.state.nonce(&sender);
// TODO: error on base gas required
// validate transaction nonce // validate transaction nonce
if t.nonce != nonce { if t.nonce != nonce {
return Err(From::from(ExecutionError::InvalidNonce { expected: nonce, is: t.nonce })); return Err(From::from(ExecutionError::InvalidNonce { expected: nonce, is: t.nonce }));
@ -136,7 +138,7 @@ impl<'a> Executive<'a> {
let backup = self.state.clone(); let backup = self.state.clone();
let schedule = self.engine.schedule(self.info); let schedule = self.engine.schedule(self.info);
let init_gas = t.gas - U256::from(schedule.tx_gas); let init_gas = t.gas - U256::from(t.gas_required(&schedule));
let res = match t.action() { let res = match t.action() {
&Action::Create => { &Action::Create => {