merge

Signed-off-by: Danno Ferrin <danno.ferrin@swirldslabs.com>

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Breaking Changes
 
 ### Additions and Improvements
+- EvmTool now executes the `execution-spec-tests` via the `t8n` and `b11r`. See the [README](ethereum/evmtool/README.md) in EvmTool for more instructions. 
 
 ### Bug Fixes
 - Use the node's configuration to determine if DNS enode URLs are allowed in calls to `admin_addPeer` and `admin_removePeer` [#5584](https://github.com/hyperledger/besu/pull/5584)

ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/B11rSubCommand.java

@@ -118,7 +118,25 @@ public class B11rSubCommand implements Runnable {
       description = "The account state after the transition")
   private final Path outBlock = Path.of("block.json");
 
-  @CommandLine.ParentCommand private final EvmToolCommand parentCommand;
+  @ParentCommand private final EvmToolCommand parentCommand;
+
+  @Parameters(parameterConsumer = OnlyEmptyParams.class)
+  @SuppressWarnings("UnusedVariable")
+  private final List<String> parameters = new ArrayList<>();
+
+  static class OnlyEmptyParams implements IParameterConsumer {
+    @Override
+    public void consumeParameters(
+        final Stack<String> args, final ArgSpec argSpec, final CommandSpec commandSpec) {
+      while (!args.isEmpty()) {
+        if (!args.pop().isEmpty()) {
+          throw new CommandLine.ParameterException(
+              argSpec.command().commandLine(),
+              "The block-builder command does not accept any non-empty parameters");
+        }
+      }
+    }
+  }
 
   @SuppressWarnings("unused")
   public B11rSubCommand() {
@@ -135,7 +153,7 @@ public B11rSubCommand(final EvmToolCommand parentCommand) {
   @Override
   public void run() {
     ObjectMapper objectMapper = JsonUtils.createObjectMapper();
-    final ObjectReader t8nReader = objectMapper.reader();
+    final ObjectReader b11rReader = objectMapper.reader();
 
     ObjectNode config;
     try {