a few fixes for preImageProxy usage, account and storage streaming

Signed-off-by: garyschulte <garyschulte@gmail.com>

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/storage/BonsaiWorldStateKeyValueStorage.java

@@ -58,6 +58,7 @@
 
 import org.apache.tuweni.bytes.Bytes;
 import org.apache.tuweni.bytes.Bytes32;
+import org.apache.tuweni.rlp.RLP;
 import org.apache.tuweni.units.bigints.UInt256;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -285,7 +286,7 @@ public NavigableMap<Bytes32, AccountStorageEntry> storageEntriesFrom(
                 e -> e.getKey(),
                 e ->
                     AccountStorageEntry.create(
-                        UInt256.fromBytes(e.getValue()),
+                        UInt256.fromBytes(RLP.decodeValue(e.getValue())),
                         Hash.wrap(e.getKey()),
                         preImageProxy.getStorageTrieKeyPreimage(e.getKey())),
                 (a, b) -> a,

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/storage/flat/FlatDbReaderStrategy.java

@@ -158,7 +158,7 @@ public Map<Bytes32, Bytes> streamStorageFlatDatabase(
             .streamFromKey(
                 ACCOUNT_STORAGE_STORAGE,
                 Bytes.concatenate(accountHash, startKeyHash).toArrayUnsafe())
-            .takeWhile(pair -> Bytes.wrap(pair.getKey()).slice(0, Hash.SIZE).equals(accountHash))
+            .filter(pair -> Bytes.wrap(pair.getKey()).slice(0, Hash.SIZE).equals(accountHash))
             .limit(max)
             .map(
                 pair ->

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

@@ -67,7 +67,7 @@ public class BonsaiWorldState
 
   private static final Logger LOG = LoggerFactory.getLogger(BonsaiWorldState.class);
 
-  private BonsaiWorldStateKeyValueStorage worldStateStorage;
+  protected BonsaiWorldStateKeyValueStorage worldStateStorage;
 
   protected final CachedMerkleTrieLoader cachedMerkleTrieLoader;
   protected final TrieLogManager trieLogManager;
@@ -218,7 +218,7 @@ private void updateTheAccounts(
       final BonsaiAccount updatedAccount = bonsaiValue.getUpdated();
       try {
         if (updatedAccount == null) {
-          final Hash addressHash = Hash.hash(accountKey);
+          final Hash addressHash = preImageProxy.hashAndSavePreImage(accountKey);
           accountTrie.remove(addressHash);
           maybeStateUpdater.ifPresent(
               bonsaiUpdater -> bonsaiUpdater.removeAccountInfoState(addressHash));
@@ -227,7 +227,8 @@ private void updateTheAccounts(
           final Bytes accountValue = updatedAccount.serializeAccount();
           maybeStateUpdater.ifPresent(
               bonsaiUpdater ->
-                  bonsaiUpdater.putAccountInfoState(Hash.hash(accountKey), accountValue));
+                  bonsaiUpdater.putAccountInfoState(
+                      preImageProxy.hashAndSavePreImage(accountKey), accountValue));
           accountTrie.put(addressHash, accountValue);
         }
       } catch (MerkleTrieException e) {

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/bonsai/worldview/BonsaiWorldStateUpdateAccumulator.java

@@ -340,7 +340,8 @@ public void commit() {
                 pendingCode.setUpdated(updatedAccount.getCode());
               }
 
-              // This is especially to avoid unnecessary computation for withdrawals
+              // This is especially to avoid unnecessary computation for withdrawals and
+              // self-destruct beneficiaries
               if (updatedAccount.getUpdatedStorage().isEmpty()) {
                 return;
               }

ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/StateTestSubCommand.java

@@ -260,6 +260,7 @@ private void traceTestSpecs(final String test, final List<GeneralStateTestCaseEi
           }
         }
         worldStateUpdater.commit();
+        worldState.freeze();
 
         summaryLine.put("output", result.getOutput().toUnprefixedHexString());
         final long gasUsed = transaction.getGasLimit() - result.getGasRemaining();

ethereum/referencetests/src/main/java/org/hyperledger/besu/ethereum/referencetests/ReferenceTestWorldState.java

@@ -93,5 +93,6 @@ static void insertAccount(
   static ReferenceTestWorldState create(final Map<String, AccountMock> accounts) {
     // delegate to a Bonsai reference test world state:
     return BonsaiReferenceTestWorldState.create(accounts);
+    //    return DefaultReferenceTestWorldState.create(accounts);
   }
 }

services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/LayeredKeyValueStorage.java

@@ -121,9 +121,9 @@ public Stream<Pair<byte[], byte[]>> stream(final SegmentIdentifier segmentId) {
 
   @Override
   public Stream<Pair<byte[], byte[]>> streamFromKey(
-      final SegmentIdentifier segmentId, final byte[] startKey) {
+      final SegmentIdentifier segmentId, final byte[] startKeyHash) {
     return stream(segmentId)
-        .filter(e -> Bytes.wrap(startKey).compareTo(Bytes.wrap(e.getKey())) <= 0);
+        .filter(e -> Bytes.wrap(startKeyHash).compareTo(Bytes.wrap(e.getKey())) <= 0);
   }
 
   @Override

services/kvstore/src/main/java/org/hyperledger/besu/services/kvstore/SegmentedKeyValueStorageAdapter.java

@@ -88,8 +88,9 @@ public Stream<Pair<byte[], byte[]>> stream() {
   }
 
   @Override
-  public Stream<Pair<byte[], byte[]>> streamFromKey(final byte[] startKey) throws StorageException {
-    return storage.streamFromKey(segmentIdentifier, startKey);
+  public Stream<Pair<byte[], byte[]>> streamFromKey(final byte[] startKeyHash)
+      throws StorageException {
+    return storage.streamFromKey(segmentIdentifier, startKeyHash);
   }
 
   @Override