@ckb-ccc/uni-sat 0.0.10-alpha.2 → 0.0.10-alpha.4

package/dist/signer.d.ts

@@ -14,6 +14,7 @@ export declare class Signer extends ccc.SignerBtc {
      * @param {Provider} provider - The provider instance.
      */
     constructor(client: ccc.Client, provider: Provider, preferredNetworks?: ccc.NetworkPreference[]);
+    _getNetworkToChange(): Promise<string | undefined>;
     /**
      * Ensure the BTC network is the same as CKB network.
      */

package/dist/signer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C;;;;GAIG;AACH,qBAAa,MAAO,SAAQ,GAAG,CAAC,SAAS;aAQrB,QAAQ,EAAE,QAAQ;IAClC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IARpC;;;;OAIG;gBAED,MAAM,EAAE,GAAG,CAAC,MAAM,EACF,QAAQ,EAAE,QAAQ,EACjB,iBAAiB,GAAE,GAAG,CAAC,iBAAiB,EAWxD;IAKH;;OAEG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IA0CpC;;;OAGG;IACG,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAItC;;;OAGG;IACG,eAAe,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IAIzC;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAK9B,UAAU,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI;IAiB5C;;;OAGG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAIrC;;;;OAIG;IACG,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;CAMvE"}
+{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C;;;;GAIG;AACH,qBAAa,MAAO,SAAQ,GAAG,CAAC,SAAS;aAQrB,QAAQ,EAAE,QAAQ;IAClC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IARpC;;;;OAIG;gBAED,MAAM,EAAE,GAAG,CAAC,MAAM,EACF,QAAQ,EAAE,QAAQ,EACjB,iBAAiB,GAAE,GAAG,CAAC,iBAAiB,EAWxD;IAKG,mBAAmB,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IA0BxD;;OAEG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IA2BpC;;;OAGG;IACG,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAItC;;;OAGG;IACG,eAAe,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IAIzC;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAK9B,UAAU,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI;IAiB5C;;;OAGG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAOrC;;;;OAIG;IACG,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;CAMvE"}

package/dist/signer.js

@@ -26,10 +26,7 @@ export class Signer extends ccc.SignerBtc {
         this.provider = provider;
         this.preferredNetworks = preferredNetworks;
     }
-    /**
-     * Ensure the BTC network is the same as CKB network.
-     */
-    async ensureNetwork() {
+    async _getNetworkToChange() {
         const currentNetwork = await (async () => {
             if (this.provider.getChain) {
                 return ({
@@ -46,6 +43,16 @@ export class Signer extends ccc.SignerBtc {
         if (network === currentNetwork) {
             return;
         }
+        return network;
+    }
+    /**
+     * Ensure the BTC network is the same as CKB network.
+     */
+    async ensureNetwork() {
+        const network = await this._getNetworkToChange();
+        if (!network) {
+            return;
+        }
         if (this.provider.switchChain) {
             const chain = {
                 btc: "BITCOIN_MAINNET",
@@ -59,6 +66,7 @@ export class Signer extends ccc.SignerBtc {
         }
         else if (network === "btc" || network === "btcTestnet") {
             await this.provider.switchNetwork(network === "btc" ? "livenet" : "testnet");
+            return;
         }
         throw new Error(`UniSat wallet doesn't support the requested chain ${network}`);
     }
@@ -103,6 +111,9 @@ export class Signer extends ccc.SignerBtc {
      * @returns {Promise<boolean>} A promise that resolves to true if connected, false otherwise.
      */
     async isConnected() {
+        if (await this._getNetworkToChange()) {
+            return false;
+        }
         return (await this.provider.getAccounts()).length !== 0;
     }
     /**

package/dist.commonjs/advanced.d.ts

@@ -1,2 +1,2 @@
 export * as UniSatA 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.UniSatA = void 0;
 exports.UniSatA = __importStar(require("./advancedBarrel"));

package/dist.commonjs/advancedBarrel.d.ts

@@ -3,78 +3,81 @@
  * @interface
  */
 export interface Provider {
-    /**
-     * Requests user accounts.
-     * @returns {Promise<string[]>} A promise that resolves to an array of account addresses.
-     */
-    requestAccounts(): Promise<string[]>;
-    /**
-     * Gets the current network.
-     * @returns current network.
-     */
-    getNetwork(): Promise<"livenet" | "testnet">;
-    /**
-     * Switch the current network.
-     */
-    switchNetwork(chain: "livenet" | "testnet"): Promise<void>;
-    /**
-     * Gets the current chain.
-     * @returns current chain.
-     */
-    getChain?(): Promise<{
-        enum: string;
-        name: string;
-        network: string;
-    }>;
-    /**
-     * Switch the current chain.
-     */
-    switchChain?(chain: string): Promise<{
-        enum: string;
-        name: string;
-        network: string;
-    }>;
-    /**
-     * Gets the current accounts.
-     * @returns {Promise<string[]>} A promise that resolves to an array of account addresses.
-     */
-    getAccounts(): Promise<string[]>;
-    /**
-     * Gets the public key of the account.
-     * @returns {Promise<string>} A promise that resolves to the public key.
-     */
-    getPublicKey(): Promise<string>;
-    /**
-     * Signs a message with the specified type.
-     * @param {string} msg - The message to sign.
-     * @param {"ecdsa" | "bip322-simple"} type - The type of signature.
-     * @returns {Promise<string>} A promise that resolves to the signed message.
-     */
-    signMessage(msg: string, type: "ecdsa" | "bip322-simple"): Promise<string>;
-    /**
-     * Adds an event listener to the provider.
-     * @type {OnMethod}
-     */
-    on: OnMethod;
-    /**
-     * Removes an event listener from the provider.
-     * @param {string} eventName - The name of the event to remove the listener from.
-     * @param {(...args: unknown[]) => unknown} listener - The listener function to remove.
-     * @returns {Provider} The provider instance.
-     */
-    removeListener(eventName: string, listener: (...args: unknown[]) => unknown): Provider;
+  /**
+   * Requests user accounts.
+   * @returns {Promise<string[]>} A promise that resolves to an array of account addresses.
+   */
+  requestAccounts(): Promise<string[]>;
+  /**
+   * Gets the current network.
+   * @returns current network.
+   */
+  getNetwork(): Promise<"livenet" | "testnet">;
+  /**
+   * Switch the current network.
+   */
+  switchNetwork(chain: "livenet" | "testnet"): Promise<void>;
+  /**
+   * Gets the current chain.
+   * @returns current chain.
+   */
+  getChain?(): Promise<{
+    enum: string;
+    name: string;
+    network: string;
+  }>;
+  /**
+   * Switch the current chain.
+   */
+  switchChain?(chain: string): Promise<{
+    enum: string;
+    name: string;
+    network: string;
+  }>;
+  /**
+   * Gets the current accounts.
+   * @returns {Promise<string[]>} A promise that resolves to an array of account addresses.
+   */
+  getAccounts(): Promise<string[]>;
+  /**
+   * Gets the public key of the account.
+   * @returns {Promise<string>} A promise that resolves to the public key.
+   */
+  getPublicKey(): Promise<string>;
+  /**
+   * Signs a message with the specified type.
+   * @param {string} msg - The message to sign.
+   * @param {"ecdsa" | "bip322-simple"} type - The type of signature.
+   * @returns {Promise<string>} A promise that resolves to the signed message.
+   */
+  signMessage(msg: string, type: "ecdsa" | "bip322-simple"): Promise<string>;
+  /**
+   * Adds an event listener to the provider.
+   * @type {OnMethod}
+   */
+  on: OnMethod;
+  /**
+   * Removes an event listener from the provider.
+   * @param {string} eventName - The name of the event to remove the listener from.
+   * @param {(...args: unknown[]) => unknown} listener - The listener function to remove.
+   * @returns {Provider} The provider instance.
+   */
+  removeListener(
+    eventName: string,
+    listener: (...args: unknown[]) => unknown,
+  ): Provider;
 }
 /**
  * Interface representing a method to add event listeners to the provider.
  * @interface
  */
 export interface OnMethod {
-    /**
-     * Adds an event listener to the provider.
-     * @param {string} eventName - The name of the event.
-     * @param {(...args: unknown[]) => unknown} listener - The listener function.
-     * @returns {Provider} The provider instance.
-     */
-    (eventName: string, listener: (...args: unknown[]) => unknown): Provider;
+  /**
+   * Adds an event listener to the provider.
+   * @param {string} eventName - The name of the event.
+   * @param {(...args: unknown[]) => unknown} listener - The listener function.
+   * @returns {Provider} The provider instance.
+   */
+  (eventName: string, listener: (...args: unknown[]) => unknown): Provider;
 }
-//# sourceMappingURL=advancedBarrel.d.ts.map
+//# sourceMappingURL=advancedBarrel.d.ts.map

package/dist.commonjs/barrel.d.ts

@@ -1,3 +1,3 @@
 export * from "./signer";
 export * from "./signersFactory";
-//# 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("./signer"), exports);
 __exportStar(require("./signersFactory"), exports);

package/dist.commonjs/index.d.ts

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

package/dist.commonjs/index.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.UniSat = void 0;
 exports.UniSat = __importStar(require("./barrel"));

package/dist.commonjs/signer.d.ts

@@ -6,44 +6,49 @@ import { Provider } from "./advancedBarrel";
  * @extends {ccc.SignerBtc}
  */
 export declare class Signer extends ccc.SignerBtc {
-    readonly provider: Provider;
-    private readonly preferredNetworks;
-    /**
-     * Creates an instance of Signer.
-     * @param {ccc.Client} client - The client instance.
-     * @param {Provider} provider - The provider instance.
-     */
-    constructor(client: ccc.Client, provider: Provider, preferredNetworks?: ccc.NetworkPreference[]);
-    /**
-     * Ensure the BTC network is the same as CKB network.
-     */
-    ensureNetwork(): Promise<void>;
-    /**
-     * 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 accounts.
-     * @returns {Promise<void>} A promise that resolves when the connection is established.
-     */
-    connect(): Promise<void>;
-    onReplaced(listener: () => void): () => 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>;
+  readonly provider: Provider;
+  private readonly preferredNetworks;
+  /**
+   * Creates an instance of Signer.
+   * @param {ccc.Client} client - The client instance.
+   * @param {Provider} provider - The provider instance.
+   */
+  constructor(
+    client: ccc.Client,
+    provider: Provider,
+    preferredNetworks?: ccc.NetworkPreference[],
+  );
+  _getNetworkToChange(): Promise<string | undefined>;
+  /**
+   * Ensure the BTC network is the same as CKB network.
+   */
+  ensureNetwork(): Promise<void>;
+  /**
+   * 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 accounts.
+   * @returns {Promise<void>} A promise that resolves when the connection is established.
+   */
+  connect(): Promise<void>;
+  onReplaced(listener: () => void): () => 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=signer.d.ts.map
+//# sourceMappingURL=signer.d.ts.map

package/dist.commonjs/signer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C;;;;GAIG;AACH,qBAAa,MAAO,SAAQ,GAAG,CAAC,SAAS;aAQrB,QAAQ,EAAE,QAAQ;IAClC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IARpC;;;;OAIG;gBAED,MAAM,EAAE,GAAG,CAAC,MAAM,EACF,QAAQ,EAAE,QAAQ,EACjB,iBAAiB,GAAE,GAAG,CAAC,iBAAiB,EAWxD;IAKH;;OAEG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IA0CpC;;;OAGG;IACG,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAItC;;;OAGG;IACG,eAAe,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IAIzC;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAK9B,UAAU,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI;IAiB5C;;;OAGG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAIrC;;;;OAIG;IACG,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;CAMvE"}
+{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C;;;;GAIG;AACH,qBAAa,MAAO,SAAQ,GAAG,CAAC,SAAS;aAQrB,QAAQ,EAAE,QAAQ;IAClC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IARpC;;;;OAIG;gBAED,MAAM,EAAE,GAAG,CAAC,MAAM,EACF,QAAQ,EAAE,QAAQ,EACjB,iBAAiB,GAAE,GAAG,CAAC,iBAAiB,EAWxD;IAKG,mBAAmB,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IA0BxD;;OAEG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IA2BpC;;;OAGG;IACG,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAItC;;;OAGG;IACG,eAAe,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IAIzC;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAK9B,UAAU,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI;IAiB5C;;;OAGG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAOrC;;;;OAIG;IACG,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;CAMvE"}

package/dist.commonjs/signer.js

@@ -8,114 +8,140 @@ const core_1 = require("@ckb-ccc/core");
  * @extends {ccc.SignerBtc}
  */
 class Signer extends core_1.ccc.SignerBtc {
-    /**
-     * Creates an instance of Signer.
-     * @param {ccc.Client} client - The client instance.
-     * @param {Provider} provider - The provider instance.
-     */
-    constructor(client, provider, preferredNetworks = [
-        {
-            addressPrefix: "ckb",
-            signerType: core_1.ccc.SignerType.BTC,
-            network: "btc",
-        },
-        {
-            addressPrefix: "ckt",
-            signerType: core_1.ccc.SignerType.BTC,
-            network: "btcTestnet",
-        },
-    ]) {
-        super(client);
-        this.provider = provider;
-        this.preferredNetworks = preferredNetworks;
+  /**
+   * Creates an instance of Signer.
+   * @param {ccc.Client} client - The client instance.
+   * @param {Provider} provider - The provider instance.
+   */
+  constructor(
+    client,
+    provider,
+    preferredNetworks = [
+      {
+        addressPrefix: "ckb",
+        signerType: core_1.ccc.SignerType.BTC,
+        network: "btc",
+      },
+      {
+        addressPrefix: "ckt",
+        signerType: core_1.ccc.SignerType.BTC,
+        network: "btcTestnet",
+      },
+    ],
+  ) {
+    super(client);
+    this.provider = provider;
+    this.preferredNetworks = preferredNetworks;
+  }
+  async _getNetworkToChange() {
+    const currentNetwork = await (async () => {
+      if (this.provider.getChain) {
+        return (
+          {
+            BITCOIN_MAINNET: "btc",
+            BITCOIN_TESTNET: "btcTestnet",
+            FRACTAL_BITCOIN_MAINNET: "fractalBtc",
+          }[(await this.provider.getChain()).enum] ?? ""
+        );
+      }
+      return (await this.provider.getNetwork()) === "livenet"
+        ? "btc"
+        : "btcTestnet";
+    })();
+    const { network } = this.matchNetworkPreference(
+      this.preferredNetworks,
+      currentNetwork,
+    ) ?? { network: currentNetwork };
+    if (network === currentNetwork) {
+      return;
     }
-    /**
-     * Ensure the BTC network is the same as CKB network.
-     */
-    async ensureNetwork() {
-        const currentNetwork = await (async () => {
-            if (this.provider.getChain) {
-                return ({
-                    BITCOIN_MAINNET: "btc",
-                    BITCOIN_TESTNET: "btcTestnet",
-                    FRACTAL_BITCOIN_MAINNET: "fractalBtc",
-                }[(await this.provider.getChain()).enum] ?? "");
-            }
-            return (await this.provider.getNetwork()) === "livenet"
-                ? "btc"
-                : "btcTestnet";
-        })();
-        const { network } = this.matchNetworkPreference(this.preferredNetworks, currentNetwork) ?? { network: currentNetwork };
-        if (network === currentNetwork) {
-            return;
-        }
-        if (this.provider.switchChain) {
-            const chain = {
-                btc: "BITCOIN_MAINNET",
-                btcTestnet: "BITCOIN_TESTNET",
-                fractalBtc: "FRACTAL_BITCOIN_MAINNET",
-            }[network];
-            if (chain) {
-                await this.provider.switchChain(chain);
-                return;
-            }
-        }
-        else if (network === "btc" || network === "btcTestnet") {
-            await this.provider.switchNetwork(network === "btc" ? "livenet" : "testnet");
-        }
-        throw new Error(`UniSat wallet doesn't support the requested chain ${network}`);
+    return network;
+  }
+  /**
+   * Ensure the BTC network is the same as CKB network.
+   */
+  async ensureNetwork() {
+    const network = await this._getNetworkToChange();
+    if (!network) {
+      return;
     }
-    /**
-     * Gets the Bitcoin account address.
-     * @returns {Promise<string>} A promise that resolves to the Bitcoin account address.
-     */
-    async getBtcAccount() {
-        return (await this.provider.getAccounts())[0];
+    if (this.provider.switchChain) {
+      const chain = {
+        btc: "BITCOIN_MAINNET",
+        btcTestnet: "BITCOIN_TESTNET",
+        fractalBtc: "FRACTAL_BITCOIN_MAINNET",
+      }[network];
+      if (chain) {
+        await this.provider.switchChain(chain);
+        return;
+      }
+    } else if (network === "btc" || network === "btcTestnet") {
+      await this.provider.switchNetwork(
+        network === "btc" ? "livenet" : "testnet",
+      );
+      return;
     }
-    /**
-     * Gets the Bitcoin public key.
-     * @returns {Promise<ccc.Hex>} A promise that resolves to the Bitcoin public key.
-     */
-    async getBtcPublicKey() {
-        return core_1.ccc.hexFrom(await this.provider.getPublicKey());
-    }
-    /**
-     * Connects to the provider by requesting accounts.
-     * @returns {Promise<void>} A promise that resolves when the connection is established.
-     */
-    async connect() {
-        await this.provider.requestAccounts();
-        await this.ensureNetwork();
-    }
-    onReplaced(listener) {
-        const stop = [];
-        const replacer = async () => {
-            listener();
-            stop[0]?.();
-        };
-        stop.push(() => {
-            this.provider.removeListener("accountsChanged", replacer);
-            this.provider.removeListener("networkChanged", replacer);
-        });
-        this.provider.on("accountsChanged", replacer);
-        this.provider.on("networkChanged", replacer);
-        return stop[0];
-    }
-    /**
-     * Checks if the signer is connected.
-     * @returns {Promise<boolean>} A promise that resolves to true if connected, false otherwise.
-     */
-    async isConnected() {
-        return (await this.provider.getAccounts()).length !== 0;
-    }
-    /**
-     * 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.
-     */
-    async signMessageRaw(message) {
-        const challenge = typeof message === "string" ? message : core_1.ccc.hexFrom(message).slice(2);
-        return this.provider.signMessage(challenge, "ecdsa");
+    throw new Error(
+      `UniSat wallet doesn't support the requested chain ${network}`,
+    );
+  }
+  /**
+   * Gets the Bitcoin account address.
+   * @returns {Promise<string>} A promise that resolves to the Bitcoin account address.
+   */
+  async getBtcAccount() {
+    return (await this.provider.getAccounts())[0];
+  }
+  /**
+   * Gets the Bitcoin public key.
+   * @returns {Promise<ccc.Hex>} A promise that resolves to the Bitcoin public key.
+   */
+  async getBtcPublicKey() {
+    return core_1.ccc.hexFrom(await this.provider.getPublicKey());
+  }
+  /**
+   * Connects to the provider by requesting accounts.
+   * @returns {Promise<void>} A promise that resolves when the connection is established.
+   */
+  async connect() {
+    await this.provider.requestAccounts();
+    await this.ensureNetwork();
+  }
+  onReplaced(listener) {
+    const stop = [];
+    const replacer = async () => {
+      listener();
+      stop[0]?.();
+    };
+    stop.push(() => {
+      this.provider.removeListener("accountsChanged", replacer);
+      this.provider.removeListener("networkChanged", replacer);
+    });
+    this.provider.on("accountsChanged", replacer);
+    this.provider.on("networkChanged", replacer);
+    return stop[0];
+  }
+  /**
+   * Checks if the signer is connected.
+   * @returns {Promise<boolean>} A promise that resolves to true if connected, false otherwise.
+   */
+  async isConnected() {
+    if (await this._getNetworkToChange()) {
+      return false;
     }
+    return (await this.provider.getAccounts()).length !== 0;
+  }
+  /**
+   * 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.
+   */
+  async signMessageRaw(message) {
+    const challenge =
+      typeof message === "string"
+        ? message
+        : core_1.ccc.hexFrom(message).slice(2);
+    return this.provider.signMessage(challenge, "ecdsa");
+  }
 }
 exports.Signer = Signer;

package/dist.commonjs/signersFactory.d.ts

@@ -5,5 +5,8 @@ import { Signer } from "./signer";
  * @param {ccc.Client} client - The client instance.
  * @returns {Signer | undefined} The Signer instance if the UniSat provider is available, otherwise undefined.
  */
-export declare function getUniSatSigner(client: ccc.Client, preferredNetworks: ccc.NetworkPreference[]): Signer | undefined;
-//# sourceMappingURL=signersFactory.d.ts.map
+export declare function getUniSatSigner(
+  client: ccc.Client,
+  preferredNetworks: ccc.NetworkPreference[],
+): Signer | undefined;
+//# sourceMappingURL=signersFactory.d.ts.map

package/dist.commonjs/signersFactory.js

@@ -8,10 +8,10 @@ const signer_1 = require("./signer");
  * @returns {Signer | undefined} The Signer instance if the UniSat provider is available, otherwise undefined.
  */
 function getUniSatSigner(client, preferredNetworks) {
-    const windowRef = window;
-    if (typeof windowRef.unisat === "undefined") {
-        return undefined;
-    }
-    return new signer_1.Signer(client, windowRef.unisat, preferredNetworks);
+  const windowRef = window;
+  if (typeof windowRef.unisat === "undefined") {
+    return undefined;
+  }
+  return new signer_1.Signer(client, windowRef.unisat, preferredNetworks);
 }
 exports.getUniSatSigner = getUniSatSigner;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckb-ccc/uni-sat",
-  "version": "0.0.10-alpha.2",
+  "version": "0.0.10-alpha.4",
   "description": "CCC - CKBer's Codebase. Common Chains Connector's support for UniSat",
   "author": "Hanssen0 <hanssen0@hanssen0.com>",
   "license": "MIT",
@@ -50,7 +50,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@ckb-ccc/core": "0.0.10-alpha.0"
+    "@ckb-ccc/core": "0.0.10-alpha.4"
   },
-  "gitHead": "660e6ab1d43b34d151a69f01e43bba64f9a2f761"
+  "gitHead": "61228337bbf4bdc0bc082e3c9530f843c2182106"
 }

package/src/signer.ts

@@ -31,10 +31,7 @@ export class Signer extends ccc.SignerBtc {
     super(client);
   }
 
-  /**
-   * Ensure the BTC network is the same as CKB network.
-   */
-  async ensureNetwork(): Promise<void> {
+  async _getNetworkToChange(): Promise<string | undefined> {
     const currentNetwork = await (async () => {
       if (this.provider.getChain) {
         return (
@@ -56,6 +53,18 @@ export class Signer extends ccc.SignerBtc {
     if (network === currentNetwork) {
       return;
     }
+
+    return network;
+  }
+
+  /**
+   * Ensure the BTC network is the same as CKB network.
+   */
+  async ensureNetwork(): Promise<void> {
+    const network = await this._getNetworkToChange();
+    if (!network) {
+      return;
+    }
     if (this.provider.switchChain) {
       const chain = {
         btc: "BITCOIN_MAINNET",
@@ -70,7 +79,9 @@ export class Signer extends ccc.SignerBtc {
       await this.provider.switchNetwork(
         network === "btc" ? "livenet" : "testnet",
       );
+      return;
     }
+
     throw new Error(
       `UniSat wallet doesn't support the requested chain ${network}`,
     );
@@ -123,6 +134,9 @@ export class Signer extends ccc.SignerBtc {
    * @returns {Promise<boolean>} A promise that resolves to true if connected, false otherwise.
    */
   async isConnected(): Promise<boolean> {
+    if (await this._getNetworkToChange()) {
+      return false;
+    }
     return (await this.provider.getAccounts()).length !== 0;
   }