fix: incorrect when data search is any

ckb-js · Jun 20, 2024 · 36d5838 · 36d5838
1 parent b908020
commit 36d5838
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/packages/ckb-indexer/src/collector.ts b/packages/ckb-indexer/src/collector.ts
@@ -159,19 +159,18 @@ export class CKBCellCollector implements BaseCellCollector {
       }
 
       // set data range to narrow the search result if the data is set
-      // the default data search filter mode is exact search that is the same as ckb-indexer
-      if (!query.outputDataLenRange) {
-        if (
-          query.data &&
-          query.data !== "any" &&
-          typeof query.data === "string"
-        ) {
-          const dataLenRange = getHexStringBytes(unwrapDataWrapper(query.data));
-          query.outputDataLenRange = [
-            "0x" + dataLenRange.toString(16),
-            "0x" + (dataLenRange + 1).toString(16),
-          ];
-        }
+      if (
+        !query.outputDataLenRange &&
+        query.data &&
+        query.data !== "any" &&
+        // the default data search filter mode is exact search that is the same as ckb-indexer
+        (typeof query.data === "string" || query.data.searchMode === "exact")
+      ) {
+        const dataLenRange = getHexStringBytes(unwrapDataWrapper(query.data));
+        query.outputDataLenRange = [
+          "0x" + dataLenRange.toString(16),
+          "0x" + (dataLenRange + 1).toString(16),
+        ];
       }
 
       if (!query.scriptLenRange && query.type === "empty") {

diff --git a/packages/ckb-indexer/tests/resultFormatter.unit.test.ts b/packages/ckb-indexer/tests/resultFormatter.unit.test.ts
@@ -31,6 +31,8 @@ test("should toSearchKey works fine", async (t) => {
       outputCapacityRange: undefined,
       scriptLenRange: undefined,
       blockRange: undefined,
+      outputData: undefined,
+      outputDataFilterMode: undefined,
       outputDataLenRange: ["0x1", "0x2"],
     },
   };

diff --git a/packages/ckb-indexer/tests/service.unit.test.ts b/packages/ckb-indexer/tests/service.unit.test.ts
@@ -17,6 +17,8 @@ test("should generateSearchKey works fine", async (t) => {
       outputCapacityRange: undefined,
       blockRange: undefined,
       scriptLenRange: undefined,
+      outputData: undefined,
+      outputDataFilterMode: undefined,
       outputDataLenRange: ["0x1", "0x2"],
     },
   };