not close layered worldstate during getAccount

Signed-off-by: Karim TAAM <karim.t2am@gmail.com>

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/query/BlockchainQueries.java

@@ -855,12 +855,19 @@ public <U> Optional<U> getAndMapWorldState(
         .getBlockHeader(blockHash)
         .flatMap(
             blockHeader -> {
-              try (var ws =
+              try (final var worldState =
                   worldStateArchive
                       .getMutable(blockHeader.getStateRoot(), blockHeader.getHash(), false)
+                      .map(
+                          ws -> {
+                            if (!ws.isPersistable()) {
+                              return ws.copy();
+                            }
+                            return ws;
+                          })
                       .orElse(null)) {
-                if (ws != null) {
-                  return Optional.ofNullable(mapper.apply(ws));
+                if (worldState != null) {
+                  return Optional.ofNullable(mapper.apply(worldState));
                 }
               } catch (Exception ex) {
                 LOG.error("failed worldstate query for " + blockHash.toShortHexString(), ex);

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/BonsaiLayeredWorldState.java

@@ -91,9 +91,9 @@ private void maybeSubscribe() {
         .filter(BonsaiPersistedWorldState.class::isInstance)
         .map(BonsaiPersistedWorldState.class::cast)
         .ifPresent(
-            worldState ->
-                newtWorldViewSubscribeId =
-                    Optional.of(worldState.worldStateStorage.subscribe(this)));
+            worldState -> {
+              newtWorldViewSubscribeId = Optional.of(worldState.worldStateStorage.subscribe(this));
+            });
   }
 
   private void maybeUnSubscribe() {