Refactor get mutable methods of the worldtstate provider

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/FlexiblePrivacyPrecompiledContract.java

@@ -18,7 +18,7 @@
 import static org.hyperledger.besu.ethereum.mainnet.PrivateStateUtils.KEY_IS_PERSISTING_PRIVATE_STATE;
 import static org.hyperledger.besu.ethereum.mainnet.PrivateStateUtils.KEY_PRIVATE_METADATA_UPDATER;
 import static org.hyperledger.besu.ethereum.mainnet.PrivateStateUtils.KEY_TRANSACTION_HASH;
-import static org.hyperledger.besu.ethereum.trie.diffbased.common.provider.WorldStateQueryParams.withStateRootAndBlockHashAndUpdateNodeHead;
+import static org.hyperledger.besu.ethereum.trie.diffbased.common.provider.WorldStateQueryParams.withStateRootAndUpdateNodeHead;
 
 import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.enclave.Enclave;
@@ -157,9 +157,7 @@ public PrecompileContractResult computePrecompile(
         privateStateRootResolver.resolveLastStateRoot(privacyGroupId, privateMetadataUpdater);
 
     final MutableWorldState disposablePrivateState =
-        privateWorldStateArchive
-            .getWorldState(withStateRootAndBlockHashAndUpdateNodeHead(lastRootHash, null))
-            .get();
+        privateWorldStateArchive.getWorldState(withStateRootAndUpdateNodeHead(lastRootHash)).get();
 
     final WorldUpdater privateWorldStateUpdater = disposablePrivateState.updater();
 

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/PrivacyPluginPrecompiledContract.java

@@ -14,7 +14,7 @@
  */
 package org.hyperledger.besu.ethereum.mainnet.precompiles.privacy;
 
-import static org.hyperledger.besu.ethereum.trie.diffbased.common.provider.WorldStateQueryParams.withStateRootAndBlockHashAndUpdateNodeHead;
+import static org.hyperledger.besu.ethereum.trie.diffbased.common.provider.WorldStateQueryParams.withStateRootAndUpdateNodeHead;
 
 import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
@@ -83,9 +83,7 @@ public PrecompileContractResult computePrecompile(
         privateStateRootResolver.resolveLastStateRoot(privacyGroupId, privateMetadataUpdater);
 
     final MutableWorldState disposablePrivateState =
-        privateWorldStateArchive
-            .getWorldState(withStateRootAndBlockHashAndUpdateNodeHead(lastRootHash, null))
-            .get();
+        privateWorldStateArchive.getWorldState(withStateRootAndUpdateNodeHead(lastRootHash)).get();
 
     final WorldUpdater privateWorldStateUpdater = disposablePrivateState.updater();
 

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/precompiles/privacy/PrivacyPrecompiledContract.java

@@ -18,7 +18,7 @@
 import static org.hyperledger.besu.ethereum.mainnet.PrivateStateUtils.KEY_PRIVATE_METADATA_UPDATER;
 import static org.hyperledger.besu.ethereum.mainnet.PrivateStateUtils.KEY_TRANSACTION_HASH;
 import static org.hyperledger.besu.ethereum.privacy.PrivateStateRootResolver.EMPTY_ROOT_HASH;
-import static org.hyperledger.besu.ethereum.trie.diffbased.common.provider.WorldStateQueryParams.withStateRootAndBlockHashAndUpdateNodeHead;
+import static org.hyperledger.besu.ethereum.trie.diffbased.common.provider.WorldStateQueryParams.withStateRootAndUpdateNodeHead;
 
 import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.datatypes.Hash;
@@ -173,9 +173,7 @@ public PrecompileContractResult computePrecompile(
         privateStateRootResolver.resolveLastStateRoot(privacyGroupId, privateMetadataUpdater);
 
     final MutableWorldState disposablePrivateState =
-        privateWorldStateArchive
-            .getWorldState(withStateRootAndBlockHashAndUpdateNodeHead(lastRootHash, null))
-            .get();
+        privateWorldStateArchive.getWorldState(withStateRootAndUpdateNodeHead(lastRootHash)).get();
 
     final WorldUpdater privateWorldStateUpdater = disposablePrivateState.updater();
 

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/PrivateGroupRehydrationBlockProcessor.java

@@ -15,7 +15,7 @@
 package org.hyperledger.besu.ethereum.privacy;
 
 import static org.hyperledger.besu.ethereum.privacy.PrivateStateRootResolver.EMPTY_ROOT_HASH;
-import static org.hyperledger.besu.ethereum.trie.diffbased.common.provider.WorldStateQueryParams.withStateRootAndBlockHashAndUpdateNodeHead;
+import static org.hyperledger.besu.ethereum.trie.diffbased.common.provider.WorldStateQueryParams.withStateRootAndUpdateNodeHead;
 
 import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.datatypes.Hash;
@@ -127,7 +127,7 @@ public BlockProcessingResult processBlock(
 
         final MutableWorldState disposablePrivateState =
             privateWorldStateArchive
-                .getWorldState(withStateRootAndBlockHashAndUpdateNodeHead(lastRootHash, null))
+                .getWorldState(withStateRootAndUpdateNodeHead(lastRootHash))
                 .get();
         final WorldUpdater privateWorldStateUpdater = disposablePrivateState.updater();
 

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/trie/diffbased/bonsai/BonsaiWorldStateProvider.java

@@ -25,7 +25,6 @@
 import org.hyperledger.besu.ethereum.trie.diffbased.bonsai.worldview.BonsaiWorldState;
 import org.hyperledger.besu.ethereum.trie.diffbased.common.provider.DiffBasedWorldStateProvider;
 import org.hyperledger.besu.ethereum.trie.diffbased.common.trielog.TrieLogManager;
-import org.hyperledger.besu.ethereum.trie.diffbased.common.worldview.WorldStateSharedConfig;
 import org.hyperledger.besu.ethereum.trie.patricia.StoredMerklePatriciaTrie;
 import org.hyperledger.besu.evm.internal.EvmConfiguration;
 import org.hyperledger.besu.plugin.ServiceManager;
@@ -60,7 +59,7 @@ public BonsaiWorldStateProvider(
     this.worldStateHealerSupplier = worldStateHealerSupplier;
     provideCachedWorldStorageManager(
         new BonsaiCachedWorldStorageManager(
-            this, worldStateKeyValueStorage, this::cloneBonsaiWorldStateConfig));
+            this, worldStateKeyValueStorage, worldStateSharedConfig));
     loadHeadWorldState(
         new BonsaiWorldState(
             this, worldStateKeyValueStorage, evmConfiguration, worldStateSharedConfig));
@@ -154,10 +153,6 @@ public void prepareStateHealing(final Address address, final Bytes location) {
     getBonsaiWorldStateKeyValueStorage().downgradeToPartialFlatDbMode();
   }
 
-  private WorldStateSharedConfig cloneBonsaiWorldStateConfig() {
-    return WorldStateSharedConfig.newBuilder(worldStateSharedConfig).build();
-  }
-
   @Override
   public void heal(final Optional<Address> maybeAccountToRepair, final Bytes location) {
     worldStateHealerSupplier.get().heal(maybeAccountToRepair, location);

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/trie/diffbased/bonsai/cache/BonsaiCachedWorldStorageManager.java

@@ -26,15 +26,13 @@
 import org.hyperledger.besu.ethereum.trie.diffbased.common.worldview.WorldStateSharedConfig;
 import org.hyperledger.besu.evm.internal.EvmConfiguration;
 
-import java.util.function.Supplier;
-
 public class BonsaiCachedWorldStorageManager extends DiffBasedCachedWorldStorageManager {
 
   public BonsaiCachedWorldStorageManager(
       final BonsaiWorldStateProvider archive,
       final DiffBasedWorldStateKeyValueStorage worldStateKeyValueStorage,
-      final Supplier<WorldStateSharedConfig> worldStateSharedConfigSupplier) {
-    super(archive, worldStateKeyValueStorage, worldStateSharedConfigSupplier);
+      final WorldStateSharedConfig worldStateSharedConfig) {
+    super(archive, worldStateKeyValueStorage, worldStateSharedConfig);
   }
 
   @Override
@@ -46,7 +44,7 @@ public DiffBasedWorldState createWorldState(
         (BonsaiWorldStateProvider) archive,
         (BonsaiWorldStateKeyValueStorage) worldStateKeyValueStorage,
         evmConfiguration,
-        worldStateSharedConfigSupplier.get());
+        WorldStateSharedConfig.newBuilder(worldStateSharedConfig).build());
   }
 
   @Override

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/trie/diffbased/bonsai/cache/NoOpBonsaiCachedWorldStorageManager.java

@@ -30,7 +30,7 @@ public NoOpBonsaiCachedWorldStorageManager(
     super(
         null,
         bonsaiWorldStateKeyValueStorage,
-        WorldStateSharedConfig::createStatefulConfigWithTrie);
+        WorldStateSharedConfig.createStatefulConfigWithTrie());
   }
 
   @Override

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/trie/diffbased/bonsai/worldview/BonsaiWorldState.java

@@ -36,7 +36,6 @@
 import org.hyperledger.besu.ethereum.trie.diffbased.common.trielog.TrieLogManager;
 import org.hyperledger.besu.ethereum.trie.diffbased.common.worldview.DiffBasedWorldState;
 import org.hyperledger.besu.ethereum.trie.diffbased.common.worldview.WorldStateSharedConfig;
-import org.hyperledger.besu.ethereum.trie.diffbased.common.worldview.WorldStateStorageConfig;
 import org.hyperledger.besu.ethereum.trie.diffbased.common.worldview.accumulator.DiffBasedWorldStateUpdateAccumulator;
 import org.hyperledger.besu.ethereum.trie.diffbased.common.worldview.accumulator.preload.StorageConsumingMap;
 import org.hyperledger.besu.ethereum.trie.patricia.StoredMerklePatriciaTrie;
@@ -67,14 +66,14 @@ public BonsaiWorldState(
       final BonsaiWorldStateProvider archive,
       final BonsaiWorldStateKeyValueStorage worldStateKeyValueStorage,
       final EvmConfiguration evmConfiguration,
-      final WorldStateSharedConfig worldStateSpec) {
+      final WorldStateSharedConfig worldStateConfig) {
     this(
         worldStateKeyValueStorage,
         archive.getCachedMerkleTrieLoader(),
         archive.getCachedWorldStorageManager(),
         archive.getTrieLogManager(),
         evmConfiguration,
-        worldStateSpec);
+        worldStateConfig);
   }
 
   public BonsaiWorldState(
@@ -86,7 +85,7 @@ public BonsaiWorldState(
         worldState.cachedWorldStorageManager,
         worldState.trieLogManager,
         worldState.accumulator.getEvmConfiguration(),
-        WorldStateSharedConfig.newBuilder(worldState.worldStateSpec).build());
+        WorldStateSharedConfig.newBuilder(worldState.worldStateConfig).build());
   }
 
   public BonsaiWorldState(
@@ -95,8 +94,8 @@ public BonsaiWorldState(
       final DiffBasedCachedWorldStorageManager cachedWorldStorageManager,
       final TrieLogManager trieLogManager,
       final EvmConfiguration evmConfiguration,
-      final WorldStateSharedConfig worldStateSpec) {
-    super(worldStateKeyValueStorage, cachedWorldStorageManager, trieLogManager, worldStateSpec);
+      final WorldStateSharedConfig worldStateConfig) {
+    super(worldStateKeyValueStorage, cachedWorldStorageManager, trieLogManager, worldStateConfig);
     this.bonsaiCachedMerkleTrieLoader = bonsaiCachedMerkleTrieLoader;
     this.worldStateKeyValueStorage = worldStateKeyValueStorage;
     this.setAccumulator(
@@ -302,7 +301,7 @@ private void updateAccountStorageState(
                         writeStorageTrieNode(
                             bonsaiUpdater, updatedAddressHash, location, key, value)));
         // only use storage root of the trie when trie is enabled
-        if (!worldStateSpec.isTrieDisabled()) {
+        if (!worldStateConfig.isTrieDisabled()) {
           final Hash newStorageRoot = Hash.wrap(storageTrie.getRootHash());
           accountUpdated.setStorageRoot(newStorageRoot);
         }
@@ -446,14 +445,13 @@ public Map<Bytes32, Bytes> getAllAccountStorage(final Address address, final Has
 
   @Override
   public MutableWorldState freeze() {
-    this.worldStateStorageSpec =
-        WorldStateStorageConfig.newBuilder(worldStateStorageSpec).setFrozen(true).build();
+    this.isStorageFrozen = true;
     this.worldStateKeyValueStorage = new BonsaiWorldStateLayerStorage(getWorldStateStorage());
     return this;
   }
 
   private MerkleTrie<Bytes, Bytes> createTrie(final NodeLoader nodeLoader, final Bytes32 rootHash) {
-    if (worldStateSpec.isTrieDisabled()) {
+    if (worldStateConfig.isTrieDisabled()) {
       return new NoOpMerkleTrie<>();
     } else {
       return new StoredMerklePatriciaTrie<>(

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/trie/diffbased/common/cache/DiffBasedCachedWorldStorageManager.java

@@ -36,7 +36,6 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
-import java.util.function.Supplier;
 
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
@@ -50,7 +49,7 @@ public abstract class DiffBasedCachedWorldStorageManager implements StorageSubsc
       LoggerFactory.getLogger(DiffBasedCachedWorldStorageManager.class);
   private final DiffBasedWorldStateProvider archive;
   private final EvmConfiguration evmConfiguration;
-  protected final Supplier<WorldStateSharedConfig> worldStateSharedConfigSupplier;
+  protected final WorldStateSharedConfig worldStateSharedConfig;
   private final Cache<Hash, BlockHeader> stateRootToBlockHeaderCache =
       Caffeine.newBuilder()
           .maximumSize(RETAINED_LAYERS)
@@ -65,25 +64,25 @@ private DiffBasedCachedWorldStorageManager(
       final DiffBasedWorldStateKeyValueStorage worldStateKeyValueStorage,
       final Map<Bytes32, DiffBasedCachedWorldView> cachedWorldStatesByHash,
       final EvmConfiguration evmConfiguration,
-      final Supplier<WorldStateSharedConfig> worldStateSharedConfigSupplier) {
+      final WorldStateSharedConfig worldStateSharedConfig) {
     worldStateKeyValueStorage.subscribe(this);
     this.rootWorldStateStorage = worldStateKeyValueStorage;
     this.cachedWorldStatesByHash = cachedWorldStatesByHash;
     this.archive = archive;
     this.evmConfiguration = evmConfiguration;
-    this.worldStateSharedConfigSupplier = worldStateSharedConfigSupplier;
+    this.worldStateSharedConfig = worldStateSharedConfig;
   }
 
   public DiffBasedCachedWorldStorageManager(
       final DiffBasedWorldStateProvider archive,
       final DiffBasedWorldStateKeyValueStorage worldStateKeyValueStorage,
-      final Supplier<WorldStateSharedConfig> worldStateSharedConfigSupplier) {
+      final WorldStateSharedConfig worldStateSharedConfig) {
     this(
         archive,
         worldStateKeyValueStorage,
         new ConcurrentHashMap<>(),
         EvmConfiguration.DEFAULT,
-        worldStateSharedConfigSupplier);
+        worldStateSharedConfig);
   }
 
   public synchronized void addCachedLayer(
@@ -94,7 +93,7 @@ public synchronized void addCachedLayer(
         Optional.ofNullable(this.cachedWorldStatesByHash.get(blockHeader.getBlockHash()));
     if (cachedDiffBasedWorldView.isPresent()) {
       // only replace if it is a layered storage
-      if (forWorldState.isHeadModifyingWorldState()
+      if (forWorldState.isModifyingHeadWorldState()
           && cachedDiffBasedWorldView.get().getWorldStateStorage()
               instanceof DiffBasedLayeredWorldStateKeyValueStorage) {
         LOG.atDebug()
@@ -113,7 +112,7 @@ public synchronized void addCachedLayer(
           .addArgument(blockHeader::toLogString)
           .addArgument(worldStateRootHash::toShortHexString)
           .log();
-      if (forWorldState.isHeadModifyingWorldState()) {
+      if (forWorldState.isModifyingHeadWorldState()) {
         cachedWorldStatesByHash.put(
             blockHeader.getHash(),
             new DiffBasedCachedWorldView(