@ckb-ccc/joy-id 0.0.9-alpha.2 → 0.0.10-alpha.4

package/dist.commonjs/ckb/index.js

@@ -12,276 +12,326 @@ const connectionsStorage_1 = require("../connectionsStorage");
  * @extends {ccc.Signer}
  */
 class CkbSigner extends core_1.ccc.Signer {
-    /**
-     * Gets the signer type.
-     * @returns {ccc.SignerType} The type of the signer.
-     */
-    get type() {
-        return core_1.ccc.SignerType.CKB;
+  /**
+   * Gets the signer type.
+   * @returns {ccc.SignerType} The type of the signer.
+   */
+  get type() {
+    return core_1.ccc.SignerType.CKB;
+  }
+  /**
+   * Gets the sign type.
+   * @returns {ccc.SignerSignType} The sign type.
+   */
+  get signType() {
+    return core_1.ccc.SignerSignType.JoyId;
+  }
+  /**
+   * Ensures that the signer is connected and returns the connection.
+   * @private
+   * @throws Will throw an error if not connected.
+   * @returns {Promise<Connection>} A promise that resolves to the current connection.
+   */
+  async assertConnection() {
+    if (!(await this.isConnected()) || !this.connection) {
+      throw new Error("Not connected");
     }
-    /**
-     * Gets the sign type.
-     * @returns {ccc.SignerSignType} The sign type.
-     */
-    get signType() {
-        return core_1.ccc.SignerSignType.JoyId;
+    return this.connection;
+  }
+  /**
+   * Creates an instance of CkbSigner.
+   * @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 {string} [_appUri] - The application URI.
+   * @param {string} [_aggregatorUri] - The aggregator URI.
+   * @param {ConnectionsRepo} [connectionsRepo=new ConnectionsRepoLocalStorage()] - The connections repository.
+   */
+  constructor(
+    client,
+    name,
+    icon,
+    _appUri,
+    _aggregatorUri,
+    connectionsRepo = new connectionsStorage_1.ConnectionsRepoLocalStorage(),
+  ) {
+    super(client);
+    this.name = name;
+    this.icon = icon;
+    this._appUri = _appUri;
+    this._aggregatorUri = _aggregatorUri;
+    this.connectionsRepo = connectionsRepo;
+  }
+  /**
+   * Gets the configuration for JoyID.
+   * @private
+   * @returns The configuration object.
+   */
+  getConfig() {
+    return {
+      redirectURL: location.href,
+      joyidAppURL:
+        this._appUri ?? this.client.addressPrefix === "ckb"
+          ? "https://app.joy.id"
+          : "https://testnet.joyid.dev",
+      name: this.name,
+      logo: this.icon,
+    };
+  }
+  /**
+   * Gets the aggregator URI.
+   * @private
+   * @returns {string} The aggregator URI.
+   */
+  getAggregatorUri() {
+    if (this._aggregatorUri) {
+      return this._aggregatorUri;
     }
-    /**
-     * Ensures that the signer is connected and returns the connection.
-     * @private
-     * @throws Will throw an error if not connected.
-     * @returns {Promise<Connection>} A promise that resolves to the current connection.
-     */
-    async assertConnection() {
-        if (!(await this.isConnected()) || !this.connection) {
-            throw new Error("Not connected");
-        }
-        return this.connection;
-    }
-    /**
-     * Creates an instance of CkbSigner.
-     * @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 {string} [_appUri] - The application URI.
-     * @param {string} [_aggregatorUri] - The aggregator URI.
-     * @param {ConnectionsRepo} [connectionsRepo=new ConnectionsRepoLocalStorage()] - The connections repository.
-     */
-    constructor(client, name, icon, _appUri, _aggregatorUri, connectionsRepo = new connectionsStorage_1.ConnectionsRepoLocalStorage()) {
-        super(client);
-        this.name = name;
-        this.icon = icon;
-        this._appUri = _appUri;
-        this._aggregatorUri = _aggregatorUri;
-        this.connectionsRepo = connectionsRepo;
+    return this.client.addressPrefix === "ckb"
+      ? "https://cota.nervina.dev/mainnet-aggregator"
+      : "https://cota.nervina.dev/aggregator";
+  }
+  /**
+   * Connects to the provider by requesting authentication.
+   * @returns {Promise<void>} A promise that resolves when the connection is established.
+   */
+  async connect() {
+    const config = this.getConfig();
+    const res = await (0, common_2.createPopup)(
+      (0, common_1.buildJoyIDURL)(config, "popup", "/auth"),
+      {
+        ...config,
+        type: common_1.DappRequestType.Auth,
+      },
+    );
+    this.connection = {
+      address: res.address,
+      publicKey: core_1.ccc.hexFrom(res.pubkey),
+      keyType: res.keyType,
+    };
+    await this.saveConnection();
+  }
+  async disconnect() {
+    await super.disconnect();
+    this.connection = undefined;
+    await this.saveConnection();
+  }
+  /**
+   * Checks if the signer is connected.
+   * @returns {Promise<boolean>} A promise that resolves to true if connected, false otherwise.
+   */
+  async isConnected() {
+    if (this.connection) {
+      return true;
     }
-    async replaceClient(client) {
-        if (!(await super.replaceClient(client))) {
-            return false;
-        }
-        this.connection = undefined;
-        return true;
+    await this.restoreConnection();
+    return this.connection !== undefined;
+  }
+  /**
+   * Gets the internal address.
+   * @returns {Promise<string>} A promise that resolves to the internal address.
+   */
+  async getInternalAddress() {
+    return (await this.assertConnection()).address;
+  }
+  /**
+   * Gets the identity of the signer.
+   * @returns {Promise<string>} A promise that resolves to the identity.
+   */
+  async getIdentity() {
+    const connection = await this.assertConnection();
+    return JSON.stringify({
+      keyType: connection.keyType,
+      publicKey: connection.publicKey.slice(2),
+    });
+  }
+  /**
+   * Gets the address object.
+   * @returns {Promise<ccc.Address>} A promise that resolves to the address object.
+   */
+  async getAddressObj() {
+    return await core_1.ccc.Address.fromString(
+      await this.getInternalAddress(),
+      this.client,
+    );
+  }
+  /**
+   * Gets the address objects.
+   * @returns {Promise<ccc.Address[]>} A promise that resolves to an array of address objects.
+   */
+  async getAddressObjs() {
+    return [await this.getAddressObj()];
+  }
+  /**
+   * Prepares a transaction.
+   * @param {ccc.TransactionLike} txLike - The transaction-like object.
+   * @returns {Promise<ccc.Transaction>} A promise that resolves to the prepared transaction.
+   */
+  async prepareTransaction(txLike) {
+    const tx = core_1.ccc.Transaction.from(txLike);
+    await tx.addCellDepsOfKnownScripts(
+      this.client,
+      core_1.ccc.KnownScript.JoyId,
+    );
+    const position = await tx.findInputIndexByLock(
+      (await this.getAddressObj()).script,
+      this.client,
+    );
+    if (position === undefined) {
+      return tx;
     }
-    /**
-     * Gets the configuration for JoyID.
-     * @private
-     * @returns The configuration object.
-     */
-    getConfig() {
-        return {
-            redirectURL: location.href,
-            joyidAppURL: this._appUri ?? this.client.addressPrefix === "ckb"
-                ? "https://app.joy.id"
-                : "https://testnet.joyid.dev",
-            name: this.name,
-            logo: this.icon,
-        };
-    }
-    /**
-     * Gets the aggregator URI.
-     * @private
-     * @returns {string} The aggregator URI.
-     */
-    getAggregatorUri() {
-        if (this._aggregatorUri) {
-            return this._aggregatorUri;
-        }
-        return this.client.addressPrefix === "ckb"
-            ? "https://cota.nervina.dev/mainnet-aggregator"
-            : "https://cota.nervina.dev/aggregator";
+    const witness =
+      tx.getWitnessArgsAt(position) ?? core_1.ccc.WitnessArgs.from({});
+    witness.lock = core_1.ccc.hexFrom("00".repeat(1000));
+    await this.prepareTransactionForSubKey(tx, witness);
+    tx.setWitnessArgsAt(position, witness);
+    return tx;
+  }
+  /**
+   * Prepares a transaction for a sub key.
+   * @private
+   * @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) {
+    if (this.connection?.keyType !== "sub_key") {
+      return [];
     }
-    /**
-     * Connects to the provider by requesting authentication.
-     * @returns {Promise<void>} A promise that resolves when the connection is established.
-     */
-    async connect() {
-        const config = this.getConfig();
-        const res = await (0, common_2.createPopup)((0, common_1.buildJoyIDURL)(config, "popup", "/auth"), {
-            ...config,
-            type: common_1.DappRequestType.Auth,
-        });
-        this.connection = {
-            address: res.address,
-            publicKey: core_1.ccc.hexFrom(res.pubkey),
-            keyType: res.keyType,
-        };
-        await this.saveConnection();
+    const pubkeyHash = core_1.ccc
+      .hashCkb(this.connection.publicKey)
+      .substring(0, 42);
+    const lock = (await this.getAddressObj()).script;
+    const aggregator = new ckb_1.Aggregator(this.getAggregatorUri());
+    const { unlock_entry: unlockEntry } =
+      await aggregator.generateSubkeyUnlockSmt({
+        alg_index: 1,
+        pubkey_hash: pubkeyHash,
+        lock_script: core_1.ccc.hexFrom(lock.toBytes()),
+      });
+    witness.outputType = core_1.ccc.hexFrom(unlockEntry);
+    const cotaDeps = [];
+    for await (const cell of this.client.findCellsByLockAndType(
+      lock,
+      await core_1.ccc.Script.fromKnownScript(
+        this.client,
+        core_1.ccc.KnownScript.COTA,
+        "0x",
+      ),
+    )) {
+      cotaDeps.push(
+        core_1.ccc.CellDep.from({
+          depType: "code",
+          outPoint: cell.outPoint,
+        }),
+      );
     }
-    async disconnect() {
-        await super.disconnect();
-        this.connection = undefined;
-        await this.saveConnection();
+    if (cotaDeps.length === 0) {
+      throw new Error("No COTA cells for sub key wallet");
     }
-    /**
-     * Checks if the signer is connected.
-     * @returns {Promise<boolean>} A promise that resolves to true if connected, false otherwise.
-     */
-    async isConnected() {
-        if (this.connection) {
-            return true;
+    tx.cellDeps.unshift(...cotaDeps);
+  }
+  /**
+   * Signs a transaction.
+   * @param {ccc.TransactionLike} txLike - The transaction-like object.
+   * @returns {Promise<ccc.Transaction>} A promise that resolves to the signed transaction.
+   */
+  async signOnlyTransaction(txLike) {
+    const tx = core_1.ccc.Transaction.from(txLike);
+    const { script } = await this.getAddressObj();
+    const witnessIndexes = await core_1.ccc.reduceAsync(
+      tx.inputs,
+      async (acc, input, i) => {
+        await input.completeExtraInfos(this.client);
+        if (!input.cellOutput) {
+          throw new Error("Unable to complete input");
         }
-        await this.restoreConnection();
-        return this.connection !== undefined;
-    }
-    /**
-     * Gets the internal address.
-     * @returns {Promise<string>} A promise that resolves to the internal address.
-     */
-    async getInternalAddress() {
-        return (await this.assertConnection()).address;
-    }
-    /**
-     * Gets the identity of the signer.
-     * @returns {Promise<string>} A promise that resolves to the identity.
-     */
-    async getIdentity() {
-        const connection = await this.assertConnection();
-        return JSON.stringify({
-            keyType: connection.keyType,
-            publicKey: connection.publicKey.slice(2),
-        });
-    }
-    /**
-     * Gets the address object.
-     * @returns {Promise<ccc.Address>} A promise that resolves to the address object.
-     */
-    async getAddressObj() {
-        return await core_1.ccc.Address.fromString(await this.getInternalAddress(), this.client);
-    }
-    /**
-     * Gets the address objects.
-     * @returns {Promise<ccc.Address[]>} A promise that resolves to an array of address objects.
-     */
-    async getAddressObjs() {
-        return [await this.getAddressObj()];
-    }
-    /**
-     * Prepares a transaction.
-     * @param {ccc.TransactionLike} txLike - The transaction-like object.
-     * @returns {Promise<ccc.Transaction>} A promise that resolves to the prepared transaction.
-     */
-    async prepareTransaction(txLike) {
-        const tx = core_1.ccc.Transaction.from(txLike);
-        await tx.addCellDepsOfKnownScripts(this.client, core_1.ccc.KnownScript.JoyId);
-        const position = await tx.findInputIndexByLock((await this.getAddressObj()).script, this.client);
-        if (position === undefined) {
-            return tx;
+        if (input.cellOutput.lock.eq(script)) {
+          acc.push(i);
         }
-        const witness = tx.getWitnessArgsAt(position) ?? core_1.ccc.WitnessArgs.from({});
-        witness.lock = core_1.ccc.hexFrom("00".repeat(1000));
-        await this.prepareTransactionForSubKey(tx, witness);
-        tx.setWitnessArgsAt(position, witness);
-        return tx;
-    }
-    /**
-     * Prepares a transaction for a sub key.
-     * @private
-     * @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) {
-        if (this.connection?.keyType !== "sub_key") {
-            return [];
-        }
-        const pubkeyHash = core_1.ccc.hashCkb(this.connection.publicKey).substring(0, 42);
-        const lock = (await this.getAddressObj()).script;
-        const aggregator = new ckb_1.Aggregator(this.getAggregatorUri());
-        const { unlock_entry: unlockEntry } = await aggregator.generateSubkeyUnlockSmt({
-            alg_index: 1,
-            pubkey_hash: pubkeyHash,
-            lock_script: core_1.ccc.hexFrom(lock.toBytes()),
-        });
-        witness.outputType = core_1.ccc.hexFrom(unlockEntry);
-        const cotaDeps = [];
-        for await (const cell of this.client.findCellsByLockAndType(lock, await core_1.ccc.Script.fromKnownScript(this.client, core_1.ccc.KnownScript.COTA, "0x"))) {
-            cotaDeps.push(core_1.ccc.CellDep.from({
-                depType: "code",
-                outPoint: cell.outPoint,
-            }));
-        }
-        if (cotaDeps.length === 0) {
-            throw new Error("No COTA cells for sub key wallet");
-        }
-        tx.cellDeps.unshift(...cotaDeps);
-    }
-    /**
-     * Signs a transaction.
-     * @param {ccc.TransactionLike} txLike - The transaction-like object.
-     * @returns {Promise<ccc.Transaction>} A promise that resolves to the signed transaction.
-     */
-    async signOnlyTransaction(txLike) {
-        const tx = core_1.ccc.Transaction.from(txLike);
-        const { script } = await this.getAddressObj();
-        const witnessIndexes = await core_1.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 (0, common_2.createPopup)((0, common_1.buildJoyIDURL)({
-            ...config,
-            tx: JSON.parse(tx.stringify()),
-            signerAddress: (await this.assertConnection()).address,
-            witnessIndexes,
-        }, "popup", "/sign-ckb-raw-tx"), {
-            ...config,
-            type: common_1.DappRequestType.SignCkbRawTx,
-        });
-        return core_1.ccc.Transaction.from(res.tx);
-    }
-    /**
-     * Signs a raw message with the account.
-     * @param {string | ccc.BytesLike} message - The message to sign.
-     * @returns {Promise<string>} A promise that resolves to the signed message.
-     */
-    async signMessageRaw(message) {
-        const { address } = await this.assertConnection();
-        const challenge = typeof message === "string" ? message : core_1.ccc.hexFrom(message).slice(2);
-        const config = this.getConfig();
-        const res = await (0, common_2.createPopup)((0, common_1.buildJoyIDURL)({
-            ...config,
-            challenge,
-            isData: typeof message !== "string",
-            address,
-        }, "popup", "/sign-message"), { ...config, type: common_1.DappRequestType.SignMessage });
-        return JSON.stringify({
-            signature: res.signature,
-            alg: res.alg,
-            message: res.message,
-        });
-    }
-    /**
-     * Saves the current connection.
-     * @private
-     * @returns {Promise<void>}
-     */
-    async saveConnection() {
-        return this.connectionsRepo.set({
-            uri: this.getConfig().joyidAppURL,
-            addressType: "ckb",
-        }, this.connection);
-    }
-    /**
-     * Restores the previous connection.
-     * @private
-     * @returns {Promise<void>}
-     */
-    async restoreConnection() {
-        this.connection = await this.connectionsRepo.get({
-            uri: this.getConfig().joyidAppURL,
-            addressType: "ckb",
-        });
-    }
+      },
+      [],
+    );
+    // 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 (0, common_2.createPopup)(
+      (0, common_1.buildJoyIDURL)(
+        {
+          ...config,
+          tx: JSON.parse(tx.stringify()),
+          signerAddress: (await this.assertConnection()).address,
+          witnessIndexes,
+        },
+        "popup",
+        "/sign-ckb-raw-tx",
+      ),
+      {
+        ...config,
+        type: common_1.DappRequestType.SignCkbRawTx,
+      },
+    );
+    return core_1.ccc.Transaction.from(res.tx);
+  }
+  /**
+   * Signs a raw message with the account.
+   * @param {string | ccc.BytesLike} message - The message to sign.
+   * @returns {Promise<string>} A promise that resolves to the signed message.
+   */
+  async signMessageRaw(message) {
+    const { address } = await this.assertConnection();
+    const challenge =
+      typeof message === "string"
+        ? message
+        : core_1.ccc.hexFrom(message).slice(2);
+    const config = this.getConfig();
+    const res = await (0, common_2.createPopup)(
+      (0, common_1.buildJoyIDURL)(
+        {
+          ...config,
+          challenge,
+          isData: typeof message !== "string",
+          address,
+        },
+        "popup",
+        "/sign-message",
+      ),
+      { ...config, type: common_1.DappRequestType.SignMessage },
+    );
+    return JSON.stringify({
+      signature: res.signature,
+      alg: res.alg,
+      message: res.message,
+    });
+  }
+  /**
+   * Saves the current connection.
+   * @private
+   * @returns {Promise<void>}
+   */
+  async saveConnection() {
+    return this.connectionsRepo.set(
+      {
+        uri: this.getConfig().joyidAppURL,
+        addressType: "ckb",
+      },
+      this.connection,
+    );
+  }
+  /**
+   * Restores the previous connection.
+   * @private
+   * @returns {Promise<void>}
+   */
+  async restoreConnection() {
+    this.connection = await this.connectionsRepo.get({
+      uri: this.getConfig().joyidAppURL,
+      addressType: "ckb",
+    });
+  }
 }
 exports.CkbSigner = CkbSigner;

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

@@ -1,26 +1,36 @@
-import { AuthResponseData, DappRequestType, EvmWeb2LoginResponse, PopupConfigOptions, SignCkbTxResponseData, SignCotaNFTResponseData, SignEvmTxResponseData, SignMessageResponseData, SignNostrEventData } from "@joyid/common";
+import {
+  AuthResponseData,
+  DappRequestType,
+  EvmWeb2LoginResponse,
+  PopupConfigOptions,
+  SignCkbTxResponseData,
+  SignCotaNFTResponseData,
+  SignEvmTxResponseData,
+  SignMessageResponseData,
+  SignNostrEventData,
+} from "@joyid/common";
 /**
  * Interface representing the return type for various Dapp request types.
  * @interface
  */
 export interface PopupReturnType {
-    [DappRequestType.Auth]: AuthResponseData;
-    [DappRequestType.SignMessage]: SignMessageResponseData;
-    [DappRequestType.SignEvm]: SignEvmTxResponseData;
-    [DappRequestType.SignPsbt]: SignEvmTxResponseData;
-    [DappRequestType.BatchSignPsbt]: {
-        psbts: string[];
-    };
-    [DappRequestType.SignCkbTx]: SignCkbTxResponseData;
-    [DappRequestType.SignCotaNFT]: SignCotaNFTResponseData;
-    [DappRequestType.SignCkbRawTx]: SignCkbTxResponseData;
-    [DappRequestType.SignNostrEvent]: SignNostrEventData;
-    [DappRequestType.EncryptNostrMessage]: any;
-    [DappRequestType.DecryptNostrMessage]: any;
-    [DappRequestType.AuthMiniApp]: any;
-    [DappRequestType.SignMiniAppEvm]: any;
-    [DappRequestType.SignMiniAppMessage]: any;
-    [DappRequestType.EvmWeb2Login]: EvmWeb2LoginResponse;
+  [DappRequestType.Auth]: AuthResponseData;
+  [DappRequestType.SignMessage]: SignMessageResponseData;
+  [DappRequestType.SignEvm]: SignEvmTxResponseData;
+  [DappRequestType.SignPsbt]: SignEvmTxResponseData;
+  [DappRequestType.BatchSignPsbt]: {
+    psbts: string[];
+  };
+  [DappRequestType.SignCkbTx]: SignCkbTxResponseData;
+  [DappRequestType.SignCotaNFT]: SignCotaNFTResponseData;
+  [DappRequestType.SignCkbRawTx]: SignCkbTxResponseData;
+  [DappRequestType.SignNostrEvent]: SignNostrEventData;
+  [DappRequestType.EncryptNostrMessage]: any;
+  [DappRequestType.DecryptNostrMessage]: any;
+  [DappRequestType.AuthMiniApp]: any;
+  [DappRequestType.SignMiniAppEvm]: any;
+  [DappRequestType.SignMiniAppMessage]: any;
+  [DappRequestType.EvmWeb2Login]: EvmWeb2LoginResponse;
 }
 /**
  * Creates a popup window for JoyID Dapp requests.
@@ -31,7 +41,10 @@ export interface PopupReturnType {
  * @throws {PopupCancelledError} If the popup is closed by the user.
  * @throws {PopupTimeoutError} If the popup operation times out.
  */
-export declare function createPopup<T extends DappRequestType>(url: string, config: PopupConfigOptions<T> & {
+export declare function createPopup<T extends DappRequestType>(
+  url: string,
+  config: PopupConfigOptions<T> & {
     joyidAppURL: string;
-}): Promise<PopupReturnType[T]>;
-//# sourceMappingURL=index.d.ts.map
+  },
+): Promise<PopupReturnType[T]>;
+//# sourceMappingURL=index.d.ts.map