diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2016-07-16 18:08:16 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-16 18:08:16 +0800 |
| commit | a4c4125b1155d9276614029163b498a17643f0f2 (patch) | |
| tree | 328c438483cb7c87333190605ec1ef79cfa162a6 /accounts | |
| parent | aa1e052cb41c39363a9930added46dac5b6db832 (diff) | |
| parent | 993b41216092fa6dc20d3755afe322cd1376b398 (diff) | |
| download | go-tangerine-a4c4125b1155d9276614029163b498a17643f0f2.tar go-tangerine-a4c4125b1155d9276614029163b498a17643f0f2.tar.gz go-tangerine-a4c4125b1155d9276614029163b498a17643f0f2.tar.bz2 go-tangerine-a4c4125b1155d9276614029163b498a17643f0f2.tar.lz go-tangerine-a4c4125b1155d9276614029163b498a17643f0f2.tar.xz go-tangerine-a4c4125b1155d9276614029163b498a17643f0f2.tar.zst go-tangerine-a4c4125b1155d9276614029163b498a17643f0f2.zip | |
Merge pull request #2814 from karalabe/dao-hard-finalcombo
cmd, core, eth, miner, params, tests: finalize the DAO fork
Diffstat (limited to 'accounts')
| -rw-r--r-- | accounts/abi/bind/backends/simulated.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go index 9bce3f988..687a31bf1 100644 --- a/accounts/abi/bind/backends/simulated.go +++ b/accounts/abi/bind/backends/simulated.go @@ -73,7 +73,7 @@ func (b *SimulatedBackend) Commit() { // Rollback aborts all pending transactions, reverting to the last committed state. func (b *SimulatedBackend) Rollback() { - blocks, _ := core.GenerateChain(b.blockchain.CurrentBlock(), b.database, 1, func(int, *core.BlockGen) {}) + blocks, _ := core.GenerateChain(nil, b.blockchain.CurrentBlock(), b.database, 1, func(int, *core.BlockGen) {}) b.pendingBlock = blocks[0] b.pendingState, _ = state.New(b.pendingBlock.Root(), b.database) @@ -179,7 +179,7 @@ func (b *SimulatedBackend) EstimateGasLimit(ctx context.Context, sender common.A // SendTransaction implements ContractTransactor.SendTransaction, delegating the raw // transaction injection to the remote node. func (b *SimulatedBackend) SendTransaction(ctx context.Context, tx *types.Transaction) error { - blocks, _ := core.GenerateChain(b.blockchain.CurrentBlock(), b.database, 1, func(number int, block *core.BlockGen) { + blocks, _ := core.GenerateChain(nil, b.blockchain.CurrentBlock(), b.database, 1, func(number int, block *core.BlockGen) { for _, tx := range b.pendingBlock.Transactions() { block.AddTx(tx) } |