btc-wallet 0.3.18 → 0.3.20

package/esm/index.js

@@ -271,7 +271,7 @@ var _network, _event;
 var XverseConnector = class extends BaseConnector {
   constructor() {
     super();
-    __privateAdd(this, _network, "Testnet");
+    __privateAdd(this, _network, "Mainnet");
     __privateAdd(this, _event, new EventEmitter());
     this.metadata = {
       id: "xverse",
@@ -2545,21 +2545,18 @@ function useBtcWalletSelector() {
         return context;
       },
       getNetwork: getNetwork2,
-      switchNetwork: (network) => __async(this, null, function* () {
-        console.log("switchNetwork:", network);
-        yield switchNetwork(network);
-      }),
+      switchNetwork,
       sendBitcoin: sendBitcoin2
     };
   }, [
     accounts,
-    context,
-    disconnect,
     getNetwork2,
     switchNetwork,
+    sendBitcoin2,
     openConnectModal,
     requestDirectAccount,
-    sendBitcoin2
+    context,
+    disconnect
   ]);
   return hook;
 }
@@ -3497,6 +3494,7 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
     getAccounts,
     verifyOwner,
     signMessage,
+    isSignedIn,
     signAndSendTransaction,
     signAndSendTransactions
   };
@@ -3504,25 +3502,43 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
   const currentConfig = isDev ? walletConfig.dev : walletConfig[options.network.networkId];
   const walletNetwork = isDev ? "dev" : options.network.networkId;
   yield initBtcContext();
-  function setupBtcContextListeners(btcContext) {
+  function setupBtcContextListeners() {
     return __async(this, null, function* () {
-      const context = btcContext.getContext();
+      const handleConnectionUpdate = () => __async(this, null, function* () {
+        yield checkBtcNetwork(walletNetwork);
+        const accountId = state.getAccount();
+        const btcContext = window.btcContext;
+        if (accountId && btcContext.account) {
+          setupWalletButton(walletNetwork, wallet, btcContext);
+        } else {
+          removeWalletButton();
+          setTimeout(() => {
+            handleConnectionUpdate();
+          }, 5e3);
+        }
+      });
+      const context = window.btcContext.getContext();
       context.on("updatePublicKey", (btcPublicKey) => __async(this, null, function* () {
-        const { nearTempAddress } = yield getNearAccountByBtcPublicKey(btcPublicKey);
-        removeWalletButton();
-        initConnected(walletNetwork, wallet);
+        console.log("updatePublicKey");
+        const { nearAddress } = yield getNearAccountByBtcPublicKey(btcPublicKey);
         emitter.emit("accountsChanged", {
-          accounts: [{ accountId: nearTempAddress }]
+          accounts: [{ accountId: nearAddress }]
         });
+        yield handleConnectionUpdate();
       }));
       context.on("btcLoginError", () => __async(this, null, function* () {
+        console.log("btcLoginError");
         emitter.emit("accountsChanged", { accounts: [] });
+        yield handleConnectionUpdate();
       }));
       context.on("btcLogOut", () => __async(this, null, function* () {
+        console.log("btcLogOut");
         emitter.emit("accountsChanged", { accounts: [] });
+        yield handleConnectionUpdate();
       }));
+      yield handleConnectionUpdate();
       if ("autoConnect" in metadata && metadata.autoConnect && localStorage.getItem("near-wallet-selector:selectedWalletId") === '"btc-wallet"') {
-        yield btcContext.autoConnect();
+        yield window.btcContext.autoConnect();
       }
     });
   }
@@ -3543,7 +3559,7 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
           delayMs: 500
         }
       );
-      yield setupBtcContextListeners(btcContext);
+      yield setupBtcContextListeners();
       return btcContext;
     });
   }
@@ -3554,22 +3570,22 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
   }
   function getNearAccountByBtcPublicKey(btcPublicKey) {
     return __async(this, null, function* () {
-      const nearTempAddress = yield nearCall2(
+      const nearAddress = yield nearCall2(
         currentConfig.accountContractId,
         "get_chain_signature_near_account_id",
         { btc_public_key: btcPublicKey }
       );
-      const nearTempPublicKey = yield nearCall2(
+      const nearPublicKey = yield nearCall2(
         currentConfig.accountContractId,
         "get_chain_signature_near_account_public_key",
         { btc_public_key: btcPublicKey }
       );
-      state.saveAccount(nearTempAddress);
-      state.savePublicKey(nearTempPublicKey);
+      state.saveAccount(nearAddress);
+      state.savePublicKey(nearPublicKey);
       state.saveBtcPublicKey(btcPublicKey);
       return {
-        nearTempAddress,
-        nearTempPublicKey
+        nearAddress,
+        nearPublicKey
       };
     });
   }
@@ -3587,12 +3603,11 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
       if (!btcPublicKey) {
         throw new Error("No connected BTC wallet, please connect your BTC wallet first.");
       }
-      const { nearTempAddress, nearTempPublicKey } = yield getNearAccountByBtcPublicKey(btcPublicKey);
-      initConnected(walletNetwork, wallet);
+      const { nearAddress, nearPublicKey } = yield getNearAccountByBtcPublicKey(btcPublicKey);
       return [
         {
-          accountId: nearTempAddress,
-          publicKey: nearTempPublicKey
+          accountId: nearAddress,
+          publicKey: nearPublicKey
         }
       ];
     });
@@ -3607,13 +3622,17 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
       const btcContext = window.btcContext;
       if (metadata.syncLogOut) {
         btcContext.logout();
-        yield delay(300);
       }
       state.clear();
       window.localStorage.removeItem("near-wallet-selector:selectedWalletId");
       removeWalletButton();
     });
   }
+  function isSignedIn() {
+    const accountId = state.getAccount();
+    const publicKey = state.getPublicKey();
+    return accountId && publicKey;
+  }
   function getAccounts() {
     return __async(this, null, function* () {
       return [{ accountId: state.getAccount() }];
@@ -3847,22 +3866,20 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
       return { txBytes, txHex, hash };
     });
   }
-  function initConnected(network, wallet2) {
+  function checkBtcNetwork(network) {
     return __async(this, null, function* () {
-      const checkAndSetupWalletButton = () => {
-        const accountId = state.getAccount();
-        const btcContext = window.btcContext;
-        if (accountId && btcContext.account) {
-          setupWalletButton(network, wallet2, btcContext);
-        } else {
-          removeWalletButton();
-          setTimeout(() => {
-            checkAndSetupWalletButton();
-          }, 5e3);
-        }
+      const btcContext = window.btcContext;
+      if (!btcContext.account)
+        return;
+      const btcNetwork = yield btcContext.getNetwork();
+      console.log("btcNetwork:", btcNetwork, network);
+      const networkMap = {
+        livenet: ["mainnet"],
+        testnet: ["testnet", "dev"]
       };
-      yield delay(1e3);
-      checkAndSetupWalletButton();
+      if (!networkMap[btcNetwork].includes(network)) {
+        yield btcContext.switchNetwork(btcNetwork === "livenet" ? "testnet" : "livenet");
+      }
     });
   }
   return wallet;
@@ -3906,7 +3923,7 @@ function setupBTCWallet({
 
 // src/index.ts
 var getVersion = () => {
-  return "0.3.18";
+  return "0.3.20";
 };
 if (typeof window !== "undefined") {
   window.__BTC_WALLET_VERSION = getVersion();