aboutsummaryrefslogtreecommitdiffstats
path: root/accounts
diff options
context:
space:
mode:
authorMartin Holst Swende <martin@swende.se>2018-03-19 15:29:54 +0800
committerGitHub <noreply@github.com>2018-03-19 15:29:54 +0800
commitfaed47b3c56017922a9709e57ca2795af5a535a9 (patch)
treec975560c39f4d50a47ac513517e6d8815cbcb128 /accounts
parentfe6cf00f480aa6347b8d55079cbe6c473482ea27 (diff)
parentc1d70ea97082145f5ba04cf4feb9792136b51507 (diff)
downloaddexon-faed47b3c56017922a9709e57ca2795af5a535a9.tar
dexon-faed47b3c56017922a9709e57ca2795af5a535a9.tar.gz
dexon-faed47b3c56017922a9709e57ca2795af5a535a9.tar.bz2
dexon-faed47b3c56017922a9709e57ca2795af5a535a9.tar.lz
dexon-faed47b3c56017922a9709e57ca2795af5a535a9.tar.xz
dexon-faed47b3c56017922a9709e57ca2795af5a535a9.tar.zst
dexon-faed47b3c56017922a9709e57ca2795af5a535a9.zip
Merge pull request #15990 from markya0616/sim_backend_block_hash
accounts/abi, core: add AddTxWithChain in BlockGen for simulation
Diffstat (limited to 'accounts')
-rw-r--r--accounts/abi/bind/backends/simulated.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go
index fe7dea4da..2b5c5fc4a 100644
--- a/accounts/abi/bind/backends/simulated.go
+++ b/accounts/abi/bind/backends/simulated.go
@@ -307,9 +307,9 @@ func (b *SimulatedBackend) SendTransaction(ctx context.Context, tx *types.Transa
blocks, _ := core.GenerateChain(b.config, b.blockchain.CurrentBlock(), ethash.NewFaker(), b.database, 1, func(number int, block *core.BlockGen) {
for _, tx := range b.pendingBlock.Transactions() {
- block.AddTx(tx)
+ block.AddTxWithChain(b.blockchain, tx)
}
- block.AddTx(tx)
+ block.AddTxWithChain(b.blockchain, tx)
})
statedb, _ := b.blockchain.State()