Merge 630bb0ec66 into 67cd4cd5a1

core/types/transaction_marshalling.go

@@ -514,6 +514,11 @@ func (tx *Transaction) UnmarshalJSON(input []byte) error {
 	// Now set the inner transaction.
 	tx.setDecoded(inner, 0)
 
-	// TODO: check hash here?
+	if dec.Hash != (common.Hash{}) {
+		computedHash := tx.Hash()
+		if computedHash != dec.Hash {
+			return errors.New("transaction hash mismatch")
+		}
+	}
 	return nil
 }