Skip to content
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.

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

Add Paris Support to tests #6933

Merged
merged 2 commits into from
Apr 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ public static ReferenceTestProtocolSchedules create(final StubGenesisConfigOptio
builder.put("ArrowGlacier", createSchedule(genesisStub.clone().arrowGlacierBlock(0)));
builder.put("GrayGlacier", createSchedule(genesisStub.clone().grayGlacierBlock(0)));
builder.put("Merge", createSchedule(genesisStub.clone().mergeNetSplitBlock(0)));
builder.put("Paris", createSchedule(genesisStub.clone().mergeNetSplitBlock(0)));
builder.put("Shanghai", createSchedule(genesisStub.clone().shanghaiTime(0)));
builder.put(
"ShanghaiToCancunAtTime15k",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public class BlockchainReferenceTestTools {
"test.ethereum.blockchain.eips",
"FrontierToHomesteadAt5,HomesteadToEIP150At5,HomesteadToDaoAt5,EIP158ToByzantiumAt5,"
+ "Frontier,Homestead,EIP150,EIP158,Byzantium,Constantinople,ConstantinopleFix,Istanbul,Berlin,"
+ "London,Merge,Shanghai,Cancun,Prague,Osaka,Bogota");
+ "London,Merge,Paris,Shanghai,Cancun,Prague,Osaka,Bogota");
NETWORKS_TO_RUN = Arrays.asList(networks.split(","));
}

Expand Down Expand Up @@ -87,7 +87,7 @@ public class BlockchainReferenceTestTools {
// Inconclusive fork choice rule, since in merge CL should be choosing forks and setting the
// chain head.
// Perfectly valid test pre-merge.
params.ignore("UncleFromSideChain_(Merge|Shanghai|Cancun|Prague|Osaka|Bogota)");
params.ignore("UncleFromSideChain_(Merge|Paris|Shanghai|Cancun|Prague|Osaka|Bogota)");

// EOF tests are written against an older version of the spec
params.ignore("/stEOF/");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ private static ProtocolSpec protocolSpec(final String name) {
System.getProperty(
"test.ethereum.state.eips",
"Frontier,Homestead,EIP150,EIP158,Byzantium,Constantinople,ConstantinopleFix,Istanbul,Berlin,"
+ "London,Merge,Shanghai,Cancun,Prague,Osaka,Bogota");
+ "London,Merge,Paris,Shanghai,Cancun,Prague,Osaka,Bogota");
EIPS_TO_RUN = Arrays.asList(eips.split(","));
}

Expand Down
Loading