Missing withdrawals wiring in BlockProcessor

Add empty withdrawals in GenesisState for shanghai at genesis Signed-off-by: Simon Dudley <[email protected]>
hyperledger · Jan 22, 2023 · 7473a3a · 7473a3a
1 parent 3a210fc
commit 7473a3a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/GenesisState.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/GenesisState.java
@@ -14,6 +14,8 @@
  */
 package org.hyperledger.besu.ethereum.chain;
 
+import static java.util.Collections.emptyList;
+
 import org.hyperledger.besu.config.GenesisAllocation;
 import org.hyperledger.besu.config.GenesisConfigFile;
 import org.hyperledger.besu.datatypes.Address;
@@ -25,6 +27,7 @@
 import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
 import org.hyperledger.besu.ethereum.core.Difficulty;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
 import org.hyperledger.besu.ethereum.mainnet.HeaderBasedProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions;
@@ -37,11 +40,11 @@
 import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
 
 import java.math.BigInteger;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Optional;
 import java.util.OptionalLong;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -53,9 +56,6 @@
 
 public final class GenesisState {
 
-  private static final BlockBody BODY =
-      new BlockBody(Collections.emptyList(), Collections.emptyList());
-
   private final Block block;
   private final List<GenesisAccount> genesisAccounts;
 
@@ -89,10 +89,16 @@ public static GenesisState fromConfig(
     final Block block =
         new Block(
             buildHeader(config, calculateGenesisStateHash(genesisAccounts), protocolSchedule),
-            BODY);
+            buildBody(config));
     return new GenesisState(block, genesisAccounts);
   }
 
+  private static BlockBody buildBody(final GenesisConfigFile config) {
+    final Optional<List<Withdrawal>> withdrawals =
+        isShanghaiAtGenesis(config) ? Optional.of(emptyList()) : Optional.empty();
+    return new BlockBody(emptyList(), emptyList(), withdrawals);
+  }
+
   public Block getBlock() {
     return block;
   }

diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BlockProcessor.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/BlockProcessor.java
@@ -81,7 +81,7 @@ default BlockProcessingResult processBlock(
         block.getHeader(),
         block.getBody().getTransactions(),
         block.getBody().getOmmers(),
-        Optional.empty(),
+        block.getBody().getWithdrawals(),
         null);
   }