@ckb-ccc/joy-id 0.0.5-alpha.10 → 0.0.5-alpha.11

package/dist.commonjs/ckb/index.js

@@ -7,209 +7,176 @@ const common_1 = require("@joyid/common");
 const common_2 = require("../common");
 const connectionsStorage_1 = require("../connectionsStorage");
 class CkbSigner extends core_1.ccc.Signer {
-  get type() {
-    return core_1.ccc.SignerType.CKB;
-  }
-  get signType() {
-    return core_1.ccc.SignerSignType.JoyId;
-  }
-  async assertConnection() {
-    if (!(await this.isConnected()) || !this.connection) {
-      throw new Error("Not connected");
-    }
-    return this.connection;
-  }
-  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;
-  }
-  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,
-    };
-  }
-  getAggregatorUri() {
-    if (this._aggregatorUri) {
-      return this._aggregatorUri;
-    }
-    return this.client.addressPrefix === "ckb"
-      ? "https://cota.nervina.dev/mainnet-aggregator"
-      : "https://cota.nervina.dev/aggregator";
-  }
-  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() {
-    this.connection = undefined;
-    await this.saveConnection();
-  }
-  async isConnected() {
-    if (this.connection) {
-      return true;
-    }
-    await this.restoreConnection();
-    return this.connection !== undefined;
-  }
-  async getInternalAddress() {
-    return (await this.assertConnection()).address;
-  }
-  async getIdentity() {
-    const connection = await this.assertConnection();
-    return JSON.stringify({
-      keyType: connection.keyType,
-      publicKey: connection.publicKey.slice(2),
-    });
-  }
-  async getAddressObj() {
-    return await core_1.ccc.Address.fromString(
-      await this.getInternalAddress(),
-      this.client,
-    );
-  }
-  async getAddressObjs() {
-    return [await this.getAddressObj()];
-  }
-  async prepareTransaction(txLike) {
-    const tx = core_1.ccc.Transaction.from(txLike);
-    const position = await tx.findInputIndexByLock(
-      (await this.getAddressObj()).script,
-      this.client,
-    );
-    if (position === undefined) {
-      return tx;
-    }
-    const witness =
-      tx.getWitnessArgsAt(position) ?? core_1.ccc.WitnessArgs.from({});
-    witness.lock = "0x";
-    await this.prepareTransactionForSubKey(tx, witness);
-    tx.setWitnessArgsAt(position, witness);
-    return tx;
-  }
-  async prepareTransactionForSubKey(tx, witness) {
-    if (this.connection?.keyType !== "sub_key") {
-      return [];
-    }
-    const pubkeyHash = core_1.ccc
-      .ckbHash(this.connection.publicKey)
-      .substring(0, 42);
-    const lock = (await this.getAddressObj()).script;
-    const aggregator = new ckb_1.Aggregator(await 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 this.client.getKnownScript(core_1.ccc.KnownScript.COTA)),
-      args: "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);
-  }
-  async signOnlyTransaction(txLike) {
-    const tx = core_1.ccc.Transaction.from(txLike);
-    const { script } = await this.getAddressObj();
-    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,
-          witnessIndex: await tx.findInputIndexByLock(script, this.client),
-        },
-        "popup",
-        "/sign-ckb-raw-tx",
-      ),
-      {
-        ...config,
-        type: common_1.DappRequestType.SignCkbRawTx,
-      },
-    );
-    return core_1.ccc.Transaction.from(res.tx);
-  }
-  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,
-    });
-  }
-  async saveConnection() {
-    return this.connectionsRepo.set(
-      {
-        uri: this.getConfig().joyidAppURL,
-        addressType: "ckb",
-      },
-      this.connection,
-    );
-  }
-  async restoreConnection() {
-    this.connection = await this.connectionsRepo.get({
-      uri: this.getConfig().joyidAppURL,
-      addressType: "ckb",
-    });
-  }
+    get type() {
+        return core_1.ccc.SignerType.CKB;
+    }
+    get signType() {
+        return core_1.ccc.SignerSignType.JoyId;
+    }
+    async assertConnection() {
+        if (!(await this.isConnected()) || !this.connection) {
+            throw new Error("Not connected");
+        }
+        return this.connection;
+    }
+    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;
+    }
+    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,
+        };
+    }
+    getAggregatorUri() {
+        if (this._aggregatorUri) {
+            return this._aggregatorUri;
+        }
+        return this.client.addressPrefix === "ckb"
+            ? "https://cota.nervina.dev/mainnet-aggregator"
+            : "https://cota.nervina.dev/aggregator";
+    }
+    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() {
+        this.connection = undefined;
+        await this.saveConnection();
+    }
+    async isConnected() {
+        if (this.connection) {
+            return true;
+        }
+        await this.restoreConnection();
+        return this.connection !== undefined;
+    }
+    async getInternalAddress() {
+        return (await this.assertConnection()).address;
+    }
+    async getIdentity() {
+        const connection = await this.assertConnection();
+        return JSON.stringify({
+            keyType: connection.keyType,
+            publicKey: connection.publicKey.slice(2),
+        });
+    }
+    async getAddressObj() {
+        return await core_1.ccc.Address.fromString(await this.getInternalAddress(), this.client);
+    }
+    async getAddressObjs() {
+        return [await this.getAddressObj()];
+    }
+    async prepareTransaction(txLike) {
+        const tx = core_1.ccc.Transaction.from(txLike);
+        const position = await tx.findInputIndexByLock((await this.getAddressObj()).script, this.client);
+        if (position === undefined) {
+            return tx;
+        }
+        const witness = tx.getWitnessArgsAt(position) ?? core_1.ccc.WitnessArgs.from({});
+        witness.lock = "0x";
+        await this.prepareTransactionForSubKey(tx, witness);
+        tx.setWitnessArgsAt(position, witness);
+        return tx;
+    }
+    async prepareTransactionForSubKey(tx, witness) {
+        if (this.connection?.keyType !== "sub_key") {
+            return [];
+        }
+        const pubkeyHash = core_1.ccc.ckbHash(this.connection.publicKey).substring(0, 42);
+        const lock = (await this.getAddressObj()).script;
+        const aggregator = new ckb_1.Aggregator(await 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 this.client.getKnownScript(core_1.ccc.KnownScript.COTA)),
+            args: "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);
+    }
+    async signOnlyTransaction(txLike) {
+        const tx = core_1.ccc.Transaction.from(txLike);
+        const { script } = await this.getAddressObj();
+        const config = this.getConfig();
+        const witnessIndexes = await tx.inputs.map(async (input, i) => {
+            await input.completeExtraInfos(this.client);
+            if (!input.cellOutput) {
+                throw Error("Unable to resolve inputs info");
+            }
+            if (!script.eq(input.cellOutput.lock)) {
+                return;
+            }
+            return i;
+        });
+        const res = await (0, common_2.createPopup)((0, common_1.buildJoyIDURL)({
+            ...config,
+            tx: JSON.parse(tx.stringify()),
+            signerAddress: (await this.assertConnection()).address,
+            witnessIndexes: witnessIndexes.filter((i) => i !== undefined),
+        }, "popup", "/sign-ckb-raw-tx"), {
+            ...config,
+            type: common_1.DappRequestType.SignCkbRawTx,
+        });
+        return core_1.ccc.Transaction.from(res.tx);
+    }
+    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,
+        });
+    }
+    async saveConnection() {
+        return this.connectionsRepo.set({
+            uri: this.getConfig().joyidAppURL,
+            addressType: "ckb",
+        }, this.connection);
+    }
+    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,37 +1,24 @@
-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";
 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;
 }
