btc-wallet 0.3.17 → 0.3.18

package/dist/connector/base.d.ts

@@ -11,8 +11,8 @@ export declare abstract class BaseConnector {
     abstract getAccounts(): Promise<string[]>;
     abstract getPublicKey(): Promise<string>;
     abstract signMessage(signStr: string, type?: 'ecdsa' | 'bip322-simple'): Promise<string>;
-    abstract on(event: string, handler: (data?: unknown) => void): void;
-    abstract removeListener(event: string, handler: (data?: unknown) => void): void;
+    abstract on(event: string, handler: (data?: any) => void): void;
+    abstract removeListener(event: string, handler: (data?: any) => void): void;
     [key: string]: any;
     abstract getProvider(): any;
     abstract getNetwork(): Promise<'livenet' | 'testnet'>;

package/dist/core/btcUtils.d.ts

@@ -9,7 +9,7 @@ export declare function getAccountInfo(csna: string, accountContractId: string):
     gas_token: Record<string, string>;
     debt_info?: DebtInfo;
 } | undefined>;
-export declare function checkGasTokenBalance(csna: string, gasToken: string, isDev: boolean): Promise<void>;
+export declare function checkGasTokenBalance(csna: string, gasToken: string, minAmount: string, isDev: boolean): Promise<void>;
 type CheckGasTokenArrearsReturnType<T extends boolean> = T extends true ? void : {
     receiver_id: string;
     amount: string;

package/dist/core/btcWalletSelectorContext.d.ts

@@ -4,7 +4,7 @@ export declare function BtcWalletSelectorContextProvider({ children, }: {
     autoConnect?: boolean;
 }): import("react/jsx-runtime").JSX.Element;
 export declare function useBtcWalletSelector(): {
-    login: () => Promise<string>;
+    login: () => Promise<string | null>;
     autoConnect: () => Promise<void>;
     logout: () => void;
     account: string;
@@ -12,6 +12,7 @@ export declare function useBtcWalletSelector(): {
     signMessage: (msg: string) => any;
     getContext: () => any;
     getNetwork: () => Promise<"livenet" | "testnet">;
+    switchNetwork: (network: "livenet" | "testnet") => Promise<void>;
     sendBitcoin: (toAddress: string, satoshis: number, options?: {
         feeRate: number;
     }) => Promise<string>;

package/dist/index.js

@@ -143,6 +143,7 @@ var InjectedConnector = class extends BaseConnector {
   requestAccounts() {
     return __async(this, null, function* () {
       const accounts = yield this.getProviderOrThrow().requestAccounts();
+      console.log("network:", yield this.getNetwork());
       console.log("\u{1F680} ~ InjectedConnector ~ requestAccounts ~ accounts:", accounts);
       return accounts;
     });
@@ -504,6 +505,7 @@ var XverseConnector = class extends BaseConnector {
             });
           }
         };
+        console.log("\u{1F680} ~ XverseConnector ~ sendBitcoin ~ sendBtcOptions:", sendBtcOptions);
         sendBtcTransaction(sendBtcOptions).catch((e) => reject(e));
       });
       return result;
