@ckb-ccc/core 0.0.13-alpha.4 → 0.0.13-alpha.5

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @ckb-ccc/core
 
+## 0.0.13-alpha.5
+
+### Patch Changes
+
+- [`6d62032`](https://github.com/ckb-ecofund/ccc/commit/6d620326f42f8c48eff9deb95578cf28d7bf5c97) Thanks [@Hanssen0](https://github.com/Hanssen0)! - fix(core): recordCells should not add usableCells
+
 ## 0.0.13-alpha.4
 
 ### Patch Changes

package/dist/client/cache/memory.d.ts

@@ -3,18 +3,18 @@ import { HexLike } from "../../hex/index.js";
 import { ClientCollectableSearchKeyLike } from "../clientTypes.advanced.js";
 import { ClientCache } from "./cache.js";
 export declare class ClientCacheMemory implements ClientCache {
-    private readonly cachedTransactions;
     private readonly unusableOutPoints;
     private readonly usableCells;
+    private readonly knownTransactions;
     private readonly knownCells;
     markUsable(...cellLikes: (CellLike | CellLike[])[]): Promise<void>;
     markUnusable(...outPointLikes: (OutPointLike | OutPointLike[])[]): Promise<void>;
     markTransactions(...transactionLike: (TransactionLike | TransactionLike[])[]): Promise<void>;
+    findCells(keyLike: ClientCollectableSearchKeyLike): AsyncGenerator<Cell>;
     isUnusable(outPointLike: OutPointLike): Promise<boolean>;
     recordTransactions(...transactions: (TransactionLike | TransactionLike[])[]): Promise<void>;
     getTransaction(txHashLike: HexLike): Promise<Transaction | undefined>;
     recordCells(...cells: (CellLike | CellLike[])[]): Promise<void>;
     getCell(outPointLike: OutPointLike): Promise<Cell | undefined>;
-    findCells(keyLike: ClientCollectableSearchKeyLike): AsyncGenerator<Cell>;
 }
 //# sourceMappingURL=memory.d.ts.map

package/dist/client/cache/memory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"memory.d.ts","sourceRoot":"","sources":["../../../src/client/cache/memory.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,QAAQ,EAER,YAAY,EACZ,WAAW,EACX,eAAe,EAChB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAW,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAGzC,qBAAa,iBAAkB,YAAW,WAAW;IACnD,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAqB;IACxD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAkB;IACpD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAc;IAC1C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAc;IAEnC,UAAU,CAAC,GAAG,SAAS,EAAE,CAAC,QAAQ,GAAG,QAAQ,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAelE,YAAY,CAChB,GAAG,aAAa,EAAE,CAAC,YAAY,GAAG,YAAY,EAAE,CAAC,EAAE,GAClD,OAAO,CAAC,IAAI,CAAC;IAYV,gBAAgB,CACpB,GAAG,eAAe,EAAE,CAAC,eAAe,GAAG,eAAe,EAAE,CAAC,EAAE,GAC1D,OAAO,CAAC,IAAI,CAAC;IAyBV,UAAU,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IAKxD,kBAAkB,CACtB,GAAG,YAAY,EAAE,CAAC,eAAe,GAAG,eAAe,EAAE,CAAC,EAAE,GACvD,OAAO,CAAC,IAAI,CAAC;IAGV,cAAc,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAKrE,WAAW,CAAC,GAAG,KAAK,EAAE,CAAC,QAAQ,GAAG,QAAQ,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAG/D,OAAO,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAK7D,SAAS,CACd,OAAO,EAAE,8BAA8B,GACtC,cAAc,CAAC,IAAI,CAAC;CASxB"}
+{"version":3,"file":"memory.d.ts","sourceRoot":"","sources":["../../../src/client/cache/memory.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,QAAQ,EAER,YAAY,EACZ,WAAW,EACX,eAAe,EAChB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAW,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAGzC,qBAAa,iBAAkB,YAAW,WAAW;IACnD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAkB;IACpD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAc;IAC1C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAqB;IACvD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAc;IAEnC,UAAU,CAAC,GAAG,SAAS,EAAE,CAAC,QAAQ,GAAG,QAAQ,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAelE,YAAY,CAChB,GAAG,aAAa,EAAE,CAAC,YAAY,GAAG,YAAY,EAAE,CAAC,EAAE,GAClD,OAAO,CAAC,IAAI,CAAC;IAYV,gBAAgB,CACpB,GAAG,eAAe,EAAE,CAAC,eAAe,GAAG,eAAe,EAAE,CAAC,EAAE,GAC1D,OAAO,CAAC,IAAI,CAAC;IAyBT,SAAS,CACd,OAAO,EAAE,8BAA8B,GACtC,cAAc,CAAC,IAAI,CAAC;IAUjB,UAAU,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IAKxD,kBAAkB,CACtB,GAAG,YAAY,EAAE,CAAC,eAAe,GAAG,eAAe,EAAE,CAAC,EAAE,GACvD,OAAO,CAAC,IAAI,CAAC;IAGV,cAAc,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAKrE,WAAW,CAAC,GAAG,KAAK,EAAE,CAAC,QAAQ,GAAG,QAAQ,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAG/D,OAAO,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;CAIrE"}

package/dist/client/cache/memory.js

@@ -3,9 +3,9 @@ import { hexFrom } from "../../hex/index.js";
 import { filterCell } from "./memory.advanced.js";
 export class ClientCacheMemory {
     constructor() {
-        this.cachedTransactions = [];
         this.unusableOutPoints = [];
         this.usableCells = [];
+        this.knownTransactions = [];
         this.knownCells = [];
     }
     async markUsable(...cellLikes) {
@@ -44,30 +44,30 @@ export class ClientCacheMemory {
             })));
         }));
     }
