Skip to content

Generalize state root computation future into a StateRootCommitter abstraction #9373

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
merged 6 commits into from
Oct 31, 2025
Merged

Generalize state root computation future into a StateRootCommitter abstraction #9373

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
de78a5c
Generalize state root computation future
mirgee Oct 29, 2025
39b05bd
Do not launch state root pre-computation in Forest mode
mirgee Oct 29, 2025
0478881
Make StateRootCommitter interface more abstract
mirgee Oct 30, 2025
7bd6b11
Add MutableWorldState#calculateOrReadRootHash and use in StateRootCom…
mirgee Oct 30, 2025
3f0088d
Update documentation
mirgee Oct 31, 2025
e9c6c7c
Merge branch 'main' into state-root-committer
matkt Oct 31, 2025
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
8 changes: 3 additions & 5 deletions ...pi/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/processor/Tracer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
import org.hyperledger.besu.ethereum.api.query.BlockchainQueries;
import org.hyperledger.besu.ethereum.core.BlockHeader;
import org.hyperledger.besu.ethereum.core.MutableWorldState;
import org.hyperledger.besu.ethereum.mainnet.staterootcommitter.StateRootCommitter;
import org.hyperledger.besu.evm.account.Account;
import org.hyperledger.besu.evm.worldstate.WorldUpdater;

import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.function.Function;
import java.util.stream.Stream;

Expand Down Expand Up @@ -64,10 +64,8 @@ private TraceableState(final MutableWorldState mutableWorldState) {
}

@Override
public void persist(
final BlockHeader blockHeader,
final Optional<CompletableFuture<Hash>> maybeStateRootFuture) {
mutableWorldState.persist(blockHeader, maybeStateRootFuture);
public void persist(final BlockHeader blockHeader, final StateRootCommitter committer) {
mutableWorldState.persist(blockHeader, committer);
}

@Override
Expand Down
7 changes: 5 additions & 2 deletions .../hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceiptTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
import org.hyperledger.besu.ethereum.mainnet.blockhash.FrontierPreExecutionProcessor;
import org.hyperledger.besu.ethereum.mainnet.feemarket.FeeMarket;
import org.hyperledger.besu.ethereum.mainnet.staterootcommitter.StateRootCommitterFactoryDefault;
import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
import org.hyperledger.besu.evm.gascalculator.CancunGasCalculator;

Expand Down Expand Up @@ -174,7 +175,8 @@ public String description() {
Duration.ofSeconds(12),
true,
Optional.empty(),
Optional.empty());
Optional.empty(),
new StateRootCommitterFactoryDefault());
private final ProtocolSpec statusTransactionTypeSpec =
new ProtocolSpec(
TestHardforkId.STATUS,
Expand Down Expand Up @@ -207,7 +209,8 @@ public String description() {
Duration.ofSeconds(12),
true,
Optional.empty(),
Optional.empty());
Optional.empty(),
new StateRootCommitterFactoryDefault());

@SuppressWarnings("unchecked")
private final ProtocolSchedule protocolSchedule = mock(ProtocolSchedule.class);
Expand Down
18 changes: 13 additions & 5 deletions ethereum/core/src/main/java/org/hyperledger/besu/ethereum/core/MutableWorldState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@
package org.hyperledger.besu.ethereum.core;

import org.hyperledger.besu.datatypes.Hash;
import org.hyperledger.besu.ethereum.mainnet.staterootcommitter.StateRootCommitter;
import org.hyperledger.besu.ethereum.mainnet.staterootcommitter.StateRootCommitterImplSync;
import org.hyperledger.besu.ethereum.trie.pathbased.common.worldview.WorldStateConfig;
import org.hyperledger.besu.ethereum.worldstate.WorldStateKeyValueStorage;
import org.hyperledger.besu.evm.worldstate.MutableWorldView;
import org.hyperledger.besu.evm.worldstate.WorldState;

import java.util.Optional;
import java.util.concurrent.CompletableFuture;

public interface MutableWorldState extends WorldState, MutableWorldView {

/**
Expand All @@ -30,10 +31,17 @@ public interface MutableWorldState extends WorldState, MutableWorldView {
* represents. If this does not represent a forward transition from one block to the next
* `null` should be passed in.
*/
void persist(BlockHeader blockHeader, Optional<CompletableFuture<Hash>> maybeStateRootFuture);
void persist(BlockHeader blockHeader, StateRootCommitter committer);

default void persist(final BlockHeader blockHeader) {
persist(blockHeader, Optional.empty());
persist(blockHeader, new StateRootCommitterImplSync());
}

default Hash calculateOrReadRootHash(
final WorldStateKeyValueStorage.Updater stateUpdater,
final BlockHeader blockHeader,
final WorldStateConfig cfg) {
throw new UnsupportedOperationException("calculateOrReadRootHash is not supported");
}

default MutableWorldState freezeStorage() {
Expand Down
Loading