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

package/dist/ckb/index.d.ts

@@ -90,9 +90,8 @@ export declare 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 prepareTransactionForSubKey;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/ckb/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAIpC,OAAO,EAEL,eAAe,EAEhB,MAAM,uBAAuB,CAAC;AAE/B;;;;GAIG;AACH,qBAAa,SAAU,SAAQ,GAAG,CAAC,MAAM;IA4CrC,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;IACzB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;IAChC,OAAO,CAAC,QAAQ,CAAC,eAAe;IA/ClC;;;OAGG;IACH,IAAI,IAAI,IAAI,GAAG,CAAC,UAAU,CAEzB;IAED;;;OAGG;IACH,IAAI,QAAQ,IAAI,GAAG,CAAC,cAAc,CAEjC;IAED,OAAO,CAAC,UAAU,CAAC,CAAa;IAEhC;;;;;OAKG;YACW,gBAAgB;IAQ9B;;;;;;;;OAQG;gBAED,MAAM,EAAE,GAAG,CAAC,MAAM,EACD,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,oBAAQ,EAChB,cAAc,CAAC,oBAAQ,EACvB,eAAe,GAAE,eAAmD;IAKvF;;;;OAIG;IACH,OAAO,CAAC,SAAS;IAYjB;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IAUxB;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB9B;;;OAGG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAQrC;;;OAGG;IACG,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC;IAI3C;;;OAGG;IACG,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAQpC;;;OAGG;IACG,aAAa,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC;IAO3C;;;OAGG;IACG,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IAI9C;;;;OAIG;IACG,kBAAkB,CACtB,MAAM,EAAE,GAAG,CAAC,eAAe,GAC1B,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;IAkB3B;;;;;;;OAOG;YACW,2BAA2B;IAuCzC;;;;OAIG;IACG,mBAAmB,CACvB,MAAM,EAAE,GAAG,CAAC,eAAe,GAC1B,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;IA6B3B;;;;OAIG;IACG,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;IA2BtE;;;;OAIG;YACW,cAAc;IAU5B;;;;OAIG;YACW,iBAAiB;CAMhC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/ckb/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAIpC,OAAO,EAEL,eAAe,EAEhB,MAAM,uBAAuB,CAAC;AAE/B;;;;GAIG;AACH,qBAAa,SAAU,SAAQ,GAAG,CAAC,MAAM;IA4CrC,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;IACzB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC;IAChC,OAAO,CAAC,QAAQ,CAAC,eAAe;IA/ClC;;;OAGG;IACH,IAAI,IAAI,IAAI,GAAG,CAAC,UAAU,CAEzB;IAED;;;OAGG;IACH,IAAI,QAAQ,IAAI,GAAG,CAAC,cAAc,CAEjC;IAED,OAAO,CAAC,UAAU,CAAC,CAAa;IAEhC;;;;;OAKG;YACW,gBAAgB;IAQ9B;;;;;;;;OAQG;gBAED,MAAM,EAAE,GAAG,CAAC,MAAM,EACD,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,oBAAQ,EAChB,cAAc,CAAC,oBAAQ,EACvB,eAAe,GAAE,eAAmD;IAKvF;;;;OAIG;IACH,OAAO,CAAC,SAAS;IAYjB;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IAUxB;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB9B;;;OAGG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAQrC;;;OAGG;IACG,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC;IAI3C;;;OAGG;IACG,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAQpC;;;OAGG;IACG,aAAa,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC;IAO3C;;;OAGG;IACG,cAAc,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IAI9C;;;;OAIG;IACG,kBAAkB,CACtB,MAAM,EAAE,GAAG,CAAC,eAAe,GAC1B,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;IAmB3B;;;;;;OAMG;YACW,2BAA2B;IAuCzC;;;;OAIG;IACG,mBAAmB,CACvB,MAAM,EAAE,GAAG,CAAC,eAAe,GAC1B,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;IA8C3B;;;;OAIG;IACG,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;IA2BtE;;;;OAIG;YACW,cAAc;IAU5B;;;;OAIG;YACW,iBAAiB;CAMhC"}

package/dist/ckb/index.js

@@ -147,12 +147,13 @@ export class CkbSigner extends ccc.Signer {
      */
     async prepareTransaction(txLike) {
         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);
         if (position === undefined) {
             return tx;
         }
         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);
         return tx;
@@ -160,9 +161,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.
      */
     async prepareTransactionForSubKey(tx, witness) {
@@ -179,10 +179,7 @@ export class CkbSigner extends ccc.Signer {
         });
         witness.outputType = ccc.hexFrom(unlockEntry);
         const cotaDeps = [];
