Merge pull request #897 from lochjin/dev2.0

fix:block sync issues caused by meer dag cropping

Author: dindinw

core/blockchain/behaviorflags.go

@@ -1,10 +1,15 @@
 package blockchain
 
+import "fmt"
+
 // BehaviorFlags is a bitmask defining tweaks to the normal behavior when
 // performing chain processing and consensus rules checks.
 type BehaviorFlags uint32
 
 const (
+	// BFNone is a convenience value to specifically indicate no flags.
+	BFNone BehaviorFlags = 0
+
 	// BFFastAdd may be set to indicate that several checks can be avoided
 	// for the block since it is already known to fit into the chain due to
 	// already proving it correct links into the chain up to a known
@@ -23,11 +28,24 @@ const (
 
 	// Add block from broadcast interface
 	BFBroadcast
-
-	// BFNone is a convenience value to specifically indicate no flags.
-	BFNone BehaviorFlags = 0
 )
 
+var bfStrings = map[BehaviorFlags]string{
+	BFNone:       "BFNone",
+	BFFastAdd:    "BFFastAdd",
+	BFNoPoWCheck: "BFNoPoWCheck",
+	BFP2PAdd:     "BFP2PAdd",
+	BFRPCAdd:     "BFRPCAdd",
+	BFBroadcast:  "BFBroadcast",
+}
+
+func (bf BehaviorFlags) String() string {
+	if s, ok := bfStrings[bf]; ok {
+		return s
+	}
+	return fmt.Sprintf("Unknown BehaviorFlags (%d)", uint32(bf))
+}
+
 func (bf BehaviorFlags) Has(value BehaviorFlags) bool {
 	return (bf & value) == value
 }

core/blockchain/blockchain.go

@@ -347,7 +347,7 @@ func (b *BlockChain) createChainState() error {
 	if err != nil {
 		return err
 	}
-	return b.bd.Commit()
+	return b.bd.Commit(false)
 }
 
 func (b *BlockChain) Start() error {
@@ -1002,7 +1002,7 @@ func (b *BlockChain) Rebuild() error {
 		if err != nil {
 			log.Error(err.Error())
 		}
-		err = b.bd.Commit()
+		err = b.bd.Commit(false)
 		if err != nil {
 			return err
 		}

core/blockchain/process.go

@@ -109,9 +109,9 @@ func (b *BlockChain) processBlock(block *types.SerializedBlock, flags BehaviorFl
 		return ib, false, err
 	}
 	if source != nil {
-		log.Debug("Accepted block", "hash", block.Hash().String(), "age", time.Since(block.Block().Header.Timestamp), "source", source.ShortString())
+		log.Debug("Accepted block", "hash", block.Hash().String(), "age", time.Since(block.Block().Header.Timestamp), "BFlags", flags.String(), "source", source.ShortString())
 	} else {
-		log.Debug("Accepted block", "hash", block.Hash().String(), "age", time.Since(block.Block().Header.Timestamp))
+		log.Debug("Accepted block", "hash", block.Hash().String(), "age", time.Since(block.Block().Header.Timestamp), "BFlags", flags.String())
 	}
 
 	return ib, false, nil
@@ -282,7 +282,7 @@ func (b *BlockChain) maybeAcceptBlock(block *types.SerializedBlock, flags Behavi
 	if err != nil {
 		panic(err.Error())
 	}
-	err = b.updateBestState(ib, block, newOrders)
+	err = b.updateBestState(block, flags.Has(BFBroadcast) || flags.Has(BFRPCAdd))
 	if err != nil {
 		panic(err.Error())
 	}
@@ -692,8 +692,8 @@ func (bc *BlockChain) disconnectTransactions(block *types.SerializedBlock, stxos
 	return nil
 }
 
-func (b *BlockChain) updateBestState(ib meerdag.IBlock, block *types.SerializedBlock, attachNodes *list.List) error {
-	err := b.bd.Commit()
+func (b *BlockChain) updateBestState(block *types.SerializedBlock, prune bool) error {
+	err := b.bd.Commit(prune)
 	if err != nil {
 		return err
 	}

core/blockchain/snap.go

@@ -231,7 +231,7 @@ func (b *BlockChain) ProcessBlockBySnap(sds []*SnapData) (meerdag.IBlock, error)
 
 		txNum += int64(len(sd.block.Transactions()))
 	}
-	err := b.updateBestState(nil, sds[len(sds)-1].block, nil)
+	err := b.updateBestState(sds[len(sds)-1].block, false)
 	if err != nil {
 		return returnFun(err)
 	}

meerdag/ghostdag.go

@@ -240,7 +240,7 @@ func (gd *GhostDAG) UpdateOrders() error {
 		curOrder++
 
 	}
-	return gd.bd.commit()
+	return gd.bd.commit(true)
 }
 
 // ---------------

meerdag/meerdag.go

@@ -532,7 +532,7 @@ func (bd *MeerDAG) AddDirectBlock(b IBlockData, ib IBlock, main bool, bids map[u
 	//
 	bd.instance.(*Phantom).AddDirectBlock(ib, main)
 	bd.commitOrder[pblock.GetOrder()] = pblock.GetID()
-	err := bd.commit()
+	err := bd.commit(false)
 	if err != nil {
 		return nil, err
 	}
@@ -1304,14 +1304,14 @@ func (bd *MeerDAG) AddToCommit(block IBlock) {
 }
 
 // Commit the consensus content to the database for persistence
-func (bd *MeerDAG) Commit() error {
+func (bd *MeerDAG) Commit(prune bool) error {
 	bd.stateLock.Lock()
 	defer bd.stateLock.Unlock()
-	return bd.commit()
+	return bd.commit(prune)
 }
 
 // Commit the consensus content to the database for persistence
-func (bd *MeerDAG) commit() error {
+func (bd *MeerDAG) commit(prune bool) error {
 	needPB := false
 	if bd.lastSnapshot.IsValid() {
 		needPB = true
@@ -1403,6 +1403,9 @@ func (bd *MeerDAG) commit() error {
 	if err != nil {
 		return err
 	}
+	if !prune {
+		return nil
+	}
 	bd.optimizeTips(false)
 	return nil
 }

meerdag/test/meerdag_test.go

@@ -265,7 +265,7 @@ func addBlock(tag string, parents []*hash.Hash) (*TestBlock, meerdag.IBlock, err
 
 func commitBlock(tag string, block *TestBlock, ib meerdag.IBlock) error {
 	tbMap[tag] = ib
-	err := bd.Commit()
+	err := bd.Commit(true)
 	if err != nil {
 		return err
 	}