fix precompile address decimal/hex, allow precompiles up to 512

Signed-off-by: garyschulte <garyschulte@gmail.com>

Author: garyschulte

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

@@ -90,6 +90,9 @@ public class Address extends DelegatingBytes {
   /** The constant BLS12_MAP_FP2_TO_G2. */
   public static final Address BLS12_MAP_FP2_TO_G2 = Address.precompiled(0x11);
 
+  /** Precompile address for P256_VERIFY. */
+  public static final Address P256_VERIFY = Address.precompiled(0x0100);
+
   /** The constant ZERO. */
   public static final Address ZERO = Address.fromHexString("0x0");
 
@@ -214,10 +217,11 @@ public static Address fromHexStringStrict(final String str) {
    * @return the address
    */
   public static Address precompiled(final int value) {
-    // Keep it simple while we don't need precompiled above 127.
-    checkArgument(value < Byte.MAX_VALUE);
+    // Allow values up to 0x01FF (511) to encompass layer2 precompile address space
+    checkArgument(value < 0x01FF, "Precompiled value must be <= 0x01FF");
     final byte[] address = new byte[SIZE];
-    address[SIZE - 1] = (byte) value;
+    address[SIZE - 2] = (byte) (value >>> 8);       // High byte
+    address[SIZE - 1] = (byte) (value & 0xFF);      // Low byte
     return new Address(Bytes.wrap(address));
   }
 

evm/src/main/java/org/hyperledger/besu/evm/gascalculator/OsakaGasCalculator.java

@@ -15,10 +15,12 @@
 package org.hyperledger.besu.evm.gascalculator;
 
 import static org.hyperledger.besu.datatypes.Address.BLS12_MAP_FP2_TO_G2;
+import static org.hyperledger.besu.datatypes.Address.P256_VERIFY;
 import static org.hyperledger.besu.evm.internal.Words.clampedAdd;
 import static org.hyperledger.besu.evm.internal.Words.clampedMultiply;
 import static org.hyperledger.besu.evm.internal.Words.clampedToInt;
 
+import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.evm.internal.Words;
 import org.hyperledger.besu.evm.precompile.BigIntegerModularExponentiationPrecompiledContract;
 
@@ -37,7 +39,7 @@ public class OsakaGasCalculator extends PragueGasCalculator {
 
   /** Instantiates a new Osaka Gas Calculator. */
   public OsakaGasCalculator() {
-    this(BLS12_MAP_FP2_TO_G2.toArrayUnsafe()[19]);
+    this(P256_VERIFY.getInt(16));
   }
 
   /**
@@ -49,6 +51,26 @@ protected OsakaGasCalculator(final int maxPrecompile) {
     super(maxPrecompile);
   }
 
+  @Override
+  public boolean isPrecompile(final Address address) {
+    final byte[] addressBytes = address.toArrayUnsafe();
+
+    // First 18 bytes must be zero:
+    for (int i = 0; i < 18; i++) {
+      if (addressBytes[i] != 0) {
+        return false;
+      }
+    }
+
+    // Interpret last two bytes as big-endian unsigned short.
+    final int precompileValue =
+        (Byte.toUnsignedInt(addressBytes[18]) << 8) |
+            Byte.toUnsignedInt(addressBytes[19]);
+
+    // values in range [1, 0x01FF] inclusive to include L1 and L2 precompiles:
+    return precompileValue > 0 && precompileValue <= 0x01FF;
+  }
+
   @Override
   public long modExpGasCost(final Bytes input) {
     final long baseLength = BigIntegerModularExponentiationPrecompiledContract.baseLength(input);

evm/src/main/java/org/hyperledger/besu/evm/precompile/MainnetPrecompiledContracts.java

@@ -17,6 +17,8 @@
 import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.evm.gascalculator.GasCalculator;
 
+import static org.hyperledger.besu.datatypes.Address.P256_VERIFY;
+
 /** Provides the various precompiled contracts used on mainnet hard forks. */
 public interface MainnetPrecompiledContracts {
 
@@ -197,8 +199,8 @@ static void populateForOsaka(
     // EIP-7823 - Set upper bounds for MODEXP
     registry.put(
         Address.MODEXP, BigIntegerModularExponentiationPrecompiledContract.osaka(gasCalculator));
-    // RIP-7212 - secp256r1 P256VERIFY
-    registry.put(Address.precompiled(100), new P256VerifyPrecompiledContract(gasCalculator));
+    // EIP-7951 - secp256r1 P256VERIFY
+    registry.put(P256_VERIFY, new P256VerifyPrecompiledContract(gasCalculator));
   }
 
   /**