@ckb-ccc/spore 1.0.8 → 1.1.1

package/dist.commonjs/cluster/index.js

@@ -10,8 +10,17 @@ const advanced_js_1 = require("../advanced.js");
 const index_js_1 = require("../codec/index.js");
 const index_js_2 = require("../helper/index.js");
 const index_js_3 = require("../predefined/index.js");
-async function findCluster(client, args, scripts) {
-    return (0, index_js_2.findSingletonCellByArgs)(client, args, scripts ?? Object.values((0, index_js_3.getClusterScriptInfos)(client)));
+async function findCluster(client, id, scripts) {
+    const found = await (0, index_js_2.findSingletonCellByArgs)(client, id, scripts ?? Object.values((0, index_js_3.getClusterScriptInfos)(client)));
+    if (!found) {
+        return;
+    }
+    return {
+        cell: found.cell,
+        cluster: found.cell,
+        clusterData: (0, index_js_1.unpackToRawClusterData)(found.cell.outputData),
+        scriptInfo: found.scriptInfo,
+    };
 }
 async function assertCluster(client, args, scripts) {
     const res = await findCluster(client, args, scripts);
@@ -38,9 +47,7 @@ async function createSporeCluster(params) {
     const scriptInfo = params.scriptInfo ?? (0, index_js_3.getClusterScriptInfo)(signer.client);
     // prepare transaction
     const tx = core_1.ccc.Transaction.from(params.tx ?? {});
-    if (tx.inputs.length === 0) {
-        await (0, index_js_2.injectOneCapacityCell)(signer, tx);
-    }
+    await tx.completeInputsAtLeastOne(signer);
     // build cluster cell
     const id = core_1.ccc.hashTypeId(tx.inputs[0], tx.outputs.length);
     const packedClusterData = (0, index_js_1.packRawClusterData)(data);
@@ -108,8 +115,7 @@ async function transferSporeCluster(params) {
  * @param order the order in creation time of clusters
  * @param scriptInfos the deployed script infos of clusters
  */
-async function* findSporeClustersBySigner(params) {
-    const { signer, order, scriptInfos } = params;
+async function* findSporeClustersBySigner({ signer, order, limit, scriptInfos, }) {
     for (const scriptInfo of scriptInfos ??
         Object.values((0, index_js_3.getClusterScriptInfos)(signer.client))) {
         if (!scriptInfo) {
@@ -118,24 +124,14 @@ async function* findSporeClustersBySigner(params) {
         for await (const cluster of signer.findCells({
             script: {
                 ...scriptInfo,
-                args: [],
+                args: "",
             },
-        }, true, order, 10)) {
-            let clusterData;
-            try {
-                clusterData = index_js_1.ClusterData.decode(cluster.outputData);
-            }
-            catch (_) {
-                try {
-                    clusterData = index_js_1.ClusterDataV1.decode(cluster.outputData);
-                }
-                catch (e) {
-                    throw new Error(`Cluster data decode failed: ${e.toString()}`);
-                }
-            }
+        }, true, order, limit)) {
             yield {
+                cell: cluster,
                 cluster,
-                clusterData,
+                clusterData: (0, index_js_1.unpackToRawClusterData)(cluster.outputData),
+                scriptInfo: index_js_3.SporeScriptInfo.from(scriptInfo),
             };
         }
     }

package/dist.commonjs/helper/index.d.ts

@@ -4,6 +4,4 @@ export declare function findSingletonCellByArgs(client: ccc.Client, args: ccc.He
     cell: ccc.Cell;
     scriptInfo: SporeScriptInfo;
 } | undefined>;
-export declare function searchOneCellBySigner(signer: ccc.Signer): Promise<ccc.Cell | undefined>;
-export declare function injectOneCapacityCell(signer: ccc.Signer, tx: ccc.Transaction): Promise<void>;
 //# sourceMappingURL=index.d.ts.map

package/dist.commonjs/helper/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/helper/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACpC,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE9E,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,GAAG,CAAC,MAAM,EAClB,IAAI,EAAE,GAAG,CAAC,OAAO,EACjB,OAAO,EAAE,CAAC,mBAAmB,GAAG,SAAS,CAAC,EAAE,GAC3C,OAAO,CACN;IACE,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC;IACf,UAAU,EAAE,eAAe,CAAC;CAC7B,GACD,SAAS,CACZ,CAqBA;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,GAAG,CAAC,MAAM,GACjB,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,SAAS,CAAC,CAY/B;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,GAAG,CAAC,MAAM,EAClB,EAAE,EAAE,GAAG,CAAC,WAAW,GAClB,OAAO,CAAC,IAAI,CAAC,CAYf"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/helper/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACpC,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAE9E,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,GAAG,CAAC,MAAM,EAClB,IAAI,EAAE,GAAG,CAAC,OAAO,EACjB,OAAO,EAAE,CAAC,mBAAmB,GAAG,SAAS,CAAC,EAAE,GAC3C,OAAO,CACN;IACE,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC;IACf,UAAU,EAAE,eAAe,CAAC;CAC7B,GACD,SAAS,CACZ,CAqBA"}

package/dist.commonjs/helper/index.js

@@ -1,9 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findSingletonCellByArgs = findSingletonCellByArgs;
-exports.searchOneCellBySigner = searchOneCellBySigner;
-exports.injectOneCapacityCell = injectOneCapacityCell;
-const core_1 = require("@ckb-ccc/core");
 const index_js_1 = require("../predefined/index.js");
 async function findSingletonCellByArgs(client, args, scripts) {
     for (const scriptInfo of scripts) {
@@ -22,21 +19,3 @@ async function findSingletonCellByArgs(client, args, scripts) {
         }
     }
 }
-async function searchOneCellBySigner(signer) {
-    for await (const cell of signer.findCells({
-        scriptLenRange: [0, 1],
-        outputDataLenRange: [0, 1],
-    }, true, undefined, 1)) {
-        return cell;
-    }
-}
-async function injectOneCapacityCell(signer, tx) {
-    const liveCell = await searchOneCellBySigner(signer);
-    if (!liveCell) {
-        throw new Error("No live cell found");
-    }
-    tx.inputs.push(core_1.ccc.CellInput.from({
-        previousOutput: liveCell.outPoint,
-        ...liveCell,
-    }));
-}

package/dist.commonjs/index.d.ts

@@ -1,5 +1,3 @@
-export * from "./cluster/index.js";
-export * as dob from "./dob/index.js";
-export * from "./predefined/index.js";
-export * from "./spore/index.js";
+export * from "./barrel.js";
+export * as spore from "./barrel.js";
 //# sourceMappingURL=index.d.ts.map

package/dist.commonjs/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,OAAO,KAAK,GAAG,MAAM,gBAAgB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,OAAO,KAAK,KAAK,MAAM,aAAa,CAAC"}

package/dist.commonjs/index.js

@@ -26,8 +26,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.dob = void 0;
-__exportStar(require("./cluster/index.js"), exports);
-exports.dob = __importStar(require("./dob/index.js"));
-__exportStar(require("./predefined/index.js"), exports);
-__exportStar(require("./spore/index.js"), exports);
+exports.spore = void 0;
+__exportStar(require("./barrel.js"), exports);
+exports.spore = __importStar(require("./barrel.js"));

package/dist.commonjs/spore/advanced.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"advanced.d.ts","sourceRoot":"","sources":["../../src/spore/advanced.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAGzC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAG1D,wBAAsB,cAAc,CAClC,MAAM,EAAE,GAAG,CAAC,MAAM,EAClB,EAAE,EAAE,GAAG,CAAC,WAAW,EACnB,IAAI,EAAE,aAAa,EACnB,WAAW,CAAC,EAAE,WAAW,GAAG,aAAa,GAAG,MAAM,EAClD,cAAc,CAAC,EAAE,GAAG,CAAC,OAAO,GAC3B,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,OAAO,MAAM,CAAC,GAAG,SAAS,CAAC,CA0EvD"}
+{"version":3,"file":"advanced.d.ts","sourceRoot":"","sources":["../../src/spore/advanced.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAGzC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAE1D,wBAAsB,cAAc,CAClC,MAAM,EAAE,GAAG,CAAC,MAAM,EAClB,EAAE,EAAE,GAAG,CAAC,WAAW,EACnB,IAAI,EAAE,aAAa,EACnB,WAAW,CAAC,EAAE,WAAW,GAAG,aAAa,GAAG,MAAM,EAClD,cAAc,CAAC,EAAE,GAAG,CAAC,OAAO,GAC3B,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,OAAO,MAAM,CAAC,GAAG,SAAS,CAAC,CAiEvD"}

package/dist.commonjs/spore/advanced.js

@@ -4,7 +4,6 @@ exports.prepareCluster = prepareCluster;
 const core_1 = require("@ckb-ccc/core");
 const advanced_js_1 = require("../advanced.js");
 const index_js_1 = require("../cluster/index.js");
-const index_js_2 = require("../helper/index.js");
 async function prepareCluster(signer, tx, data, clusterMode, scriptInfoHash) {
     // skip if the spore is not belong to a cluster
     if (!data.clusterId || clusterMode === "skip") {
@@ -18,17 +17,10 @@ async function prepareCluster(signer, tx, data, clusterMode, scriptInfoHash) {
     switch (clusterMode) {
         case "lockProxy": {
             const lock = cluster.cellOutput.lock;
-            if (await tx.findInputIndexByLock(lock, signer.client) === undefined) {
+            if ((await tx.findInputIndexByLock(lock, signer.client)) === undefined) {
                 // note: We can only search proxy of signer, if any custom logic is in need, developer should get
                 // the proxy filled in transaction before invoking `createSpore`
-                const proxy = await (0, index_js_2.searchOneCellBySigner)(signer);
-                if (!proxy) {
-                    throw new Error("Cluster lock proxy cell not found");
-                }
-                tx.inputs.push(core_1.ccc.CellInput.from({
-                    previousOutput: proxy.outPoint,
-                    ...proxy,
-                }));
+                await tx.completeInputsAddOne(signer);
             }
             if (tx.outputs.every((output) => output.lock !== lock)) {
                 tx.addOutput({

package/dist.commonjs/spore/index.d.ts

@@ -1,8 +1,10 @@
 import { ccc } from "@ckb-ccc/core";
 import { SporeDataView } from "../codec/index.js";
 import { SporeScriptInfo, SporeScriptInfoLike } from "../predefined/index.js";
-export declare function findSpore(client: ccc.Client, args: ccc.HexLike, scripts?: SporeScriptInfoLike[]): Promise<{
+export declare function findSpore(client: ccc.Client, id: ccc.HexLike, scripts?: SporeScriptInfoLike[]): Promise<{
     cell: ccc.Cell;
+    spore: ccc.Cell;
+    sporeData: SporeDataView;
     scriptInfo: SporeScriptInfo;
 } | undefined>;
 export declare function assertSpore(client: ccc.Client, args: ccc.HexLike, scripts?: SporeScriptInfoLike[]): Promise<{
@@ -82,17 +84,20 @@ export declare function meltSpore(params: {
  *
  * @param signer the owner of spores
  * @param order the order in creation time of spores
- * @param clusterId the cluster that spores belong to
+ * @param clusterId the cluster that spores belong to. "" to find public spores
  * @param scriptInfos the deployed script infos of spores
- * @returns speific spore cells
+ * @returns specified spore cells
  */
-export declare function findSporesBySigner(params: {
+export declare function findSporesBySigner({ signer, clusterId, scriptInfos, limit, order, }: {
     signer: ccc.Signer;
     order?: "asc" | "desc";
+    limit?: number;
     clusterId?: ccc.HexLike;
     scriptInfos?: SporeScriptInfoLike[];
 }): AsyncGenerator<{
+    cell: ccc.Cell;
     spore: ccc.Cell;
     sporeData: SporeDataView;
+    scriptInfo: SporeScriptInfo;
 }>;
 //# sourceMappingURL=index.d.ts.map

package/dist.commonjs/spore/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/spore/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAOpC,OAAO,EAAa,aAAa,EAAoB,MAAM,mBAAmB,CAAC;AAK/E,OAAO,EACL,eAAe,EACf,mBAAmB,EAGpB,MAAM,wBAAwB,CAAC;AAGhC,wBAAsB,SAAS,CAC7B,MAAM,EAAE,GAAG,CAAC,MAAM,EAClB,IAAI,EAAE,GAAG,CAAC,OAAO,EACjB,OAAO,CAAC,EAAE,mBAAmB,EAAE,GAC9B,OAAO,CACN;IACE,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC;IACf,UAAU,EAAE,eAAe,CAAC;CAC7B,GACD,SAAS,CACZ,CAMA;AAED,wBAAsB,WAAW,CAC/B,MAAM,EAAE,GAAG,CAAC,MAAM,EAClB,IAAI,EAAE,GAAG,CAAC,OAAO,EACjB,OAAO,CAAC,EAAE,mBAAmB,EAAE,GAC9B,OAAO,CAAC;IACT,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC;IACf,UAAU,EAAE,eAAe,CAAC;CAC7B,CAAC,CAQD;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,WAAW,CAAC,MAAM,EAAE;IACxC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC;IACnB,IAAI,EAAE,aAAa,CAAC;IACpB,EAAE,CAAC,EAAE,GAAG,CAAC,UAAU,CAAC;IACpB,WAAW,CAAC,EAAE,WAAW,GAAG,aAAa,GAAG,MAAM,CAAC;IACnD,EAAE,CAAC,EAAE,GAAG,CAAC,eAAe,CAAC;IACzB,UAAU,CAAC,EAAE,mBAAmB,CAAC;IACjC,cAAc,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC;CAC9B,GAAG,OAAO,CAAC;IACV,EAAE,EAAE,GAAG,CAAC,WAAW,CAAC;IACpB,EAAE,EAAE,GAAG,CAAC,GAAG,CAAC;CACb,CAAC,CAqDD;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,aAAa,CAAC,MAAM,EAAE;IAC1C,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC;IACnB,EAAE,EAAE,GAAG,CAAC,OAAO,CAAC;IAChB,EAAE,EAAE,GAAG,CAAC,UAAU,CAAC;IACnB,EAAE,CAAC,EAAE,GAAG,CAAC,eAAe,CAAC;IACzB,cAAc,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC;CAC9B,GAAG,OAAO,CAAC;IACV,EAAE,EAAE,GAAG,CAAC,WAAW,CAAC;CACrB,CAAC,CAmCD;AAED;;;;;;;;;GASG;AACH,wBAAsB,SAAS,CAAC,MAAM,EAAE;IACtC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC;IACnB,EAAE,EAAE,GAAG,CAAC,OAAO,CAAC;IAChB,EAAE,CAAC,EAAE,GAAG,CAAC,eAAe,CAAC;IACzB,cAAc,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC;CAC9B,GAAG,OAAO,CAAC;IACV,EAAE,EAAE,GAAG,CAAC,WAAW,CAAC;CACrB,CAAC,CAuBD;AAED;;;;;;;;GAQG;AACH,wBAAuB,kBAAkB,CAAC,MAAM,EAAE;IAChD,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC;IACxB,WAAW,CAAC,EAAE,mBAAmB,EAAE,CAAC;CACrC,GAAG,cAAc,CAAC;IACjB,KAAK,EAAE,GAAG,CAAC,IAAI,CAAC;IAChB,SAAS,EAAE,aAAa,CAAC;CAC1B,CAAC,CAqCD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/spore/index.ts"],"names":[],"mappings":"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"}

package/dist.commonjs/spore/index.js

@@ -12,8 +12,17 @@ const index_js_1 = require("../codec/index.js");
 const index_js_2 = require("../helper/index.js");
 const index_js_3 = require("../predefined/index.js");
 const advanced_js_2 = require("./advanced.js");
-async function findSpore(client, args, scripts) {
-    return (0, index_js_2.findSingletonCellByArgs)(client, args, scripts ?? Object.values((0, index_js_3.getSporeScriptInfos)(client)));
+async function findSpore(client, id, scripts) {
+    const found = await (0, index_js_2.findSingletonCellByArgs)(client, id, scripts ?? Object.values((0, index_js_3.getSporeScriptInfos)(client)));
+    if (!found) {
+        return undefined;
+    }
+    return {
+        cell: found.cell,
+        spore: found.cell,
+        sporeData: (0, index_js_1.unpackToRawSporeData)(found.cell.outputData),
+        scriptInfo: found.scriptInfo,
+    };
 }
 async function assertSpore(client, args, scripts) {
     const res = await findSpore(client, args, scripts);
@@ -47,9 +56,7 @@ async function createSpore(params) {
     const actions = [];
     const ids = [];
     const tx = core_1.ccc.Transaction.from(params.tx ?? {});
-    if (tx.inputs.length === 0) {
-        await (0, index_js_2.injectOneCapacityCell)(signer, tx);
-    }
+    await tx.completeInputsAtLeastOne(signer);
     const { script: lock } = await signer.getRecommendedAddressObj();
     // build spore cell
     const id = core_1.ccc.hashTypeId(tx.inputs[0], tx.outputs.length);
@@ -146,12 +153,11 @@ async function meltSpore(params) {
  *
  * @param signer the owner of spores
  * @param order the order in creation time of spores
- * @param clusterId the cluster that spores belong to
+ * @param clusterId the cluster that spores belong to. "" to find public spores
  * @param scriptInfos the deployed script infos of spores
- * @returns speific spore cells
+ * @returns specified spore cells
  */
-async function* findSporesBySigner(params) {
-    const { signer, clusterId, scriptInfos, order } = params;
+async function* findSporesBySigner({ signer, clusterId, scriptInfos, limit, order, }) {
     for (const scriptInfo of scriptInfos ??
         Object.values((0, index_js_3.getSporeScriptInfos)(signer.client))) {
         if (!scriptInfo) {
@@ -162,24 +168,17 @@ async function* findSporesBySigner(params) {
                 ...scriptInfo,
                 args: [],
             },
-        }, true, order, 10)) {
-            try {
-                const sporeData = index_js_1.SporeData.decode(spore.outputData);
-                if (!clusterId) {
-                    yield {
-                        spore,
-                        sporeData,
-                    };
-                }
-                if (sporeData.clusterId === clusterId) {
-                    return {
-                        spore,
-                        sporeData,
-                    };
-                }
-            }
-            catch (e) {
-                throw new Error(`Spore data decode failed: ${e.toString()}`);
+        }, true, order, limit)) {
+            const sporeData = (0, index_js_1.unpackToRawSporeData)(spore.outputData);
+            if (!clusterId ||
+                (clusterId === "" && !sporeData.clusterId) ||
+                sporeData.clusterId === core_1.ccc.hexFrom(clusterId)) {
+                yield {
+                    cell: spore,
+                    spore,
+                    sporeData,
+                    scriptInfo: index_js_3.SporeScriptInfo.from(scriptInfo),
+                };
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckb-ccc/spore",
-  "version": "1.0.8",
+  "version": "1.1.1",
   "description": "CCC - CKBer's Codebase. Common Chains Connector's support for Spore protocol",
   "author": "ashuralyk <ashuralyk@live.com>",
   "license": "MIT",
@@ -19,10 +19,20 @@
       "require": "./dist.commonjs/index.js",
       "default": "./dist.commonjs/index.js"
     },
+    "./barrel": {
+      "import": "./dist/barrel.js",
+      "require": "./dist.commonjs/barrel.js",
+      "default": "./dist.commonjs/barrel.js"
+    },
     "./advanced": {
       "import": "./dist/advanced.js",
       "require": "./dist.commonjs/advanced.js",
       "default": "./dist.commonjs/advanced.js"
+    },
+    "./advancedBarrel": {
+      "import": "./dist/advancedBarrel.js",
+      "require": "./dist.commonjs/advancedBarrel.js",
+      "default": "./dist.commonjs/advancedBarrel.js"
     }
   },
   "devDependencies": {
@@ -44,7 +54,7 @@
   },
   "dependencies": {
     "axios": "^1.7.7",
-    "@ckb-ccc/core": "1.2.3"
+    "@ckb-ccc/core": "1.3.1"
   },
   "scripts": {
     "build": "rimraf ./dist && rimraf ./dist.commonjs && tsc && tsc --project tsconfig.commonjs.json && copyfiles -u 2 misc/basedirs/**/* .",

package/src/advanced.ts

@@ -1,4 +1,2 @@
-export * from "./cobuild/index.js";
-export * from "./codec/index.js";
-export * from "./predefined/advanced.js";
-export * from "./spore/advanced.js";
+export * from "./advancedBarrel.js";
+export * as sporeA from "./advancedBarrel.js";

package/src/advancedBarrel.ts

@@ -0,0 +1,4 @@
+export * from "./cobuild/index.js";
+export * from "./codec/index.js";
+export * from "./predefined/advanced.js";
+export * from "./spore/advanced.js";

package/src/barrel.ts

@@ -0,0 +1,4 @@
+export * from "./cluster/index.js";
+export * as dob from "./dob/index.js";
+export * from "./predefined/index.js";
+export * from "./spore/index.js";

package/src/cluster/index.ts

@@ -5,15 +5,11 @@ import {
   prepareSporeTransaction,
 } from "../advanced.js";
 import {
-  ClusterData,
-  ClusterDataV1,
   ClusterDataView,
   packRawClusterData,
+  unpackToRawClusterData,
 } from "../codec/index.js";
-import {
-  findSingletonCellByArgs,
-  injectOneCapacityCell,
-} from "../helper/index.js";
+import { findSingletonCellByArgs } from "../helper/index.js";
 import {
   SporeScriptInfo,
   SporeScriptInfoLike,
@@ -23,20 +19,32 @@ import {
 
 export async function findCluster(
   client: ccc.Client,
-  args: ccc.HexLike,
+  id: ccc.HexLike,
   scripts?: SporeScriptInfoLike[],
 ): Promise<
   | {
       cell: ccc.Cell;
+      cluster: ccc.Cell;
+      clusterData: ClusterDataView;
       scriptInfo: SporeScriptInfo;
     }
   | undefined
 > {
-  return findSingletonCellByArgs(
+  const found = await findSingletonCellByArgs(
     client,
-    args,
+    id,
     scripts ?? Object.values(getClusterScriptInfos(client)),
   );
+  if (!found) {
+    return;
+  }
+
+  return {
+    cell: found.cell,
+    cluster: found.cell,
+    clusterData: unpackToRawClusterData(found.cell.outputData),
+    scriptInfo: found.scriptInfo,
+  };
 }
 
 export async function assertCluster(
@@ -85,9 +93,7 @@ export async function createSporeCluster(params: {
 
   // prepare transaction
   const tx = ccc.Transaction.from(params.tx ?? {});
-  if (tx.inputs.length === 0) {
-    await injectOneCapacityCell(signer, tx);
-  }
+  await tx.completeInputsAtLeastOne(signer);
 
   // build cluster cell
   const id = ccc.hashTypeId(tx.inputs[0], tx.outputs.length);
@@ -191,46 +197,44 @@ export async function transferSporeCluster(params: {
  * @param order the order in creation time of clusters
  * @param scriptInfos the deployed script infos of clusters
  */
-export async function* findSporeClustersBySigner(params: {
+export async function* findSporeClustersBySigner({
+  signer,
+  order,
+  limit,
+  scriptInfos,
+}: {
   signer: ccc.Signer;
   order?: "asc" | "desc";
+  limit?: number;
   scriptInfos?: SporeScriptInfoLike[];
 }): AsyncGenerator<{
+  cell: ccc.Cell;
   cluster: ccc.Cell;
   clusterData: ClusterDataView;
+  scriptInfo: SporeScriptInfo;
 }> {
-  const { signer, order, scriptInfos } = params;
   for (const scriptInfo of scriptInfos ??
     Object.values(getClusterScriptInfos(signer.client))) {
     if (!scriptInfo) {
       continue;
     }
+
     for await (const cluster of signer.findCells(
       {
         script: {
           ...scriptInfo,
-          args: [],
+          args: "",
         },
       },
       true,
       order,
-      10,
+      limit,
     )) {
-      let clusterData: ClusterDataView;
-      try {
-        clusterData = ClusterData.decode(cluster.outputData);
-      } catch (_) {
-        try {
-          clusterData = ClusterDataV1.decode(cluster.outputData);
-        } catch (e: unknown) {
-          throw new Error(
-            `Cluster data decode failed: ${(e as Error).toString()}`,
-          );
-        }
-      }
       yield {
+        cell: cluster,
         cluster,
-        clusterData,
+        clusterData: unpackToRawClusterData(cluster.outputData),
+        scriptInfo: SporeScriptInfo.from(scriptInfo),
       };
     }
   }

package/src/helper/index.ts

@@ -33,36 +33,3 @@ export async function findSingletonCellByArgs(
     }
   }
 }
-
-export async function searchOneCellBySigner(
-  signer: ccc.Signer,
-): Promise<ccc.Cell | undefined> {
-  for await (const cell of signer.findCells(
-    {
-      scriptLenRange: [0, 1],
-      outputDataLenRange: [0, 1],
-    },
-    true,
-    undefined,
-    1,
-  )) {
-    return cell;
-  }
-}
-
-export async function injectOneCapacityCell(
-  signer: ccc.Signer,
-  tx: ccc.Transaction,
-): Promise<void> {
-  const liveCell = await searchOneCellBySigner(signer);
-  if (!liveCell) {
-    throw new Error("No live cell found");
-  }
-
-  tx.inputs.push(
-    ccc.CellInput.from({
-      previousOutput: liveCell.outPoint,
-      ...liveCell,
-    }),
-  );
-}

package/src/index.ts

@@ -1,4 +1,2 @@
-export * from "./cluster/index.js";
-export * as dob from "./dob/index.js";
-export * from "./predefined/index.js";
-export * from "./spore/index.js";
+export * from "./barrel.js";
+export * as spore from "./barrel.js";

package/src/spore/advanced.ts

@@ -2,7 +2,6 @@ import { ccc, mol } from "@ckb-ccc/core";
 import { assembleTransferClusterAction } from "../advanced.js";
 import { assertCluster } from "../cluster/index.js";
 import { Action, SporeDataView } from "../codec/index.js";
-import { searchOneCellBySigner } from "../helper/index.js";
 
 export async function prepareCluster(
   signer: ccc.Signer,
@@ -30,19 +29,10 @@ export async function prepareCluster(
     case "lockProxy": {
       const lock = cluster.cellOutput.lock;
 
-      if (await tx.findInputIndexByLock(lock, signer.client) === undefined) {
+      if ((await tx.findInputIndexByLock(lock, signer.client)) === undefined) {
         // note: We can only search proxy of signer, if any custom logic is in need, developer should get
         // the proxy filled in transaction before invoking `createSpore`
-        const proxy = await searchOneCellBySigner(signer);
-        if (!proxy) {
-          throw new Error("Cluster lock proxy cell not found");
-        }
-        tx.inputs.push(
-          ccc.CellInput.from({
-            previousOutput: proxy.outPoint,
-            ...proxy,
-          }),
-        );
+        await tx.completeInputsAddOne(signer);
       }
       if (tx.outputs.every((output) => output.lock !== lock)) {
         tx.addOutput({