From 747cf4fb13af13b9f88e5aef55d0887a90c73d14 Mon Sep 17 00:00:00 2001 From: Daniel Lehrner Date: Wed, 27 Nov 2024 15:22:49 +0100 Subject: [PATCH] code clean up Signed-off-by: Daniel Lehrner --- .../mainnet/MainnetTransactionProcessor.java | 12 ------------ .../ReferenceTestProtocolSchedules.java | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessor.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessor.java index 690f621b33c..3425708247a 100644 --- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessor.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetTransactionProcessor.java @@ -346,15 +346,6 @@ public TransactionProcessingResult processTransaction( throw new RuntimeException("Code delegation processor is required for 7702 transactions"); } - // if (evmWorldUpdater.parentUpdater().isEmpty()) { - // throw new RuntimeException("Code delegation needs the underlying world state"); - // } - - // get the underlying world state to commit code delegations without the transaction having - // to succeed - // final EVMWorldUpdater parentUpdater = - // (EVMWorldUpdater) evmWorldUpdater.parentUpdater().get(); - final CodeDelegationResult codeDelegationResult = maybeCodeDelegationProcessor.get().process(evmWorldUpdater, transaction); warmAddressList.addAll(codeDelegationResult.accessedDelegatorAddresses()); @@ -363,9 +354,6 @@ public TransactionProcessingResult processTransaction( (codeDelegationResult.alreadyExistingDelegators())); evmWorldUpdater.commit(); - - // authorizations will always be commited independently if the transaction succeeds or not - // parentUpdater.commit(); } final List accessListEntries = transaction.getAccessList().orElse(List.of()); diff --git a/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestProtocolSchedules.java b/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestProtocolSchedules.java index 1529a409526..0777b0503c3 100644 --- a/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestProtocolSchedules.java +++ b/ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestProtocolSchedules.java @@ -110,7 +110,7 @@ public static ReferenceTestProtocolSchedules create(final StubGenesisConfigOptio "Prague", createSchedule( genesisStub.clone().pragueTime(0) - // .osakaTime(0) // TODO remove this once osaka_devnet_0 ships + .osakaTime(0) // TODO remove this once osaka_devnet_0 ships )), Map.entry("Osaka", createSchedule(genesisStub.clone().osakaTime(0))), Map.entry("Amsterdam", createSchedule(genesisStub.clone().futureEipsTime(0))),