btc-wallet 0.5.34-beta → 0.5.36-beta

package/README.md

@@ -76,6 +76,7 @@ interface ExecuteBTCDepositAndActionParams<T extends boolean = true> {
   pollResult?: T;         // optional: whether to poll for transaction result
   registerDeposit?: string; // optional: whether to register deposit,default 0.000125 NEAR
   newAccountMinDepositAmount?: boolean; // default is true, if true, new account minimum deposit BTC amount 1000sat, otherwise 0
+  registerContractId?: string; // if registerContractId is provided, it will be used to register the contract, otherwise it will be the default contract id
 }
 
 // Example 1: dApp one-click BTC deposit

package/dist/core/btcUtils.d.ts

@@ -52,12 +52,14 @@ interface ExecuteBTCDepositAndActionParams<T extends boolean = true> {
     env?: ENV;
     pollResult?: T;
     newAccountMinDepositAmount?: boolean;
+    /** if registerContractId is provided, it will be used to register the contract, otherwise it will be the default contract id */
+    registerContractId?: string;
 }
 /**
  * @param T - if true, return the poll result, otherwise return the btcTxHash
  */
 type ExecuteBTCDepositAndActionReturn<T extends boolean> = T extends true ? FinalExecutionOutcome[] : string;
-export declare function executeBTCDepositAndAction<T extends boolean = true>({ action, amount, feeRate, pollResult, registerDeposit, env, newAccountMinDepositAmount, }: ExecuteBTCDepositAndActionParams<T>): Promise<ExecuteBTCDepositAndActionReturn<T>>;
+export declare function executeBTCDepositAndAction<T extends boolean = true>({ action, amount, feeRate, pollResult, registerDeposit, env, newAccountMinDepositAmount, registerContractId, }: ExecuteBTCDepositAndActionParams<T>): Promise<ExecuteBTCDepositAndActionReturn<T>>;
 export declare function checkSatoshiWhitelist(btcAccountId: string, env?: ENV): Promise<void>;
 interface WithdrawParams {
     amount: string | number;

package/dist/core/btcWalletSelectorContext.d.ts

@@ -5,11 +5,11 @@ export declare function BtcWalletSelectorContextProvider({ children, }: {
 }): import("react/jsx-runtime").JSX.Element;
 export declare function useBtcWalletSelector(): {
     login: () => Promise<string | null>;
-    autoConnect: () => Promise<any>;
+    autoConnect: () => Promise<string | null>;
     logout: () => void;
     account: string;
-    getPublicKey: () => Promise<string | undefined>;
-    signMessage: (msg: string) => any;
+    getPublicKey: () => Promise<string>;
+    signMessage: (msg: string) => Promise<string>;
     getContext: () => any;
     getNetwork: () => Promise<"livenet" | "testnet">;
     switchNetwork: (network: "livenet" | "testnet") => Promise<void>;

package/dist/index.js

@@ -2689,6 +2689,10 @@ function ComfirmBox({ onClose, status = 1, fromChain = {
 
 // src/core/btcWalletSelectorContext.tsx
 var import_jsx_runtime12 = require("react/jsx-runtime");
+var eventCache = {
+  lastProcessedAccount: "",
+  lastProcessedTime: 0
+};
 var WalletSelectorContext = import_react11.default.createContext(null);
 function BtcWalletSelectorContextProvider({
   children
@@ -2776,76 +2780,63 @@ function useBtcWalletSelector() {
     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);
   (0, import_react11.useEffect)(() => {
-    if (provider) {
+    const handleAccountsChanged = (account) => {
+      if (!(account == null ? void 0 : account.length))
+        return;
+      const accountKey = JSON.stringify(account);
+      const now = Date.now();
+      if (accountKey === eventCache.lastProcessedAccount && now - eventCache.lastProcessedTime < 3e3) {
+        return;
+      }
+      eventCache.lastProcessedAccount = accountKey;
+      eventCache.lastProcessedTime = now;
       getPublicKey().then((res) => {
-        publicKey.current = res;
+        context.emit("updatePublicKey", res);
       });
-    }
-  }, [getPublicKey, provider]);
-  (0, import_react11.useEffect)(() => {
-    signMessageFn.current = signMessage;
-  }, [signMessage]);
-  (0, import_react11.useEffect)(() => {
-    const fn = (account) => {
-      console.log("accountsChanged account", account);
-      if (account == null ? void 0 : account.length) {
-        getPublicKey().then((res) => {
-          publicKey.current = res;
-          context.emit("updatePublicKey", res);
-        });
-      }
     };
-    if (connector) {
-      connector.on("accountsChanged", fn);
-    }
+    connector == null ? void 0 : connector.on("accountsChanged", handleAccountsChanged);
     connectorRef.current = connector;
     return () => {
-      if (connector) {
-        connector.removeListener("accountsChanged", fn);
-      }
+      connector == null ? void 0 : connector.removeListener("accountsChanged", handleAccountsChanged);
     };
   }, [connector, context, getPublicKey]);
   const hook = (0, import_react11.useMemo)(() => {
+    const connectWallet = (useModal = false) => __async(this, null, function* () {
+      if (connectModalOpen)
+        return null;
+      const account = accounts == null ? void 0 : accounts[0];
+      if (account)
+        return account;
+      try {
+        if (useModal) {
+          openConnectModal == null ? void 0 : openConnectModal();
+        } else {
+          yield requestDirectAccount(connectorRef.current);
+        }
+        const account2 = yield retryOperation(
+          () => window.btcContext.account,
+          (res) => !!res,
+          {
+            maxRetries: 100,
+            delayMs: 1e3
+          }
+        );
+        return account2 || null;
+      } catch (error) {
+        console.error("btcLoginError", error);
+        context.emit("btcLoginError");
+        return null;
+      }
+    });
     return {
       login: () => __async(this, null, function* () {
-        const account = accounts == null ? void 0 : accounts[0];
-        console.log("account", account);
-        console.log("connecting", connectModalOpen);
-        if (!account) {
-          if (connectModalOpen) {
-            return null;
-          }
-          try {
-            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;
-          } catch (error) {
-            console.error("btcLoginError", error);
-            context.emit("btcLoginError");
-          }
-        }
-        return account;
+        return connectWallet(true);
       }),
       autoConnect: () => __async(this, null, function* () {
-        return requestDirectAccount(connectorRef.current).catch((e) => {
-          console.error("btcLoginError", e);
-          context.emit("btcLoginError");
-        });
+        return connectWallet(false);
       }),
       logout: () => {
         const accountId = accounts == null ? void 0 : accounts[0];
@@ -2856,29 +2847,25 @@ function useBtcWalletSelector() {
       },
       account: accounts == null ? void 0 : accounts[0],
       getPublicKey: () => __async(this, null, function* () {
-        const publicKey2 = yield getPublicKey();
-        if (publicKey2)
-          return publicKey2;
-        if (connectModalOpen)
-          return;
-        try {
-          yield requestDirectAccount(connectorRef.current);
-          return yield getPublicKey();
-        } catch (error) {
-          console.error("btcLoginError", error);
-          context.emit("btcLoginError");
-          return;
-        }
+        const publicKey = yield getPublicKey().catch(() => null);
+        if (publicKey)
+          return publicKey;
+        yield connectWallet(false);
+        return getPublicKey();
+      }),
+      signMessage: (msg) => __async(this, null, function* () {
+        yield connectWallet(false);
+        return signMessage(msg);
       }),
-      signMessage: (msg) => {
-        return signMessageFn.current(msg);
-      },
       getContext: () => {
         return context;
       },
       getNetwork: getNetwork2,
       switchNetwork,
-      sendBitcoin: sendBitcoin2
+      sendBitcoin: (toAddress, satoshis, options) => __async(this, null, function* () {
+        yield connectWallet(false);
+        return sendBitcoin2(toAddress, satoshis, options);
+      })
     };
   }, [
     accounts,
@@ -2890,7 +2877,8 @@ function useBtcWalletSelector() {
     context,
     requestDirectAccount,
     disconnect,
-    getPublicKey
+    getPublicKey,
+    signMessage
   ]);
   return hook;
 }
@@ -4053,7 +4041,8 @@ function executeBTCDepositAndAction(_0) {
     pollResult = true,
     registerDeposit,
     env = "mainnet",
-    newAccountMinDepositAmount
+    newAccountMinDepositAmount,
+    registerContractId
   }) {
     var _a;
     try {
@@ -4091,17 +4080,14 @@ function executeBTCDepositAndAction(_0) {
         }));
       }
       const storageDepositMsg = {};
-      const registerContractId = ((action == null ? void 0 : action.receiver_id) || config.btcToken).replace(
-        config.accountContractId,
-        config.btcToken
-      );
-      console.log("executeBTCDepositAndAction registerContractId", registerContractId);
-      const registerRes = yield nearCall(registerContractId, "storage_balance_of", {
+      const _registerContractId = registerContractId || ((action == null ? void 0 : action.receiver_id) || config.btcToken).replace(config.accountContractId, config.btcToken);
+      console.log("executeBTCDepositAndAction registerContractId", _registerContractId);
+      const registerRes = yield nearCall(_registerContractId, "storage_balance_of", {
         account_id: csna
       });
       if (!(registerRes == null ? void 0 : registerRes.available)) {
         storageDepositMsg.storage_deposit_msg = {
-          contract_id: registerContractId,
+          contract_id: _registerContractId,
           deposit: registerDeposit || NEAR_STORAGE_DEPOSIT_AMOUNT,
           registration_only: true
         };
@@ -4607,7 +4593,6 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
           console.log("setupBtcContextListeners clear");
         }
         const valid = validateWalletState();
-        console.log("setupBtcContextListeners wallet state valid:", valid);
         if (!valid) {
           return;
         }
@@ -4927,7 +4912,7 @@ function getGroup(state) {
 
 // src/index.ts
 var getVersion = () => {
-  return "0.5.34-beta";
+  return "0.5.36-beta";
 };
 if (typeof window !== "undefined") {
   window.__BTC_WALLET_VERSION = getVersion();