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

package/dist.commonjs/connectionsStorage/index.js

@@ -2,37 +2,34 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConnectionsRepoLocalStorage = exports.isSelectorEq = void 0;
 function isSelectorEq(a, b) {
-  return a.uri === b.uri && a.addressType === b.addressType;
+    return a.uri === b.uri && a.addressType === b.addressType;
 }
 exports.isSelectorEq = isSelectorEq;
 class ConnectionsRepoLocalStorage {
-  constructor(storageKey = "ccc-joy-id-signer") {
-    this.storageKey = storageKey;
-  }
-  async readConnections() {
-    return JSON.parse(window.localStorage.getItem(this.storageKey) ?? "[]");
-  }
-  async get(selector) {
-    return (await this.readConnections()).find(([s]) =>
-      isSelectorEq(selector, s),
-    )?.[1];
-  }
-  async set(selector, connection) {
-    const connections = await this.readConnections();
-    if (connection) {
-      const existed = connections.find(([s]) => isSelectorEq(s, selector));
-      if (existed) {
-        existed[1] = connection;
-      } else {
-        connections.push([selector, connection]);
-      }
-      window.localStorage.setItem(this.storageKey, JSON.stringify(connections));
-    } else {
-      window.localStorage.setItem(
-        this.storageKey,
-        JSON.stringify(connections.filter(([s]) => !isSelectorEq(s, selector))),
-      );
+    constructor(storageKey = "ccc-joy-id-signer") {
+        this.storageKey = storageKey;
+    }
+    async readConnections() {
+        return JSON.parse(window.localStorage.getItem(this.storageKey) ?? "[]");
+    }
+    async get(selector) {
+        return (await this.readConnections()).find(([s]) => isSelectorEq(selector, s))?.[1];
+    }
+    async set(selector, connection) {
+        const connections = await this.readConnections();
+        if (connection) {
+            const existed = connections.find(([s]) => isSelectorEq(s, selector));
+            if (existed) {
+                existed[1] = connection;
+            }
+            else {
+                connections.push([selector, connection]);
+            }
+            window.localStorage.setItem(this.storageKey, JSON.stringify(connections));
+        }
+        else {
+            window.localStorage.setItem(this.storageKey, JSON.stringify(connections.filter(([s]) => !isSelectorEq(s, selector))));
+        }
     }
-  }
 }
 exports.ConnectionsRepoLocalStorage = ConnectionsRepoLocalStorage;

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

@@ -1,25 +1,19 @@
 import { ccc } from "@ckb-ccc/core";
 import { ConnectionsRepo } from "../connectionsStorage";
 export declare class EvmSigner extends ccc.SignerEvm {
-  private readonly name;
-  private readonly icon;
-  private readonly appUri;
-  private readonly connectionsRepo;
-  private connection?;
-  private assertConnection;
-  constructor(
-    client: ccc.Client,
-    name: string,
-    icon: string,
-    appUri?: string,
-    connectionsRepo?: ConnectionsRepo,
-  );
-  private getConfig;
-  getEvmAccount(): Promise<string>;
-  connect(): Promise<void>;
-  isConnected(): Promise<boolean>;
-  signMessageRaw(message: string | ccc.BytesLike): Promise<ccc.Hex>;
-  private saveConnection;
-  private restoreConnection;
+    private readonly name;
+    private readonly icon;
+    private readonly appUri;
+    private readonly connectionsRepo;
+    private connection?;
+    private assertConnection;
+    constructor(client: ccc.Client, name: string, icon: string, appUri?: string, connectionsRepo?: ConnectionsRepo);
+    private getConfig;
+    getEvmAccount(): Promise<string>;
+    connect(): Promise<void>;
+    isConnected(): Promise<boolean>;
+    signMessageRaw(message: string | ccc.BytesLike): Promise<ccc.Hex>;
+    private saveConnection;
+    private restoreConnection;
 }
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=index.d.ts.map

package/dist.commonjs/evm/index.js

@@ -6,96 +6,74 @@ const common_1 = require("@joyid/common");
 const common_2 = require("../common");
 const connectionsStorage_1 = require("../connectionsStorage");
 class EvmSigner extends core_1.ccc.SignerEvm {
-  assertConnection() {
-    if (!this.isConnected() || !this.connection) {
-      throw new Error("Not connected");
+    assertConnection() {
+        if (!this.isConnected() || !this.connection) {
+            throw new Error("Not connected");
+        }
+        return this.connection;
     }
-    return this.connection;
-  }
-  constructor(
-    client,
-    name,
-    icon,
-    appUri = "https://app.joy.id",
-    connectionsRepo = new connectionsStorage_1.ConnectionsRepoLocalStorage(),
-  ) {
-    super(client);
-    this.name = name;
-    this.icon = icon;
-    this.appUri = appUri;
-    this.connectionsRepo = connectionsRepo;
-  }
-  getConfig() {
-    return {
-      redirectURL: location.href,
-      joyidAppURL: this.appUri,
-      requestNetwork: `ethereum`,
-      name: this.name,
-      logo: this.icon,
-    };
-  }
-  async getEvmAccount() {
-    return this.assertConnection().address;
-  }
-  async connect() {
-    const config = await 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.ethAddress,
-      publicKey: core_1.ccc.hexFrom(res.pubkey),
-      keyType: res.keyType,
-    };
-    await this.saveConnection();
-  }
-  async isConnected() {
-    if (this.connection) {
-      return true;
+    constructor(client, name, icon, appUri = "https://app.joy.id", connectionsRepo = new connectionsStorage_1.ConnectionsRepoLocalStorage()) {
+        super(client);
+        this.name = name;
+        this.icon = icon;
+        this.appUri = appUri;
+        this.connectionsRepo = connectionsRepo;
+    }
+    getConfig() {
+        return {
+            redirectURL: location.href,
+            joyidAppURL: this.appUri,
+            requestNetwork: `ethereum`,
+            name: this.name,
+            logo: this.icon,
+        };
+    }
+    async getEvmAccount() {
+        return this.assertConnection().address;
+    }
+    async connect() {
+        const config = await 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.ethAddress,
+            publicKey: core_1.ccc.hexFrom(res.pubkey),
+            keyType: res.keyType,
+        };
+        await this.saveConnection();
+    }
+    async isConnected() {
+        if (this.connection) {
+            return true;
+        }
+        await this.restoreConnection();
+        return this.connection !== undefined;
+    }
+    async signMessageRaw(message) {
+        const { address } = this.assertConnection();
+        const challenge = typeof message === "string" ? message : core_1.ccc.hexFrom(message).slice(2);
+        const config = this.getConfig();
+        const { signature } = 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 core_1.ccc.hexFrom(signature);
+    }
+    async saveConnection() {
+        return this.connectionsRepo.set({
+            uri: this.getConfig().joyidAppURL,
+            addressType: "ethereum",
+        }, this.connection);
+    }
+    async restoreConnection() {
+        this.connection = await this.connectionsRepo.get({
+            uri: this.getConfig().joyidAppURL,
+            addressType: "ethereum",
+        });
     }
-    await this.restoreConnection();
-    return this.connection !== undefined;
-  }
-  async signMessageRaw(message) {
-    const { address } = this.assertConnection();
-    const challenge =
-      typeof message === "string"
-        ? message
-        : core_1.ccc.hexFrom(message).slice(2);
-    const config = this.getConfig();
-    const { signature } = 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 core_1.ccc.hexFrom(signature);
-  }
-  async saveConnection() {
-    return this.connectionsRepo.set(
-      {
-        uri: this.getConfig().joyidAppURL,
-        addressType: "ethereum",
-      },
-      this.connection,
-    );
-  }
-  async restoreConnection() {
-    this.connection = await this.connectionsRepo.get({
-      uri: this.getConfig().joyidAppURL,
-      addressType: "ethereum",
-    });
-  }
 }
 exports.EvmSigner = EvmSigner;

package/dist.commonjs/index.d.ts

@@ -1,2 +1,2 @@
 export * as JoyId from "./barrel";
-//# sourceMappingURL=index.d.ts.map
+//# sourceMappingURL=index.d.ts.map

package/dist.commonjs/index.js

@@ -1,48 +1,27 @@
 "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.JoyId = void 0;
 exports.JoyId = __importStar(require("./barrel"));

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

@@ -1,7 +1,3 @@
 import { ccc } from "@ckb-ccc/core";
-export declare function getJoyIdSigners(
-  client: ccc.Client,
-  name: string,
-  icon: string,
-): ccc.SignerInfo[];
-//# sourceMappingURL=index.d.ts.map
+export declare function getJoyIdSigners(client: ccc.Client, name: string, icon: string): ccc.SignerInfo[];
+//# sourceMappingURL=index.d.ts.map

package/dist.commonjs/signerFactory/index.js

@@ -7,44 +7,33 @@ const btc_1 = require("../btc");
 const ckb_1 = require("../ckb");
 const evm_1 = require("../evm");
 function getJoyIdSigners(client, name, icon) {
-  if (
-    (0, common_1.isStandaloneBrowser)() ||
-    core_1.ccc.isWebview(window.navigator.userAgent)
-  ) {
+    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"),
+        }));
+    }
     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",
