@ckb-ccc/lumos-patches 0.0.12-alpha.1 → 0.0.12-alpha.2

package/dist/default.d.ts

@@ -1,5 +1,5 @@
-import { LockScriptInfo } from "@ckb-lumos/common-scripts";
 import { ccc } from "@ckb-ccc/core";
+import { LockScriptInfo } from "@ckb-lumos/common-scripts";
 /**
  * Generates custom lock script information.
  * @param {string} codeHash - The code hash of the custom script.

package/dist/default.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"default.d.ts","sourceRoot":"","sources":["../src/default.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE3D,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAsFpC;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,GAAG,CAAC,eAAe,EAAE,GAC9B,cAAc,CAwEhB;AAWD;;;GAGG;AACH,wBAAgB,0BAA0B,IAAI,cAAc,EAAE,CAc7D"}
+{"version":3,"file":"default.d.ts","sourceRoot":"","sources":["../src/default.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAWpC,OAAO,EAEL,cAAc,EAEf,MAAM,2BAA2B,CAAC;AAqGnC;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,GAAG,CAAC,eAAe,EAAE,GAC9B,cAAc,CAwEhB;AAWD;;;GAGG;AACH,wBAAgB,0BAA0B,IAAI,cAAc,EAAE,CAc7D"}

package/dist/default.js

@@ -1,10 +1,24 @@
 import { ccc } from "@ckb-ccc/core";
 import { cccA } from "@ckb-ccc/core/advanced";
 import { bytes } from "@ckb-lumos/codec";
-import { parseFromInfo } from "@ckb-lumos/common-scripts";
-import { addCellDep } from "@ckb-lumos/common-scripts/lib/helper";
+import { parseFromInfo, } from "@ckb-lumos/common-scripts";
 import { getConfig } from "@ckb-lumos/config-manager";
 import { asserts } from "./utils.js";
+function addCellDep(txSkeleton, newCellDep) {
+    const cellDep = txSkeleton.get("cellDeps").find((cellDep) => {
+        return (cellDep.depType === newCellDep.depType &&
+            ccc.OutPoint.from(cellDep.outPoint).eq(ccc.OutPoint.from(newCellDep.outPoint)));
+    });
+    if (!cellDep) {
+        txSkeleton = txSkeleton.update("cellDeps", (cellDeps) => {
+            return cellDeps.push({
+                outPoint: newCellDep.outPoint,
+                depType: newCellDep.depType,
+            });
+        });
+    }
+    return txSkeleton;
+}
 /**
  * Generates a class for collecting custom script cells.
  * @param {string} codeHash - The code hash of the custom script.

package/dist.commonjs/default.d.ts

@@ -1,5 +1,5 @@
-import { LockScriptInfo } from "@ckb-lumos/common-scripts";
 import { ccc } from "@ckb-ccc/core";
+import { LockScriptInfo } from "@ckb-lumos/common-scripts";
 /**
  * Generates custom lock script information.
  * @param {string} codeHash - The code hash of the custom script.

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

@@ -1 +1 @@
-{"version":3,"file":"default.d.ts","sourceRoot":"","sources":["../src/default.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE3D,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAsFpC;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,GAAG,CAAC,eAAe,EAAE,GAC9B,cAAc,CAwEhB;AAWD;;;GAGG;AACH,wBAAgB,0BAA0B,IAAI,cAAc,EAAE,CAc7D"}
+{"version":3,"file":"default.d.ts","sourceRoot":"","sources":["../src/default.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAWpC,OAAO,EAEL,cAAc,EAEf,MAAM,2BAA2B,CAAC;AAqGnC;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAChC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,GAAG,CAAC,eAAe,EAAE,GAC9B,cAAc,CAwEhB;AAWD;;;GAGG;AACH,wBAAgB,0BAA0B,IAAI,cAAc,EAAE,CAc7D"}

package/dist.commonjs/default.js

@@ -5,9 +5,23 @@ const core_1 = require("@ckb-ccc/core");
 const advanced_1 = require("@ckb-ccc/core/advanced");
 const codec_1 = require("@ckb-lumos/codec");
 const common_scripts_1 = require("@ckb-lumos/common-scripts");
-const helper_1 = require("@ckb-lumos/common-scripts/lib/helper");
 const config_manager_1 = require("@ckb-lumos/config-manager");
 const utils_js_1 = require("./utils.js");
+function addCellDep(txSkeleton, newCellDep) {
+    const cellDep = txSkeleton.get("cellDeps").find((cellDep) => {
+        return (cellDep.depType === newCellDep.depType &&
+            core_1.ccc.OutPoint.from(cellDep.outPoint).eq(core_1.ccc.OutPoint.from(newCellDep.outPoint)));
+    });
+    if (!cellDep) {
+        txSkeleton = txSkeleton.update("cellDeps", (cellDeps) => {
+            return cellDeps.push({
+                outPoint: newCellDep.outPoint,
+                depType: newCellDep.depType,
+            });
+        });
+    }
+    return txSkeleton;
+}
 /**
  * Generates a class for collecting custom script cells.
  * @param {string} codeHash - The code hash of the custom script.
@@ -105,14 +119,14 @@ function generateScriptInfo(codeHash, cellDeps) {
                             type: item.type,
                         })
                             .collect()) {
-                            txSkeleton = (0, helper_1.addCellDep)(txSkeleton, {
+                            txSkeleton = addCellDep(txSkeleton, {
                                 depType: "code",
                                 outPoint: cell.outPoint,
                             });
                         }
                     }
                     else {
-                        txSkeleton = (0, helper_1.addCellDep)(txSkeleton, {
+                        txSkeleton = addCellDep(txSkeleton, {
                             ...item.cellDep,
                             outPoint: {
                                 txHash: item.cellDep.outPoint.txHash,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckb-ccc/lumos-patches",
-  "version": "0.0.12-alpha.1",
+  "version": "0.0.12-alpha.2",
   "description": "Patches for using Lumos with CCC",
   "author": "Hanssen0 <hanssen0@hanssen0.com>",
   "license": "MIT",
@@ -44,7 +44,8 @@
     "@ckb-lumos/codec": "^0.24.0-next.1",
     "@ckb-lumos/common-scripts": "^0.24.0-next.1",
     "@ckb-lumos/config-manager": "^0.24.0-next.1",
+    "@ckb-lumos/helpers": "^0.24.0-next.1",
     "@joyid/ckb": "^1.0.1"
   },
-  "gitHead": "22b1e1e4c7e56c8a6e9f699f54193cbec7d30a8b"
+  "gitHead": "376a1a965e35c550a425ade00926e5fd6a9127cb"
 }

package/src/default.ts

@@ -1,20 +1,48 @@
-import { LockScriptInfo } from "@ckb-lumos/common-scripts";
-
 import { ccc } from "@ckb-ccc/core";
 import { cccA } from "@ckb-ccc/core/advanced";
 import {
   Cell,
   CellCollector,
+  CellDep,
   CellProvider,
   QueryOptions,
   Script,
 } from "@ckb-lumos/base";
 import { bytes } from "@ckb-lumos/codec";
-import { FromInfo, parseFromInfo } from "@ckb-lumos/common-scripts";
-import { addCellDep } from "@ckb-lumos/common-scripts/lib/helper";
+import {
+  FromInfo,
+  LockScriptInfo,
+  parseFromInfo,
+} from "@ckb-lumos/common-scripts";
 import { Config, getConfig } from "@ckb-lumos/config-manager";
+import { TransactionSkeletonType } from "@ckb-lumos/helpers";
 import { asserts } from "./utils.js";
 
+function addCellDep(
+  txSkeleton: TransactionSkeletonType,
+  newCellDep: CellDep,
+): TransactionSkeletonType {
+  const cellDep = txSkeleton.get("cellDeps").find((cellDep) => {
+    return (
+      cellDep.depType === newCellDep.depType &&
+      ccc.OutPoint.from(cellDep.outPoint).eq(
+        ccc.OutPoint.from(newCellDep.outPoint),
+      )
+    );
+  });
+
+  if (!cellDep) {
+    txSkeleton = txSkeleton.update("cellDeps", (cellDeps) => {
+      return cellDeps.push({
+        outPoint: newCellDep.outPoint,
+        depType: newCellDep.depType,
+      });
+    });
+  }
+
+  return txSkeleton;
+}
+
 /**
  * Generates a class for collecting custom script cells.
  * @param {string} codeHash - The code hash of the custom script.