@ckb-ccc/joy-id 0.0.6-alpha.0 → 0.0.7-alpha.1

package/dist.commonjs/signerFactory/index.js

@@ -17,37 +17,48 @@ const nostr_1 = require("../nostr");
  * @returns {ccc.SignerInfo[]} An array of signer information objects.
  */
 function getJoyIdSigners(client, name, icon) {
-    if ((0, common_1.isStandaloneBrowser)() || core_1.ccc.isWebview(window.navigator.userAgent)) {
-        return [core_1.ccc.SignerType.CKB, core_1.ccc.SignerType.EVM, core_1.ccc.SignerType.BTC].map((type) => ({
-            name: type,
-            signer: new core_1.ccc.SignerAlwaysError(client, type, "JoyID can only be used with standard browsers"),
-        }));
-    }
+  if (
+    (0, common_1.isStandaloneBrowser)() ||
+    core_1.ccc.isWebview(window.navigator.userAgent)
+  ) {
     return [
-        {
-            name: "CKB",
-            signer: new ckb_1.CkbSigner(client, name, icon),
-        },
-        {
-            name: "BTC",
-            signer: new btc_1.BitcoinSigner(client, name, icon),
-        },
-        {
-            name: "Nostr",
-            signer: new nostr_1.NostrSigner(client, name, icon),
-        },
-        {
-            name: "EVM",
-            signer: new evm_1.EvmSigner(client, name, icon),
-        },
-        {
-            name: "BTC (P2WPKH)",
-            signer: new btc_1.BitcoinSigner(client, name, icon, "p2wpkh"),
-        },
-        {
-            name: "BTC (P2TR)",
-            signer: new btc_1.BitcoinSigner(client, name, icon, "p2tr"),
-        },
-    ];
+      core_1.ccc.SignerType.CKB,
+      core_1.ccc.SignerType.EVM,
+      core_1.ccc.SignerType.BTC,
+    ].map((type) => ({
+      name: type,
+      signer: new core_1.ccc.SignerAlwaysError(
+        client,
+        type,
+        "JoyID can only be used with standard browsers",
+      ),
+    }));
+  }
+  return [
+    {
+      name: "CKB",
+      signer: new ckb_1.CkbSigner(client, name, icon),
+    },
+    {
+      name: "BTC",
+      signer: new btc_1.BitcoinSigner(client, name, icon),
+    },
+    {
+      name: "Nostr",
+      signer: new nostr_1.NostrSigner(client, name, icon),
+    },
+    {
+      name: "EVM",
+      signer: new evm_1.EvmSigner(client, name, icon),
+    },
+    {
+      name: "BTC (P2WPKH)",
+      signer: new btc_1.BitcoinSigner(client, name, icon, "p2wpkh"),
+    },
+    {
+      name: "BTC (P2TR)",
+      signer: new btc_1.BitcoinSigner(client, name, icon, "p2tr"),
+    },
+  ];
 }
 exports.getJoyIdSigners = getJoyIdSigners;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckb-ccc/joy-id",
-  "version": "0.0.6-alpha.0",
+  "version": "0.0.7-alpha.1",
   "description": "Connector's support for JoyID",
   "author": "Hanssen0 <hanssen0@hanssen0.com>",
   "license": "MIT",
@@ -38,9 +38,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@ckb-ccc/core": "0.0.6-alpha.0",
-    "@joyid/ckb": "^0.0.11",
-    "@joyid/common": "^0.0.3"
+    "@ckb-ccc/core": "0.0.7-alpha.1",
+    "@joyid/ckb": "^1.0.0",
+    "@joyid/common": "^0.2.0"
   },
-  "gitHead": "2cbb4f450ed88e773a353a13ad006dbe6208f67f"
+  "gitHead": "08978b86747dd8ad7f4abb833c8eb00b98fd0496"
 }

package/src/ckb/index.ts

@@ -178,6 +178,7 @@ export class CkbSigner extends ccc.Signer {
     txLike: ccc.TransactionLike,
   ): Promise<ccc.Transaction> {
     const tx = ccc.Transaction.from(txLike);
+    await tx.addCellDepsOfKnownScripts(this.client, ccc.KnownScript.JoyId);
     const position = await tx.findInputIndexByLock(
       (await this.getAddressObj()).script,
       this.client,
@@ -187,7 +188,7 @@ export class CkbSigner extends ccc.Signer {
     }
 
     const witness = tx.getWitnessArgsAt(position) ?? ccc.WitnessArgs.from({});
-    witness.lock = "0x";
+    witness.lock = ccc.hexFrom("00".repeat(1000));
     await this.prepareTransactionForSubKey(tx, witness);
     tx.setWitnessArgsAt(position, witness);
 
@@ -197,9 +198,8 @@ export class CkbSigner extends ccc.Signer {
   /**
    * Prepares a transaction for a sub key.
    * @private
-   * @param {ccc.Transaction} tx - The transaction object.
-   * @param {ccc.WitnessArgs} witness - The witness arguments.
-   * @returns {Promise<void>}
+   * @param tx - The transaction object.
+   * @param witness - The witness arguments.
    * @throws Will throw an error if no COTA cells are found for the sub key wallet.
    */
   private async prepareTransactionForSubKey(
@@ -222,10 +222,10 @@ export class CkbSigner extends ccc.Signer {
     witness.outputType = ccc.hexFrom(unlockEntry);
 
     const cotaDeps: ccc.CellDep[] = [];
-    for await (const cell of this.client.findCellsByLockAndType(lock, {
-      ...(await this.client.getKnownScript(ccc.KnownScript.COTA)),
-      args: "0x",
-    })) {
+    for await (const cell of this.client.findCellsByLockAndType(
+      lock,
+      await ccc.Script.fromKnownScript(this.client, ccc.KnownScript.COTA, "0x"),
+    )) {
       cotaDeps.push(
         ccc.CellDep.from({
           depType: "code",
@@ -251,6 +251,27 @@ export class CkbSigner extends ccc.Signer {
   ): Promise<ccc.Transaction> {
     const tx = ccc.Transaction.from(txLike);
     const { script } = await this.getAddressObj();
+    const witnessIndexes = await ccc.reduceAsync(
+      tx.inputs,
+      async (acc, input, i) => {
+        await input.completeExtraInfos(this.client);
+        if (!input.cellOutput) {
+          throw new Error("Unable to complete input");
+        }
+
+        if (input.cellOutput.lock.eq(script)) {
+          acc.push(i);
+        }
+      },
+      [] as number[],
+    );
+
+    // Trim unnecessary fields to reduce tx size
+    await tx.prepareSighashAllWitness(script, 0, this.client);
+    tx.inputs.forEach((i) => {
+      i.cellOutput = undefined;
+      i.outputData = undefined;
+    });
 
     const config = this.getConfig();
     const res = await createPopup(
@@ -259,11 +280,7 @@ export class CkbSigner extends ccc.Signer {
           ...config,
           tx: JSON.parse(tx.stringify()),
           signerAddress: (await this.assertConnection()).address,
-          witnessIndex: await tx.findInputIndexByLock(script, this.client),
-          witnessLastIndex: await tx.findLastInputIndexByLock(
-            script,
-            this.client,
-          ),
+          witnessIndexes,
         },
         "popup",
         "/sign-ckb-raw-tx",