Prague Devnet5 - EIP2935 - Fix edge case when the contract is deploye…

…d after the fork (#8211) Signed-off-by: Gabriel-Trintinalia <[email protected]>
hyperledger · Jan 31, 2025 · e984126 · e984126
1 parent 68665db
commit e984126
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/...c/main/java/org/hyperledger/besu/ethereum/mainnet/blockhash/PragueBlockHashProcessor.java b/...c/main/java/org/hyperledger/besu/ethereum/mainnet/blockhash/PragueBlockHashProcessor.java
@@ -68,9 +68,11 @@ public void processBlockHashes(
     super.processBlockHashes(mutableWorldState, currentBlockHeader);
 
     WorldUpdater worldUpdater = mutableWorldState.updater();
-    final MutableAccount historyStorageAccount = worldUpdater.getOrCreate(historyStorageAddress);
+    final MutableAccount historyStorageAccount = worldUpdater.getAccount(historyStorageAddress);
 
-    if (currentBlockHeader.getNumber() > 0) {
+    if (historyStorageAccount != null
+        && historyStorageAccount.getNonce() > 0
+        && currentBlockHeader.getNumber() > 0) {
       storeParentHash(historyStorageAccount, currentBlockHeader);
     }
     worldUpdater.commit();

diff --git a/...src/test/java/org/hyperledger/besu/ethereum/mainnet/blockhash/BlockHashProcessorTest.java b/...src/test/java/org/hyperledger/besu/ethereum/mainnet/blockhash/BlockHashProcessorTest.java
@@ -45,8 +45,9 @@ void setUp() {
     mutableWorldState = mock(MutableWorldState.class);
     worldUpdater = mock(WorldUpdater.class);
     account = mock(MutableAccount.class);
+    when(account.getNonce()).thenReturn(1L);
     when(mutableWorldState.updater()).thenReturn(worldUpdater);
-    when(worldUpdater.getOrCreate(PragueBlockHashProcessor.HISTORY_STORAGE_ADDRESS))
+    when(worldUpdater.getAccount(PragueBlockHashProcessor.HISTORY_STORAGE_ADDRESS))
         .thenReturn(account);
   }
 
@@ -72,7 +73,7 @@ void shouldNotStoreBlockHashForGenesisBlock() {
     mockAncestorHeaders(currentBlockHeader, 0);
 
     processor.processBlockHashes(mutableWorldState, currentBlockHeader);
-    verifyNoInteractions(account);
+    verify(account, times(0)).setStorageValue(any(), any());
   }
 
   @Test
@@ -89,6 +90,20 @@ void shouldStoreAncestorBlockHashesAtForkCorrectlyParentIsGenesis() {
     verifyAccount(0, historicalWindow);
   }
 
+  @Test
+  void shouldNotStoreBlockHashIfContractIsNotDeployed() {
+    when(worldUpdater.getAccount(PragueBlockHashProcessor.HISTORY_STORAGE_ADDRESS))
+        .thenReturn(null);
+
+    long currentBlock = 1;
+    processor = new PragueBlockHashProcessor();
+    BlockHeader currentBlockHeader = mockBlockHeader(currentBlock);
+    mockAncestorHeaders(currentBlockHeader, 0);
+
+    processor.processBlockHashes(mutableWorldState, currentBlockHeader);
+    verifyNoInteractions(account);
+  }
+
   @Test
   void shouldWriteGenesisHashAtSlot0() {
     processor = new PragueBlockHashProcessor();