-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

package/dist.commonjs/common/index.js

@@ -3,57 +3,52 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createPopup = void 0;
 const common_1 = require("@joyid/common");
 async function createPopup(url, config) {
-  if (config.popup == null) {
-    config.popup = (0, common_1.openPopup)("");
     if (config.popup == null) {
-      return (0, common_1.createBlockDialog)(async () =>
-        createPopup(url, config),
-      );
+        config.popup = (0, common_1.openPopup)("");
+        if (config.popup == null) {
+            return (0, common_1.createBlockDialog)(async () => createPopup(url, config));
+        }
     }
-  }
-  config.popup.location.href = url;
-  return new Promise((resolve, reject) => {
-    if ((0, common_1.isStandaloneBrowser)()) {
-      reject(new common_1.PopupNotSupportedError(config.popup));
-    }
-    let popupEventListener;
-    let timeoutId;
-    // Check each second if the popup is closed triggering a PopupCancelledError
-    const popupTimer = setInterval(() => {
-      if (config.popup?.closed) {
-        clearInterval(popupTimer);
-        clearTimeout(timeoutId);
-        window.removeEventListener("message", popupEventListener, false);
-        reject(new common_1.PopupCancelledError(config.popup));
-      }
-    }, 1000);
-    timeoutId = setTimeout(
-      () => {
-        clearInterval(popupTimer);
-        reject(new common_1.PopupTimeoutError(config.popup));
-        window.removeEventListener("message", popupEventListener, false);
-      },
-      (config.timeoutInSeconds ?? 3000) * 1000,
-    );
-    popupEventListener = (e) => {
-      const { joyidAppURL } = config;
-      const appURL = new URL(joyidAppURL);
-      if (e.origin !== appURL.origin) {
-        return;
-      }
-      if (!e.data || e.data?.type !== config.type) {
-        return;
-      }
-      clearTimeout(timeoutId);
-      clearInterval(popupTimer);
-      window.removeEventListener("message", popupEventListener, false);
-      config.popup.close();
-      if (e.data.error) {
-        reject(new Error(e.data.error));
-      }
-      resolve(e.data.data);
-    };
-    window.addEventListener("message", popupEventListener);
-  });
+    config.popup.location.href = url;
+    return new Promise((resolve, reject) => {
+        if ((0, common_1.isStandaloneBrowser)()) {
+            reject(new common_1.PopupNotSupportedError(config.popup));
+        }
+        let popupEventListener;
+        let timeoutId;
+        // Check each second if the popup is closed triggering a PopupCancelledError
+        const popupTimer = setInterval(() => {
+            if (config.popup?.closed) {
+                clearInterval(popupTimer);
+                clearTimeout(timeoutId);
+                window.removeEventListener("message", popupEventListener, false);
+                reject(new common_1.PopupCancelledError(config.popup));
+            }
+        }, 1000);
+        timeoutId = setTimeout(() => {
+            clearInterval(popupTimer);
+            reject(new common_1.PopupTimeoutError(config.popup));
+            window.removeEventListener("message", popupEventListener, false);
+        }, (config.timeoutInSeconds ?? 3000) * 1000);
+        popupEventListener = (e) => {
+            const { joyidAppURL } = config;
+            const appURL = new URL(joyidAppURL);
+            if (e.origin !== appURL.origin) {
+                return;
+            }
+            if (!e.data || e.data?.type !== config.type) {
+                return;
+            }
+            clearTimeout(timeoutId);
+            clearInterval(popupTimer);
+            window.removeEventListener("message", popupEventListener, false);
+            config.popup.close();
+            if (e.data.error) {
+                reject(new Error(e.data.error));
+            }
+            resolve(e.data.data);
+        };
+        window.addEventListener("message", popupEventListener);
+    });
 }
 exports.createPopup = createPopup;

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

