Build block before import in reference tests

Signed-off-by: Miroslav Kovar <[email protected]>

Author: mirgee

ethereum/blockcreation/src/main/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockCreator.java

@@ -178,7 +178,7 @@ public BlockCreationResult createBlock(
         parentHeader);
   }
 
-  protected BlockCreationResult createBlock(
+  public BlockCreationResult createBlock(
       final Optional<List<Transaction>> maybeTransactions,
       final Optional<List<BlockHeader>> maybeOmmers,
       final Optional<List<Withdrawal>> maybeWithdrawals,

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockBody.java

@@ -185,12 +185,13 @@ public boolean equals(final Object o) {
     BlockBody blockBody = (BlockBody) o;
     return Objects.equals(transactions, blockBody.transactions)
         && Objects.equals(ommers, blockBody.ommers)
-        && Objects.equals(withdrawals, blockBody.withdrawals);
+        && Objects.equals(withdrawals, blockBody.withdrawals)
+        && Objects.equals(blockAccessList, blockBody.blockAccessList);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(transactions, ommers, withdrawals);
+    return Objects.hash(transactions, ommers, withdrawals, blockAccessList);
   }
 
   public boolean isEmpty() {

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/BlockHeaderBuilder.java

@@ -66,6 +66,9 @@ public class BlockHeaderBuilder {
   private long gasUsed = -1L;
 
   private long timestamp = -1L;
+  // Some reference tests are setting a negative timestamp so we can't use the sign to decide
+  // whether a timestamp has been set
+  private boolean timestampSet = false;
 
   private Bytes extraData;
 
@@ -260,7 +263,7 @@ public BlockHeader buildBlockHeader() {
         number,
         gasLimit,
         gasUsed,
-        timestamp < 0 ? Instant.now().getEpochSecond() : timestamp,
+        timestampSet ? timestamp : Instant.now().getEpochSecond(),
         extraData,
         baseFee,
         mixHashOrPrevRandao,
@@ -450,6 +453,7 @@ public BlockHeaderBuilder gasUsed(final long gasUsed) {
 
   public BlockHeaderBuilder timestamp(final long timestamp) {
     this.timestamp = timestamp;
+    this.timestampSet = true;
     return this;
   }
 

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/block/access/list/BlockAccessList.java

@@ -29,6 +29,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.TreeMap;
@@ -51,6 +52,23 @@ public List<AccountChanges> getAccountChanges() {
     return accountChanges;
   }
 
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (!(o instanceof BlockAccessList)) {
+      return false;
+    }
+    final BlockAccessList that = (BlockAccessList) o;
+    return Objects.equals(accountChanges, that.accountChanges);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(accountChanges);
+  }
+
   public void writeTo(final RLPOutput out) {
     BlockAccessListEncoder.encode(this, out);
   }
@@ -319,7 +337,7 @@ void addStorageRead(final StorageSlotKey slot) {
       }
 
       void addBalanceChange(final int txIndex, final Bytes postBalance) {
-        balances.add(new BalanceChange(txIndex, postBalance));
+        balances.add(new BalanceChange(txIndex, postBalance.trimLeadingZeros()));
       }
 
       void addNonceChange(final int txIndex, final long newNonce) {

ethereum/referencetests/build.gradle

@@ -186,6 +186,9 @@ dependencies {
   implementation project(':crypto:algorithms')
   implementation project(':datatypes')
   implementation project(':ethereum:core')
+  implementation project(':ethereum:eth')
+  implementation project(':ethereum:blockcreation')
+  implementation project(':consensus:merge')
   implementation project(':metrics:core')
   implementation project(':util')
   implementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
@@ -202,6 +205,9 @@ dependencies {
   referenceTestImplementation project(path: ':config')
   referenceTestImplementation project(path: ':datatypes')
   referenceTestImplementation project(path: ':ethereum:core')
+  referenceTestImplementation project(path: ':ethereum:eth')
+  referenceTestImplementation project(path: ':ethereum:blockcreation')
+  referenceTestImplementation project(path: ':consensus:merge')
   referenceTestImplementation project(path: ':metrics:core')
   referenceTestImplementation project(path: ':ethereum:core', configuration: 'testSupportArtifacts')
   referenceTestImplementation project(path: ':ethereum:rlp')

ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestProtocolSchedules.java

@@ -34,6 +34,7 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -44,6 +45,17 @@ public class ReferenceTestProtocolSchedules {
   private static final List<String> SPECS_PRIOR_TO_DELETING_EMPTY_ACCOUNTS =
       Arrays.asList("Frontier", "Homestead", "EIP150");
 
+  private static final Set<String> FORKS_WITHOUT_BLOCK_BUILDING =
+      Set.of(
+          "frontier",
+          "frontiertohomesteadat5",
+          "homestead",
+          "homesteartoeip150at5",
+          "homesteadtodaoat5",
+          "eip150",
+          "eip158",
+          "eip158tobyzantiumat5");
+
   private static ReferenceTestProtocolSchedules instance;
 
   public static ReferenceTestProtocolSchedules getInstance() {
@@ -159,4 +171,8 @@ private static ProtocolSchedule createSchedule(final GenesisConfigOptions option
   public static boolean shouldClearEmptyAccounts(final String fork) {
     return !SPECS_PRIOR_TO_DELETING_EMPTY_ACCOUNTS.contains(fork);
   }
+
+  public static boolean supportsBlockBuilding(final String fork) {
+    return !FORKS_WITHOUT_BLOCK_BUILDING.contains(fork.toLowerCase(Locale.ROOT));
+  }
 }

ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/consensus/merge/blockcreation/ReferenceTestMergeBlockCreator.java

@@ -0,0 +1,72 @@
+/*
+ * Copyright contributors to Hyperledger Besu.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.hyperledger.besu.consensus.merge.blockcreation;
+
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.blockcreation.AbstractBlockCreator;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockHeader;
+import org.hyperledger.besu.ethereum.core.MiningConfiguration;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.core.Withdrawal;
+import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
+import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.tuweni.bytes.Bytes32;
+
+/** Utility class exposing {@link MergeBlockCreator} functionality for reference tests. */
+public final class ReferenceTestMergeBlockCreator {
+
+  private ReferenceTestMergeBlockCreator() {}
+
+  public static Block createBlock(
+      final MiningConfiguration miningConfiguration,
+      final AbstractBlockCreator.ExtraDataCalculator extraDataCalculator,
+      final TransactionPool transactionPool,
+      final ProtocolContext protocolContext,
+      final ProtocolSchedule protocolSchedule,
+      final BlockHeader parentHeader,
+      final EthScheduler ethScheduler,
+      final Optional<List<Transaction>> transactions,
+      final Optional<List<BlockHeader>> ommers,
+      final Bytes32 random,
+      final long timestamp,
+      final Optional<List<Withdrawal>> withdrawals,
+      final Optional<Bytes32> parentBeaconBlockRoot) {
+
+    return new MergeBlockCreator(
+            miningConfiguration,
+            extraDataCalculator,
+            transactionPool,
+            protocolContext,
+            protocolSchedule,
+            parentHeader,
+            ethScheduler)
+        .createBlock(
+            transactions,
+            ommers,
+            withdrawals,
+            Optional.of(random),
+            parentBeaconBlockRoot,
+            timestamp,
+            true,
+            parentHeader)
+        .getBlock();
+  }
+}