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 | fc452a397e853a80d4de7edf8e08b96c1ee99314 (patch) | |
| tree | 10d030f3d2bf80fcf1448d1385634c15b1af0569 /core | |
| parent | e67f9f0cbf15da6d88ef1c09c99c628fba552418 (diff) | |
| download | dexon-fc452a397e853a80d4de7edf8e08b96c1ee99314.tar.gz dexon-fc452a397e853a80d4de7edf8e08b96c1ee99314.tar.zst dexon-fc452a397e853a80d4de7edf8e08b96c1ee99314.zip | |
app: check nonce and balance in prepare payload
Diffstat (limited to 'core')
| -rw-r--r-- | core/blockchain.go | 6 | ||||
| -rw-r--r-- | core/types/block.go | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/core/blockchain.go b/core/blockchain.go index 8fce9a994..1baabc0d5 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -28,10 +28,9 @@ import ( "sync/atomic" "time" - "github.com/hashicorp/golang-lru" - coreCommon "github.com/dexon-foundation/dexon-consensus-core/common" coreTypes "github.com/dexon-foundation/dexon-consensus-core/core/types" + lru "github.com/hashicorp/golang-lru" "github.com/dexon-foundation/dexon/common" "github.com/dexon-foundation/dexon/common/mclock" @@ -1620,10 +1619,11 @@ func (bc *BlockChain) insertPendingBlocks(chain types.Blocks) (int, []interface{ proctime := time.Since(bstart) // commit state to refresh stateCache - _, err = pendingState.Commit(true) + root, err := pendingState.Commit(true) if err != nil { return i, nil, nil, fmt.Errorf("pendingState commit error: %v", err) } + log.Info("commit pending root", "hash", root) // add into pending blocks bc.pendingBlocks[block.NumberU64()] = struct { diff --git a/core/types/block.go b/core/types/block.go index 652f33aa1..113104198 100644 --- a/core/types/block.go +++ b/core/types/block.go @@ -91,8 +91,6 @@ type Header struct { WitnessRoot common.Hash `json:"witnessRoot" gencodec:"required"` WitnessReceiptHash common.Hash `json:"witnessReceiptHash" gencodec:"required"` DexconMeta []byte `json:"dexconMeta" gencodec:"required"` - ChainID uint32 `json:"chainID" gencodec:"required"` - ChainBlockHeight uint64 `json:"chainBlockHeight" gencodec:"required"` } // field type overrides for gencodec |