fix duplicated headers when batching dao unlocks

tea2x · Aug 18, 2024 · 3800e7f · 3800e7f
1 parent 32d03d9
commit 3800e7f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "joy-dao",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "Nervos DAO transaction builder",
   "main": "dist/index.js",
   "files": [

diff --git a/src/lumos-patcher.ts b/src/lumos-patcher.ts
@@ -185,15 +185,22 @@ export const unlock = async (
   }
 
   // add dao unlock header deps
-  txSkeleton = txSkeleton.update("headerDeps", (headerDeps) => {
-    return headerDeps.push(
-      daoDepositCell.blockHash!,
-      daoWithdrawalCell.blockHash!
-    );
-  });
+  let headerDeps = txSkeleton.get("headerDeps");
+  if (!headerDeps.contains(daoDepositCell.blockHash!)) {
+    txSkeleton = txSkeleton.update("headerDeps", (headerDeps) => {
+      return headerDeps.push(daoDepositCell.blockHash!);
+    });
+  }
+
+  if (!headerDeps.contains(daoWithdrawalCell.blockHash!)) {
+    txSkeleton = txSkeleton.update("headerDeps", (headerDeps) => {
+      return headerDeps.push(daoWithdrawalCell.blockHash!);
+    });
+  }
 
   // add dao unlock witness
-  const depositHeaderDepIndex = txSkeleton.get("headerDeps").size - 2;
+  headerDeps = txSkeleton.get("headerDeps");
+  const depositHeaderDepIndex = headerDeps.indexOf(daoDepositCell.blockHash!);
   const defaultWitnessArgs: WitnessArgs = {
     inputType: bytes.hexify(number.Uint64LE.pack(depositHeaderDepIndex)),
   };