Skip to content

Do not set up pre-execution and request processors for PoA networks #9623

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
matkt merged 6 commits into from
Jan 19, 2026
Merged

Do not set up pre-execution and request processors for PoA networks #9623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c769991
Do not set up pre-execution and request processors for PoA networks
mirgee Jan 12, 2026
fd43438
Fix failing code delegation acceptance test by running node in PoS mode
mirgee Jan 18, 2026
73f892f
Merge branch 'main' into no-system-call-processors-for-poa
matkt Jan 19, 2026
4e20dcb
fix acceptances tests using ethash
matkt Jan 19, 2026
923aa16
Merge branch 'main' into no-system-call-processors-for-poa
matkt Jan 19, 2026
1174ac1
Merge branch 'main' into no-system-call-processors-for-poa
matkt Jan 19, 2026
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
7 changes: 2 additions & 5 deletions acceptance-tests/tests/src/test/resources/dev/dev_prague.json
View file
Open in desktop
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 Down Expand Up @@ -142,4 +139,4 @@
"gasUsed":"0x0",
"parentHash":"0x0000000000000000000000000000000000000000000000000000000000000000",
"baseFeePerGas":"0x7"
}
}
5 changes: 1 addition & 4 deletions acceptance-tests/tests/src/test/resources/jsonrpc/engine/osaka/genesis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@
"cancunTime":0,
"pragueTime":0,
"osakaTime": 32,
"clique": {
"period": 5,
"epoch": 30000
},
"ethash": {},
"depositContractAddress": "0x4242424242424242424242424242424242424242",
"withdrawalRequestContractAddress": "0x00A3ca265EBcb825B45F985A16CEFB49958cE017",
"consolidationRequestContractAddress": "0x00b42dbF2194e931E80326D950320f7d9Dbeac02"
Expand Down
5 changes: 1 addition & 4 deletions acceptance-tests/tests/src/test/resources/jsonrpc/engine/paris/genesis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@
"berlinBlock":0,
"londonBlock":0,
"terminalTotalDifficulty":0,
"clique": {
"period": 5,
"epoch": 30000
}
"ethash": {}
},
"nonce":"0x42",
"timestamp":"0x0",
Expand Down
5 changes: 1 addition & 4 deletions acceptance-tests/tests/src/test/resources/jsonrpc/engine/prague/genesis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,7 @@
"terminalTotalDifficulty":0,
"cancunTime":0,
"pragueTime":20,
"clique": {
"period": 5,
"epoch": 30000
},
"ethash": {},
"depositContractAddress": "0x4242424242424242424242424242424242424242",
"withdrawalRequestContractAddress": "0x00A3ca265EBcb825B45F985A16CEFB49958cE017",
"consolidationRequestContractAddress": "0x00b42dbF2194e931E80326D950320f7d9Dbeac02"
Expand Down
5 changes: 1 addition & 4 deletions acceptance-tests/tests/src/test/resources/jsonrpc/engine/shanghai/genesis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,7 @@
"londonBlock":0,
"terminalTotalDifficulty":0,
"shanghaiTime":10,
"clique": {
"period": 5,
"epoch": 30000
}
"ethash": {}
},
"nonce":"0x42",
"timestamp":"0x0",
Expand Down
5 changes: 1 addition & 4 deletions acceptance-tests/tests/src/test/resources/jsonrpc/eth/getBlockBy/genesis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@
"berlinBlock":0,
"londonBlock":0,
"shanghaiTime":10,
"clique": {
"period": 5,
"epoch": 30000
},
"ethash": {},
"terminalTotalDifficulty":0
},
"nonce":"0x42",
Expand Down
39 changes: 28 additions & 11 deletions ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecs.java
View file
Open in desktop
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