Skip to content

Commit c0da5fa

Browse files
matktjflo
matkt
authored and
jflo
committed
create trie package for bonsai and forest (besu-eth#6300)
Signed-off-by: Karim Taam <karim.t2am@gmail.com> Signed-off-by: matkt <karim.t2am@gmail.com>
1 parent e33974e commit c0da5fa

File tree

93 files changed

+237
-236
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+237
-236
lines changed

‎besu/src/main/java/org/hyperledger/besu/cli/BesuCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@
130130
import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
131131
import org.hyperledger.besu.ethereum.eth.transactions.ImmutableTransactionPoolConfiguration;
132132
import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
133-
import org.hyperledger.besu.ethereum.forest.pruner.PrunerConfiguration;
134133
import org.hyperledger.besu.ethereum.mainnet.FrontierTargetingGasLimitCalculator;
135134
import org.hyperledger.besu.ethereum.p2p.config.DiscoveryConfiguration;
136135
import org.hyperledger.besu.ethereum.p2p.peers.EnodeDnsConfiguration;
@@ -147,6 +146,7 @@
147146
import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier;
148147
import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStorageProvider;
149148
import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStorageProviderBuilder;
149+
import org.hyperledger.besu.ethereum.trie.forest.pruner.PrunerConfiguration;
150150
import org.hyperledger.besu.evm.precompile.AbstractAltBnPrecompiledContract;
151151
import org.hyperledger.besu.evm.precompile.BigIntegerModularExponentiationPrecompiledContract;
152152
import org.hyperledger.besu.evm.precompile.KZGPointEvalPrecompiledContract;

‎besu/src/main/java/org/hyperledger/besu/cli/subcommands/operator/BackupState.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.hyperledger.besu.ethereum.api.query.StateBackupService.BackupStatus;
2727
import org.hyperledger.besu.ethereum.chain.MutableBlockchain;
2828
import org.hyperledger.besu.ethereum.eth.manager.EthScheduler;
29-
import org.hyperledger.besu.ethereum.forest.ForestWorldStateArchive;
29+
import org.hyperledger.besu.ethereum.trie.forest.ForestWorldStateArchive;
3030
import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
3131
import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
3232

‎besu/src/main/java/org/hyperledger/besu/cli/subcommands/operator/RestoreState.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030
import org.hyperledger.besu.ethereum.core.BlockHeader;
3131
import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions;
3232
import org.hyperledger.besu.ethereum.core.TransactionReceipt;
33-
import org.hyperledger.besu.ethereum.forest.ForestWorldStateArchive;
3433
import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
3534
import org.hyperledger.besu.ethereum.rlp.BytesValueRLPInput;
3635
import org.hyperledger.besu.ethereum.rlp.RLPInput;
3736
import org.hyperledger.besu.ethereum.trie.Node;
3837
import org.hyperledger.besu.ethereum.trie.PersistVisitor;
3938
import org.hyperledger.besu.ethereum.trie.RestoreVisitor;
39+
import org.hyperledger.besu.ethereum.trie.forest.ForestWorldStateArchive;
4040
import org.hyperledger.besu.ethereum.worldstate.StateTrieAccountValue;
4141
import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;
4242
import org.hyperledger.besu.util.io.RollingFileReader;

‎besu/src/main/java/org/hyperledger/besu/components/BesuComponent.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
package org.hyperledger.besu.components;
1818

1919
import org.hyperledger.besu.cli.BesuCommand;
20-
import org.hyperledger.besu.ethereum.bonsai.cache.CachedMerkleTrieLoader;
21-
import org.hyperledger.besu.ethereum.bonsai.cache.CachedMerkleTrieLoaderModule;
2220
import org.hyperledger.besu.ethereum.eth.transactions.BlobCache;
2321
import org.hyperledger.besu.ethereum.eth.transactions.BlobCacheModule;
22+
import org.hyperledger.besu.ethereum.trie.bonsai.cache.CachedMerkleTrieLoader;
23+
import org.hyperledger.besu.ethereum.trie.bonsai.cache.CachedMerkleTrieLoaderModule;
2424
import org.hyperledger.besu.metrics.MetricsSystemModule;
2525
import org.hyperledger.besu.metrics.ObservableMetricsSystem;
2626
import org.hyperledger.besu.services.BesuPluginContextImpl;

‎besu/src/main/java/org/hyperledger/besu/controller/BesuControllerBuilder.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@
3131
import org.hyperledger.besu.ethereum.ProtocolContext;
3232
import org.hyperledger.besu.ethereum.api.jsonrpc.methods.JsonRpcMethods;
3333
import org.hyperledger.besu.ethereum.blockcreation.MiningCoordinator;
34-
import org.hyperledger.besu.ethereum.bonsai.BonsaiWorldStateProvider;
35-
import org.hyperledger.besu.ethereum.bonsai.cache.CachedMerkleTrieLoader;
36-
import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage;
37-
import org.hyperledger.besu.ethereum.bonsai.trielog.TrieLogPruner;
3834
import org.hyperledger.besu.ethereum.chain.Blockchain;
3935
import org.hyperledger.besu.ethereum.chain.BlockchainStorage;
4036
import org.hyperledger.besu.ethereum.chain.ChainDataPruner;
@@ -78,16 +74,20 @@
7874
import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
7975
import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
8076
import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolFactory;
81-
import org.hyperledger.besu.ethereum.forest.ForestWorldStateArchive;
82-
import org.hyperledger.besu.ethereum.forest.pruner.MarkSweepPruner;
83-
import org.hyperledger.besu.ethereum.forest.pruner.Pruner;
84-
import org.hyperledger.besu.ethereum.forest.pruner.PrunerConfiguration;
8577
import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
8678
import org.hyperledger.besu.ethereum.mainnet.ProtocolSpec;
8779
import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration;
8880
import org.hyperledger.besu.ethereum.p2p.config.SubProtocolConfiguration;
8981
import org.hyperledger.besu.ethereum.storage.StorageProvider;
9082
import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier;
83+
import org.hyperledger.besu.ethereum.trie.bonsai.BonsaiWorldStateProvider;
84+
import org.hyperledger.besu.ethereum.trie.bonsai.cache.CachedMerkleTrieLoader;
85+
import org.hyperledger.besu.ethereum.trie.bonsai.storage.BonsaiWorldStateKeyValueStorage;
86+
import org.hyperledger.besu.ethereum.trie.bonsai.trielog.TrieLogPruner;
87+
import org.hyperledger.besu.ethereum.trie.forest.ForestWorldStateArchive;
88+
import org.hyperledger.besu.ethereum.trie.forest.pruner.MarkSweepPruner;
89+
import org.hyperledger.besu.ethereum.trie.forest.pruner.Pruner;
90+
import org.hyperledger.besu.ethereum.trie.forest.pruner.PrunerConfiguration;
9191
import org.hyperledger.besu.ethereum.worldstate.DataStorageConfiguration;
9292
import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
9393
import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;

‎besu/src/main/java/org/hyperledger/besu/controller/ConsensusScheduleBesuControllerBuilder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@
5353
import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
5454
import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
5555
import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
56-
import org.hyperledger.besu.ethereum.forest.pruner.PrunerConfiguration;
5756
import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
5857
import org.hyperledger.besu.ethereum.p2p.config.SubProtocolConfiguration;
5958
import org.hyperledger.besu.ethereum.storage.StorageProvider;
59+
import org.hyperledger.besu.ethereum.trie.forest.pruner.PrunerConfiguration;
6060
import org.hyperledger.besu.ethereum.worldstate.DataStorageConfiguration;
6161
import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
6262
import org.hyperledger.besu.evm.internal.EvmConfiguration;

‎besu/src/main/java/org/hyperledger/besu/controller/TransitionBesuControllerBuilder.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@
5050
import org.hyperledger.besu.ethereum.eth.sync.state.SyncState;
5151
import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
5252
import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
53-
import org.hyperledger.besu.ethereum.forest.pruner.Pruner;
54-
import org.hyperledger.besu.ethereum.forest.pruner.PrunerConfiguration;
5553
import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
5654
import org.hyperledger.besu.ethereum.storage.StorageProvider;
55+
import org.hyperledger.besu.ethereum.trie.forest.pruner.Pruner;
56+
import org.hyperledger.besu.ethereum.trie.forest.pruner.PrunerConfiguration;
5757
import org.hyperledger.besu.ethereum.worldstate.DataStorageConfiguration;
5858
import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
5959
import org.hyperledger.besu.ethereum.worldstate.WorldStateStorage;

‎besu/src/test/java/org/hyperledger/besu/cli/BesuCommandTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,11 @@
7979
import org.hyperledger.besu.ethereum.eth.sync.SyncMode;
8080
import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
8181
import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
82-
import org.hyperledger.besu.ethereum.forest.pruner.PrunerConfiguration;
8382
import org.hyperledger.besu.ethereum.p2p.peers.EnodeURLImpl;
8483
import org.hyperledger.besu.ethereum.permissioning.LocalPermissioningConfiguration;
8584
import org.hyperledger.besu.ethereum.permissioning.PermissioningConfiguration;
8685
import org.hyperledger.besu.ethereum.permissioning.SmartContractPermissioningConfiguration;
86+
import org.hyperledger.besu.ethereum.trie.forest.pruner.PrunerConfiguration;
8787
import org.hyperledger.besu.ethereum.worldstate.DataStorageConfiguration;
8888
import org.hyperledger.besu.evm.precompile.AbstractAltBnPrecompiledContract;
8989
import org.hyperledger.besu.evm.precompile.KZGPointEvalPrecompiledContract;

‎besu/src/test/java/org/hyperledger/besu/controller/BesuControllerBuilderTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,22 @@
3030
import org.hyperledger.besu.cryptoservices.NodeKeyUtils;
3131
import org.hyperledger.besu.datatypes.Hash;
3232
import org.hyperledger.besu.ethereum.GasLimitCalculator;
33-
import org.hyperledger.besu.ethereum.bonsai.cache.CachedMerkleTrieLoader;
34-
import org.hyperledger.besu.ethereum.bonsai.storage.BonsaiWorldStateKeyValueStorage;
35-
import org.hyperledger.besu.ethereum.bonsai.worldview.BonsaiWorldState;
3633
import org.hyperledger.besu.ethereum.chain.Blockchain;
3734
import org.hyperledger.besu.ethereum.core.MiningParameters;
3835
import org.hyperledger.besu.ethereum.core.PrivacyParameters;
3936
import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration;
4037
import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration;
4138
import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
42-
import org.hyperledger.besu.ethereum.forest.pruner.PrunerConfiguration;
4339
import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions;
4440
import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration;
4541
import org.hyperledger.besu.ethereum.storage.StorageProvider;
4642
import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueSegmentIdentifier;
4743
import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStoragePrefixedKeyBlockchainStorage;
4844
import org.hyperledger.besu.ethereum.storage.keyvalue.VariablesKeyValueStorage;
45+
import org.hyperledger.besu.ethereum.trie.bonsai.cache.CachedMerkleTrieLoader;
46+
import org.hyperledger.besu.ethereum.trie.bonsai.storage.BonsaiWorldStateKeyValueStorage;
47+
import org.hyperledger.besu.ethereum.trie.bonsai.worldview.BonsaiWorldState;
48+
import org.hyperledger.besu.ethereum.trie.forest.pruner.PrunerConfiguration;
4949
import org.hyperledger.besu.ethereum.worldstate.DataStorageConfiguration;
5050
import org.hyperledger.besu.ethereum.worldstate.DataStorageFormat;
5151
import org.hyperledger.besu.ethereum.worldstate.ImmutableDataStorageConfiguration;

‎consensus/qbft/src/integration-test/java/org/hyperledger/besu/consensus/qbft/support/TestContextBuilder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@
103103
import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration;
104104
import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolMetrics;
105105
import org.hyperledger.besu.ethereum.eth.transactions.sorter.GasPricePendingTransactionsSorter;
106-
import org.hyperledger.besu.ethereum.forest.ForestWorldStateArchive;
107106
import org.hyperledger.besu.ethereum.transaction.TransactionSimulator;
107+
import org.hyperledger.besu.ethereum.trie.forest.ForestWorldStateArchive;
108108
import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
109109
import org.hyperledger.besu.evm.internal.EvmConfiguration;
110110
import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;

0 commit comments

Comments
 (0)