reduce commit size

Author: zhiqiangxu

consensus/bihs/adapter/statedb.go

@@ -37,8 +37,12 @@ func NewStateDB(chain *core.BlockChain, gov *gov.Governance, prepareEmptyHeaderF
 
 func (db *StateDB) StoreBlock(blk bihs.Block, commitQC *bihs.QC) error {
 
+	if commitQC.Type != bihs.MTPreCommit {
+		return fmt.Errorf("invalid type for commitQC")
+	}
+
 	sink := common.NewZeroCopySink(nil)
-	commitQC.Serialize(sink)
+	commitQC.SerializeForHeader(sink)
 
 	block := blk.(*Block)
 	header := block.header()
@@ -48,8 +52,17 @@ func (db *StateDB) StoreBlock(blk bihs.Block, commitQC *bihs.QC) error {
 	return nil
 }
 
-func (db *StateDB) Validate(blk bihs.Block) error {
-	return db.verifyHeaderFunc(db.chain, blk.(*Block).header(), true)
+func (db *StateDB) Validate(blk bihs.Block) (err error) {
+	block, ok := blk.(*Block)
+	if !ok {
+		err = fmt.Errorf("invalid block")
+		return
+	}
+	err = db.verifyHeaderFunc(db.chain, block.header(), false)
+	if err != nil {
+		return
+	}
+	return db.chain.PreExecuteBlock((*types.Block)(block))
 }
 
 func (db *StateDB) EmptyBlock(height uint64) (bihs.Block, error) {

consensus/bihs/engine.go

@@ -26,6 +26,7 @@ import (
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/ethereum/go-ethereum/rpc"
 	"github.com/ethereum/go-ethereum/trie"
+	ocommon "github.com/ontio/ontology/common"
 	"github.com/zhiqiangxu/bihs"
 	"github.com/zhiqiangxu/util"
 )
@@ -38,6 +39,7 @@ type BiHS struct {
 	signer     *adapter.Signer
 	db         ethdb.Database
 	core       *bihs.HotStuff
+	gov        *gov.Governance
 	p2p        *adapter.P2P
 
 	chainHeadCh  chan core.ChainHeadEvent
@@ -84,6 +86,7 @@ func (bh *BiHS) Init(chain *ethcore.BlockChain, bc adapter.Broadcaster, consensu
 
 	core := bihs.New(store, p2p, conf)
 	bh.core = core
+	bh.gov = governance
 	bh.p2p = p2p
 
 	bh.chainHeadSub = chain.SubscribeChainHeadEvent(bh.chainHeadCh)
@@ -104,7 +107,7 @@ func (bh *BiHS) Author(header *types.Header) (common.Address, error) {
 }
 
 func (bh *BiHS) VerifyHeader(chain consensus.ChainHeaderReader, header *types.Header, seal bool) error {
-	return bh.verifyHeader(chain, header, nil)
+	return bh.verifyHeader(chain, header, nil, seal)
 }
 
 func (bh *BiHS) VerifyHeaders(chain consensus.ChainHeaderReader, headers []*types.Header, seals []bool) (chan<- struct{}, <-chan error) {
@@ -113,7 +116,7 @@ func (bh *BiHS) VerifyHeaders(chain consensus.ChainHeaderReader, headers []*type
 
 	go func() {
 		for i, header := range headers {
-			err := bh.verifyHeader(chain, header, headers[:i])
+			err := bh.verifyHeader(chain, header, headers[:i], seals[i])
 
 			select {
 			case <-abort:
@@ -132,7 +135,7 @@ func (bh *BiHS) VerifyUncles(chain consensus.ChainReader, block *types.Block) er
 	return nil
 }
 
-func (bh *BiHS) verifyHeader(chain consensus.ChainHeaderReader, header *types.Header, parents []*types.Header) error {
+func (bh *BiHS) verifyHeader(chain consensus.ChainHeaderReader, header *types.Header, parents []*types.Header, seal bool) error {
 	if header.Number == nil {
 		return errUnknownBlock
 	}
@@ -203,14 +206,31 @@ func (bh *BiHS) verifyHeader(chain consensus.ChainHeaderReader, header *types.He
 		return err
 	}
 
-	// All basic checks passed, verify signatures fields
+	if !seal {
+		if len(header.Extra) != 0 {
+			return fmt.Errorf("extra should be empty for non-seal header, #len %d", len(header.Extra))
+		}
+	} else {
+		var qc bihs.QC
+		hash := header.Hash()
+		err := qc.DeserializeFromHeader(header.Number.Uint64(), hash[:], ocommon.NewZeroCopySource(header.Extra))
+		if err != nil {
+			return err
+		}
+
+		ids := bh.gov.ValidatorIDs(header.Number.Uint64())
+		if !qc.VerifyEC(bh.signer, ids) {
+			return fmt.Errorf("qc.VerifyEC failed")
+		}
+	}
 	return nil
 }
 
 func (bh *BiHS) Prepare(chain consensus.ChainHeaderReader, header *types.Header) error {
 	header.Coinbase = bh.signer.Address()
 	header.Nonce = defaultNonce
 	header.MixDigest = types.BiHSDigest
+	header.Extra = nil
 
 	parent, err := bh.getParentHeader(chain, header)
 	if err != nil {

core/blockchain.go

@@ -2316,3 +2316,20 @@ func (bc *BlockChain) InsertHeaderChain(chain []*types.Header, checkFreq int) (i
 	_, err := bc.hc.InsertHeaderChain(chain, start, bc.forker)
 	return 0, err
 }
+
+func (bc *BlockChain) PreExecuteBlock(block *types.Block) error {
+	parent := bc.GetBlockByHash(block.ParentHash())
+	statedb, err := bc.StateAt(parent.Root())
+	if err != nil {
+		return err
+	}
+
+	receipts, _, usedGas, err := bc.processor.Process(block, statedb, bc.vmConfig)
+	if err != nil {
+		return err
+	}
+	if err := bc.validator.ValidateState(block, statedb, receipts, usedGas); err != nil {
+		return err
+	}
+	return nil
+}

go.mod

@@ -56,7 +56,7 @@ require (
 	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
 	github.com/tklauser/go-sysconf v0.3.5 // indirect
 	github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef
-	github.com/zhiqiangxu/bihs v0.0.0-20220220082638-37970b7e45b3
+	github.com/zhiqiangxu/bihs v0.0.0-20220220105359-0df6181f96c6
 	github.com/zhiqiangxu/util v0.0.0-20210608123940-8b5a9fec779f
 	golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
 	golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d // indirect

go.sum

@@ -541,6 +541,14 @@ github.com/zhiqiangxu/bihs v0.0.0-20220220074118-099a9e15a091 h1:bMtwWQXNa6CGg3v
 github.com/zhiqiangxu/bihs v0.0.0-20220220074118-099a9e15a091/go.mod h1:pQJtnkZtU04PYOihQ5/v2BzNCkTklfFqtHHmFMJqG3g=
 github.com/zhiqiangxu/bihs v0.0.0-20220220082638-37970b7e45b3 h1:PAhRf0aN9eZ2E5/OKdyPIn5VcRC1kWjXDDrLwuDfY9I=
 github.com/zhiqiangxu/bihs v0.0.0-20220220082638-37970b7e45b3/go.mod h1:pQJtnkZtU04PYOihQ5/v2BzNCkTklfFqtHHmFMJqG3g=
+github.com/zhiqiangxu/bihs v0.0.0-20220220102243-49afa4a8b4c7 h1:WDOsRbEGRa+ZhXfOqfC/z5e6FcE445omPAXJwnUGXrY=
+github.com/zhiqiangxu/bihs v0.0.0-20220220102243-49afa4a8b4c7/go.mod h1:pQJtnkZtU04PYOihQ5/v2BzNCkTklfFqtHHmFMJqG3g=
+github.com/zhiqiangxu/bihs v0.0.0-20220220104908-6751ab827174 h1:C4M3lrLjRqv1ZYczR9Kn1bIgBfA2akveVbXF2ahsnyk=
+github.com/zhiqiangxu/bihs v0.0.0-20220220104908-6751ab827174/go.mod h1:pQJtnkZtU04PYOihQ5/v2BzNCkTklfFqtHHmFMJqG3g=
+github.com/zhiqiangxu/bihs v0.0.0-20220220105201-7b93be2e78f3 h1:gLR/0h0pxnx4NTEHkFiGsE5q32LDN3FtWS30vUaYcF4=
+github.com/zhiqiangxu/bihs v0.0.0-20220220105201-7b93be2e78f3/go.mod h1:pQJtnkZtU04PYOihQ5/v2BzNCkTklfFqtHHmFMJqG3g=
+github.com/zhiqiangxu/bihs v0.0.0-20220220105359-0df6181f96c6 h1:DJx8j55Kq5VW3IhsYRzbswj4x7tWCXYwMPMUMMkTv28=
+github.com/zhiqiangxu/bihs v0.0.0-20220220105359-0df6181f96c6/go.mod h1:pQJtnkZtU04PYOihQ5/v2BzNCkTklfFqtHHmFMJqG3g=
 github.com/zhiqiangxu/rpheap v0.0.0-20191222053847-9002d7e5a1a1 h1:9i/8yn4zcZL85rmOMp9AskgJJhb2HzducF1EahdxEME=
 github.com/zhiqiangxu/rpheap v0.0.0-20191222053847-9002d7e5a1a1/go.mod h1:aYy7SAJP4LY667NfqoMR/ZJAy8HQ8KVtQTvEDrGS5ks=
 github.com/zhiqiangxu/util v0.0.0-20210608123940-8b5a9fec779f h1:Qj4r6VNJRHJOy50ixhmPerKf0r/qM+SSpuuIY5J/hiM=

miner/worker.go

@@ -981,6 +981,9 @@ func (w *worker) prepareHeaderLocked(parent *types.Block, timestamp int64) *type
 		log.Error("Failed to prepare header for mining", "err", err)
 		return nil
 	}
+	if header.Extra == nil {
+		return header
+	}
 	// If we are care about TheDAO hard-fork check whether to override the extra-data or not
 	if daoBlock := w.chainConfig.DAOForkBlock; daoBlock != nil {
 		// Check whether the block is among the fork extra-override range