modify validator

fractalplatform · Dec 2, 2019 · e220bfd · e220bfd
1 parent 8d82e26
commit e220bfd
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/processor/validator.go b/processor/validator.go
@@ -133,9 +133,16 @@ func (v *BlockValidator) ValidateBody(block *types.Block) error {
 		return err
 	}
 
-	// Header validity is known at this point, check the uncles and transactions
-	if hash := types.DeriveTxsMerkleRoot(block.Txs); hash != block.TxHash() {
-		return fmt.Errorf("transaction root hash mismatch: have %x, want %x", hash, block.TxHash())
+	if block.CurForkID() >= params.ForkID4 {
+		// Header validity is known at this point, check the uncles and transactions
+		if hash := types.DeriveExtensTxsMerkleRoot(block.Txs); hash != block.TxHash() {
+			return fmt.Errorf("transaction root hash mismatch: have %x, want %x", hash, block.TxHash())
+		}
+	} else {
+		// Header validity is known at this point, check the uncles and transactions
+		if hash := types.DeriveTxsMerkleRoot(block.Txs); hash != block.TxHash() {
+			return fmt.Errorf("transaction root hash mismatch: have %x, want %x", hash, block.TxHash())
+		}
 	}
 	return nil
 }