@@ -2490,12 +2492,22 @@ function InitBtcWalletSelectorContext() {
   return null;
 }
 function useBtcWalletSelector() {
-  const { openConnectModal, openConnectModalAsync, disconnect, requestDirectAccount } = useConnectModal();
-  const { accounts, sendBitcoin: sendBitcoin2, getPublicKey, provider, signMessage, connector, getNetwork: getNetwork2 } = useBTCProvider();
+  const { openConnectModal, disconnect, requestDirectAccount } = useConnectModal();
+  const {
+    accounts,
+    sendBitcoin: sendBitcoin2,
+    getPublicKey,
+    provider,
+    signMessage,
+    connector,
+    getNetwork: getNetwork2,
+    switchNetwork
+  } = useBTCProvider();
   const publicKey = (0, import_react11.useRef)(null);
   const signMessageFn = (0, import_react11.useRef)(null);
   const connectorRef = (0, import_react11.useRef)(null);
   const context = (0, import_react11.useContext)(WalletSelectorContext);
+  const isLoggingIn = (0, import_react11.useRef)(false);
   (0, import_react11.useEffect)(() => {
     if (provider) {
       getPublicKey().then((res) => {
@@ -2530,7 +2542,27 @@ function useBtcWalletSelector() {
       login: () => __async(this, null, function* () {
         const account = accounts == null ? void 0 : accounts[0];
         if (!account) {
-          openConnectModal == null ? void 0 : openConnectModal();
+          if (isLoggingIn.current) {
+            return null;
+          }
+          try {
+            isLoggingIn.current = true;
+            openConnectModal == null ? void 0 : openConnectModal();
+            const account1 = yield retryOperation(
+              () => window.btcContext.account,
+              (res) => !!res,
+              {
+                maxRetries: 100,
+                delayMs: 1e3
+              }
+            );
+            if (!account1) {
+              throw new Error("Failed to get account");
+            }
+            return account1;
+          } finally {
+            isLoggingIn.current = false;
+          }
         }
         return account;
       }),
@@ -2557,6 +2589,10 @@ function useBtcWalletSelector() {
         return context;
       },
       getNetwork: getNetwork2,
+      switchNetwork: (network) => __async(this, null, function* () {
+        console.log("switchNetwork:", network);
+        yield switchNetwork(network);
+      }),
       sendBitcoin: sendBitcoin2
     };
   }, [
@@ -2564,6 +2600,7 @@ function useBtcWalletSelector() {
     context,
     disconnect,
     getNetwork2,
+    switchNetwork,
     openConnectModal,
     requestDirectAccount,
     sendBitcoin2
@@ -2576,7 +2613,7 @@ var import_near_api_js2 = require("near-api-js");
 var import_transactions = require("@near-js/transactions");
 var import_key_pair = require("near-api-js/lib/utils/key_pair");
 var import_transaction = require("near-api-js/lib/transaction");
-var import_utils6 = require("@near-js/utils");
+var import_utils7 = require("@near-js/utils");
 var import_bs58 = __toESM(require("bs58"), 1);
 var import_js_sha256 = require("js-sha256");
 
@@ -3228,11 +3265,11 @@ function getAccountInfo(csna, accountContractId) {
     return accountInfo;
   });
 }
-function checkGasTokenBalance(csna, gasToken, isDev) {
+function checkGasTokenBalance(csna, gasToken, minAmount, isDev) {
   return __async(this, null, function* () {
     const amount = yield nearCall(gasToken, "ft_balance_of", { account_id: csna });
     console.log("gas token balance:", amount);
-    if (new import_big.default(amount).lte(MINIMUM_DEPOSIT_AMOUNT_BASE)) {
+    if (new import_big.default(amount).lt(minAmount)) {
       yield Dialog.confirm({
         title: "Gas token balance is insufficient",
         message: "Please deposit gas token to continue, will open bridge website."
@@ -3488,7 +3525,6 @@ var state = {
     return window.localStorage.getItem("btc-wallet-btc-publickey");
   }
 };
-var inter = null;
 var BTCWallet = (_0) => __async(void 0, [_0], function* ({
   metadata,
   options,
@@ -3511,41 +3547,49 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
   const isDev = (_a = "isDev" in metadata && metadata.isDev) != null ? _a : false;
   const currentConfig = isDev ? walletConfig.dev : walletConfig[options.network.networkId];
   const walletNetwork = isDev ? "dev" : options.network.networkId;
-  initWalletButton(walletNetwork, wallet);
-  if (!inter) {
-    inter = setInterval(() => __async(void 0, null, function* () {
-      const btcContext = window.btcContext;
-      if (btcContext) {
-        clearInterval(inter);
-        const context = btcContext.getContext();
-        context.on("updatePublicKey", (btcPublicKey) => __async(void 0, null, function* () {
-          const { nearTempAddress } = yield getNearAccountByBtcPublicKey(btcPublicKey);
-          removeWalletButton();
-          initWalletButton(walletNetwork, wallet);
-          emitter.emit("accountsChanged", {
-            accounts: [
-              {
-                accountId: nearTempAddress
-              }
-            ]
-          });
-        }));
-        context.on("btcLoginError", (e) => __async(void 0, null, function* () {
-          emitter.emit("accountsChanged", {
-            accounts: []
-          });
-        }));
-        context.on("btcLogOut", (e) => __async(void 0, null, function* () {
-          emitter.emit("accountsChanged", {
-            accounts: []
-          });
-        }));
-        if ("autoConnect" in metadata && metadata.autoConnect && localStorage.getItem("near-wallet-selector:selectedWalletId") === '"btc-wallet"') {
-          yield btcContext.autoConnect();
-        }
-        clearInterval(inter);
+  yield initBtcContext();
+  function setupBtcContextListeners(btcContext) {
+    return __async(this, null, function* () {
+      const context = btcContext.getContext();
+      context.on("updatePublicKey", (btcPublicKey) => __async(this, null, function* () {
+        const { nearTempAddress } = yield getNearAccountByBtcPublicKey(btcPublicKey);
+        removeWalletButton();
+        initConnected(walletNetwork, wallet);
+        emitter.emit("accountsChanged", {
+          accounts: [{ accountId: nearTempAddress }]
+        });
+      }));
+      context.on("btcLoginError", () => __async(this, null, function* () {
+        emitter.emit("accountsChanged", { accounts: [] });
+      }));
+      context.on("btcLogOut", () => __async(this, null, function* () {
+        emitter.emit("accountsChanged", { accounts: [] });
+      }));
+      if ("autoConnect" in metadata && metadata.autoConnect && localStorage.getItem("near-wallet-selector:selectedWalletId") === '"btc-wallet"') {
+        yield btcContext.autoConnect();
       }
-    }), 500);
+    });
+  }
+  function initBtcContext() {
+    return __async(this, null, function* () {
+      console.log("initBtcContext");
+      const btcContext = yield retryOperation(
+        () => __async(this, null, function* () {
+          const ctx = window.btcContext;
+          if (!ctx) {
+            throw new Error("btcContext not found");
+          }
+          return ctx;
+        }),
+        (res) => !!res,
+        {
+          maxRetries: 10,
+          delayMs: 500
+        }
+      );
+      yield setupBtcContextListeners(btcContext);
+      return btcContext;
+    });
   }
   function nearCall2(contractId, methodName, args) {
     return __async(this, null, function* () {
@@ -3575,28 +3619,20 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
   }
   function signIn(_02) {
     return __async(this, arguments, function* ({ contractId, methodNames }) {
+      const btcContext = window.btcContext;
       const accountId = state.getAccount();
       const publicKey = state.getPublicKey();
-      const btcContext = window.btcContext;
-      initWalletButton(walletNetwork, wallet);
-      if (accountId && publicKey) {
-        return [
-          {
-            accountId,
-            publicKey
-          }
-        ];
+      console.log("isLogin:", accountId && publicKey);
+      if (!accountId || !publicKey) {
+        yield btcContext.login();
       }
-      yield btcContext.login();
-      const btcPublicKey = yield retryOperation(btcContext.getPublicKey, (res) => !!res, {
-        maxRetries: 40,
-        delayMs: 3e3
-      });
+      const btcPublicKey = yield btcContext.getPublicKey();
       console.log("btcPublicKey:", btcPublicKey);
       if (!btcPublicKey) {
         throw new Error("No connected BTC wallet, please connect your BTC wallet first.");
       }
       const { nearTempAddress, nearTempPublicKey } = yield getNearAccountByBtcPublicKey(btcPublicKey);
+      initConnected(walletNetwork, wallet);
       return [
         {
           accountId: nearTempAddress,
@@ -3615,6 +3651,7 @@ 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");
@@ -3652,7 +3689,6 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
       const btcContext = window.btcContext;
       const accountId = state.getAccount();
       const accountInfo = yield getAccountInfo(accountId, currentConfig.accountContractId);
-      yield checkGasTokenBalance(accountId, currentConfig.token, isDev);
       yield checkGasTokenArrears(accountInfo == null ? void 0 : accountInfo.debt_info, isDev, true);
       const trans = [...params.transactions];
       console.log("raw trans:", trans);
@@ -3664,6 +3700,7 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
       console.log("transferGasTransaction:", transferGasTransaction);
       console.log("useNearPayGas:", useNearPayGas);
       console.log("gasLimit:", gasLimit);
+      yield checkGasTokenBalance(accountId, currentConfig.token, gasLimit, isDev);
       if (transferGasTransaction) {
         trans.unshift(transferGasTransaction);
       }
@@ -3844,7 +3881,7 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
         transaction.receiverId,
         BigInt(nearNonceNumber) + BigInt(index),
         newActions,
-        (0, import_utils6.baseDecode)(header.hash)
+        (0, import_utils7.baseDecode)(header.hash)
       );
       const txBytes = (0, import_transaction.encodeTransaction)(_transaction);
       const txHex = Array.from(txBytes, (byte) => ("0" + (byte & 255).toString(16)).slice(-2)).join(
@@ -3854,7 +3891,7 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
       return { txBytes, txHex, hash };
     });
   }
-  function initWalletButton(network, wallet2) {
+  function initConnected(network, wallet2) {
     return __async(this, null, function* () {
       const checkAndSetupWalletButton = () => {
         const accountId = state.getAccount();
@@ -3913,7 +3950,7 @@ function setupBTCWallet({
 
 // src/index.ts
 var getVersion = () => {
-  return "0.3.17";
+  return "0.3.18";
 };
 if (typeof window !== "undefined") {
   window.__BTC_WALLET_VERSION = getVersion();