diff options
| author | Jimmy Hu <jimmy.hu@dexon.org> | 2018-12-04 14:54:28 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2019-03-12 12:19:09 +0800 |
| commit | 511054aa3d3b8d1e4eab33d891ef212196b50f6d (patch) | |
| tree | 1f0eddd02f65058a60977d905f7cd6e60dd59a81 /core/blockchain.go | |
| parent | 0b2bbcef07cfca898dcb5841b06818536bc0e299 (diff) | |
| download | dexon-511054aa3d3b8d1e4eab33d891ef212196b50f6d.tar dexon-511054aa3d3b8d1e4eab33d891ef212196b50f6d.tar.gz dexon-511054aa3d3b8d1e4eab33d891ef212196b50f6d.tar.bz2 dexon-511054aa3d3b8d1e4eab33d891ef212196b50f6d.tar.lz dexon-511054aa3d3b8d1e4eab33d891ef212196b50f6d.tar.xz dexon-511054aa3d3b8d1e4eab33d891ef212196b50f6d.tar.zst dexon-511054aa3d3b8d1e4eab33d891ef212196b50f6d.zip | |
core, dex: Timeout for prepare payload (#72)
* Timeout on prepare payload
* Leave 2 CPU for others
* Add hardLimit and softLimit to PreparePayload
Diffstat (limited to 'core/blockchain.go')
| -rw-r--r-- | core/blockchain.go | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/core/blockchain.go b/core/blockchain.go index 2adad1d74..31336f555 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -270,13 +270,15 @@ func (bc *BlockChain) AddConfirmedBlock(block *coreTypes.Block) error { bc.confirmedBlockInitMu.Unlock() var transactions types.Transactions - err := rlp.Decode(bytes.NewReader(block.Payload), &transactions) - if err != nil { - return err - } - _, err = types.GlobalSigCache.Add(types.NewEIP155Signer(bc.Config().ChainID), transactions) - if err != nil { - return err + if len(block.Payload) != 0 { + err := rlp.Decode(bytes.NewReader(block.Payload), &transactions) + if err != nil { + return err + } + _, err = types.GlobalSigCache.Add(types.NewEIP155Signer(bc.Config().ChainID), transactions) + if err != nil { + return err + } } addressMap := map[common.Address]struct{}{} |