diff options
| author | Bojie Wu <bojie@dexon.org> | 2018-10-09 13:28:45 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@byzantine-lab.io> | 2019-06-12 17:27:17 +0800 |
| commit | bb5521512cf0558f606e0c9d456426881ab4e99d (patch) | |
| tree | 1dee469563ddb138aeb9e9e0908e454ace385e42 | |
| parent | 35db267fc287eea05d0163ec460293761f5c9243 (diff) | |
| download | go-tangerine-bb5521512cf0558f606e0c9d456426881ab4e99d.tar go-tangerine-bb5521512cf0558f606e0c9d456426881ab4e99d.tar.gz go-tangerine-bb5521512cf0558f606e0c9d456426881ab4e99d.tar.bz2 go-tangerine-bb5521512cf0558f606e0c9d456426881ab4e99d.tar.lz go-tangerine-bb5521512cf0558f606e0c9d456426881ab4e99d.tar.xz go-tangerine-bb5521512cf0558f606e0c9d456426881ab4e99d.tar.zst go-tangerine-bb5521512cf0558f606e0c9d456426881ab4e99d.zip | |
app: fix concurrent map read write issue and accept fail transaction when round change
| -rw-r--r-- | core/blockchain.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/core/blockchain.go b/core/blockchain.go index 429b3a4cc..9b0620679 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -148,7 +148,8 @@ type BlockChain struct { addressCounter map[common.Address]uint64 chainLastHeight map[uint32]uint64 - pendingBlocks map[uint64]struct { + pendingBlockMu *sync.Mutex + pendingBlocks map[uint64]struct { block *types.Block receipts types.Receipts } @@ -193,6 +194,7 @@ func NewBlockChain(db ethdb.Database, cacheConfig *CacheConfig, chainConfig *par block *types.Block receipts types.Receipts }), + pendingBlockMu: &sync.Mutex{}, addressNonce: make(map[common.Address]uint64), addressCost: make(map[common.Address]*big.Int), addressCounter: make(map[common.Address]uint64), @@ -1643,7 +1645,9 @@ func (bc *BlockChain) processPendingBlock(block *types.Block, witness *coreTypes case SideStatTy: return 0, nil, nil, fmt.Errorf("insert pending block and fork found") } + bc.pendingBlockMu.Lock() delete(bc.pendingBlocks, pendingHeight) + bc.pendingBlockMu.Unlock() stats.processed++ stats.usedGas += pendingIns.block.GasUsed() @@ -1660,6 +1664,8 @@ func (bc *BlockChain) processPendingBlock(block *types.Block, witness *coreTypes } func (bc *BlockChain) GetPendingBlockByHeight(height uint64) *types.Block { + bc.pendingBlockMu.Lock() + defer bc.pendingBlockMu.Unlock() return bc.pendingBlocks[height].block } |