Stream dependency replacement with walk all value nodes

packages/statemanager/src/stateManager.ts

@@ -1,6 +1,6 @@
 import { Chain, Common } from '@ethereumjs/common'
 import { RLP } from '@ethereumjs/rlp'
-import { Trie, createTrieFromProof, verifyTrieProof } from '@ethereumjs/trie'
+import { LeafNode, Trie, createTrieFromProof, verifyTrieProof } from '@ethereumjs/trie'
 import {
   Account,
   Address,
@@ -39,6 +39,7 @@ import type {
   StorageDump,
   StorageRange,
 } from '@ethereumjs/common'
+import type { Nibbles, TrieNode } from '@ethereumjs/trie'
 import type { DB, PrefixedHexString } from '@ethereumjs/util'
 import type { Debugger } from 'debug'
 
@@ -984,26 +985,32 @@ export class DefaultStateManager implements EVMStateManagerInterface {
    * Both are represented as hex strings without the `0x` prefix.
    */
   async dumpStorage(address: Address): Promise<StorageDump> {
+    function nibblestoBytes(arr: Nibbles): Uint8Array {
+      const buf = new Uint8Array(arr.length / 2)
+      for (let i = 0; i < buf.length; i++) {
+        let q = i * 2
+        buf[i] = (arr[q] << 4) + arr[++q]
+      }
+      return buf
+    }
+
     await this.flush()
     const account = await this.getAccount(address)
     if (!account) {
       throw new Error(`dumpStorage f() can only be called for an existing account`)
     }
     const trie = this._getStorageTrie(address, account)
 
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve, _) => {
       const storage: StorageDump = {}
-      const stream = trie.createReadStream()
 
-      stream.on('data', (val: any) => {
-        storage[bytesToHex(val.key)] = bytesToHex(val.value)
-      })
-      stream.on('end', () => {
-        resolve(storage)
-      })
-      stream.on('error', (e) => {
-        reject(e)
-      })
+      return trie
+        .walkAllValueNodes(async (node: TrieNode, _) => {
+          if (node instanceof LeafNode) {
+            storage[bytesToHex(nibblestoBytes(node._nibbles))] = bytesToHex(node._value)
+          }
+        })
+        .then((_) => resolve(storage))
     })
   }
 
@@ -1017,6 +1024,15 @@ export class DefaultStateManager implements EVMStateManagerInterface {
    The object will also contain `nextKey`, the next (hashed) storage key after the range included in `storage`.
    */
   async dumpStorageRange(address: Address, startKey: bigint, limit: number): Promise<StorageRange> {
+    function nibblestoBytes(arr: Nibbles): Uint8Array {
+      const buf = new Uint8Array(arr.length / 2)
+      for (let i = 0; i < buf.length; i++) {
+        let q = i * 2
+        buf[i] = (arr[q] << 4) + arr[++q]
+      }
+      return buf
+    }
+
     if (!Number.isSafeInteger(limit) || limit < 0) {
       throw new Error(`Limit is not a proper uint.`)
     }
@@ -1026,44 +1042,48 @@ export class DefaultStateManager implements EVMStateManagerInterface {
     if (!account) {
       throw new Error(`Account does not exist.`)
     }
+
     const trie = this._getStorageTrie(address, account)
 
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve, _) => {
       let inRange = false
       let i = 0
 
       /** Object conforming to {@link StorageRange.storage}. */
       const storageMap: StorageRange['storage'] = {}
-      const stream = trie.createReadStream()
-
-      stream.on('data', (val: any) => {
-        if (!inRange) {
-          // Check if the key is already in the correct range.
-          if (bytesToBigInt(val.key) >= startKey) {
-            inRange = true
-          } else {
-            return
-          }
-        }
 
-        if (i < limit) {
-          storageMap[bytesToHex(val.key)] = { key: null, value: bytesToHex(val.value) }
-          i++
-        } else if (i === limit) {
+      return trie
+        .walkAllValueNodes(async (node: TrieNode, currentKey) => {
+          if (node instanceof LeafNode) {
+            // storage[bytesToHex(nibblestoBytes(node._nibbles))] = bytesToHex(node._value)
+
+            const keyBytes = nibblestoBytes(currentKey.concat(node.key()))
+            if (!inRange) {
+              // Check if the key is already in the correct range.
+              if (bytesToBigInt(keyBytes) >= startKey) {
+                inRange = true
+              } else {
+                return
+              }
+            }
+
+            if (i < limit) {
+              storageMap[bytesToHex(keyBytes)] = { key: null, value: bytesToHex(node._value) }
+              i++
+            } else if (i === limit) {
+              resolve({
+                storage: storageMap,
+                nextKey: bytesToHex(keyBytes),
+              })
+            }
+          }
+        })
+        .then((_) =>
           resolve({
             storage: storageMap,
-            nextKey: bytesToHex(val.key),
+            nextKey: null,
           })
-        }
-      })
-
-      stream.on('end', () => {
-        resolve({
-          storage: storageMap,
-          nextKey: null,
-        })
-      })
-      stream.on('error', (e) => reject(e))
+        )
     })
   }
 

packages/trie/package.json

@@ -59,8 +59,7 @@
     "@types/readable-stream": "^2.3.13",
     "debug": "^4.3.4",
     "lru-cache": "10.1.0",
-    "ethereum-cryptography": "^2.2.1",
-    "readable-stream": "^3.6.0"
+    "ethereum-cryptography": "^2.2.1"
   },
   "devDependencies": {
     "@ethereumjs/genesis": "^0.2.2",

packages/trie/src/trie.ts

@@ -30,7 +30,6 @@ import { verifyRangeProof } from './proof/range.js'
 import { ROOT_DB_KEY } from './types.js'
 import { _walkTrie } from './util/asyncWalk.js'
 import { bytesToNibbles, matchingNibbleLength } from './util/nibbles.js'
-import { TrieReadStream as ReadStream } from './util/readStream.js'
 import { WalkController } from './util/walkController.js'
 
 import type {
@@ -1081,14 +1080,6 @@ export class Trie {
     return true
   }
 
-  /**
-   * The `data` event is given an `Object` that has two properties; the `key` and the `value`. Both should be Uint8Arrays.
-   * @return Returns a [stream](https://nodejs.org/dist/latest-v12.x/docs/api/stream.html#stream_class_stream_readable) of the contents of the `trie`
-   */
-  createReadStream(): ReadStream {
-    return new ReadStream(this)
-  }
-
   /**
    * Returns a copy of the underlying trie.
    *

packages/trie/src/util/index.ts

@@ -1,5 +1,4 @@
 export * from './encoding.js'
 export * from './genesisState.js'
-export * from './readStream.js'
 export * from './tasks.js'
 export * from './walkController.js'