@@ -1,32 +1,23 @@
 import { ccc } from "@ckb-ccc/core";
 export type AccountSelector = {
-  uri: string;
-  addressType: string;
+    uri: string;
+    addressType: string;
 };
-export declare function isSelectorEq(
-  a: AccountSelector,
-  b: AccountSelector,
-): boolean;
+export declare function isSelectorEq(a: AccountSelector, b: AccountSelector): boolean;
 export type Connection = {
-  readonly address: string;
-  readonly publicKey: ccc.Hex;
-  readonly keyType: string;
+    readonly address: string;
+    readonly publicKey: ccc.Hex;
+    readonly keyType: string;
 };
 export interface ConnectionsRepo {
-  get(selector: AccountSelector): Promise<Connection | undefined>;
-  set(
-    selector: AccountSelector,
-    connection: Connection | undefined,
-  ): Promise<void>;
+    get(selector: AccountSelector): Promise<Connection | undefined>;
+    set(selector: AccountSelector, connection: Connection | undefined): Promise<void>;
 }
 export declare class ConnectionsRepoLocalStorage implements ConnectionsRepo {
-  private readonly storageKey;
-  constructor(storageKey?: string);
-  readConnections(): Promise<[AccountSelector, Connection][]>;
-  get(selector: AccountSelector): Promise<Connection | undefined>;
-  set(
-    selector: AccountSelector,
-    connection: Connection | undefined,
-  ): Promise<void>;
+    private readonly storageKey;
+    constructor(storageKey?: string);
+    readConnections(): Promise<[AccountSelector, Connection][]>;
+    get(selector: AccountSelector): Promise<Connection | undefined>;
+    set(selector: AccountSelector, connection: Connection | undefined): Promise<void>;
 }
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=index.d.ts.map