diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2016-07-14 23:17:03 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2016-07-16 19:30:05 +0800 |
| commit | b8c088377097f040dc51f56d3e375d039e0e9ebe (patch) | |
| tree | 91dc0a6be08471c49abb1471e54ec8c3d97d3197 /accounts | |
| parent | 14bad7e212011337d14e40c9f975efd096ab7418 (diff) | |
| download | go-tangerine-b8c088377097f040dc51f56d3e375d039e0e9ebe.tar go-tangerine-b8c088377097f040dc51f56d3e375d039e0e9ebe.tar.gz go-tangerine-b8c088377097f040dc51f56d3e375d039e0e9ebe.tar.bz2 go-tangerine-b8c088377097f040dc51f56d3e375d039e0e9ebe.tar.lz go-tangerine-b8c088377097f040dc51f56d3e375d039e0e9ebe.tar.xz go-tangerine-b8c088377097f040dc51f56d3e375d039e0e9ebe.tar.zst go-tangerine-b8c088377097f040dc51f56d3e375d039e0e9ebe.zip | |
[release/1.4.10] accounts, core, eth: pass chain config for chain maker to test DAO
(cherry picked from commit 3291235711082759cd7b70253c02150a80d57011)
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 54b1ce603..cbd2982df 100644 --- a/accounts/abi/bind/backends/simulated.go +++ b/accounts/abi/bind/backends/simulated.go @@ -72,7 +72,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) @@ -178,7 +178,7 @@ func (b *SimulatedBackend) EstimateGasLimit(sender common.Address, contract *com // SendTransaction implements ContractTransactor.SendTransaction, delegating the raw // transaction injection to the remote node. func (b *SimulatedBackend) SendTransaction(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) } |