+    async *findCells(keyLike) {
+        for (const cell of this.usableCells) {
+            if (!filterCell(keyLike, cell)) {
+                continue;
+            }
+            yield cell;
+        }
+    }
     async isUnusable(outPointLike) {
         const outPoint = OutPoint.from(outPointLike);
         return this.unusableOutPoints.find((o) => o.eq(outPoint)) !== undefined;
     }
     async recordTransactions(...transactions) {
-        this.cachedTransactions.push(...transactions.flat().map(Transaction.from));
+        this.knownTransactions.push(...transactions.flat().map(Transaction.from));
     }
     async getTransaction(txHashLike) {
         const txHash = hexFrom(txHashLike);
-        return this.cachedTransactions.find((tx) => tx.hash() === txHash);
+        return this.knownTransactions.find((tx) => tx.hash() === txHash);
     }
     async recordCells(...cells) {
-        this.usableCells.push(...cells.flat().map(Cell.from));
+        this.knownCells.push(...cells.flat().map(Cell.from));
     }
     async getCell(outPointLike) {
         const outPoint = OutPoint.from(outPointLike);
-        return this.usableCells.find((cell) => cell.outPoint.eq(outPoint));
-    }
-    async *findCells(keyLike) {
-        for (const cell of this.usableCells) {
-            if (!filterCell(keyLike, cell)) {
-                continue;
-            }
-            yield cell;
-        }
+        return this.knownCells.find((cell) => cell.outPoint.eq(outPoint));
     }
 }

package/dist.commonjs/client/cache/memory.d.ts

@@ -3,18 +3,18 @@ import { HexLike } from "../../hex/index.js";
 import { ClientCollectableSearchKeyLike } from "../clientTypes.advanced.js";
 import { ClientCache } from "./cache.js";
 export declare class ClientCacheMemory implements ClientCache {
-    private readonly cachedTransactions;
     private readonly unusableOutPoints;
     private readonly usableCells;
+    private readonly knownTransactions;
     private readonly knownCells;
     markUsable(...cellLikes: (CellLike | CellLike[])[]): Promise<void>;
     markUnusable(...outPointLikes: (OutPointLike | OutPointLike[])[]): Promise<void>;
     markTransactions(...transactionLike: (TransactionLike | TransactionLike[])[]): Promise<void>;
+    findCells(keyLike: ClientCollectableSearchKeyLike): AsyncGenerator<Cell>;
     isUnusable(outPointLike: OutPointLike): Promise<boolean>;
     recordTransactions(...transactions: (TransactionLike | TransactionLike[])[]): Promise<void>;
     getTransaction(txHashLike: HexLike): Promise<Transaction | undefined>;
     recordCells(...cells: (CellLike | CellLike[])[]): Promise<void>;
     getCell(outPointLike: OutPointLike): Promise<Cell | undefined>;
-    findCells(keyLike: ClientCollectableSearchKeyLike): AsyncGenerator<Cell>;
 }
 //# sourceMappingURL=memory.d.ts.map

