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

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/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.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

@@ -29,10 +29,7 @@ class Signer extends core_1.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 ({
@@ -49,6 +46,16 @@ class Signer extends core_1.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",
@@ -62,6 +69,7 @@ class Signer extends core_1.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}`);
     }
@@ -106,6 +114,9 @@ class Signer extends core_1.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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckb-ccc/uni-sat",
-  "version": "0.0.10-alpha.2",
+  "version": "0.0.10-alpha.3",
   "description": "CCC - CKBer's Codebase. Common Chains Connector's support for UniSat",
   "author": "Hanssen0 <hanssen0@hanssen0.com>",
   "license": "MIT",
@@ -52,5 +52,5 @@
   "dependencies": {
     "@ckb-ccc/core": "0.0.10-alpha.0"
   },
-  "gitHead": "660e6ab1d43b34d151a69f01e43bba64f9a2f761"
+  "gitHead": "89ba0d00d88fc9eeac8d2b0e51bc3e039edd8d53"
 }

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;
   }