Use hashed tries

ethereumjs · Aug 6, 2023 · d026655 · d026655
1 parent 7bf3148
commit d026655
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/packages/client/src/sync/fetcher/accountfetcher.ts b/packages/client/src/sync/fetcher/accountfetcher.ts
@@ -141,9 +141,10 @@ export class AccountFetcher extends Fetcher<JobTask, AccountData[], AccountData>
     this.root = options.root
     this.first = options.first
     this.count = options.count ?? BigInt(2) ** BigInt(256) - this.first
-    this.codeTrie = new Trie({ useKeyHashing: true })
-    this.accountTrie = new Trie({ useKeyHashing: true })
+    this.codeTrie = new Trie({ useKeyHashing: false })
+    this.accountTrie = new Trie({ useKeyHashing: false })
     this.accountToStorageTrie = new Map()
+
     this.debug = createDebugLogger('client:AccountFetcher')
     this.storageFetcher = new StorageFetcher({
       config: this.config,

diff --git a/packages/client/src/sync/fetcher/bytecodefetcher.ts b/packages/client/src/sync/fetcher/bytecodefetcher.ts
@@ -45,7 +45,7 @@ export class ByteCodeFetcher extends Fetcher<JobTask, Uint8Array[], Uint8Array>
   constructor(options: ByteCodeFetcherOptions) {
     super(options)
     this.hashes = options.hashes ?? []
-    this.trie = options.trie ?? new Trie({ useKeyHashing: true })
+    this.trie = options.trie ?? new Trie({ useKeyHashing: false })
     this.debug = createDebugLogger('client:ByteCodeFetcher')
     if (this.hashes.length > 0) {
       const fullJob = { task: { hashes: this.hashes } } as Job<JobTask, Uint8Array[], Uint8Array>

diff --git a/packages/client/src/sync/fetcher/storagefetcher.ts b/packages/client/src/sync/fetcher/storagefetcher.ts
@@ -398,7 +398,7 @@ export class StorageFetcher extends Fetcher<JobTask, StorageData[][], StorageDat
         const accountHash = result.requests[i].accountHash
         const storageTrie =
           this.accountToStorageTrie.get(bytesToUnprefixedHex(accountHash)) ??
-          new Trie({ useKeyHashing: true })
+          new Trie({ useKeyHashing: false })
         for (const slot of slotArray as any) {
           slotCount++
           void storageTrie.put(slot.hash, slot.body)

diff --git a/packages/client/src/sync/fetcher/trienodefetcher.ts b/packages/client/src/sync/fetcher/trienodefetcher.ts
@@ -89,8 +89,8 @@ export class TrieNodeFetcher extends Fetcher<JobTask, Uint8Array[], Uint8Array>
     this.pathToNodeRequestData = new OrderedMap<string, NodeRequestData>()
     this.requestedNodeToPath = new Map<string, string>()
     this.fetchedAccountNodes = new Map<string, FetchedNodeData>()
-    this.accountTrie = options.accountTrie ?? new Trie({ useKeyHashing: true })
-    this.codeTrie = options.codeTrie ?? new Trie({ useKeyHashing: true })
+    this.accountTrie = options.accountTrie ?? new Trie({ useKeyHashing: false })
+    this.codeTrie = options.codeTrie ?? new Trie({ useKeyHashing: false })
     this.accountToStorageTrie = options.accountToStorageTrie ?? new Map<String, Trie>()
     this.nodeCount = 0
     this.debug = createDebugLogger('client:TrieNodeFetcher')
@@ -323,7 +323,7 @@ export class TrieNodeFetcher extends Fetcher<JobTask, Uint8Array[], Uint8Array>
 
             // add storage data for account if it has fetched nodes
             // TODO figure out what the key should be for mapping accounts to storage tries
-            const storageTrie = new Trie({ useKeyHashing: true })
+            const storageTrie = new Trie({ useKeyHashing: false })
             const storageTrieOps: BatchDBOp[] = []
             if (pathToStorageNode !== undefined && pathToStorageNode.size > 0) {
               for (const [path, data] of pathToStorageNode) {