-        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",
                 outPoint: cell.outPoint,
@@ -201,13 +198,27 @@ export class CkbSigner extends ccc.Signer {
     async signOnlyTransaction(txLike) {
         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);
+            }
+        }, []);
+        // 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(buildJoyIDURL({
             ...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"), {
             ...config,
             type: DappRequestType.SignCkbRawTx,

package/dist.commonjs/advanced.d.ts

@@ -1,2 +1,2 @@
 export * as JoyIdA from "./advancedBarrel";
-//# sourceMappingURL=advanced.d.ts.map
+//# sourceMappingURL=advanced.d.ts.map

package/dist.commonjs/advanced.js

@@ -1,27 +1,48 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
+var __createBinding =
+  (this && this.__createBinding) ||
+  (Object.create
+    ? function (o, m, k, k2) {
+        if (k2 === undefined) k2 = k;
+        var desc = Object.getOwnPropertyDescriptor(m, k);
+        if (
+          !desc ||
+          ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)
+        ) {
+          desc = {
+            enumerable: true,
+            get: function () {
+              return m[k];
+            },
+          };
+        }
+        Object.defineProperty(o, k2, desc);
+      }
+    : function (o, m, k, k2) {
+        if (k2 === undefined) k2 = k;
+        o[k2] = m[k];
+      });
+var __setModuleDefault =
+  (this && this.__setModuleDefault) ||
+  (Object.create
+    ? function (o, v) {
+        Object.defineProperty(o, "default", { enumerable: true, value: v });
+      }
+    : function (o, v) {
+        o["default"] = v;
+      });
+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);
+    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;
-};
+  };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JoyIdA = void 0;
 exports.JoyIdA = __importStar(require("./advancedBarrel"));

package/dist.commonjs/advancedBarrel.d.ts

@@ -1,3 +1,3 @@
 export * from "./common";
 export * from "./connectionsStorage";
-//# sourceMappingURL=advancedBarrel.d.ts.map
+//# sourceMappingURL=advancedBarrel.d.ts.map

package/dist.commonjs/advancedBarrel.js

@@ -1,18 +1,34 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-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 __createBinding =
+  (this && this.__createBinding) ||
+  (Object.create
+    ? function (o, m, k, k2) {
+        if (k2 === undefined) k2 = k;
+        var desc = Object.getOwnPropertyDescriptor(m, k);
+        if (
+          !desc ||
+          ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)
+        ) {
+          desc = {
+            enumerable: true,
+            get: function () {
+              return m[k];
+            },
+          };
+        }
+        Object.defineProperty(o, k2, desc);
+      }
+    : function (o, m, k, k2) {
+        if (k2 === undefined) k2 = k;
+        o[k2] = m[k];
+      });
+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);
+  };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./common"), exports);
 __exportStar(require("./connectionsStorage"), exports);

package/dist.commonjs/barrel.d.ts

@@ -2,4 +2,4 @@ export * from "./btc";
 export * from "./ckb";
 export * from "./evm";
 export * from "./signerFactory";
-//# sourceMappingURL=barrel.d.ts.map
+//# sourceMappingURL=barrel.d.ts.map

package/dist.commonjs/barrel.js

@@ -1,18 +1,34 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-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 __createBinding =
+  (this && this.__createBinding) ||
+  (Object.create
+    ? function (o, m, k, k2) {
+        if (k2 === undefined) k2 = k;
+        var desc = Object.getOwnPropertyDescriptor(m, k);
+        if (
+          !desc ||
+          ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)
+        ) {
+          desc = {
+            enumerable: true,
+            get: function () {
+              return m[k];
+            },
+          };
+        }
+        Object.defineProperty(o, k2, desc);
+      }
+    : function (o, m, k, k2) {
+        if (k2 === undefined) k2 = k;
+        o[k2] = m[k];
+      });
+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);
+  };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./btc"), exports);
 __exportStar(require("./ckb"), exports);

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

