@ckb-ccc/joy-id 0.0.8-alpha.4 → 0.0.9-alpha.0

package/dist.commonjs/btc/index.js

@@ -25,35 +25,60 @@ class BitcoinSigner extends core_1.ccc.SignerBtc {
     }
     /**
      * 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.
+     * @param client - The client instance.
+     * @param name - The name of the signer.
+     * @param icon - The icon URL of the signer.
+     * @param addressType - The address type.
+     * @param _appUri - The application URI.
+     * @param connectionsRepo - The connections repository.
      */
-    constructor(client, name, icon, addressType = "auto", appUri = "https://app.joy.id", connectionsRepo = new connectionsStorage_1.ConnectionsRepoLocalStorage()) {
+    constructor(client, name, icon, preferredNetworks, addressType = "auto", _appUri, connectionsRepo = new connectionsStorage_1.ConnectionsRepoLocalStorage()) {
         super(client);
         this.name = name;
         this.icon = icon;
+        this.preferredNetworks = preferredNetworks;
         this.addressType = addressType;
-        this.appUri = appUri;
+        this._appUri = _appUri;
         this.connectionsRepo = connectionsRepo;
+        this.network = "btcTestnet";
+    }
+    async replaceClient(client) {
+        if (!(await super.replaceClient(client))) {
+            return false;
+        }
+        this.connection = undefined;
+        return true;
     }
     /**
      * Gets the configuration for JoyID.
      * @private
-     * @returns {object} The configuration object.
+     * @returns The configuration object.
      */
     getConfig() {
+        const { network } = this.matchNetworkPreference(this.preferredNetworks, this.network) ?? { network: this.network };
+        if (this.network !== network) {
+            this.connection = undefined;
+        }
+        this.network = network;
+        const url = {
+            btc: "https://app.joy.id",
+            btcTestnet: "https://testnet.joyid.dev",
+        }[network];
+        if (!url) {
+            throw new Error(`JoyID wallet doesn't support the requested chain ${this.network}`);
+        }
         return {
             redirectURL: location.href,
-            joyidAppURL: this.appUri,
+            joyidAppURL: this._appUri ?? url,
             requestNetwork: `btc-${this.addressType}`,
             name: this.name,
             logo: this.icon,
         };
     }
+    async disconnect() {
+        await super.disconnect();
+        await this.connectionsRepo.set({ uri: this.getConfig().joyidAppURL, addressType: "btc" }, undefined);
+    }
     /**
      * Gets the Bitcoin account address.
      * @returns {Promise<string>} A promise that resolves to the Bitcoin account address.
@@ -92,8 +117,8 @@ class BitcoinSigner extends core_1.ccc.SignerBtc {
             keyType: res.keyType,
         };
         await Promise.all([
-            this.connectionsRepo.set({ uri: this.appUri, addressType: `btc-${res.btcAddressType}` }, this.connection),
-            this.connectionsRepo.set({ uri: this.appUri, addressType: "btc-auto" }, this.connection),
+            this.connectionsRepo.set({ uri: config.joyidAppURL, addressType: `btc-${res.btcAddressType}` }, this.connection),
+            this.connectionsRepo.set({ uri: config.joyidAppURL, addressType: "btc-auto" }, this.connection),
         ]);
     }
     /**
@@ -105,7 +130,7 @@ class BitcoinSigner extends core_1.ccc.SignerBtc {
             return true;
         }
         this.connection = await this.connectionsRepo.get({
-            uri: this.appUri,
+            uri: this.getConfig().joyidAppURL,
             addressType: `btc-${this.addressType}`,
         });
         return this.connection !== undefined;

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

@@ -39,10 +39,11 @@ export declare class CkbSigner extends ccc.Signer {
      * @param {ConnectionsRepo} [connectionsRepo=new ConnectionsRepoLocalStorage()] - The connections repository.
      */
     constructor(client: ccc.Client, name: string, icon: string, _appUri?: string | undefined, _aggregatorUri?: string | undefined, connectionsRepo?: ConnectionsRepo);
+    replaceClient(client: ccc.Client): Promise<boolean>;
     /**
      * Gets the configuration for JoyID.
      * @private
-     * @returns {object} The configuration object.
+     * @returns The configuration object.
      */
     private getConfig;
     /**
@@ -56,6 +57,7 @@ export declare class CkbSigner extends ccc.Signer {
      * @returns {Promise<void>} A promise that resolves when the connection is established.
      */
     connect(): Promise<void>;
+    disconnect(): Promise<void>;
     /**
      * Checks if the signer is connected.
      * @returns {Promise<boolean>} A promise that resolves to true if connected, false otherwise.

package/dist.commonjs/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;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"}
+{"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;IAKjF,aAAa,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAQzD;;;;OAIG;IACH,OAAO,CAAC,SAAS;IAYjB;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IAUxB;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAOjC;;;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.commonjs/ckb/index.js

@@ -55,10 +55,17 @@ class CkbSigner extends core_1.ccc.Signer {
         this._aggregatorUri = _aggregatorUri;
         this.connectionsRepo = connectionsRepo;
     }
+    async replaceClient(client) {
+        if (!(await super.replaceClient(client))) {
+            return false;
+        }
+        this.connection = undefined;
+        return true;
+    }
     /**
      * Gets the configuration for JoyID.
      * @private
-     * @returns {object} The configuration object.
+     * @returns The configuration object.
      */
     getConfig() {
         return {
@@ -100,6 +107,11 @@ class CkbSigner extends core_1.ccc.Signer {
         };
         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.

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

@@ -15,7 +15,7 @@ export type AccountSelector = {
  * @param {AccountSelector} b - The second account selector.
  * @returns {boolean} True if the selectors are equal, false otherwise.
  */
-export declare function isSelectorEq(a: AccountSelector, b: AccountSelector): boolean;
+export declare function isSelectorMatch(a: AccountSelector, filter: AccountSelector): boolean;
 /**
  * Type representing a connection with an address, public key, and key type.
  * @typedef {Object} Connection

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/connectionsStorage/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAEpC;;;;;GAKG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,CAAC,EAAE,eAAe,EAAE,CAAC,EAAE,eAAe,GAAG,OAAO,CAE5E;AAED;;;;;;GAMG;AACH,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC;IAC5B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B;;;;OAIG;IACH,GAAG,CAAC,QAAQ,EAAE,eAAe,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC;IAEhE;;;;;OAKG;IACH,GAAG,CACD,QAAQ,EAAE,eAAe,EACzB,UAAU,EAAE,UAAU,GAAG,SAAS,GACjC,OAAO,CAAC,IAAI,CAAC,CAAC;CAClB;AAED;;;;GAIG;AACH,qBAAa,2BAA4B,YAAW,eAAe;IAKrD,OAAO,CAAC,QAAQ,CAAC,UAAU;IAJvC;;;OAGG;gBAC0B,UAAU,SAAsB;IAE7D;;;OAGG;IACG,eAAe,IAAI,OAAO,CAAC,CAAC,eAAe,EAAE,UAAU,CAAC,EAAE,CAAC;IAIjE;;;;OAIG;IACG,GAAG,CAAC,QAAQ,EAAE,eAAe,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAMrE;;;;;OAKG;IACG,GAAG,CACP,QAAQ,EAAE,eAAe,EACzB,UAAU,EAAE,UAAU,GAAG,SAAS,GACjC,OAAO,CAAC,IAAI,CAAC;CAkBjB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/connectionsStorage/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAEpC;;;;;GAKG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,CAAC,EAAE,eAAe,EAClB,MAAM,EAAE,eAAe,GACtB,OAAO,CAET;AAED;;;;;;GAMG;AACH,MAAM,MAAM,UAAU,GAAG;IACvB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC;IAC5B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,eAAe;IAC9B;;;;OAIG;IACH,GAAG,CAAC,QAAQ,EAAE,eAAe,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC;IAEhE;;;;;OAKG;IACH,GAAG,CACD,QAAQ,EAAE,eAAe,EACzB,UAAU,EAAE,UAAU,GAAG,SAAS,GACjC,OAAO,CAAC,IAAI,CAAC,CAAC;CAClB;AAED;;;;GAIG;AACH,qBAAa,2BAA4B,YAAW,eAAe;IAKrD,OAAO,CAAC,QAAQ,CAAC,UAAU;IAJvC;;;OAGG;gBAC0B,UAAU,SAAsB;IAE7D;;;OAGG;IACG,eAAe,IAAI,OAAO,CAAC,CAAC,eAAe,EAAE,UAAU,CAAC,EAAE,CAAC;IAIjE;;;;OAIG;IACG,GAAG,CAAC,QAAQ,EAAE,eAAe,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAMrE;;;;;OAKG;IACG,GAAG,CACP,QAAQ,EAAE,eAAe,EACzB,UAAU,EAAE,UAAU,GAAG,SAAS,GACjC,OAAO,CAAC,IAAI,CAAC;CAoBjB"}

package/dist.commonjs/connectionsStorage/index.js

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConnectionsRepoLocalStorage = exports.isSelectorEq = void 0;
+exports.ConnectionsRepoLocalStorage = exports.isSelectorMatch = void 0;
 /**
  * Checks if two AccountSelectors are equal.
  * @param {AccountSelector} a - The first account selector.
  * @param {AccountSelector} b - The second account selector.
  * @returns {boolean} True if the selectors are equal, false otherwise.
  */
-function isSelectorEq(a, b) {
-    return a.uri === b.uri && a.addressType === b.addressType;
+function isSelectorMatch(a, filter) {
+    return a.uri === filter.uri && a.addressType.startsWith(filter.addressType);
 }
-exports.isSelectorEq = isSelectorEq;
+exports.isSelectorMatch = isSelectorMatch;
 /**
  * Class representing a local storage-based repository for managing connections.
  * @class
@@ -37,7 +37,7 @@ class ConnectionsRepoLocalStorage {
      * @returns {Promise<Connection | undefined>} A promise that resolves to the connection, if found.
      */
     async get(selector) {
-        return (await this.readConnections()).find(([s]) => isSelectorEq(selector, s))?.[1];
+        return (await this.readConnections()).find(([s]) => isSelectorMatch(selector, s))?.[1];
     }
     /**
      * Sets a connection for the given selector.
@@ -48,7 +48,7 @@ class ConnectionsRepoLocalStorage {
     async set(selector, connection) {
         const connections = await this.readConnections();
         if (connection) {
-            const existed = connections.find(([s]) => isSelectorEq(s, selector));
+            const existed = connections.find(([s]) => isSelectorMatch(s, selector));
             if (existed) {
                 existed[1] = connection;
             }
@@ -58,7 +58,7 @@ class ConnectionsRepoLocalStorage {
             window.localStorage.setItem(this.storageKey, JSON.stringify(connections));
         }
         else {
-            window.localStorage.setItem(this.storageKey, JSON.stringify(connections.filter(([s]) => !isSelectorEq(s, selector))));
+            window.localStorage.setItem(this.storageKey, JSON.stringify(connections.filter(([s]) => !isSelectorMatch(s, selector))));
         }
     }
 }

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

@@ -8,7 +8,7 @@ import { ConnectionsRepo } from "../connectionsStorage";
 export declare class EvmSigner extends ccc.SignerEvm {
     private readonly name;
     private readonly icon;
-    private readonly appUri;
+    private readonly _appUri?;
     private readonly connectionsRepo;
     private connection?;
     /**
@@ -20,13 +20,14 @@ export declare class EvmSigner extends ccc.SignerEvm {
     private assertConnection;
     /**
      * Creates an instance of EvmSigner.
-     * @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="https://app.joy.id"] - The application URI.
-     * @param {ConnectionsRepo} [connectionsRepo=new ConnectionsRepoLocalStorage()] - The connections repository.
+     * @param client - The client instance.
+     * @param name - The name of the signer.
+     * @param icon - The icon URL of the signer.
+     * @param appUri - The application URI.
+     * @param connectionsRepo - The connections repository.
      */
-    constructor(client: ccc.Client, name: string, icon: string, appUri?: string, connectionsRepo?: ConnectionsRepo);
+    constructor(client: ccc.Client, name: string, icon: string, _appUri?: string | undefined, connectionsRepo?: ConnectionsRepo);
+    replaceClient(client: ccc.Client): Promise<boolean>;
     /**
      * Gets the configuration for JoyID.
      * @private
@@ -43,6 +44,7 @@ export declare class EvmSigner extends ccc.SignerEvm {
      * @returns {Promise<void>} A promise that resolves when the connection is established.
      */
     connect(): Promise<void>;
+    disconnect(): Promise<void>;
     /**
      * Checks if the signer is connected.
      * @returns {Promise<boolean>} A promise that resolves to true if connected, false otherwise.

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/evm/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAGpC,OAAO,EAEL,eAAe,EAEhB,MAAM,uBAAuB,CAAC;AAE/B;;;;GAIG;AACH,qBAAa,SAAU,SAAQ,GAAG,CAAC,SAAS;IA2BxC,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,eAAe;IA7BlC,OAAO,CAAC,UAAU,CAAC,CAAa;IAEhC;;;;;OAKG;IACH,OAAO,CAAC,gBAAgB;IAQxB;;;;;;;OAOG;gBAED,MAAM,EAAE,GAAG,CAAC,MAAM,EACD,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,MAAM,SAAuB,EAC7B,eAAe,GAAE,eAAmD;IAKvF;;;;OAIG;IACH,OAAO,CAAC,SAAS;IAUjB;;;OAGG;IACG,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAItC;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAgB9B;;;OAGG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAQrC;;;;OAIG;IACG,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IAuBvE;;;;OAIG;YACW,cAAc;IAU5B;;;;OAIG;YACW,iBAAiB;CAMhC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/evm/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAGpC,OAAO,EAEL,eAAe,EAEhB,MAAM,uBAAuB,CAAC;AAE/B;;;;GAIG;AACH,qBAAa,SAAU,SAAQ,GAAG,CAAC,SAAS;IA2BxC,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;IACzB,OAAO,CAAC,QAAQ,CAAC,eAAe;IA7BlC,OAAO,CAAC,UAAU,CAAC,CAAa;IAEhC;;;;;OAKG;IACH,OAAO,CAAC,gBAAgB;IAQxB;;;;;;;OAOG;gBAED,MAAM,EAAE,GAAG,CAAC,MAAM,EACD,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,oBAAQ,EAChB,eAAe,GAAE,eAAmD;IAKjF,aAAa,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAQzD;;;;OAIG;IACH,OAAO,CAAC,SAAS;IAajB;;;OAGG;IACG,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAItC;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAOjC;;;OAGG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAQrC;;;;OAIG;IACG,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IAuBvE;;;;OAIG;YACW,cAAc;IAU5B;;;;OAIG;YACW,iBAAiB;CAMhC"}

package/dist.commonjs/evm/index.js

@@ -25,19 +25,26 @@ class EvmSigner extends core_1.ccc.SignerEvm {
     }
     /**
      * Creates an instance of EvmSigner.
-     * @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="https://app.joy.id"] - The application URI.
-     * @param {ConnectionsRepo} [connectionsRepo=new ConnectionsRepoLocalStorage()] - The connections repository.
+     * @param client - The client instance.
+     * @param name - The name of the signer.
+     * @param icon - The icon URL of the signer.
+     * @param appUri - The application URI.
+     * @param connectionsRepo - The connections repository.
      */
-    constructor(client, name, icon, appUri = "https://app.joy.id", connectionsRepo = new connectionsStorage_1.ConnectionsRepoLocalStorage()) {
+    constructor(client, name, icon, _appUri, connectionsRepo = new connectionsStorage_1.ConnectionsRepoLocalStorage()) {
         super(client);
         this.name = name;
         this.icon = icon;
-        this.appUri = appUri;
+        this._appUri = _appUri;
         this.connectionsRepo = connectionsRepo;
     }
+    async replaceClient(client) {
+        if (!(await super.replaceClient(client))) {
+            return false;
+        }
+        this.connection = undefined;
+        return true;
+    }
     /**
      * Gets the configuration for JoyID.
      * @private
@@ -46,7 +53,9 @@ class EvmSigner extends core_1.ccc.SignerEvm {
     getConfig() {
         return {
             redirectURL: location.href,
-            joyidAppURL: this.appUri,
+            joyidAppURL: this._appUri ?? this.client.addressPrefix === "ckb"
+                ? "https://app.joy.id"
+                : "https://testnet.joyid.dev",
             requestNetwork: `ethereum`,
             name: this.name,
             logo: this.icon,
@@ -76,6 +85,11 @@ class EvmSigner extends core_1.ccc.SignerEvm {
         };
         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.

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

@@ -8,7 +8,7 @@ import { ConnectionsRepo } from "../connectionsStorage";
 export declare class NostrSigner extends ccc.SignerNostr {
     private readonly name;
     private readonly icon;
-    private readonly appUri;
+    private readonly _appUri?;
     private readonly connectionsRepo;
     private connection?;
     /**
@@ -20,13 +20,13 @@ export declare class NostrSigner extends ccc.SignerNostr {
     private assertConnection;
     /**
      * Creates an instance of NostrSigner.
-     * @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="https://app.joy.id"] - The application URI.
-     * @param {ConnectionsRepo} [connectionsRepo=new ConnectionsRepoLocalStorage()] - The connections repository.
+     * @param client - The client instance.
+     * @param name - The name of the signer.
+     * @param icon - The icon URL of the signer.
+     * @param appUri - The application URI.
+     * @param connectionsRepo - The connections repository.
      */
-    constructor(client: ccc.Client, name: string, icon: string, appUri?: string, connectionsRepo?: ConnectionsRepo);
+    constructor(client: ccc.Client, name: string, icon: string, _appUri?: string | undefined, connectionsRepo?: ConnectionsRepo);
     replaceClient(client: ccc.Client): Promise<boolean>;
     /**
      * Gets the configuration for JoyID.
@@ -39,6 +39,7 @@ export declare class NostrSigner extends ccc.SignerNostr {
      * @returns {Promise<void>} A promise that resolves when the connection is established.
      */
     connect(): Promise<void>;
+    disconnect(): Promise<void>;
     /**
      * Checks if the signer is connected.
      * @returns {Promise<boolean>} A promise that resolves to true if connected, false otherwise.
@@ -46,5 +47,17 @@ export declare class NostrSigner extends ccc.SignerNostr {
     isConnected(): Promise<boolean>;
     getNostrPublicKey(): Promise<ccc.Hex>;
     signNostrEvent(event: ccc.NostrEvent): Promise<Required<ccc.NostrEvent>>;
+    /**
+     * Saves the current connection.
+     * @private
+     * @returns {Promise<void>}
+     */
+    private saveConnection;
+    /**
+     * Restores the previous connection.
+     * @private
+     * @returns {Promise<void>}
+     */
+    private restoreConnection;
 }
 //# sourceMappingURL=index.d.ts.map

package/dist.commonjs/nostr/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/nostr/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAGpC,OAAO,EAEL,eAAe,EAEhB,MAAM,uBAAuB,CAAC;AAE/B;;;;GAIG;AACH,qBAAa,WAAY,SAAQ,GAAG,CAAC,WAAW;IA2B5C,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,eAAe;IA7BlC,OAAO,CAAC,UAAU,CAAC,CAAa;IAEhC;;;;;OAKG;IACH,OAAO,CAAC,gBAAgB;IAQxB;;;;;;;OAOG;gBAED,MAAM,EAAE,GAAG,CAAC,MAAM,EACD,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,MAAM,SAAuB,EAC7B,eAAe,GAAE,eAAmD;IAKjF,aAAa,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAIzD;;;;OAIG;IACH,OAAO,CAAC,SAAS;IAUjB;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAkB9B;;;OAGG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAY/B,iBAAiB,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IAIrC,cAAc,CAClB,KAAK,EAAE,GAAG,CAAC,UAAU,GACpB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;CAWrC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/nostr/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAGpC,OAAO,EAEL,eAAe,EAEhB,MAAM,uBAAuB,CAAC;AAE/B;;;;GAIG;AACH,qBAAa,WAAY,SAAQ,GAAG,CAAC,WAAW;IA2B5C,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;IACzB,OAAO,CAAC,QAAQ,CAAC,eAAe;IA7BlC,OAAO,CAAC,UAAU,CAAC,CAAa;IAEhC;;;;;OAKG;IACH,OAAO,CAAC,gBAAgB;IAQxB;;;;;;;OAOG;gBAED,MAAM,EAAE,GAAG,CAAC,MAAM,EACD,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,oBAAQ,EAChB,eAAe,GAAE,eAAmD;IAKjF,aAAa,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAQzD;;;;OAIG;IACH,OAAO,CAAC,SAAS;IAajB;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAexB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAOjC;;;OAGG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAS/B,iBAAiB,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IAIrC,cAAc,CAClB,KAAK,EAAE,GAAG,CAAC,UAAU,GACpB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAYpC;;;;OAIG;YACW,cAAc;IAU5B;;;;OAIG;YACW,iBAAiB;CAMhC"}

package/dist.commonjs/nostr/index.js

@@ -25,21 +25,25 @@ class NostrSigner extends core_1.ccc.SignerNostr {
     }
     /**
      * Creates an instance of NostrSigner.
-     * @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="https://app.joy.id"] - The application URI.
-     * @param {ConnectionsRepo} [connectionsRepo=new ConnectionsRepoLocalStorage()] - The connections repository.
+     * @param client - The client instance.
+     * @param name - The name of the signer.
+     * @param icon - The icon URL of the signer.
+     * @param appUri - The application URI.
+     * @param connectionsRepo - The connections repository.
      */
-    constructor(client, name, icon, appUri = "https://app.joy.id", connectionsRepo = new connectionsStorage_1.ConnectionsRepoLocalStorage()) {
+    constructor(client, name, icon, _appUri, connectionsRepo = new connectionsStorage_1.ConnectionsRepoLocalStorage()) {
         super(client);
         this.name = name;
         this.icon = icon;
-        this.appUri = appUri;
+        this._appUri = _appUri;
         this.connectionsRepo = connectionsRepo;
     }
     async replaceClient(client) {
-        return super.replaceClient(client);
+        if (!(await super.replaceClient(client))) {
+            return false;
+        }
+        this.connection = undefined;
+        return true;
     }
     /**
      * Gets the configuration for JoyID.
@@ -49,7 +53,9 @@ class NostrSigner extends core_1.ccc.SignerNostr {
     getConfig() {
         return {
             redirectURL: location.href,
-            joyidAppURL: this.appUri,
+            joyidAppURL: this._appUri ?? this.client.addressPrefix === "ckb"
+                ? "https://app.joy.id"
+                : "https://testnet.joyid.dev",
             requestNetwork: "nostr",
             name: this.name,
             logo: this.icon,
@@ -70,7 +76,12 @@ class NostrSigner extends core_1.ccc.SignerNostr {
             publicKey: core_1.ccc.hexFrom(res.nostrPubkey),
             keyType: res.keyType,
         };
-        await this.connectionsRepo.set({ uri: this.appUri, addressType: "nostr" }, this.connection);
+        await this.saveConnection();
+    }
+    async disconnect() {
+        await super.disconnect();
+        this.connection = undefined;
+        await this.saveConnection();
     }
     /**
      * Checks if the signer is connected.
@@ -80,10 +91,7 @@ class NostrSigner extends core_1.ccc.SignerNostr {
         if (this.connection) {
             return true;
         }
-        this.connection = await this.connectionsRepo.get({
-            uri: this.appUri,
-            addressType: "nostr",
-        });
+        await this.restoreConnection();
         return this.connection !== undefined;
     }
     async getNostrPublicKey() {
@@ -97,5 +105,27 @@ class NostrSigner extends core_1.ccc.SignerNostr {
         });
         return res.event;
     }
+    /**
+     * Saves the current connection.
+     * @private
+     * @returns {Promise<void>}
+     */
+    async saveConnection() {
+        return this.connectionsRepo.set({
+            uri: this.getConfig().joyidAppURL,
+            addressType: "nostr",
+        }, this.connection);
+    }
+    /**
+     * Restores the previous connection.
+     * @private
+     * @returns {Promise<void>}
+     */
+    async restoreConnection() {
+        this.connection = await this.connectionsRepo.get({
+            uri: this.getConfig().joyidAppURL,
+            addressType: "nostr",
+        });
+    }
 }
 exports.NostrSigner = NostrSigner;

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

@@ -8,5 +8,5 @@ import { ccc } from "@ckb-ccc/core";
  * @param {string} icon - The icon URL of the signer.
  * @returns {ccc.SignerInfo[]} An array of signer information objects.
  */
-export declare function getJoyIdSigners(client: ccc.Client, name: string, icon: string): ccc.SignerInfo[];
+export declare function getJoyIdSigners(client: ccc.Client, name: string, icon: string, preferredNetworks: ccc.NetworkPreference[]): ccc.SignerInfo[];
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/signerFactory/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAOpC;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,GAAG,CAAC,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,GACX,GAAG,CAAC,UAAU,EAAE,CAwClB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/signerFactory/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAOpC;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,GAAG,CAAC,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,iBAAiB,EAAE,GAAG,CAAC,iBAAiB,EAAE,GACzC,GAAG,CAAC,UAAU,EAAE,CA8ClB"}

package/dist.commonjs/signerFactory/index.js

@@ -16,7 +16,7 @@ const nostr_1 = require("../nostr");
  * @param {string} icon - The icon URL of the signer.
  * @returns {ccc.SignerInfo[]} An array of signer information objects.
  */
-function getJoyIdSigners(client, name, icon) {
+function getJoyIdSigners(client, name, icon, preferredNetworks) {
     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,
@@ -30,7 +30,7 @@ function getJoyIdSigners(client, name, icon) {
         },
         {
             name: "BTC",
-            signer: new btc_1.BitcoinSigner(client, name, icon),
+            signer: new btc_1.BitcoinSigner(client, name, icon, preferredNetworks),
         },
         {
             name: "Nostr",
@@ -42,11 +42,11 @@ function getJoyIdSigners(client, name, icon) {
         },
         {
             name: "BTC (P2WPKH)",
-            signer: new btc_1.BitcoinSigner(client, name, icon, "p2wpkh"),
+            signer: new btc_1.BitcoinSigner(client, name, icon, preferredNetworks, "p2wpkh"),
         },
         {
             name: "BTC (P2TR)",
-            signer: new btc_1.BitcoinSigner(client, name, icon, "p2tr"),
+            signer: new btc_1.BitcoinSigner(client, name, icon, preferredNetworks, "p2tr"),
         },
     ];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckb-ccc/joy-id",
-  "version": "0.0.8-alpha.4",
+  "version": "0.0.9-alpha.0",
   "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.8-alpha.4",
+    "@ckb-ccc/core": "0.0.9-alpha.0",
     "@joyid/ckb": "^1.0.0",
     "@joyid/common": "^0.2.0"
   },
-  "gitHead": "444a378be18f46f5d13b18848fa90829755d5ff8"
+  "gitHead": "ac4435006da9c9e48b3b66fc329e6f539156b252"
 }