Improve BLOCKHASH Short Circuit (hyperledger#8171)

* Improve BLOCKHASH Short Circuit Signed-off-by: Danno Ferrin <[email protected]> Co-authored-by: Justin Florentine <[email protected]> Signed-off-by: Daniel Lehrner <[email protected]>
daniellehrner · Jan 31, 2025 · a459e1f · a459e1f
1 parent c1b96ec
commit a459e1f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/evm/src/main/java/org/hyperledger/besu/evm/operation/BlockHashOperation.java b/evm/src/main/java/org/hyperledger/besu/evm/operation/BlockHashOperation.java
@@ -57,9 +57,9 @@ public OperationResult execute(final MessageFrame frame, final EVM evm) {
     final long currentBlockNumber = blockValues.getNumber();
     final BlockHashLookup blockHashLookup = frame.getBlockHashLookup();
 
-    // If the current block is the genesis block or the sought block is
-    // not within the lookback window, zero is returned.
-    if (currentBlockNumber == 0
+    // If the sought block is negative, a future block, the current block, or not in the
+    // lookback window, zero is returned.
+    if (soughtBlock < 0
         || soughtBlock >= currentBlockNumber
         || soughtBlock < (currentBlockNumber - blockHashLookup.getLookback())) {
       frame.pushStackItem(Bytes32.ZERO);