From f611f3195a8b93696ed3ac57a368a46013842dbb Mon Sep 17 00:00:00 2001 From: Sally MacFarlane Date: Fri, 13 Jun 2025 14:38:24 +0200 Subject: [PATCH 1/3] adjust tests to match changes to Address Signed-off-by: Sally MacFarlane --- .../src/main/java/org/hyperledger/besu/datatypes/Address.java | 2 +- .../besu/evm/gascalculator/OsakaGasCalculatorTest.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/datatypes/src/main/java/org/hyperledger/besu/datatypes/Address.java b/datatypes/src/main/java/org/hyperledger/besu/datatypes/Address.java index 31f49713488..4799189d016 100644 --- a/datatypes/src/main/java/org/hyperledger/besu/datatypes/Address.java +++ b/datatypes/src/main/java/org/hyperledger/besu/datatypes/Address.java @@ -218,7 +218,7 @@ public static Address fromHexStringStrict(final String str) { */ public static Address precompiled(final int value) { // Allow values up to 0x01FF (511) to encompass layer2 precompile address space - checkArgument(value < 0x01FF, "Precompiled value must be <= 0x01FF"); + checkArgument(value <= 0x01FF, "Precompiled value must be <= 0x01FF"); final byte[] address = new byte[SIZE]; address[SIZE - 2] = (byte) (value >>> 8); // High byte address[SIZE - 1] = (byte) (value & 0xFF); // Low byte diff --git a/evm/src/test/java/org/hyperledger/besu/evm/gascalculator/OsakaGasCalculatorTest.java b/evm/src/test/java/org/hyperledger/besu/evm/gascalculator/OsakaGasCalculatorTest.java index 796dae64319..b310814dfc7 100644 --- a/evm/src/test/java/org/hyperledger/besu/evm/gascalculator/OsakaGasCalculatorTest.java +++ b/evm/src/test/java/org/hyperledger/besu/evm/gascalculator/OsakaGasCalculatorTest.java @@ -25,7 +25,9 @@ class OsakaGasCalculatorTest { @Test void testPrecompileSize() { OsakaGasCalculator subject = new OsakaGasCalculator(); - assertThat(subject.isPrecompile(Address.precompiled(0x14))).isFalse(); + assertThat(subject.isPrecompile(Address.precompiled(0x14))).isTrue(); + assertThat(subject.isPrecompile(Address.precompiled(0x01FF))).isTrue(); + assertThat(subject.isPrecompile(Address.P256_VERIFY)).isTrue(); assertThat(subject.isPrecompile(Address.BLS12_MAP_FP2_TO_G2)).isTrue(); } } From dd6232a2408232a9de518784c1e4a386d64f6804 Mon Sep 17 00:00:00 2001 From: Sally MacFarlane Date: Fri, 13 Jun 2025 14:38:36 +0200 Subject: [PATCH 2/3] comment Signed-off-by: Sally MacFarlane --- .../org/hyperledger/besu/evm/gascalculator/GasCalculator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/GasCalculator.java b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/GasCalculator.java index 79dc70e0d08..f24d3679299 100644 --- a/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/GasCalculator.java +++ b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/GasCalculator.java @@ -35,6 +35,7 @@ import org.hyperledger.besu.evm.operation.SLoadOperation; import org.hyperledger.besu.evm.operation.SelfDestructOperation; import org.hyperledger.besu.evm.precompile.ECRECPrecompiledContract; +import org.hyperledger.besu.evm.precompile.P256VerifyPrecompiledContract; import org.hyperledger.besu.evm.precompile.IDPrecompiledContract; import org.hyperledger.besu.evm.precompile.RIPEMD160PrecompiledContract; import org.hyperledger.besu.evm.precompile.SHA256PrecompiledContract; @@ -77,7 +78,7 @@ public interface GasCalculator { long getEcrecPrecompiledContractGasCost(); /** - * Returns the gas cost to execute the {@link ECRECPrecompiledContract}. + * Returns the gas cost to execute the {@link P256VerifyPrecompiledContract}. * * @return the gas cost to execute the P256Verify precompiled contract */ From 0519ed802179342ffdec050ed434cd8f1309c211 Mon Sep 17 00:00:00 2001 From: Sally MacFarlane Date: Fri, 13 Jun 2025 14:40:09 +0200 Subject: [PATCH 3/3] imports Signed-off-by: Sally MacFarlane --- .../org/hyperledger/besu/evm/gascalculator/GasCalculator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/GasCalculator.java b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/GasCalculator.java index f24d3679299..bc4a79fd2bd 100644 --- a/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/GasCalculator.java +++ b/evm/src/main/java/org/hyperledger/besu/evm/gascalculator/GasCalculator.java @@ -35,8 +35,8 @@ import org.hyperledger.besu.evm.operation.SLoadOperation; import org.hyperledger.besu.evm.operation.SelfDestructOperation; import org.hyperledger.besu.evm.precompile.ECRECPrecompiledContract; -import org.hyperledger.besu.evm.precompile.P256VerifyPrecompiledContract; import org.hyperledger.besu.evm.precompile.IDPrecompiledContract; +import org.hyperledger.besu.evm.precompile.P256VerifyPrecompiledContract; import org.hyperledger.besu.evm.precompile.RIPEMD160PrecompiledContract; import org.hyperledger.besu.evm.precompile.SHA256PrecompiledContract; import org.hyperledger.besu.evm.processor.AbstractMessageProcessor;