fix: delay open trie

core/block_validator.go

@@ -128,15 +128,15 @@ func (v *BlockValidator) ValidateBody(block *types.Block) error {
 			}
 			return nil
 		},
-		func() error {
-			if !v.bc.HasBlockAndState(block.ParentHash(), block.NumberU64()-1) {
-				if !v.bc.HasBlock(block.ParentHash(), block.NumberU64()-1) {
-					return consensus.ErrUnknownAncestor
-				}
-				return consensus.ErrPrunedAncestor
-			}
-			return nil
-		},
+		//func() error {
+		//	if !v.bc.HasBlockAndState(block.ParentHash(), block.NumberU64()-1) {
+		//		if !v.bc.HasBlock(block.ParentHash(), block.NumberU64()-1) {
+		//			return consensus.ErrUnknownAncestor
+		//		}
+		//		return consensus.ErrPrunedAncestor
+		//	}
+		//	return nil
+		//},
 		func() error {
 			if v.remoteValidator != nil && !v.remoteValidator.AncestorVerified(block.Header()) {
 				return fmt.Errorf("%w, number: %s, hash: %s", ErrAncestorHasNotBeenVerified, block.Number(), block.Hash())

core/state/statedb.go

@@ -194,12 +194,12 @@ func New(root common.Hash, db Database, snaps *snapshot.Tree) (*StateDB, error)
 		sdb.snap = sdb.snaps.Snapshot(root)
 	}
 
-	tr, err := db.OpenTrie(root)
-	if err != nil {
-		return nil, err
-	}
-	_, sdb.noTrie = tr.(*trie.EmptyTrie)
-	sdb.trie = tr
+	//tr, err := db.OpenTrie(root)
+	//if err != nil {
+	//	return nil, err
+	//}
+	//_, sdb.noTrie = tr.(*trie.EmptyTrie)
+	//sdb.trie = tr
 	return sdb, nil
 }
 
@@ -1023,6 +1023,13 @@ func (s *StateDB) Finalise(deleteEmptyObjects bool) {
 func (s *StateDB) IntermediateRoot(deleteEmptyObjects bool) common.Hash {
 	// Finalise all the dirty storage states and write them into the tries
 	s.Finalise(deleteEmptyObjects)
+
+	tr, err := s.db.OpenTrie(s.originalRoot)
+	if err != nil {
+		panic("Failed to open state trie")
+	}
+	s.trie = tr
+
 	s.AccountsIntermediateRoot()
 	return s.StateIntermediateRoot()
 }