diff options
| author | Bojie Wu <bojie@dexon.org> | 2018-10-09 13:28:45 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2019-03-12 12:19:09 +0800 |
| commit | be36e03b7ae08fc6993881a66773ad20a48be4fc (patch) | |
| tree | 1c7cff53e5ed5b8c67b6a055e0f0d7786177f064 /core | |
| parent | 32d79763bfb2ab6952786bf590c3a65fd33eca50 (diff) | |
| download | dexon-be36e03b7ae08fc6993881a66773ad20a48be4fc.tar.gz dexon-be36e03b7ae08fc6993881a66773ad20a48be4fc.tar.zst dexon-be36e03b7ae08fc6993881a66773ad20a48be4fc.zip | |
app: fix concurrent map read write issue and accept fail transaction when round change
Diffstat (limited to 'core')
| -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 4c5fb3c25..8e7b1b7b5 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 } |