Add parameters to EVM library fluent API

datatypes/src/main/java/org/hyperledger/besu/datatypes/Address.java

@@ -113,7 +113,13 @@ public static Address wrap(final Bytes value) {
         "An account address must be %s bytes long, got %s",
         SIZE,
         value.size());
-    return new Address(value);
+    if (value instanceof Address address) {
+      return address;
+    } else if (value instanceof DelegatingBytes delegatingBytes) {
+      return new Address(delegatingBytes.copy());
+    } else {
+      return new Address(value);
+    }
   }
 
   /**

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

@@ -59,6 +59,7 @@
 import java.util.List;
 import java.util.NavigableMap;
 import java.util.Optional;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import com.google.common.base.Joiner;
@@ -134,6 +135,12 @@ void setBytes(final String optionValue) {
       description = "Receiving address for this invocation.")
   private final Address receiver = Address.fromHexString("0x00");
 
+  @Option(
+      names = {"--coinbase"},
+      paramLabel = "<address>",
+      description = "Coinbase for this invocation.")
+  private final Address coinbase = Address.fromHexString("0x00");
+
   @Option(
       names = {"--input"},
       paramLabel = "<code>",
@@ -317,7 +324,7 @@ public void run() {
       final BlockHeader blockHeader =
           BlockHeaderBuilder.create()
               .parentHash(Hash.EMPTY)
-              .coinbase(Address.ZERO)
+              .coinbase(coinbase)
               .difficulty(Difficulty.ONE)
               .number(1)
               .gasLimit(5000)
@@ -399,6 +406,10 @@ public void run() {
                 .completer(c -> {})
                 .miningBeneficiary(blockHeader.getCoinbase())
                 .blockHashLookup(new CachingBlockHashLookup(blockHeader, component.getBlockchain()))
+                .accessListWarmAddresses(
+                    EvmSpecVersion.SHANGHAI.compareTo(evm.getEvmVersion()) <= 0
+                        ? Set.of(coinbase)
+                        : Set.of())
                 .build();
         Deque<MessageFrame> messageFrameStack = initialMessageFrame.getMessageFrameStack();
 

ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/trace/coinbase-cold.json

@@ -0,0 +1,57 @@
+{
+  "cli": [
+    "--notime",
+    "--json",
+    "--code",
+    "4131ff",
+    "--coinbase",
+    "4444588443C3A91288C5002483449ABA1054192B",
+    "--fork",
+    "paris"
+  ],
+  "stdin": "",
+  "stdout": [
+    {
+      "pc": 0,
+      "op": 65,
+      "gas": "0x2540b91f8",
+      "gasCost": "0x2",
+      "memSize": 0,
+      "stack": [],
+      "depth": 1,
+      "refund": 0,
+      "opName": "COINBASE"
+    },
+    {
+      "pc": 1,
+      "op": 49,
+      "gas": "0x2540b91f6",
+      "gasCost": "0xa28",
+      "memSize": 0,
+      "stack": [
+        "0x4444588443c3a91288c5002483449aba1054192b"
+      ],
+      "depth": 1,
+      "refund": 0,
+      "opName": "BALANCE"
+    },
+    {
+      "pc": 2,
+      "op": 255,
+      "gas": "0x2540b87ce",
+      "gasCost": "0x1388",
+      "memSize": 0,
+      "stack": [
+        "0x0"
+      ],
+      "depth": 1,
+      "refund": 0,
+      "opName": "SELFDESTRUCT"
+    },
+    {
+      "gasUser": "0x1db2",
+      "gasTotal": "0x1db2",
+      "output": "0x"
+    }
+  ]
+}

ethereum/evmtool/src/test/resources/org/hyperledger/besu/evmtool/trace/coinbase-warm.json

@@ -0,0 +1,57 @@
+{
+  "cli": [
+    "--notime",
+    "--json",
+    "--code",
+    "4131ff",
+    "--coinbase",
+    "4444588443C3A91288C5002483449ABA1054192B",
+    "--fork",
+    "shanghai"
+  ],
+  "stdin": "",
+  "stdout": [
+    {
+      "pc": 0,
+      "op": 65,
+      "gas": "0x2540b91f8",
+      "gasCost": "0x2",
+      "memSize": 0,
+      "stack": [],
+      "depth": 1,
+      "refund": 0,
+      "opName": "COINBASE"
+    },
+    {
+      "pc": 1,
+      "op": 49,
+      "gas": "0x2540b91f6",
+      "gasCost": "0x64",
+      "memSize": 0,
+      "stack": [
+        "0x4444588443c3a91288c5002483449aba1054192b"
+      ],
+      "depth": 1,
+      "refund": 0,
+      "opName": "BALANCE"
+    },
+    {
+      "pc": 2,
+      "op": 255,
+      "gas": "0x2540b9192",
+      "gasCost": "0x1388",
+      "memSize": 0,
+      "stack": [
+        "0x0"
+      ],
+      "depth": 1,
+      "refund": 0,
+      "opName": "SELFDESTRUCT"
+    },
+    {
+      "gasUser": "0x13ee",
+      "gasTotal": "0x13ee",
+      "output": "0x"
+    }
+  ]
+}

evm/src/main/java/org/hyperledger/besu/evm/EVM.java

@@ -31,6 +31,7 @@
 import org.hyperledger.besu.evm.operation.AddOperation;
 import org.hyperledger.besu.evm.operation.AndOperation;
 import org.hyperledger.besu.evm.operation.ByteOperation;
+import org.hyperledger.besu.evm.operation.ChainIdOperation;
 import org.hyperledger.besu.evm.operation.DivOperation;
 import org.hyperledger.besu.evm.operation.DupOperation;
 import org.hyperledger.besu.evm.operation.ExpOperation;
@@ -130,6 +131,30 @@ public int getMaxEOFVersion() {
     return evmSpecVersion.maxEofVersion;
   }
 
+  /**
+   * Returns the configured EVM spec version for this EVM
+   *
+   * @return the evm spec version
+   */
+  public EvmSpecVersion getEvmVersion() {
+    return evmSpecVersion;
+  }
+
+  /**
+   * Return the ChainId this Executor is using, or empty if the EVM version does not expose chain
+   * ID.
+   *
+   * @return the ChainId, or empty if not exposed.
+   */
+  public Optional<Bytes> getChainId() {
+    Operation op = operations.get(ChainIdOperation.OPCODE);
+    if (op instanceof ChainIdOperation chainIdOperation) {
+      return Optional.of(chainIdOperation.getChainId());
+    } else {
+      return Optional.empty();
+    }
+  }
+
   /**
    * Run to halt.
    *

evm/src/main/java/org/hyperledger/besu/evm/EvmSpecVersion.java

@@ -15,6 +15,9 @@
  */
 package org.hyperledger.besu.evm;
 
