Skip to content

[fusaka-devnet-2] EIP-7951 updates - fix unit tests #8821

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
macfarla merged 3 commits into from
Jun 13, 2025
Merged

[fusaka-devnet-2] EIP-7951 updates - fix unit tests #8821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f611f31
adjust tests to match changes to Address
macfarla Jun 13, 2025
dd6232a
comment
macfarla Jun 13, 2025
0519ed8
imports
macfarla Jun 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion datatypes/src/main/java/org/hyperledger/besu/datatypes/Address.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion evm/src/main/java/org/hyperledger/besu/evm/gascalculator/GasCalculator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import org.hyperledger.besu.evm.operation.SelfDestructOperation;
import org.hyperledger.besu.evm.precompile.ECRECPrecompiledContract;
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;
Expand Down Expand Up @@ -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
*/
Expand Down
4 changes: 3 additions & 1 deletion evm/src/test/java/org/hyperledger/besu/evm/gascalculator/OsakaGasCalculatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
Loading