feat: reenable cache (#4566)

connext · Jun 21, 2023 · bf26efb · bf26efb
1 parent 1411cc1
commit bf26efb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/packages/adapters/database/src/client.ts b/packages/adapters/database/src/client.ts
@@ -1025,7 +1025,7 @@ export const getSpokeNodes = async (
   start: number,
   end: number,
   count: number,
-  pageSize = 100000,
+  pageSize = 10000,
   _pool?: Pool | db.TxnClientForRepeatableRead,
 ): Promise<string[]> => {
   const poolToUse = _pool ?? pool;
@@ -1066,7 +1066,7 @@ export const getHubNodes = async (
   start: number,
   end: number,
   count: number,
-  pageSize = 100000,
+  pageSize = 10000,
   _pool?: Pool | db.TxnClientForRepeatableRead,
 ): Promise<string[]> => {
   const poolToUse = _pool ?? pool;

diff --git a/packages/utils/src/helpers/merkle.ts b/packages/utils/src/helpers/merkle.ts
@@ -137,20 +137,18 @@ export class SparseMerkleTree {
       // Get the subtree down the opposite path of the one to the target.
       const nodes = await this.getSubtreeNodes(depth + 1, siblingPath);
 
-      siblings[depth] = this.getSubtreeRoot(depth + 1, nodes);
-
-      // // Use cached root for path if available
-      // const cachedRoot = await this.db.getRoot(siblingPath);
-      // if (cachedRoot) {
-      //   siblings[depth] = cachedRoot;
-      // } else {
-      //   // The sibling at this depth will be the root of that subtree.
-      //   siblings[depth] = this.getSubtreeRoot(depth + 1, nodes);
-
-      //   // Cache the subtree in the DB once we have solved for root.
-      //   const expectedNodeCount = 2 ** (this.height - (depth + 1));
-      //   if (expectedNodeCount - nodes.length === 0) await this.db.putRoot(siblingPath, siblings[depth]);
-      // }
+      // Use cached root for path if available
+      const cachedRoot = await this.db.getRoot(siblingPath);
+      if (cachedRoot) {
+        siblings[depth] = cachedRoot;
+      } else {
+        // The sibling at this depth will be the root of that subtree.
+        siblings[depth] = this.getSubtreeRoot(depth + 1, nodes);
+
+        // Cache the subtree in the DB once we have solved for root.
+        const expectedNodeCount = 2 ** (this.height - (depth + 1));
+        if (expectedNodeCount - nodes.length === 0) await this.db.putRoot(siblingPath, siblings[depth]);
+      }
     }
 
     // Get the last sibling node.