Async verify

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())
@@ -187,7 +187,7 @@ func (v *BlockValidator) ValidateState(block *types.Block, statedb *state.StateD
 	}
 	validateFuns = append(validateFuns, func() error {
 		if root := statedb.IntermediateRoot(v.config.IsEIP158(header.Number)); header.Root != root {
-			return fmt.Errorf("invalid merkle root (remote: %x local: %x) dberr: %w", header.Root, root, statedb.Error())
+			return fmt.Errorf("invalid merkle root (block: %d block_hash: %x remote: %x local: %x) dberr: %w", block.Number(), header.Hash(), header.Root, root, statedb.Error())
 		}
 		return nil
 	})