From 57ac5c865c1a4e4d706e21bef7bc57fa133e4aac Mon Sep 17 00:00:00 2001 From: Simon Dudley Date: Wed, 19 Feb 2025 05:58:18 +1000 Subject: [PATCH 1/2] Upgrade to execution-spec-tests version 4.0.0 fixtures_stable contains test fixtures for all forks up to Cancun, configured for all forks (up to and including Cancun). fixtures_develop contains Pectra test fixtures (we are not yet using this but will in a future commit). Signed-off-by: Simon Dudley --- ethereum/referencetests/build.gradle | 2 +- gradle/verification-metadata.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ethereum/referencetests/build.gradle b/ethereum/referencetests/build.gradle index 5fdf6d28e3c..4ef6b90779f 100644 --- a/ethereum/referencetests/build.gradle +++ b/ethereum/referencetests/build.gradle @@ -198,7 +198,7 @@ dependencies { referenceTestImplementation project(path: ':testutil') referenceTestImplementation project(path: ':util') // the following will be resolved via custom ivy repository declared in root build.gradle - referenceTestImplementation 'ethereum:execution-spec-tests:3.0.0:fixtures_stable@tar.gz' + referenceTestImplementation 'ethereum:execution-spec-tests:4.0.0:fixtures_stable@tar.gz' referenceTestImplementation 'com.fasterxml.jackson.core:jackson-databind' referenceTestImplementation 'com.google.guava:guava' referenceTestImplementation 'io.tmio:tuweni-bytes' diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index dc437e20b35..042f03f932e 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -1834,9 +1834,9 @@ - - - + + + From 470f2022cdca610e5c25aa37d88b64264d7a7b1a Mon Sep 17 00:00:00 2001 From: Simon Dudley Date: Wed, 19 Feb 2025 09:13:55 +1000 Subject: [PATCH 2/2] Use fixtures_develop to include pectra execution-spec-tests Unignore the BLS execution-spec-tests, but keep ignoring the older reference tests version Signed-off-by: Simon Dudley --- ethereum/referencetests/build.gradle | 2 +- .../besu/ethereum/vm/BlockchainReferenceTestTools.java | 3 +-- .../besu/ethereum/vm/GeneralStateReferenceTestTools.java | 3 +-- gradle/verification-metadata.xml | 3 +++ 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ethereum/referencetests/build.gradle b/ethereum/referencetests/build.gradle index 4ef6b90779f..b66a6310529 100644 --- a/ethereum/referencetests/build.gradle +++ b/ethereum/referencetests/build.gradle @@ -198,7 +198,7 @@ dependencies { referenceTestImplementation project(path: ':testutil') referenceTestImplementation project(path: ':util') // the following will be resolved via custom ivy repository declared in root build.gradle - referenceTestImplementation 'ethereum:execution-spec-tests:4.0.0:fixtures_stable@tar.gz' + referenceTestImplementation 'ethereum:execution-spec-tests:4.0.0:fixtures_develop@tar.gz' referenceTestImplementation 'com.fasterxml.jackson.core:jackson-databind' referenceTestImplementation 'com.google.guava:guava' referenceTestImplementation 'io.tmio:tuweni-bytes' diff --git a/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/vm/BlockchainReferenceTestTools.java b/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/vm/BlockchainReferenceTestTools.java index b273a8dd818..0c428f4f9db 100644 --- a/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/vm/BlockchainReferenceTestTools.java +++ b/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/vm/BlockchainReferenceTestTools.java @@ -92,8 +92,7 @@ public class BlockchainReferenceTestTools { // EOF tests don't have Prague stuff like deposits right now params.ignore("/stEOF/"); - // TODO: remove once updated EIP-2537 gas cost artifacts exist - params.ignore("/eip2537_bls_12_381_precompiles/"); + // These are for the older reference tests but EIP-2537 is covered by eip2537_bls_12_381_precompiles in the execution-spec-tests params.ignore("/stEIP2537/"); } diff --git a/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/vm/GeneralStateReferenceTestTools.java b/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/vm/GeneralStateReferenceTestTools.java index d18045b69d3..760f54cef88 100644 --- a/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/vm/GeneralStateReferenceTestTools.java +++ b/ethereum/referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/vm/GeneralStateReferenceTestTools.java @@ -117,8 +117,7 @@ private static ProtocolSpec protocolSpec(final String name) { // EOF tests are written against an older version of the spec params.ignore("/stEOF/"); - // TODO: remove once updated EIP-2537 gas cost artifacts exist - params.ignore("/eip2537_bls_12_381_precompiles/"); + // These are for the older reference tests but EIP-2537 is covered by eip2537_bls_12_381_precompiles in the execution-spec-tests params.ignore("/stEIP2537/"); } diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 042f03f932e..e956f8713f2 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -1838,6 +1838,9 @@ + + +