-      ),
-    }));
-  }
-  return [
-    {
-      name: "CKB",
-      signer: new ckb_1.CkbSigner(client, name, icon),
-    },
-    {
-      name: "BTC",
-      signer: new btc_1.BitcoinSigner(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"),
-    },
-  ];
+        {
+            name: "CKB",
+            signer: new ckb_1.CkbSigner(client, name, icon),
+        },
+        {
+            name: "BTC",
+            signer: new btc_1.BitcoinSigner(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.5-alpha.10",
+  "version": "0.0.5-alpha.12",
   "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.5-alpha.10",
+    "@ckb-ccc/core": "0.0.5-alpha.11",
     "@joyid/ckb": "^0.0.11",
     "@joyid/common": "^0.0.3"
   },
-  "gitHead": "91ea3a92b02117905449ce4d2afef88bd3ffcc60"
+  "gitHead": "0d502bed4e9485d36ff4c1070048e55c99de0236"
 }

package/src/ckb/index.ts

@@ -178,13 +178,28 @@ export class CkbSigner extends ccc.Signer {
     const { script } = await this.getAddressObj();
 
     const config = this.getConfig();
+
+    const witnessIndexes = await Promise.all(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 createPopup(
       buildJoyIDURL(
         {
           ...config,
           tx: JSON.parse(tx.stringify()),
           signerAddress: (await this.assertConnection()).address,
-          witnessIndex: await tx.findInputIndexByLock(script, this.client),
+          witnessIndexes: witnessIndexes.filter((i) => i !== undefined),
         },
         "popup",
         "/sign-ckb-raw-tx",