diff options
author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2016-03-24 06:20:51 +0800 |
---|---|---|
committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2016-03-24 06:20:51 +0800 |
commit | 75c86f8646ed6a21116d6c5f5e400dd966bb218d (patch) | |
tree | 6c979fd121e7721328b9502f1855387b602dcd87 /miner/worker.go | |
parent | 9866f19d6af607f629be311cb1c879e8f6472773 (diff) | |
parent | 0cfa21fc7f34d9da93abc41541dd4a98d70eb9dd (diff) | |
download | dexon-75c86f8646ed6a21116d6c5f5e400dd966bb218d.tar dexon-75c86f8646ed6a21116d6c5f5e400dd966bb218d.tar.gz dexon-75c86f8646ed6a21116d6c5f5e400dd966bb218d.tar.bz2 dexon-75c86f8646ed6a21116d6c5f5e400dd966bb218d.tar.lz dexon-75c86f8646ed6a21116d6c5f5e400dd966bb218d.tar.xz dexon-75c86f8646ed6a21116d6c5f5e400dd966bb218d.tar.zst dexon-75c86f8646ed6a21116d6c5f5e400dd966bb218d.zip |
Merge pull request #2141 from obscuren/evm-init
core, core/vm, tests: changed the initialisation behaviour of the EVM
Diffstat (limited to 'miner/worker.go')
-rw-r--r-- | miner/worker.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/miner/worker.go b/miner/worker.go index 108b2d6b5..b3ddf9707 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -657,7 +657,7 @@ func (env *Work) commitTransactions(mux *event.TypeMux, transactions types.Trans func (env *Work) commitTransaction(tx *types.Transaction, bc *core.BlockChain, gp *core.GasPool) (error, vm.Logs) { snap := env.state.Copy() - receipt, logs, _, err := core.ApplyTransaction(bc, gp, env.state, env.header, tx, env.header.GasUsed) + receipt, logs, _, err := core.ApplyTransaction(bc, gp, env.state, env.header, tx, env.header.GasUsed, nil) if err != nil { env.state.Set(snap) return err, nil |