package/dist.commonjs/client/cache/memory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"memory.d.ts","sourceRoot":"","sources":["../../../src/client/cache/memory.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,QAAQ,EAER,YAAY,EACZ,WAAW,EACX,eAAe,EAChB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAW,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAGzC,qBAAa,iBAAkB,YAAW,WAAW;IACnD,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAqB;IACxD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAkB;IACpD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAc;IAC1C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAc;IAEnC,UAAU,CAAC,GAAG,SAAS,EAAE,CAAC,QAAQ,GAAG,QAAQ,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAelE,YAAY,CAChB,GAAG,aAAa,EAAE,CAAC,YAAY,GAAG,YAAY,EAAE,CAAC,EAAE,GAClD,OAAO,CAAC,IAAI,CAAC;IAYV,gBAAgB,CACpB,GAAG,eAAe,EAAE,CAAC,eAAe,GAAG,eAAe,EAAE,CAAC,EAAE,GAC1D,OAAO,CAAC,IAAI,CAAC;IAyBV,UAAU,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IAKxD,kBAAkB,CACtB,GAAG,YAAY,EAAE,CAAC,eAAe,GAAG,eAAe,EAAE,CAAC,EAAE,GACvD,OAAO,CAAC,IAAI,CAAC;IAGV,cAAc,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAKrE,WAAW,CAAC,GAAG,KAAK,EAAE,CAAC,QAAQ,GAAG,QAAQ,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAG/D,OAAO,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAK7D,SAAS,CACd,OAAO,EAAE,8BAA8B,GACtC,cAAc,CAAC,IAAI,CAAC;CASxB"}
+{"version":3,"file":"memory.d.ts","sourceRoot":"","sources":["../../../src/client/cache/memory.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,QAAQ,EAER,YAAY,EACZ,WAAW,EACX,eAAe,EAChB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAW,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAGzC,qBAAa,iBAAkB,YAAW,WAAW;IACnD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAkB;IACpD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAc;IAC1C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAqB;IACvD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAc;IAEnC,UAAU,CAAC,GAAG,SAAS,EAAE,CAAC,QAAQ,GAAG,QAAQ,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAelE,YAAY,CAChB,GAAG,aAAa,EAAE,CAAC,YAAY,GAAG,YAAY,EAAE,CAAC,EAAE,GAClD,OAAO,CAAC,IAAI,CAAC;IAYV,gBAAgB,CACpB,GAAG,eAAe,EAAE,CAAC,eAAe,GAAG,eAAe,EAAE,CAAC,EAAE,GAC1D,OAAO,CAAC,IAAI,CAAC;IAyBT,SAAS,CACd,OAAO,EAAE,8BAA8B,GACtC,cAAc,CAAC,IAAI,CAAC;IAUjB,UAAU,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IAKxD,kBAAkB,CACtB,GAAG,YAAY,EAAE,CAAC,eAAe,GAAG,eAAe,EAAE,CAAC,EAAE,GACvD,OAAO,CAAC,IAAI,CAAC;IAGV,cAAc,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;IAKrE,WAAW,CAAC,GAAG,KAAK,EAAE,CAAC,QAAQ,GAAG,QAAQ,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAG/D,OAAO,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;CAIrE"}

package/dist.commonjs/client/cache/memory.js

@@ -6,9 +6,9 @@ const index_js_2 = require("../../hex/index.js");
 const memory_advanced_js_1 = require("./memory.advanced.js");
 class ClientCacheMemory {
     constructor() {
-        this.cachedTransactions = [];
         this.unusableOutPoints = [];
         this.usableCells = [];
+        this.knownTransactions = [];
         this.knownCells = [];
     }
     async markUsable(...cellLikes) {
@@ -47,31 +47,31 @@ class ClientCacheMemory {
             })));
         }));
     }
