Merge remote-tracking branch 'origin/main' into feature/promote-segme…

…nted-storage
garyschulte · Jul 26, 2023 · e28eaa3 · e28eaa3
2 parents f63a720 + 1c099e8
commit e28eaa3
Show file tree

Hide file tree

Showing 398 changed files with 22,664 additions and 15,190 deletions.
diff --git a/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/BlockUtils.java b/acceptance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/BlockUtils.java
@@ -56,6 +56,7 @@ public static BlockHeader createBlockHeader(
         null,
         null,
         null,
+        null,
         blockHeaderFunctions);
   }
 }
diff --git a/...a/org/hyperledger/besu/tests/acceptance/jsonrpc/ExecutionEngineEip6110AcceptanceTest.java b/...a/org/hyperledger/besu/tests/acceptance/jsonrpc/ExecutionEngineEip6110AcceptanceTest.java
@@ -20,10 +20,12 @@
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
 @RunWith(Parameterized.class)
+@Ignore("EIP-6110 is not yet implemented")
 public class ExecutionEngineEip6110AcceptanceTest extends AbstractJsonRpcTest {
   private static final String GENESIS_FILE = "/jsonrpc/engine/eip6110/genesis.json";
   private static final String TEST_CASE_PATH = "/jsonrpc/engine/eip6110/test-cases/";