From 0228fb57cd58147ab2c3914520c7805e25a8a1c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Wed, 16 Mar 2016 11:20:02 +0200 Subject: eth, miner: fetch pending block/state in on go (data race) --- eth/api.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'eth') diff --git a/eth/api.go b/eth/api.go index 487d24ae7..c16c3d142 100644 --- a/eth/api.go +++ b/eth/api.go @@ -56,7 +56,8 @@ const defaultGas = uint64(90000) func blockByNumber(m *miner.Miner, bc *core.BlockChain, blockNr rpc.BlockNumber) *types.Block { // Pending block is only known by the miner if blockNr == rpc.PendingBlockNumber { - return m.PendingBlock() + block, _ := m.Pending() + return block } // Otherwise resolve and return the block if blockNr == rpc.LatestBlockNumber { @@ -72,7 +73,8 @@ func blockByNumber(m *miner.Miner, bc *core.BlockChain, blockNr rpc.BlockNumber) func stateAndBlockByNumber(m *miner.Miner, bc *core.BlockChain, blockNr rpc.BlockNumber, chainDb ethdb.Database) (*state.StateDB, *types.Block, error) { // Pending state is only known by the miner if blockNr == rpc.PendingBlockNumber { - return m.PendingState(), m.PendingBlock(), nil + block, state := m.Pending() + return state, block, nil } // Otherwise resolve the block number and return its state block := blockByNumber(m, bc, blockNr) -- cgit v1.2.3