Skip to content

Commit ffa6ff8

Browse files
AliZDev-v0fab-10
AliZDev-v0
and
fab-10
authored
Move WorldStateKeyValueStorage and WorldStatePreimageStorage to plugin-api; preparement for creating WorldStateArchiveProvider (#9897)
* move to plugin api Signed-off-by: Ali <alijakparov.kz@gmail.com> * run spotlessApply Signed-off-by: Ali <alijakparov.kz@gmail.com> * update has Signed-off-by: Ali <alijakparov.kz@gmail.com> * add javadoc Signed-off-by: Ali <alijakparov.kz@gmail.com> * run spotless appy Signed-off-by: Ali <alijakparov.kz@gmail.com> * refactor Signed-off-by: Ali <alijakparov.kz@gmail.com> * update javadoc Signed-off-by: Ali <alijakparov.kz@gmail.com> * use WorldStateKeyValueStorage in test Signed-off-by: Ali <alijakparov.kz@gmail.com> * update plugin api hash Signed-off-by: Ali <alijakparov.kz@gmail.com> * run spotless update plugin api has Signed-off-by: Ali <alijakparov.kz@gmail.com> * fix errors Signed-off-by: Ali <alijakparov.kz@gmail.com> * fix errors Signed-off-by: Ali <alijakparov.kz@gmail.com> * fix errors Signed-off-by: Ali <alijakparov.kz@gmail.com> * merge main and update hash for plugin api Signed-off-by: Ali <alijakparov.kz@gmail.com> * update plugin api hasj Signed-off-by: Ali <alijakparov.kz@gmail.com> * fix test Signed-off-by: Ali <alijakparov.kz@gmail.com> --------- Signed-off-by: Ali <alijakparov.kz@gmail.com> Co-authored-by: Fabio Di Fabio <fabio.difabio@consensys.net>
1 parent 530f182 commit ffa6ff8

File tree

42 files changed

+143
-87
lines changed

Some content is hidden

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

42 files changed

+143
-87
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,14 +100,14 @@
100100
import org.hyperledger.besu.ethereum.worldstate.PathBasedExtraStorageConfiguration;
101101
import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
102102
import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive.WorldStateHealer;
103-
import org.hyperledger.besu.ethereum.worldstate.WorldStateKeyValueStorage;
104-
import org.hyperledger.besu.ethereum.worldstate.WorldStatePreimageStorage;
105103
import org.hyperledger.besu.ethereum.worldstate.WorldStateStorageCoordinator;
106104
import org.hyperledger.besu.evm.internal.EvmConfiguration;
107105
import org.hyperledger.besu.metrics.ObservableMetricsSystem;
108106
import org.hyperledger.besu.plugin.ServiceManager;
109107
import org.hyperledger.besu.plugin.services.permissioning.NodeMessagePermissioningProvider;
110108
import org.hyperledger.besu.plugin.services.storage.DataStorageFormat;
109+
import org.hyperledger.besu.plugin.services.storage.WorldStateKeyValueStorage;
110+
import org.hyperledger.besu.plugin.services.storage.WorldStatePreimageStorage;
111111
import org.hyperledger.besu.services.BesuPluginContextImpl;
112112

113113
import java.io.Closeable;

‎app/src/test/java/org/hyperledger/besu/controller/AbstractBftBesuControllerBuilderTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@
4747
import org.hyperledger.besu.ethereum.storage.keyvalue.VariablesKeyValueStorage;
4848
import org.hyperledger.besu.ethereum.trie.forest.storage.ForestWorldStateKeyValueStorage;
4949
import org.hyperledger.besu.ethereum.worldstate.DataStorageConfiguration;
50-
import org.hyperledger.besu.ethereum.worldstate.WorldStatePreimageStorage;
5150
import org.hyperledger.besu.ethereum.worldstate.WorldStateStorageCoordinator;
5251
import org.hyperledger.besu.evm.internal.EvmConfiguration;
5352
import org.hyperledger.besu.metrics.ObservableMetricsSystem;
5453
import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
54+
import org.hyperledger.besu.plugin.services.storage.WorldStatePreimageStorage;
5555
import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
5656

5757
import java.math.BigInteger;

‎app/src/test/java/org/hyperledger/besu/controller/MergeBesuControllerBuilderTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@
5858
import org.hyperledger.besu.ethereum.trie.pathbased.bonsai.cache.CodeCache;
5959
import org.hyperledger.besu.ethereum.worldstate.DataStorageConfiguration;
6060
import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
61-
import org.hyperledger.besu.ethereum.worldstate.WorldStatePreimageStorage;
6261
import org.hyperledger.besu.ethereum.worldstate.WorldStateStorageCoordinator;
6362
import org.hyperledger.besu.evm.internal.EvmConfiguration;
6463
import org.hyperledger.besu.metrics.ObservableMetricsSystem;
6564
import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem;
65+
import org.hyperledger.besu.plugin.services.storage.WorldStatePreimageStorage;
6666
import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage;
6767

6868
import java.math.BigInteger;

‎ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/staterootcommitter/BalStateRootCommitterFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
import org.hyperledger.besu.ethereum.trie.pathbased.common.storage.PathBasedWorldStateKeyValueStorage;
2727
import org.hyperledger.besu.ethereum.trie.pathbased.common.worldview.PathBasedWorldState;
2828
import org.hyperledger.besu.ethereum.trie.pathbased.common.worldview.accumulator.PathBasedWorldStateUpdateAccumulator;
29-
import org.hyperledger.besu.ethereum.worldstate.WorldStateKeyValueStorage;
3029
import org.hyperledger.besu.plugin.data.BlockHeader;
30+
import org.hyperledger.besu.plugin.services.storage.WorldStateKeyValueStorage;
3131

3232
import java.time.Duration;
3333
import java.util.Optional;

‎ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/staterootcommitter/StateRootCommitter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
import org.hyperledger.besu.datatypes.Hash;
1818
import org.hyperledger.besu.ethereum.core.MutableWorldState;
19-
import org.hyperledger.besu.ethereum.worldstate.WorldStateKeyValueStorage;
2019
import org.hyperledger.besu.plugin.data.BlockHeader;
2120
import org.hyperledger.besu.plugin.services.metrics.OperationTimer;
21+
import org.hyperledger.besu.plugin.services.storage.WorldStateKeyValueStorage;
2222

2323
import java.util.function.Supplier;
2424

‎ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/StorageProvider.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
import org.hyperledger.besu.ethereum.chain.VariablesStorage;
1919
import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
2020
import org.hyperledger.besu.ethereum.worldstate.DataStorageConfiguration;
21-
import org.hyperledger.besu.ethereum.worldstate.WorldStateKeyValueStorage;
22-
import org.hyperledger.besu.ethereum.worldstate.WorldStatePreimageStorage;
2321
import org.hyperledger.besu.ethereum.worldstate.WorldStateStorageCoordinator;
2422
import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
2523
import org.hyperledger.besu.plugin.services.storage.SegmentIdentifier;
2624
import org.hyperledger.besu.plugin.services.storage.SegmentedKeyValueStorage;
25+
import org.hyperledger.besu.plugin.services.storage.WorldStateKeyValueStorage;
26+
import org.hyperledger.besu.plugin.services.storage.WorldStatePreimageStorage;
2727

2828
import java.io.Closeable;
2929
import java.util.List;

‎ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/KeyValueStorageProvider.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
import org.hyperledger.besu.ethereum.trie.forest.storage.ForestWorldStateKeyValueStorage;
2323
import org.hyperledger.besu.ethereum.trie.pathbased.bonsai.storage.BonsaiWorldStateKeyValueStorage;
2424
import org.hyperledger.besu.ethereum.worldstate.DataStorageConfiguration;
25-
import org.hyperledger.besu.ethereum.worldstate.WorldStateKeyValueStorage;
26-
import org.hyperledger.besu.ethereum.worldstate.WorldStatePreimageStorage;
2725
import org.hyperledger.besu.ethereum.worldstate.WorldStateStorageCoordinator;
2826
import org.hyperledger.besu.metrics.ObservableMetricsSystem;
2927
import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
3028
import org.hyperledger.besu.plugin.services.storage.SegmentIdentifier;
3129
import org.hyperledger.besu.plugin.services.storage.SegmentedKeyValueStorage;
30+
import org.hyperledger.besu.plugin.services.storage.WorldStateKeyValueStorage;
31+
import org.hyperledger.besu.plugin.services.storage.WorldStatePreimageStorage;
3232
import org.hyperledger.besu.services.kvstore.SegmentedKeyValueStorageAdapter;
3333

3434
import java.io.IOException;

‎ethereum/core/src/main/java/org/hyperledger/besu/ethereum/storage/keyvalue/WorldStatePreimageKeyValueStorage.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
package org.hyperledger.besu.ethereum.storage.keyvalue;
1616

1717
import org.hyperledger.besu.datatypes.Address;
18-
import org.hyperledger.besu.ethereum.worldstate.WorldStatePreimageStorage;
1918
import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
2019
import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction;
20+
import org.hyperledger.besu.plugin.services.storage.WorldStatePreimageStorage;
2121

2222
import java.util.Optional;
2323

‎ethereum/core/src/main/java/org/hyperledger/besu/ethereum/trie/forest/ForestWorldStateArchive.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
import org.hyperledger.besu.ethereum.trie.forest.worldview.ForestMutableWorldState;
2525
import org.hyperledger.besu.ethereum.trie.pathbased.common.provider.WorldStateQueryParams;
2626
import org.hyperledger.besu.ethereum.worldstate.WorldStateArchive;
27-
import org.hyperledger.besu.ethereum.worldstate.WorldStatePreimageStorage;
2827
import org.hyperledger.besu.ethereum.worldstate.WorldStateStorageCoordinator;
2928
import org.hyperledger.besu.evm.internal.EvmConfiguration;
3029
import org.hyperledger.besu.evm.worldstate.WorldState;
3130
import org.hyperledger.besu.plugin.data.BlockHeader;
31+
import org.hyperledger.besu.plugin.services.storage.WorldStatePreimageStorage;
3232

3333
import java.util.List;
3434
import java.util.Optional;

‎ethereum/core/src/main/java/org/hyperledger/besu/ethereum/trie/forest/storage/ForestWorldStateKeyValueStorage.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616

1717
import org.hyperledger.besu.datatypes.Hash;
1818
import org.hyperledger.besu.ethereum.trie.MerkleTrie;
19-
import org.hyperledger.besu.ethereum.worldstate.WorldStateKeyValueStorage;
2019
import org.hyperledger.besu.plugin.services.storage.DataStorageFormat;
2120
import org.hyperledger.besu.plugin.services.storage.KeyValueStorage;
2221
import org.hyperledger.besu.plugin.services.storage.KeyValueStorageTransaction;
22+
import org.hyperledger.besu.plugin.services.storage.WorldStateKeyValueStorage;
2323
import org.hyperledger.besu.util.Subscribers;
2424

2525
import java.util.HashSet;

0 commit comments

Comments
 (0)