+    async *findCells(keyLike) {
+        for (const cell of this.usableCells) {
+            if (!(0, memory_advanced_js_1.filterCell)(keyLike, cell)) {
+                continue;
+            }
+            yield cell;
+        }
+    }
     async isUnusable(outPointLike) {
         const outPoint = index_js_1.OutPoint.from(outPointLike);
         return this.unusableOutPoints.find((o) => o.eq(outPoint)) !== undefined;
     }
     async recordTransactions(...transactions) {
-        this.cachedTransactions.push(...transactions.flat().map(index_js_1.Transaction.from));
+        this.knownTransactions.push(...transactions.flat().map(index_js_1.Transaction.from));
     }
     async getTransaction(txHashLike) {
         const txHash = (0, index_js_2.hexFrom)(txHashLike);
-        return this.cachedTransactions.find((tx) => tx.hash() === txHash);
+        return this.knownTransactions.find((tx) => tx.hash() === txHash);
     }
     async recordCells(...cells) {
-        this.usableCells.push(...cells.flat().map(index_js_1.Cell.from));
+        this.knownCells.push(...cells.flat().map(index_js_1.Cell.from));
     }
     async getCell(outPointLike) {
         const outPoint = index_js_1.OutPoint.from(outPointLike);
-        return this.usableCells.find((cell) => cell.outPoint.eq(outPoint));
-    }
-    async *findCells(keyLike) {
-        for (const cell of this.usableCells) {
-            if (!(0, memory_advanced_js_1.filterCell)(keyLike, cell)) {
-                continue;
-            }
-            yield cell;
-        }
+        return this.knownCells.find((cell) => cell.outPoint.eq(outPoint));
     }
 }
 exports.ClientCacheMemory = ClientCacheMemory;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckb-ccc/core",
-  "version": "0.0.13-alpha.4",
+  "version": "0.0.13-alpha.5",
   "description": "Core of CCC - CKBer's Codebase",
   "author": "Hanssen0 <hanssen0@hanssen0.com>",
   "license": "MIT",

package/src/client/cache/memory.ts

@@ -12,9 +12,9 @@ import { ClientCache } from "./cache.js";
 import { filterCell } from "./memory.advanced.js";
 
 export class ClientCacheMemory implements ClientCache {
-  private readonly cachedTransactions: Transaction[] = [];
   private readonly unusableOutPoints: OutPoint[] = [];
   private readonly usableCells: Cell[] = [];
+  private readonly knownTransactions: Transaction[] = [];
   private readonly knownCells: Cell[] = [];
 
   async markUsable(...cellLikes: (CellLike | CellLike[])[]): Promise<void> {
@@ -73,6 +73,18 @@ export class ClientCacheMemory implements ClientCache {
     );
   }
 
+  async *findCells(
+    keyLike: ClientCollectableSearchKeyLike,
+  ): AsyncGenerator<Cell> {
+    for (const cell of this.usableCells) {
+      if (!filterCell(keyLike, cell)) {
+        continue;
+      }
+
+      yield cell;
+    }
+  }
+
   async isUnusable(outPointLike: OutPointLike): Promise<boolean> {
     const outPoint = OutPoint.from(outPointLike);
     return this.unusableOutPoints.find((o) => o.eq(outPoint)) !== undefined;
@@ -81,30 +93,18 @@ export class ClientCacheMemory implements ClientCache {
   async recordTransactions(
     ...transactions: (TransactionLike | TransactionLike[])[]
   ): Promise<void> {
-    this.cachedTransactions.push(...transactions.flat().map(Transaction.from));
+    this.knownTransactions.push(...transactions.flat().map(Transaction.from));
   }
   async getTransaction(txHashLike: HexLike): Promise<Transaction | undefined> {
     const txHash = hexFrom(txHashLike);
-    return this.cachedTransactions.find((tx) => tx.hash() === txHash);
+    return this.knownTransactions.find((tx) => tx.hash() === txHash);
   }
 
   async recordCells(...cells: (CellLike | CellLike[])[]): Promise<void> {
-    this.usableCells.push(...cells.flat().map(Cell.from));
+    this.knownCells.push(...cells.flat().map(Cell.from));
   }
   async getCell(outPointLike: OutPointLike): Promise<Cell | undefined> {
     const outPoint = OutPoint.from(outPointLike);
-    return this.usableCells.find((cell) => cell.outPoint.eq(outPoint));
-  }
-
-  async *findCells(
-    keyLike: ClientCollectableSearchKeyLike,
-  ): AsyncGenerator<Cell> {
-    for (const cell of this.usableCells) {
-      if (!filterCell(keyLike, cell)) {
-        continue;
-      }
-
-      yield cell;
-    }
+    return this.knownCells.find((cell) => cell.outPoint.eq(outPoint));
   }
 }