@@ -6,60 +6,67 @@ import { ConnectionsRepo } from "../connectionsStorage";
  * @extends {ccc.SignerBtc}
  */
 export declare class BitcoinSigner extends ccc.SignerBtc {
-    private readonly name;
-    private readonly icon;
-    private readonly addressType;
-    private readonly appUri;
-    private readonly connectionsRepo;
-    private connection?;
-    /**
-     * Ensures that the signer is connected and returns the connection.
-     * @private
-     * @throws Will throw an error if not connected.
-     * @returns {Connection} The current connection.
-     */
-    private assertConnection;
-    /**
-     * Creates an instance of BitcoinSigner.
-     * @param {ccc.Client} client - The client instance.
-     * @param {string} name - The name of the signer.
-     * @param {string} icon - The icon URL of the signer.
-     * @param {"auto" | "p2wpkh" | "p2tr"} [addressType="auto"] - The address type.
-     * @param {string} [appUri="https://app.joy.id"] - The application URI.
-     * @param {ConnectionsRepo} [connectionsRepo=new ConnectionsRepoLocalStorage()] - The connections repository.
-     */
-    constructor(client: ccc.Client, name: string, icon: string, addressType?: "auto" | "p2wpkh" | "p2tr", appUri?: string, connectionsRepo?: ConnectionsRepo);
-    /**
-     * Gets the configuration for JoyID.
-     * @private
-     * @returns {object} The configuration object.
-     */
-    private getConfig;
-    /**
-     * Gets the Bitcoin account address.
-     * @returns {Promise<string>} A promise that resolves to the Bitcoin account address.
-     */
-    getBtcAccount(): Promise<string>;
-    /**
-     * Gets the Bitcoin public key.
-     * @returns {Promise<ccc.Hex>} A promise that resolves to the Bitcoin public key.
-     */
-    getBtcPublicKey(): Promise<ccc.Hex>;
-    /**
-     * Connects to the provider by requesting authentication.
-     * @returns {Promise<void>} A promise that resolves when the connection is established.
-     */
-    connect(): Promise<void>;
-    /**
-     * Checks if the signer is connected.
-     * @returns {Promise<boolean>} A promise that resolves to true if connected, false otherwise.
-     */
-    isConnected(): Promise<boolean>;
-    /**
-     * Signs a raw message with the Bitcoin account.
-     * @param {string | ccc.BytesLike} message - The message to sign.
-     * @returns {Promise<string>} A promise that resolves to the signed message.
-     */
-    signMessageRaw(message: string | ccc.BytesLike): Promise<string>;
+  private readonly name;
+  private readonly icon;
+  private readonly addressType;
+  private readonly appUri;
+  private readonly connectionsRepo;
+  private connection?;
+  /**
+   * Ensures that the signer is connected and returns the connection.
+   * @private
+   * @throws Will throw an error if not connected.
+   * @returns {Connection} The current connection.
+   */
+  private assertConnection;
+  /**
+   * Creates an instance of BitcoinSigner.
+   * @param {ccc.Client} client - The client instance.
+   * @param {string} name - The name of the signer.
+   * @param {string} icon - The icon URL of the signer.
+   * @param {"auto" | "p2wpkh" | "p2tr"} [addressType="auto"] - The address type.
+   * @param {string} [appUri="https://app.joy.id"] - The application URI.
+   * @param {ConnectionsRepo} [connectionsRepo=new ConnectionsRepoLocalStorage()] - The connections repository.
+   */
+  constructor(
+    client: ccc.Client,
+    name: string,
+    icon: string,
+    addressType?: "auto" | "p2wpkh" | "p2tr",
+    appUri?: string,
+    connectionsRepo?: ConnectionsRepo,
+  );
+  /**
+   * Gets the configuration for JoyID.
+   * @private
+   * @returns {object} The configuration object.
+   */
+  private getConfig;
+  /**
+   * Gets the Bitcoin account address.
+   * @returns {Promise<string>} A promise that resolves to the Bitcoin account address.
+   */
+  getBtcAccount(): Promise<string>;
+  /**
+   * Gets the Bitcoin public key.
+   * @returns {Promise<ccc.Hex>} A promise that resolves to the Bitcoin public key.
+   */
+  getBtcPublicKey(): Promise<ccc.Hex>;
+  /**
+   * Connects to the provider by requesting authentication.
+   * @returns {Promise<void>} A promise that resolves when the connection is established.
+   */
+  connect(): Promise<void>;
+  /**
+   * Checks if the signer is connected.
+   * @returns {Promise<boolean>} A promise that resolves to true if connected, false otherwise.
+   */
+  isConnected(): Promise<boolean>;
+  /**
+   * Signs a raw message with the Bitcoin account.
+   * @param {string | ccc.BytesLike} message - The message to sign.
+   * @returns {Promise<string>} A promise that resolves to the signed message.
+   */
+  signMessageRaw(message: string | ccc.BytesLike): Promise<string>;
 }
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=index.d.ts.map