Merge pull request #5462 from m-Peter/fix-block-hash-inconsistency

Move `blockHash` calculation after deduction of supply diff
onflow · Feb 27, 2024 · 97775ab · 97775ab
2 parents bf3cec4 + aa0c6b4
commit 97775ab
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/fvm/evm/handler/handler.go b/fvm/evm/handler/handler.go
@@ -300,11 +300,6 @@ func (h *ContractHandler) executeAndHandleCall(
 	bp.AppendTxHash(res.TxHash)
 	// TODO: in the future we might update the receipt hash here
 
-	blockHash, err := bp.Hash()
-	if err != nil {
-		return res, err
-	}
-
 	if totalSupplyDiff != nil {
 		if deductSupplyDiff {
 			bp.TotalSupply = new(big.Int).Sub(bp.TotalSupply, totalSupplyDiff)
@@ -316,6 +311,11 @@ func (h *ContractHandler) executeAndHandleCall(
 		}
 	}
 
+	blockHash, err := bp.Hash()
+	if err != nil {
+		return res, err
+	}
+
 	// emit events
 	encoded, err := call.Encode()
 	if err != nil {