+import java.util.Comparator;
+import java.util.stream.Stream;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -24,6 +27,10 @@ public enum EvmSpecVersion {
   FRONTIER(0, true, "Frontier", "Finalized"),
   /** Homestead evm spec version. */
   HOMESTEAD(0, true, "Homestead", "Finalized"),
+  /** Tangerine Whistle evm spec version. */
+  TANGERINE_WHISTLE(0, true, "Tangerine Whistle", "Finalized"),
+  /** Spurious Dragon evm spec version. */
+  SPURIOUS_DRAGON(0, true, "Spuruous Dragon", "Finalized"),
   /** Byzantium evm spec version. */
   BYZANTIUM(0, true, "Byzantium", "Finalized"),
   /** Constantinople evm spec version. */
@@ -47,7 +54,7 @@ public enum EvmSpecVersion {
   /** Osaka evm spec version. */
   OSAKA(0, false, "Osaka", "Placeholder"),
   /** Bogota evm spec version. */
-  BOGOTA(0, false, "Bogata", "Placeholder"),
+  BOGOTA(0, false, "Bogota", "Placeholder"),
   /** Development fork for unscheduled EIPs */
   FUTURE_EIPS(1, false, "Future_EIPs", "Development, for accepted and unscheduled EIPs"),
   /** Development fork for EIPs not accepted to Mainnet */
@@ -134,7 +141,7 @@ public void maybeWarnVersion() {
   /**
    * Calculate a spec version from a text fork name.
    *
-   * @param name The name of the fork, such as "shahghai" or "berlin"
+   * @param name The name of the fork, such as "shanghai" or "berlin"
    * @return the EVM spec version for that fork, or null if no fork matched.
    */
   public static EvmSpecVersion fromName(final String name) {
@@ -145,4 +152,17 @@ public static EvmSpecVersion fromName(final String name) {
     }
     return null;
   }
+
+  /**
+   * The most recent deployed evm supported by the library. This will change across versions and
+   * will be updated after mainnet activations.
+   *
+   * @return the most recently activated mainnet spec.
+   */
+  public static EvmSpecVersion mostRecent() {
+    return Stream.of(EvmSpecVersion.values())
+        .filter(v -> v.specFinalized)
+        .max(Comparator.naturalOrder())
+        .orElseThrow();
+  }
 }

evm/src/main/java/org/hyperledger/besu/evm/MainnetEVMs.java

@@ -20,6 +20,7 @@
 import org.hyperledger.besu.evm.gascalculator.ConstantinopleGasCalculator;
 import org.hyperledger.besu.evm.gascalculator.FrontierGasCalculator;
 import org.hyperledger.besu.evm.gascalculator.GasCalculator;
+import org.hyperledger.besu.evm.gascalculator.HomesteadGasCalculator;
 import org.hyperledger.besu.evm.gascalculator.IstanbulGasCalculator;
 import org.hyperledger.besu.evm.gascalculator.LondonGasCalculator;
 import org.hyperledger.besu.evm.gascalculator.PetersburgGasCalculator;
@@ -278,7 +279,7 @@ public static void registerFrontierOperations(
    * @return the evm
    */
   public static EVM homestead(final EvmConfiguration evmConfiguration) {
-    return homestead(new FrontierGasCalculator(), evmConfiguration);
+    return homestead(new HomesteadGasCalculator(), evmConfiguration);
   }
 
   /**
@@ -328,7 +329,12 @@ public static void registerHomesteadOperations(
    * @return the evm
    */
   public static EVM spuriousDragon(final EvmConfiguration evmConfiguration) {
-    return homestead(new SpuriousDragonGasCalculator(), evmConfiguration);
+    GasCalculator gasCalculator = new SpuriousDragonGasCalculator();
+    return new EVM(
+        homesteadOperations(gasCalculator),
+        gasCalculator,
+        evmConfiguration,
+        EvmSpecVersion.SPURIOUS_DRAGON);
   }
 
   /**
@@ -338,7 +344,12 @@ public static EVM spuriousDragon(final EvmConfiguration evmConfiguration) {
    * @return the evm
    */
   public static EVM tangerineWhistle(final EvmConfiguration evmConfiguration) {
-    return homestead(new TangerineWhistleGasCalculator(), evmConfiguration);
+    GasCalculator gasCalculator = new TangerineWhistleGasCalculator();
+    return new EVM(
+        homesteadOperations(gasCalculator),
+        gasCalculator,
+        evmConfiguration,
+        EvmSpecVersion.TANGERINE_WHISTLE);
   }
 
   /**
@@ -413,11 +424,16 @@ public static EVM constantinople(final EvmConfiguration evmConfiguration) {
    */
   public static EVM constantinople(
       final GasCalculator gasCalculator, final EvmConfiguration evmConfiguration) {
+    var version = EvmSpecVersion.CONSTANTINOPLE;
+    return constantiNOPEl(gasCalculator, evmConfiguration, version);
+  }
+
+  private static EVM constantiNOPEl(
+      final GasCalculator gasCalculator,
+      final EvmConfiguration evmConfiguration,
+      final EvmSpecVersion version) {
     return new EVM(
-        constantinopleOperations(gasCalculator),
-        gasCalculator,
-        evmConfiguration,
-        EvmSpecVersion.CONSTANTINOPLE);
+        constantinopleOperations(gasCalculator), gasCalculator, evmConfiguration, version);
   }
 
   /**
@@ -455,7 +471,8 @@ public static void registerConstantinopleOperations(
    * @return the evm
    */
   public static EVM petersburg(final EvmConfiguration evmConfiguration) {
-    return constantinople(new PetersburgGasCalculator(), evmConfiguration);
+    return constantiNOPEl(
+        new PetersburgGasCalculator(), evmConfiguration, EvmSpecVersion.PETERSBURG);
   }
 
   /**
@@ -1145,7 +1162,7 @@ public static void registerFutureEipsOperations(
    * @return the evm
    */
   public static EVM experimentalEips(final EvmConfiguration evmConfiguration) {
-    return futureEips(DEV_NET_CHAIN_ID, evmConfiguration);
+    return experimentalEips(DEV_NET_CHAIN_ID, evmConfiguration);
   }
 
   /**
@@ -1157,7 +1174,7 @@ public static EVM experimentalEips(final EvmConfiguration evmConfiguration) {
    */
   public static EVM experimentalEips(
       final BigInteger chainId, final EvmConfiguration evmConfiguration) {
-    return futureEips(chainId, evmConfiguration);
+    return experimentalEips(new CancunGasCalculator(), chainId, evmConfiguration);
   }
 
   /**
@@ -1176,7 +1193,7 @@ public static EVM experimentalEips(
         experimentalEipsOperations(gasCalculator, chainId),
         gasCalculator,
         evmConfiguration,
-        EvmSpecVersion.FUTURE_EIPS);
+        EvmSpecVersion.EXPERIMENTAL_EIPS);
   }
 
   /**