@ckb-ccc/spore 1.2.4 → 1.3.0

package/CHANGELOG.md

@@ -1,27 +1,21 @@
 # @ckb-ccc/spore
 
-## 1.2.4
+## 1.3.0
 
-### Patch Changes
-
-- Updated dependencies [[`2d80b5d`](https://github.com/ckb-devrel/ccc/commit/2d80b5da31bb542f0305a6f0da86f35e56681f50)]:
-  - @ckb-ccc/core@1.5.3
+### Minor Changes
 
-## 1.2.3
+- [#173](https://github.com/ckb-devrel/ccc/pull/173) [`9eaa0ad`](https://github.com/ckb-devrel/ccc/commit/9eaa0ad3214d21bb00bec98d89c76b4bde2c0515) Thanks [@ashuralyk](https://github.com/ashuralyk)! - support search spore/cluster under customized lock script
 
 ### Patch Changes
 
-- Updated dependencies [[`1a39a8e`](https://github.com/ckb-devrel/ccc/commit/1a39a8ee291e603029ebc50ab65220b0c86986cb)]:
-  - @ckb-ccc/core@1.5.2
+- [#179](https://github.com/ckb-devrel/ccc/pull/179) [`732ad59`](https://github.com/ckb-devrel/ccc/commit/732ad59f13ea2cd47003033e30b310b8ff26f058) Thanks [@Hanssen0](https://github.com/Hanssen0)! - fix: add inputs after cobuild witness injected
 
-## 1.2.2
-
-### Patch Changes
+- [#175](https://github.com/ckb-devrel/ccc/pull/175) [`5fa86e7`](https://github.com/ckb-devrel/ccc/commit/5fa86e7656d34d47662669d91e273f994640f707) Thanks [@ashuralyk](https://github.com/ashuralyk)! - bug: add scriptInfo parameter in transfer/melt spore method
 
-- [`dc7ee7d`](https://github.com/ckb-devrel/ccc/commit/dc7ee7dffa1802ae07407c123def16f97cf73b03) Thanks [@Hanssen0](https://github.com/Hanssen0)! - chore: fix versioning
+- [#158](https://github.com/ckb-devrel/ccc/pull/158) [`6f10589`](https://github.com/ckb-devrel/ccc/commit/6f1058977e7aa113808fa74793f1ad5d672626d2) Thanks [@Hanssen0](https://github.com/Hanssen0)! - feat(core): Transaction utils
 
-- Updated dependencies [[`dc7ee7d`](https://github.com/ckb-devrel/ccc/commit/dc7ee7dffa1802ae07407c123def16f97cf73b03)]:
-  - @ckb-ccc/core@1.5.1
+- Updated dependencies [[`80e605d`](https://github.com/ckb-devrel/ccc/commit/80e605d0645e87b4e8b5be85c63322f7a3926e38), [`8c7e000`](https://github.com/ckb-devrel/ccc/commit/8c7e00069a276ac58afa4737623e95656d4852c5), [`732ad59`](https://github.com/ckb-devrel/ccc/commit/732ad59f13ea2cd47003033e30b310b8ff26f058), [`90b6e9f`](https://github.com/ckb-devrel/ccc/commit/90b6e9fee543b6ee16b96e27d6f86ff33fc57029), [`815fb4d`](https://github.com/ckb-devrel/ccc/commit/815fb4da3432b889b848eb70943d725988fe611d), [`def62a0`](https://github.com/ckb-devrel/ccc/commit/def62a08bf908c6a21fe91c8db2c60848a2ada52), [`d584059`](https://github.com/ckb-devrel/ccc/commit/d584059644e8bcd3a0ea8b0314fdcbb68ee66013), [`f58d398`](https://github.com/ckb-devrel/ccc/commit/f58d3980f08da1f3fa19cee45aa50c8b293294ea), [`1e88ad8`](https://github.com/ckb-devrel/ccc/commit/1e88ad8743428b46b28fe790bd559b96df8a6ce4), [`6f10589`](https://github.com/ckb-devrel/ccc/commit/6f1058977e7aa113808fa74793f1ad5d672626d2), [`601a729`](https://github.com/ckb-devrel/ccc/commit/601a7291e877b39c4032c95fab421ed3d41404c2), [`074b4cd`](https://github.com/ckb-devrel/ccc/commit/074b4cd3b0cdc925dc9ef99e8146564a60646f1e), [`d7728d9`](https://github.com/ckb-devrel/ccc/commit/d7728d9edb46c9c5a2bfeb342fc68a8b1c0fec5d), [`ab195a0`](https://github.com/ckb-devrel/ccc/commit/ab195a024aeee5e21ed19d89c2cf1bf8d52bb380), [`29a2e22`](https://github.com/ckb-devrel/ccc/commit/29a2e223b902ed23523e4948ab3fca793f9e5b01)]:
+  - @ckb-ccc/core@1.6.0
 
 ## 1.2.1
 

package/dist/cluster/index.d.ts

@@ -14,12 +14,12 @@ export declare function assertCluster(client: ccc.Client, args: ccc.HexLike, scr
 /**
  * Create a new Cluster cell
  *
- * @param signer who takes the responsibility to balance and sign the transaction
- * @param data specific format of data required by Cluster protocol
- * @param to the owner of the Cluster cell, which will be replaced with signer if not provided
- * @param tx the transaction skeleton, if not provided, a new one will be created
- * @param scriptInfo the script info of new cluster, default spore version if undefined
- * @param scriptInfoHash the script info hash used in cobuild
+ * @param params.signer who takes the responsibility to balance and sign the transaction
+ * @param params.data specific format of data required by Cluster protocol
+ * @param params.to the owner of the Cluster cell, which will be replaced with signer if not provided
+ * @param params.tx the transaction skeleton, if not provided, a new one will be created
+ * @param params.scriptInfo the script info of new cluster, default spore version if undefined
+ * @param params.scriptInfoHash the script info hash used in cobuild
  * @returns
  *  - **tx**: a new transaction that contains created Cluster cell
  *  - **id**: the id of the created Cluster cell
@@ -38,11 +38,11 @@ export declare function createSporeCluster(params: {
 /**
  * Transfer a Cluster cell
  *
- * @param signer who takes the responsibility to balance and sign the transaction
- * @param id the id of the Cluster cell to be transferred
- * @param to the new owner of the Cluster cell
- * @param tx the transaction skeleton, if not provided, a new one will be created
- * @param scriptInfoHash the script info hash used in cobuild
+ * @param params.signer who takes the responsibility to balance and sign the transaction
+ * @param params.id the id of the Cluster cell to be transferred
+ * @param params.to the new owner of the Cluster cell
+ * @param params.tx the transaction skeleton, if not provided, a new one will be created
+ * @param params.scriptInfoHash the script info hash used in cobuild
  * @returns
  *  - **tx**: a new transaction that contains transferred Cluster cell
  */
@@ -51,6 +51,7 @@ export declare function transferSporeCluster(params: {
     id: ccc.HexLike;
     to: ccc.ScriptLike;
     tx?: ccc.TransactionLike;
+    scripts?: SporeScriptInfoLike[];
     scriptInfoHash?: ccc.HexLike;
 }): Promise<{
     tx: ccc.Transaction;
@@ -58,11 +59,11 @@ export declare function transferSporeCluster(params: {
 /**
  * Search on-chain clusters under the signer's control
  *
- * @param signer the owner of clusters
- * @param order the order in creation time of clusters
- * @param scriptInfos the deployed script infos of clusters
+ * @param params.signer the owner of clusters
+ * @param params.order the order in creation time of clusters
+ * @param params.scriptInfos the deployed script infos of clusters
  */
-export declare function findSporeClustersBySigner({ signer, order, limit, scriptInfos, }: {
+export declare function findSporeClustersBySigner(params: {
     signer: ccc.Signer;
     order?: "asc" | "desc";
     limit?: number;
@@ -73,4 +74,22 @@ export declare function findSporeClustersBySigner({ signer, order, limit, script
     clusterData: ClusterDataView;
     scriptInfo: SporeScriptInfo;
 }>;
+/**
+ * Search on-chain clusters under the specified lock or not
+ *
+ * @param params.client the client to search clusters
+ * @param params.lock the lock of clusters
+ */
+export declare function findSporeClusters(params: {
+    client: ccc.Client;
+    lock?: ccc.ScriptLike;
+    order?: "asc" | "desc";
+    limit?: number;
+    scriptInfos?: SporeScriptInfoLike[];
+}): AsyncGenerator<{
+    cell: ccc.Cell;
+    cluster: ccc.Cell;
+    clusterData: ClusterDataView;
+    scriptInfo: SporeScriptInfo;
+}>;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cluster/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAMpC,OAAO,EACL,eAAe,EAGhB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EACL,eAAe,EACf,mBAAmB,EAGpB,MAAM,wBAAwB,CAAC;AAEhC,wBAAsB,WAAW,CAC/B,MAAM,EAAE,GAAG,CAAC,MAAM,EAClB,EAAE,EAAE,GAAG,CAAC,OAAO,EACf,OAAO,CAAC,EAAE,mBAAmB,EAAE,GAC9B,OAAO,CACN;IACE,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC;IACf,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC;IAClB,WAAW,EAAE,eAAe,CAAC;IAC7B,UAAU,EAAE,eAAe,CAAC;CAC7B,GACD,SAAS,CACZ,CAgBA;AAED,wBAAsB,aAAa,CACjC,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;;;;;;;;;;;;GAYG;AACH,wBAAsB,kBAAkB,CAAC,MAAM,EAAE;IAC/C,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC;IACnB,IAAI,EAAE,eAAe,CAAC;IACtB,EAAE,CAAC,EAAE,GAAG,CAAC,UAAU,CAAC;IACpB,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,CAwCD;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,oBAAoB,CAAC,MAAM,EAAE;IACjD,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,CAwCD;AAED;;;;;;GAMG;AACH,wBAAuB,yBAAyB,CAAC,EAC/C,MAAM,EACN,KAAK,EACL,KAAK,EACL,WAAW,GACZ,EAAE;IACD,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,mBAAmB,EAAE,CAAC;CACrC,GAAG,cAAc,CAAC;IACjB,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC;IACf,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC;IAClB,WAAW,EAAE,eAAe,CAAC;IAC7B,UAAU,EAAE,eAAe,CAAC;CAC7B,CAAC,CA0BD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/cluster/index.ts"],"names":[],"mappings":"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"}

package/dist/cluster/index.js

@@ -25,12 +25,12 @@ export async function assertCluster(client, args, scripts) {
 /**
  * Create a new Cluster cell
  *
- * @param signer who takes the responsibility to balance and sign the transaction
- * @param data specific format of data required by Cluster protocol
- * @param to the owner of the Cluster cell, which will be replaced with signer if not provided
- * @param tx the transaction skeleton, if not provided, a new one will be created
- * @param scriptInfo the script info of new cluster, default spore version if undefined
- * @param scriptInfoHash the script info hash used in cobuild
+ * @param params.signer who takes the responsibility to balance and sign the transaction
+ * @param params.data specific format of data required by Cluster protocol
+ * @param params.to the owner of the Cluster cell, which will be replaced with signer if not provided
+ * @param params.tx the transaction skeleton, if not provided, a new one will be created
+ * @param params.scriptInfo the script info of new cluster, default spore version if undefined
+ * @param params.scriptInfoHash the script info hash used in cobuild
  * @returns
  *  - **tx**: a new transaction that contains created Cluster cell
  *  - **id**: the id of the created Cluster cell
@@ -67,32 +67,29 @@ export async function createSporeCluster(params) {
 /**
  * Transfer a Cluster cell
  *
- * @param signer who takes the responsibility to balance and sign the transaction
- * @param id the id of the Cluster cell to be transferred
- * @param to the new owner of the Cluster cell
- * @param tx the transaction skeleton, if not provided, a new one will be created
- * @param scriptInfoHash the script info hash used in cobuild
+ * @param params.signer who takes the responsibility to balance and sign the transaction
+ * @param params.id the id of the Cluster cell to be transferred
+ * @param params.to the new owner of the Cluster cell
+ * @param params.tx the transaction skeleton, if not provided, a new one will be created
+ * @param params.scriptInfoHash the script info hash used in cobuild
  * @returns
  *  - **tx**: a new transaction that contains transferred Cluster cell
  */
 export async function transferSporeCluster(params) {
-    const { signer, id, to, scriptInfoHash } = params;
+    const { signer, id, to, scripts, scriptInfoHash } = params;
     // prepare transaction
     const tx = ccc.Transaction.from(params.tx ?? {});
     // build cluster cell
-    const { cell: cluster, scriptInfo } = await assertCluster(signer.client, id);
-    tx.inputs.push(ccc.CellInput.from({
-        previousOutput: cluster.outPoint,
-        ...cluster,
-    }));
+    const { cell: cluster, scriptInfo: clusterScriptInfo } = await assertCluster(signer.client, id, scripts);
+    tx.addInput(cluster);
     tx.addOutput({
         lock: to,
         type: cluster.cellOutput.type,
     }, cluster.outputData);
     // complete cellDeps
-    await tx.addCellDepInfos(signer.client, scriptInfo.cellDeps);
+    await tx.addCellDepInfos(signer.client, clusterScriptInfo.cellDeps);
     // generate cobuild action
-    const actions = scriptInfo.cobuild
+    const actions = clusterScriptInfo.cobuild
         ? [
             assembleTransferClusterAction(cluster.cellOutput, tx.outputs[tx.outputs.length - 1], scriptInfoHash),
         ]
@@ -104,11 +101,12 @@ export async function transferSporeCluster(params) {
 /**
  * Search on-chain clusters under the signer's control
  *
- * @param signer the owner of clusters
- * @param order the order in creation time of clusters
- * @param scriptInfos the deployed script infos of clusters
+ * @param params.signer the owner of clusters
+ * @param params.order the order in creation time of clusters
+ * @param params.scriptInfos the deployed script infos of clusters
  */
-export async function* findSporeClustersBySigner({ signer, order, limit, scriptInfos, }) {
+export async function* findSporeClustersBySigner(params) {
+    const { signer, order, limit, scriptInfos } = params;
     for (const scriptInfo of scriptInfos ??
         Object.values(getClusterScriptInfos(signer.client))) {
         if (!scriptInfo) {
@@ -129,3 +127,39 @@ export async function* findSporeClustersBySigner({ signer, order, limit, scriptI
         }
     }
 }
+/**
+ * Search on-chain clusters under the specified lock or not
+ *
+ * @param params.client the client to search clusters
+ * @param params.lock the lock of clusters
+ */
+export async function* findSporeClusters(params) {
+    const { client, lock, order, limit, scriptInfos } = params;
+    for (const scriptInfo of scriptInfos ??
+        Object.values(getClusterScriptInfos(client))) {
+        if (!scriptInfo) {
+            continue;
+        }
+        for await (const cluster of client.findCells({
+            script: {
+                ...scriptInfo,
+                args: "",
+            },
+            scriptType: "type",
+            scriptSearchMode: "prefix",
+            withData: true,
+            filter: lock
+                ? {
+                    script: lock,
+                }
+                : undefined,
+        }, order, limit)) {
+            yield {
+                cell: cluster,
+                cluster,
+                clusterData: unpackToRawClusterData(cluster.outputData),
+                scriptInfo: SporeScriptInfo.from(scriptInfo),
+            };
+        }
+    }
+}

package/dist/cobuild/index.js

@@ -155,7 +155,7 @@ export function extractCobuildActionsFromTx(tx) {
     return witnessLayout.value.message.actions;
 }
 export function injectCobuild(tx, actions) {
-    const witnessLayout = ccc.hexFrom(WitnessLayout.encode({
+    tx.setWitnessAt(Math.max(tx.witnesses.length, tx.inputs.length), WitnessLayout.encode({
         type: "SighashAll",
         value: {
             seal: "0x",
@@ -164,5 +164,4 @@ export function injectCobuild(tx, actions) {
             },
         },
     }));
-    tx.witnesses.push(ccc.hexFrom(witnessLayout));
 }

package/dist/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;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"}
+{"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,CA4DvD"}

package/dist/spore/advanced.js

@@ -1,4 +1,3 @@
-import { ccc } from "@ckb-ccc/core";
 import { assembleTransferClusterAction } from "../advanced.js";
 import { assertCluster } from "../cluster/index.js";
 export async function prepareCluster(signer, tx, data, clusterMode, scriptInfoHash) {
@@ -34,10 +33,7 @@ export async function prepareCluster(signer, tx, data, clusterMode, scriptInfoHa
             if (tx.inputs.some((i) => i.previousOutput.eq(cluster.outPoint))) {
                 return;
             }
-            tx.inputs.push(ccc.CellInput.from({
-                previousOutput: cluster.outPoint,
-                ...cluster,
-            }));
+            tx.addInput(cluster);
             tx.addOutput(cluster.cellOutput, cluster.outputData);
             await tx.addCellDepInfos(signer.client, scriptInfo.cellDeps);
             // note: add cluster as cellDep, which will be used in Spore contract

package/dist/spore/index.d.ts

@@ -14,17 +14,17 @@ export declare function assertSpore(client: ccc.Client, args: ccc.HexLike, scrip
 /**
  * Create one Spore cell with the specified Spore data.
  *
- * @param signer who takes the responsibility to balance and sign the transaction
- * @param data specific format of data required by Spore protocol
- * @param to owner of new spore cell, signer if no provided
- * @param clusterMode how to process cluster cell **(if clusterId is not provided in SporeData, this parameter will be ignored)**
+ * @param params.signer who takes the responsibility to balance and sign the transaction
+ * @param params.data specific format of data required by Spore protocol
+ * @param params.to owner of new spore cell, signer if no provided
+ * @param params.clusterMode how to process cluster cell **(if clusterId is not provided in SporeData, this parameter will be ignored)**
  *   - undefined: error if the spore has a cluster but the clusterMode is not set
  *   - lockProxy: put a cell that uses the same lock from Cluster cell in both Inputs and Outputs
  *   - clusterCell: directly put Cluster cell in Inputs and Outputs
  *   - skip: don't handle the cluster logic
- * @param tx the transaction skeleton, if not provided, a new one will be created
- * @param scriptInfo the script info of Spore cell, if not provided, the default script info will be used
- * @param scriptInfoHash the script info hash used in cobuild
+ * @param params.tx the transaction skeleton, if not provided, a new one will be created
+ * @param params.scriptInfo the script info of Spore cell, if not provided, the default script info will be used
+ * @param params.scriptInfoHash the script info hash used in cobuild
  * @returns
  *  - **tx**: a new transaction that contains created Spore cells
  *  - **id**: the sporeId of created Spore cell
@@ -44,11 +44,11 @@ export declare function createSpore(params: {
 /**
  * Transfer one Spore cell
  *
- * @param signer who takes the responsibility to balance and sign the transaction
- * @param id sporeId
- * @param to Spore's new owner
- * @param tx the transaction skeleton, if not provided, a new one will be created
- * @param scriptInfoHash the script info hash used in cobuild
+ * @param params.signer who takes the responsibility to balance and sign the transaction
+ * @param params.id sporeId
+ * @param params.to Spore's new owner
+ * @param params.tx the transaction skeleton, if not provided, a new one will be created
+ * @param params.scriptInfoHash the script info hash used in cobuild
  * @returns
  *  - **tx**: a new transaction that contains transferred Spore cells
  */
@@ -57,6 +57,7 @@ export declare function transferSpore(params: {
     id: ccc.HexLike;
     to: ccc.ScriptLike;
     tx?: ccc.TransactionLike;
+    scripts?: SporeScriptInfoLike[];
     scriptInfoHash?: ccc.HexLike;
 }): Promise<{
     tx: ccc.Transaction;
@@ -64,10 +65,10 @@ export declare function transferSpore(params: {
 /**
  * Melt one Spore cell
  *
- * @param signer who takes the responsibility to balance and sign the transaction
- * @param id sporeId to be melted
- * @param tx the transaction skeleton, if not provided, a new one will be created
- * @param scriptInfoHash the script info hash used in cobuild
+ * @param params.signer who takes the responsibility to balance and sign the transaction
+ * @param params.id sporeId to be melted
+ * @param params.tx the transaction skeleton, if not provided, a new one will be created
+ * @param params.scriptInfoHash the script info hash used in cobuild
  * @returns
  *  - **tx**: a new transaction that contains melted Spore cell
  */
@@ -75,6 +76,7 @@ export declare function meltSpore(params: {
     signer: ccc.Signer;
     id: ccc.HexLike;
     tx?: ccc.TransactionLike;
+    scripts?: SporeScriptInfoLike[];
     scriptInfoHash?: ccc.HexLike;
 }): Promise<{
     tx: ccc.Transaction;
@@ -82,13 +84,13 @@ export declare function meltSpore(params: {
 /**
  * Search on-chain spores under the signer's control, if cluster provided, filter spores belonging to this cluster
  *
- * @param signer the owner of spores
- * @param order the order in creation time of spores
- * @param clusterId the cluster that spores belong to. "" to find public spores
- * @param scriptInfos the deployed script infos of spores
+ * @param params.signer the owner of spores
+ * @param params.order the order in creation time of spores
+ * @param params.clusterId the cluster that spores belong to. "" to find public spores
+ * @param params.scriptInfos the deployed script infos of spores
  * @returns specified spore cells
  */
-export declare function findSporesBySigner({ signer, clusterId, scriptInfos, limit, order, }: {
+export declare function findSporesBySigner(params: {
     signer: ccc.Signer;
     order?: "asc" | "desc";
     limit?: number;
@@ -100,4 +102,28 @@ export declare function findSporesBySigner({ signer, clusterId, scriptInfos, lim
     sporeData: SporeDataView;
     scriptInfo: SporeScriptInfo;
 }>;
+/**
+ * Search on-chain spores under the specified lock or not, if cluster provided, filter spores belonging to this cluster
+ *
+ * @param params.client the client to search spores
+ * @param params.lock the lock of spores
+ * @param params.clusterId the cluster that spores belong to. "" to find public spores
+ * @param params.scriptInfos the deployed script infos of spores
+ * @param params.limit the limit of spores to search
+ * @param params.order the order in creation time of spores
+ * @returns specified spore cells
+ */
+export declare function findSpores(params: {
+    client: ccc.Client;
+    lock?: ccc.ScriptLike;
+    clusterId?: ccc.HexLike;
+    scriptInfos?: SporeScriptInfoLike[];
+    limit?: number;
+    order?: "asc" | "desc";
+}): AsyncGenerator<{
+    cell: ccc.Cell;
+    spore: ccc.Cell;
+    sporeData: SporeDataView;
+    scriptInfo: SporeScriptInfo;
+}>;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/spore/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/spore/index.ts"],"names":[],"mappings":"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"}

package/dist/spore/index.js

@@ -26,17 +26,17 @@ export async function assertSpore(client, args, scripts) {
 /**
  * Create one Spore cell with the specified Spore data.
  *
- * @param signer who takes the responsibility to balance and sign the transaction
- * @param data specific format of data required by Spore protocol
- * @param to owner of new spore cell, signer if no provided
- * @param clusterMode how to process cluster cell **(if clusterId is not provided in SporeData, this parameter will be ignored)**
+ * @param params.signer who takes the responsibility to balance and sign the transaction
+ * @param params.data specific format of data required by Spore protocol
+ * @param params.to owner of new spore cell, signer if no provided
+ * @param params.clusterMode how to process cluster cell **(if clusterId is not provided in SporeData, this parameter will be ignored)**
  *   - undefined: error if the spore has a cluster but the clusterMode is not set
  *   - lockProxy: put a cell that uses the same lock from Cluster cell in both Inputs and Outputs
  *   - clusterCell: directly put Cluster cell in Inputs and Outputs
  *   - skip: don't handle the cluster logic
- * @param tx the transaction skeleton, if not provided, a new one will be created
- * @param scriptInfo the script info of Spore cell, if not provided, the default script info will be used
- * @param scriptInfoHash the script info hash used in cobuild
+ * @param params.tx the transaction skeleton, if not provided, a new one will be created
+ * @param params.scriptInfo the script info of Spore cell, if not provided, the default script info will be used
+ * @param params.scriptInfoHash the script info hash used in cobuild
  * @returns
  *  - **tx**: a new transaction that contains created Spore cells
  *  - **id**: the sporeId of created Spore cell
@@ -81,29 +81,26 @@ export async function createSpore(params) {
 /**
  * Transfer one Spore cell
  *
- * @param signer who takes the responsibility to balance and sign the transaction
- * @param id sporeId
- * @param to Spore's new owner
- * @param tx the transaction skeleton, if not provided, a new one will be created
- * @param scriptInfoHash the script info hash used in cobuild
+ * @param params.signer who takes the responsibility to balance and sign the transaction
+ * @param params.id sporeId
+ * @param params.to Spore's new owner
+ * @param params.tx the transaction skeleton, if not provided, a new one will be created
+ * @param params.scriptInfoHash the script info hash used in cobuild
  * @returns
  *  - **tx**: a new transaction that contains transferred Spore cells
  */
 export async function transferSpore(params) {
-    const { signer, id, to, scriptInfoHash } = params;
+    const { signer, id, to, scripts, scriptInfoHash } = params;
     // prepare transaction
     const tx = ccc.Transaction.from(params.tx ?? {});
-    const { cell: sporeCell, scriptInfo } = await assertSpore(signer.client, id);
-    await tx.addCellDepInfos(signer.client, scriptInfo.cellDeps);
-    tx.inputs.push(ccc.CellInput.from({
-        previousOutput: sporeCell.outPoint,
-        ...sporeCell,
-    }));
+    const { cell: sporeCell, scriptInfo: sporeScriptInfo } = await assertSpore(signer.client, id, scripts);
+    await tx.addCellDepInfos(signer.client, sporeScriptInfo.cellDeps);
+    tx.addInput(sporeCell);
     tx.addOutput({
         lock: to,
         type: sporeCell.cellOutput.type,
     }, sporeCell.outputData);
-    const actions = scriptInfo.cobuild
+    const actions = sporeScriptInfo.cobuild
         ? [
             assembleTransferSporeAction(sporeCell.cellOutput, tx.outputs[tx.outputs.length - 1], scriptInfoHash),
         ]
@@ -115,25 +112,22 @@ export async function transferSpore(params) {
 /**
  * Melt one Spore cell
  *
- * @param signer who takes the responsibility to balance and sign the transaction
- * @param id sporeId to be melted
- * @param tx the transaction skeleton, if not provided, a new one will be created
- * @param scriptInfoHash the script info hash used in cobuild
+ * @param params.signer who takes the responsibility to balance and sign the transaction
+ * @param params.id sporeId to be melted
+ * @param params.tx the transaction skeleton, if not provided, a new one will be created
+ * @param params.scriptInfoHash the script info hash used in cobuild
  * @returns
  *  - **tx**: a new transaction that contains melted Spore cell
  */
 export async function meltSpore(params) {
-    const { signer, id, scriptInfoHash } = params;
+    const { signer, id, scripts, scriptInfoHash } = params;
     // prepare transaction
     const tx = ccc.Transaction.from(params.tx ?? {});
     // build spore cell
-    const { cell: sporeCell, scriptInfo } = await assertSpore(signer.client, id);
-    await tx.addCellDepInfos(signer.client, scriptInfo.cellDeps);
-    tx.inputs.push(ccc.CellInput.from({
-        previousOutput: sporeCell.outPoint,
-        ...sporeCell,
-    }));
-    const actions = scriptInfo.cobuild
+    const { cell: sporeCell, scriptInfo: sporeScriptInfo } = await assertSpore(signer.client, id, scripts);
+    await tx.addCellDepInfos(signer.client, sporeScriptInfo.cellDeps);
+    tx.addInput(sporeCell);
+    const actions = sporeScriptInfo.cobuild
         ? [assembleMeltSporeAction(sporeCell.cellOutput, scriptInfoHash)]
         : [];
     return {
@@ -143,13 +137,14 @@ export async function meltSpore(params) {
 /**
  * Search on-chain spores under the signer's control, if cluster provided, filter spores belonging to this cluster
  *
- * @param signer the owner of spores
- * @param order the order in creation time of spores
- * @param clusterId the cluster that spores belong to. "" to find public spores
- * @param scriptInfos the deployed script infos of spores
+ * @param params.signer the owner of spores
+ * @param params.order the order in creation time of spores
+ * @param params.clusterId the cluster that spores belong to. "" to find public spores
+ * @param params.scriptInfos the deployed script infos of spores
  * @returns specified spore cells
  */
-export async function* findSporesBySigner({ signer, clusterId, scriptInfos, limit, order, }) {
+export async function* findSporesBySigner(params) {
+    const { signer, clusterId, scriptInfos, limit, order } = params;
     for (const scriptInfo of scriptInfos ??
         Object.values(getSporeScriptInfos(signer.client))) {
         if (!scriptInfo) {
@@ -175,3 +170,49 @@ export async function* findSporesBySigner({ signer, clusterId, scriptInfos, limi
         }
     }
 }
+/**
+ * Search on-chain spores under the specified lock or not, if cluster provided, filter spores belonging to this cluster
+ *
+ * @param params.client the client to search spores
+ * @param params.lock the lock of spores
+ * @param params.clusterId the cluster that spores belong to. "" to find public spores
+ * @param params.scriptInfos the deployed script infos of spores
+ * @param params.limit the limit of spores to search
+ * @param params.order the order in creation time of spores
+ * @returns specified spore cells
+ */
+export async function* findSpores(params) {
+    const { client, lock, clusterId, scriptInfos, limit, order } = params;
+    for (const scriptInfo of scriptInfos ??
+        Object.values(getSporeScriptInfos(client))) {
+        if (!scriptInfo) {
+            continue;
+        }
+        for await (const spore of client.findCells({
+            script: {
+                ...scriptInfo,
+                args: [],
+            },
+            scriptType: "type",
+            scriptSearchMode: "prefix",
+            withData: true,
+            filter: lock
+                ? {
+                    script: lock,
+                }
+                : undefined,
+        }, order, limit)) {
+            const sporeData = unpackToRawSporeData(spore.outputData);
+            if (!clusterId ||
+                (clusterId === "" && !sporeData.clusterId) ||
+                sporeData.clusterId === ccc.hexFrom(clusterId)) {
+                yield {
+                    cell: spore,
+                    spore,
+                    sporeData,
+                    scriptInfo: SporeScriptInfo.from(scriptInfo),
+                };
+            }
+        }
+    }
+}

package/dist.commonjs/advanced.js

@@ -18,13 +18,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sporeA = void 0;
 __exportStar(require("./advancedBarrel.js"), exports);