Update reference tests to Cancun (hyperledger#6054)

* Update reference tests to Cancun Update reference tests to cancun tests. Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> * update the subrepo Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> * update the EIP-6110 acceptance tests Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> * update to develop Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> --------- Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com> Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com> Co-authored-by: Sally MacFarlane <macfarla.github@gmail.com>
NickSneo · Nov 12, 2023 · f40fd95 · f40fd95
1 parent f3c6cf4
commit f40fd95
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 36 deletions.
diff --git a/...core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ParentBeaconBlockRootHelper.java b/...core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ParentBeaconBlockRootHelper.java
@@ -19,7 +19,6 @@
 import org.hyperledger.besu.evm.account.MutableAccount;
 import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 
-import com.google.common.primitives.Longs;
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
 import org.apache.tuweni.units.bigints.UInt256;
@@ -49,8 +48,7 @@ static void storeParentBeaconBlockRoot(
     final UInt256 timestampIndex = UInt256.valueOf(timestampReduced);
     final UInt256 rootIndex = UInt256.valueOf(timestampExtended);
 
-    account.setStorageValue(
-        timestampIndex, UInt256.fromBytes(Bytes.of(Longs.toByteArray(timestamp))));
+    account.setStorageValue(timestampIndex, UInt256.fromBytes(Bytes.ofUnsignedLong(timestamp)));
     account.setStorageValue(rootIndex, UInt256.fromBytes(root));
     worldUpdater.commit();
   }

diff --git a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/StateTestSubCommand.java b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/StateTestSubCommand.java
@@ -100,6 +100,11 @@ public class StateTestSubCommand implements Runnable {
       description = "Limit execution to one value variable.")
   private Integer valueIndex = null;
 
+  @Option(
+      names = {"--fork-index"},
+      description = "Limit execution to one fork.")
+  private String forkIndex = null;
+
   @ParentCommand private final EvmToolCommand parentCommand;
 
   // picocli does it magically
@@ -197,6 +202,9 @@ private void traceTestSpecs(final String test, final List<GeneralStateTestCaseEi
       if (valueIndex != null && spec.getValueIndex() != valueIndex) {
         continue;
       }
+      if (forkIndex != null && !spec.getFork().equalsIgnoreCase(forkIndex)) {
+        continue;
+      }
 
       final BlockHeader blockHeader = spec.getBlockHeader();
       final Transaction transaction = spec.getTransaction();

diff --git a/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/T8nExecutor.java b/ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/T8nExecutor.java
@@ -240,7 +240,6 @@ static T8nResult runTest(
 
     final BonsaiReferenceTestWorldState worldState =
         (BonsaiReferenceTestWorldState) initialWorldState.copy();
-    worldState.disableRootHashVerification();
 
     final ProtocolSchedule protocolSchedule = referenceTestProtocolSchedules.getByName(fork);
     if (protocolSchedule == null) {

diff --git a/ethereum/referencetests/build.gradle b/ethereum/referencetests/build.gradle
@@ -198,7 +198,7 @@ tasks.register('validateReferenceTestSubmodule') {
   description = "Checks that the reference tests submodule is not accidentally changed"
   doLast {
     def result = new ByteArrayOutputStream()
-    def expectedHash = '661356317ac6df52208d54187e692472a25a01f8'
+    def expectedHash = '02c1859633abbdf776956136931ea247485c9f90'
     def submodulePath = java.nio.file.Path.of("${rootProject.projectDir}", "ethereum/referencetests/src/reference-test/external-resources").toAbsolutePath()
     try {
       exec {

diff --git a/...in/java/org/hyperledger/besu/ethereum/referencetests/BlockchainReferenceTestCaseSpec.java b/...in/java/org/hyperledger/besu/ethereum/referencetests/BlockchainReferenceTestCaseSpec.java
@@ -232,6 +232,7 @@ public ParsedExtraData parseExtraData(final BlockHeader header) {
     "expectExceptionHomestead",
     "expectExceptionALL",
     "hasBigInt",
+    "rlp_decoded",
     "transactionSequence"
   })
   public static class CandidateBlock {

diff --git a/...main/java/org/hyperledger/besu/ethereum/referencetests/BonsaiReferenceTestWorldState.java b/...main/java/org/hyperledger/besu/ethereum/referencetests/BonsaiReferenceTestWorldState.java
@@ -49,8 +49,6 @@ public class BonsaiReferenceTestWorldState extends BonsaiWorldState
   private final BonsaiReferenceTestWorldStateStorage refTestStorage;
   private final BonsaiPreImageProxy preImageProxy;
 
-  private boolean disableRootHashVerification;
-
   protected BonsaiReferenceTestWorldState(
       final BonsaiReferenceTestWorldStateStorage worldStateStorage,
       final CachedMerkleTrieLoader cachedMerkleTrieLoader,
@@ -78,20 +76,15 @@ public ReferenceTestWorldState copy() {
   }
 
   /**
-   * If the supplied header has a non-zero state root, verify. Else we assume that stateroot is an
-   * output instead of an input for this reference test and we bypass the state root check.
-   *
-   * <p>Besu reference-test style test cases should supply a stateroot to verify to prevent bonsai
-   * regressions.
+   * For reference tests world state root validation is handled in the harness, this stubs out the
+   * behavior to always pass.
    *
    * @param calculatedStateRoot state root calculated during bonsai persist step.
    * @param header supplied reference test block header.
    */
   @Override
   protected void verifyWorldStateRoot(final Hash calculatedStateRoot, final BlockHeader header) {
-    if (!disableRootHashVerification) {
-      super.verifyWorldStateRoot(calculatedStateRoot, header);
-    }
+    // The test harness validates the root hash, no need to validate in-line for reference test
   }
 
   @JsonCreator
@@ -127,10 +120,6 @@ public Stream<StreamableAccount> streamAccounts(final Bytes32 startKeyHash, fina
     return this.refTestStorage.streamAccounts(this, startKeyHash, limit);
   }
 
-  public void disableRootHashVerification() {
-    disableRootHashVerification = true;
-  }
-
   static class NoOpTrieLogManager implements TrieLogManager {
     private final Subscribers<TrieLogEvent.TrieLogObserver> trieLogObservers = Subscribers.create();
     private final TrieLogFactory trieLogFactory = new TrieLogFactoryImpl();
@@ -150,7 +139,9 @@ public void saveTrieLog(
     public void addCachedLayer(
         final BlockHeader blockHeader,
         final Hash worldStateRootHash,
-        final BonsaiWorldState forWorldState) {}
+        final BonsaiWorldState forWorldState) {
+      // reference tests do not cache layers
+    }
 
     @Override
     public boolean containWorldStateStorage(final Hash blockHash) {
@@ -179,7 +170,9 @@ public long getMaxLayersToLoad() {
     }
 
     @Override
-    public void reset() {}
+    public void reset() {
+      // reference test world states are not re-used
+    }
 
     @Override
     public Optional<? extends TrieLog> getTrieLogLayer(final Hash blockHash) {

diff --git a/ethereum/referencetests/src/reference-test/external-resources b/ethereum/referencetests/src/reference-test/external-resources
diff --git a/...rc/reference-test/java/org/hyperledger/besu/ethereum/vm/BlockchainReferenceTestTools.java b/...rc/reference-test/java/org/hyperledger/besu/ethereum/vm/BlockchainReferenceTestTools.java
@@ -82,13 +82,6 @@ public class BlockchainReferenceTestTools {
     // Perfectly valid test pre-merge.
     params.ignore("UncleFromSideChain_(Merge|Shanghai|Cancun|Prague|Osaka|Bogota)");
 
-    // Reference Tests are old.  Max blob count is 6.
-    params.ignore("blobhashListBounds5");
-    params.ignore("blockWithAllTransactionTypes");
-
-    // EIP-4788 is still in flux and the current fill is not against the final address
-    params.ignore("\\[Cancun\\]");
-
     // EOF tests are written against an older version of the spec
     params.ignore("/stEOF/");
   }

diff --git a/.../reference-test/java/org/hyperledger/besu/ethereum/vm/GeneralStateReferenceTestTools.java b/.../reference-test/java/org/hyperledger/besu/ethereum/vm/GeneralStateReferenceTestTools.java
@@ -21,10 +21,8 @@
 import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
-import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.Transaction;
-import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.mainnet.MainnetTransactionProcessor;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
 import org.hyperledger.besu.ethereum.mainnet.TransactionValidationParams;
@@ -35,10 +33,8 @@
 import org.hyperledger.besu.ethereum.referencetests.ReferenceTestProtocolSchedules;
 import org.hyperledger.besu.ethereum.referencetests.ReferenceTestWorldState;
 import org.hyperledger.besu.ethereum.rlp.RLP;
-import org.hyperledger.besu.ethereum.worldstate.DefaultMutableWorldState;
 import org.hyperledger.besu.evm.account.Account;
 import org.hyperledger.besu.evm.log.Log;
-import org.hyperledger.besu.evm.worldstate.WorldState;
 import org.hyperledger.besu.evm.worldstate.WorldUpdater;
 import org.hyperledger.besu.testutil.JsonTestParameters;
 
@@ -109,9 +105,6 @@ private static ProtocolSpec protocolSpec(final String name) {
     params.ignore("CALLBlake2f_MaxRounds.*");
     params.ignore("loopMul-.*");
 
-    // Reference Tests are old.  Max blob count is 6.
-    params.ignore("blobhashListBounds5");
-
     // EOF tests are written against an older version of the spec
     params.ignore("/stEOF/");
   }