Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 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
9 changes: 3 additions & 6 deletions acceptance-tests/tests/src/test/resources/dev/dev_prague.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,7 @@
"baseFeeUpdateFraction": 5007716
}
},
"clique": {
"period": 5,
"epoch": 30000
},
"ethash": {},
"depositContractAddress": "0x4242424242424242424242424242424242424242",
"withdrawalRequestContractAddress": "0x00A3ca265EBcb825B45F985A16CEFB49958cE017",
"consolidationRequestContractAddress": "0x00b42dbF2194e931E80326D950320f7d9Dbeac02"
Expand All @@ -44,7 +41,7 @@
"timestamp":"0x0",
"extraData":"0x0000000000000000000000000000000000000000000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"gasLimit":"0x1C9C380",
"difficulty":"0x400000000",
"difficulty":"0x0",
"mixHash":"0x0000000000000000000000000000000000000000000000000000000000000000",
"coinbase":"0x0000000000000000000000000000000000000000",
"alloc":{
Expand Down Expand Up @@ -142,4 +139,4 @@
"gasUsed":"0x0",
"parentHash":"0x0000000000000000000000000000000000000000000000000000000000000000",
"baseFeePerGas":"0x7"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -866,7 +866,10 @@ static ProtocolSpecBuilder cancunDefinition(
evm.getMaxInitcodeSize()))
.precompileContractRegistryBuilder(MainnetPrecompiledContractRegistries::cancun)
.blockHeaderValidatorBuilder(MainnetBlockHeaderValidator::blobAwareBlockHeaderValidator)
.preExecutionProcessor(new CancunPreExecutionProcessor())
.preExecutionProcessor(
isPoAConsensus(genesisConfigOptions)
? new FrontierPreExecutionProcessor()
: new CancunPreExecutionProcessor())
.hardforkId(CANCUN);
}

Expand Down Expand Up @@ -947,22 +950,36 @@ static ProtocolSpecBuilder pragueDefinition(
new CodeDelegationService()))
.build())
// EIP-2935 Blockhash processor
.preExecutionProcessor(new PraguePreExecutionProcessor())
.preExecutionProcessor(
isPoAConsensus(genesisConfigOptions)
? new FrontierPreExecutionProcessor()
: new PraguePreExecutionProcessor())
.hardforkId(PRAGUE);
try {
RequestContractAddresses requestContractAddresses =
RequestContractAddresses.fromGenesis(genesisConfigOptions);

pragueSpecBuilder.requestProcessorCoordinator(
pragueRequestsProcessors(requestContractAddresses));
} catch (NoSuchElementException nsee) {
LOG.warn("Prague definitions require system contract addresses in genesis");
throw nsee;
if (isPoAConsensus(genesisConfigOptions)) {
LOG.debug(
"Skipping system contract request processors for PoA consensus (clique/ibft/qbft).");
} else {
try {
RequestContractAddresses requestContractAddresses =
RequestContractAddresses.fromGenesis(genesisConfigOptions);

pragueSpecBuilder.requestProcessorCoordinator(
pragueRequestsProcessors(requestContractAddresses));
} catch (NoSuchElementException nsee) {
LOG.warn("Prague definitions require system contract addresses in genesis");
throw nsee;
}
}

return pragueSpecBuilder;
}

private static boolean isPoAConsensus(final GenesisConfigOptions genesisConfigOptions) {
return genesisConfigOptions.isClique()
|| genesisConfigOptions.isIbft2()
|| genesisConfigOptions.isQbft();
}

static ProtocolSpecBuilder osakaDefinition(
final Optional<BigInteger> chainId,
final boolean enableRevertReason,
Expand Down
Loading