deal with reorg

chore

Author: weiihann

core/blockchain.go

@@ -944,7 +944,8 @@ func (bc *BlockChain) rewindPathHead(head *types.Header, root common.Hash) (*typ
 	}
 	// Recover if the target state if it's not available yet.
 	if !bc.HasState(head.Root) {
-		if err := bc.triedb.Recover(head.Root); err != nil {
+		curPeriod := head.Number.Uint64() / state.NumBlocksPerPeriod // TODO(weiihann): deal with this later
+		if err := bc.triedb.Recover(head.Root, curPeriod); err != nil {
 			log.Error("Failed to rollback state, resetting to genesis", "err", err)
 			return bc.genesisBlock.Header(), rootNumber
 		}
@@ -2324,7 +2325,8 @@ func (bc *BlockChain) insertSideChain(block *types.Block, it *insertIterator, ma
 	parent := it.previous()
 	for parent != nil && !bc.HasState(parent.Root) {
 		if bc.stateRecoverable(parent.Root) {
-			if err := bc.triedb.Recover(parent.Root); err != nil {
+			curPeriod := parent.Number.Uint64() / state.NumBlocksPerPeriod // TODO(weiihann): deal with this later
+			if err := bc.triedb.Recover(parent.Root, curPeriod); err != nil {
 				return nil, 0, err
 			}
 			break
@@ -2386,7 +2388,8 @@ func (bc *BlockChain) recoverAncestors(block *types.Block, makeWitness bool) (co
 	)
 	for parent != nil && !bc.HasState(parent.Root()) {
 		if bc.stateRecoverable(parent.Root()) {
-			if err := bc.triedb.Recover(parent.Root()); err != nil {
+			curPeriod := parent.NumberU64() / state.NumBlocksPerPeriod // TODO(weiihann): deal with this later
+			if err := bc.triedb.Recover(parent.Root(), curPeriod); err != nil {
 				return common.Hash{}, err
 			}
 			break

triedb/database.go

@@ -272,12 +272,12 @@ func (db *Database) Dereference(root common.Hash) error {
 // supported as the rollback destination only if it's canonical state and the
 // corresponding trie histories are existent. It's only supported by path-based
 // database and will return an error for others.
-func (db *Database) Recover(target common.Hash) error {
+func (db *Database) Recover(target common.Hash, period uint64) error {
 	pdb, ok := db.backend.(*pathdb.Database)
 	if !ok {
 		return errors.New("not supported")
 	}
-	return pdb.Recover(target)
+	return pdb.Recover(target, period)
 }
 
 // Recoverable returns the indicator if the specified state is enabled to be

triedb/pathdb/database.go

@@ -460,7 +460,7 @@ func (db *Database) Enable(root common.Hash) error {
 // canonical state and the corresponding trie histories are existent.
 //
 // The supplied root must be a valid trie hash value.
-func (db *Database) Recover(root common.Hash) error {
+func (db *Database) Recover(root common.Hash, period uint64) error {
 	db.lock.Lock()
 	defer db.lock.Unlock()
 
@@ -485,6 +485,7 @@ func (db *Database) Recover(root common.Hash) error {
 		if err != nil {
 			return err
 		}
+		h.meta.period = period
 		dl, err = dl.revert(h)
 		if err != nil {
 			return err

triedb/pathdb/database_test.go

@@ -597,7 +597,7 @@ func TestDatabaseRollback(t *testing.T) {
 		if i > 0 {
 			parent = tester.roots[i-1]
 		}
-		if err := tester.db.Recover(parent); err != nil {
+		if err := tester.db.Recover(parent, 0); err != nil {
 			t.Fatalf("Failed to revert db, err: %v", err)
 		}
 		if i > 0 {
@@ -703,7 +703,7 @@ func TestExecuteRollback(t *testing.T) {
 			}
 		}
 
-		if err := tester.db.Recover(h.meta.parent); err != nil {
+		if err := tester.db.Recover(h.meta.parent, h.meta.period); err != nil {
 			t.Fatalf("Failed to recover db, err: %v", err)
 		}
 	}

triedb/pathdb/disklayer.go

@@ -494,6 +494,14 @@ func (dl *diskLayer) revert(h *stateHistory) (*diskLayer, error) {
 	if err != nil {
 		return nil, err
 	}
+
+	// Populate the period for the nodes
+	for _, subset := range nodes {
+		for _, n := range subset {
+			n.Period = h.meta.period
+		}
+	}
+
 	// Derive the state modification set from the history, keyed by the hash
 	// of the account address and the storage key.
 	accounts, storages := h.stateSet()

triedb/pathdb/history_state.go

@@ -203,6 +203,7 @@ type meta struct {
 	parent  common.Hash // prev-state root before the state transition
 	root    common.Hash // post-state root after the state transition
 	block   uint64      // associated block number
+	period  uint64      // associated period, not persisted to disk
 }
 
 // encode packs the meta object into byte stream.

triedb/pathdb/nodes.go

@@ -64,7 +64,9 @@ func newNodeSet(nodes map[common.Hash]map[string]*trienode.Node, period uint64)
 		}
 	}
 	s.computeSize()
-	s.setPeriod(period)
+	if period != 0 {
+		s.setPeriod(period)
+	}
 	return s
 }