btc-wallet 0.3.2 → 0.3.4

package/dist/utils/request.d.ts

@@ -7,5 +7,5 @@ interface RequestOptions<T> extends RequestInit {
     maxPollingAttempts?: number;
     shouldStopPolling?: (response: T) => boolean;
 }
-export default function request<T>(url: string, options?: RequestOptions<T>): Promise<T>;
+export default function request<T = any>(url: string, options?: RequestOptions<T>): Promise<T>;
 export {};

package/esm/index.js

@@ -270,7 +270,7 @@ var _network, _event;
 var XverseConnector = class extends BaseConnector {
   constructor() {
     super();
-    __privateAdd(this, _network, "Mainnet");
+    __privateAdd(this, _network, "Testnet");
     __privateAdd(this, _event, new EventEmitter());
     this.metadata = {
       id: "xverse",
@@ -470,7 +470,7 @@ var _network2, _event2;
 var MagicEdenConnector = class extends BaseConnector {
   constructor() {
     super();
-    __privateAdd(this, _network2, "Mainnet");
+    __privateAdd(this, _network2, "Testnet");
     __privateAdd(this, _event2, new EventEmitter2());
     this.metadata = {
       id: "magicEden",
@@ -690,7 +690,16 @@ var useAccounts = () => {
 // src/hooks/useBTCProvider.ts
 import { useCallback } from "react";
 var useBTCProvider = () => {
-  const { connector, provider, accounts, getPublicKey, signMessage, getNetwork, switchNetwork, sendBitcoin: sendBitcoin2 } = useConnectProvider();
+  const {
+    connector,
+    provider,
+    accounts,
+    getPublicKey,
+    signMessage,
+    getNetwork: getNetwork2,
+    switchNetwork,
+    sendBitcoin: sendBitcoin2
+  } = useConnectProvider();
   const sendInscription = useCallback(
     (address, inscriptionId, options) => __async(void 0, null, function* () {
       if (!connector) {
@@ -701,7 +710,17 @@ var useBTCProvider = () => {
     }),
     [connector]
   );
-  return { provider, accounts, getPublicKey, signMessage, getNetwork, switchNetwork, sendBitcoin: sendBitcoin2, sendInscription, connector };
+  return {
+    provider,
+    accounts,
+    getPublicKey,
+    signMessage,
+    getNetwork: getNetwork2,
+    switchNetwork,
+    sendBitcoin: sendBitcoin2,
+    sendInscription,
+    connector
+  };
 };
 
 // src/hooks/useConnectModal.ts
@@ -2069,7 +2088,7 @@ var ConnectProvider = ({
     }),
     [connector]
   );
-  const getNetwork = useCallback7(() => __async(void 0, null, function* () {
+  const getNetwork2 = useCallback7(() => __async(void 0, null, function* () {
     if (!connector) {
       throw new Error("Wallet not connected!");
     }
@@ -2253,7 +2272,7 @@ var ConnectProvider = ({
         signMessage,
         evmAccount,
         smartAccount,
-        getNetwork,
+        getNetwork: getNetwork2,
         switchNetwork,
         sendBitcoin: sendBitcoin2,
         accountContract,
@@ -2407,21 +2426,18 @@ function InitBtcWalletSelectorContext() {
 }
 function useBtcWalletSelector() {
   const { openConnectModal, openConnectModalAsync, disconnect, requestDirectAccount } = useConnectModal();
-  const { accounts, sendBitcoin: sendBitcoin2, getPublicKey, provider, signMessage, connector } = useBTCProvider();
+  const { accounts, sendBitcoin: sendBitcoin2, getPublicKey, provider, signMessage, connector, getNetwork: getNetwork2 } = useBTCProvider();
   const publicKey = useRef(null);
   const signMessageFn = useRef(null);
   const connectorRef = useRef(null);
-  const providerRef = useRef(null);
-  const [updater, setUpdater] = useState8(1);
   const context = useContext2(WalletSelectorContext);
   useEffect6(() => {
     if (provider) {
       getPublicKey().then((res) => {
         publicKey.current = res;
       });
-      providerRef.current = provider;
     }
-  }, [provider, updater]);
+  }, [provider]);
   useEffect6(() => {
     signMessageFn.current = signMessage;
   }, [signMessage]);
@@ -2444,67 +2460,53 @@ function useBtcWalletSelector() {
       }
     };
   }, [connector]);
-  return {
-    login: () => __async(this, null, function* () {
-      const account = accounts && accounts.length ? accounts[0] : null;
-      if (account) {
-        return account;
-      }
-      setUpdater(updater + 1);
-      if (openConnectModal) {
-        yield openConnectModal();
-      }
-      return null;
-    }),
-    autoConnect: () => __async(this, null, function* () {
-      let times = 0;
-      while (!connectorRef.current) {
-        yield delay(500);
-        if (times++ > 10) {
-          return null;
+  const hook = useMemo6(() => {
+    return {
+      login: () => __async(this, null, function* () {
+        const account = accounts && accounts.length ? accounts[0] : null;
+        if (account) {
+          return account;
         }
-      }
-      requestDirectAccount(connectorRef.current).catch((e) => {
-        context.emit("btcLoginError");
-      });
-    }),
-    logout: () => {
-      const accountId = accounts && accounts.length ? accounts[0] : null;
-      if (!accountId)
-        return;
-      disconnect == null ? void 0 : disconnect();
-      context.emit("btcLogOut");
-    },
-    account: accounts && accounts.length ? accounts[0] : null,
-    getPublicKey: () => __async(this, null, function* () {
-      let times = 0;
-      while (!publicKey.current) {
-        yield delay(1e3);
-        if (times++ > 10) {
-          return null;
+        if (openConnectModal) {
+          yield openConnectModal();
         }
-      }
-      return publicKey.current;
-    }),
-    signMessage: (msg) => {
-      return signMessageFn.current(msg);
-    },
-    getContext: () => {
-      return context;
-    },
-    getBalance: () => __async(this, null, function* () {
-      let times = 0;
-      while (!providerRef.current) {
-        yield delay(500);
-        if (times++ > 10) {
-          return null;
-        }
-      }
-      const { total } = yield providerRef.current.getBalance();
-      return total;
-    }),
-    sendBitcoin: sendBitcoin2
-  };
+        return null;
+      }),
+      autoConnect: () => __async(this, null, function* () {
+        requestDirectAccount(connectorRef.current).catch((e) => {
+          context.emit("btcLoginError");
+        });
+      }),
+      logout: () => {
+        const accountId = accounts && accounts.length ? accounts[0] : null;
+        if (!accountId)
+          return;
+        disconnect == null ? void 0 : disconnect();
+        context.emit("btcLogOut");
+      },
+      account: accounts && accounts.length ? accounts[0] : null,
+      getPublicKey: () => {
+        return publicKey.current;
+      },
+      signMessage: (msg) => {
+        return signMessageFn.current(msg);
+      },
+      getContext: () => {
+        return context;
+      },
+      getNetwork: getNetwork2,
+      sendBitcoin: sendBitcoin2
+    };
+  }, [
+    accounts,
+    context,
+    disconnect,
+    getNetwork2,
+    openConnectModal,
+    requestDirectAccount,
+    sendBitcoin2
+  ]);
+  return hook;
 }
 
 // src/core/setupBTCWallet.ts
@@ -2727,7 +2729,7 @@ function request(url, options) {
       body,
       method
     });
-    const retryCount = (_a = options == null ? void 0 : options.retryCount) != null ? _a : 1;
+    const retryCount2 = (_a = options == null ? void 0 : options.retryCount) != null ? _a : 1;
     const controller = new AbortController();
     const timeout = (options == null ? void 0 : options.timeout) || 2e4;
     const timeoutId = setTimeout(() => controller.abort(), timeout);
@@ -2750,16 +2752,16 @@ function request(url, options) {
       return data;
     } catch (err) {
       console.error(err);
-      if (retryCount > 0) {
-        console.log(`Retrying... attempts left: ${retryCount}`);
-        return request(url, __spreadProps(__spreadValues({}, options), { retryCount: retryCount - 1 }));
+      if (retryCount2 > 0) {
+        console.log(`Retrying... attempts left: ${retryCount2}`);
+        return request(url, __spreadProps(__spreadValues({}, options), { retryCount: retryCount2 - 1 }));
       } else if ((options == null ? void 0 : options.pollingInterval) && (options == null ? void 0 : options.maxPollingAttempts)) {
         if (options.maxPollingAttempts > 0) {
           console.log(`Polling... attempts left: ${options.maxPollingAttempts}`);
           yield new Promise((resolve) => setTimeout(resolve, options.pollingInterval));
           return request(url, __spreadProps(__spreadValues({}, options), {
             maxPollingAttempts: options.maxPollingAttempts - 1,
-            retryCount
+            retryCount: retryCount2
           }));
         }
       }
@@ -3027,18 +3029,8 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
         near_transactions: newTransactions.map((t) => t.txHex),
         gas_token: currentConfig.token,
         gas_limit: "3000",
-        use_near_pay_gas: false,
         nonce
       };
-      const nearAccount = yield provider.query({
-        request_type: "view_account",
-        account_id: accountId,
-        finality: "final"
-      });
-      const availableBalance = parseFloat(nearAccount.amount) / __pow(10, 24);
-      if (availableBalance > 0.2) {
-        intention.use_near_pay_gas = true;
-      }
       const strIntention = JSON.stringify(intention);
       const signature = yield btcContext.signMessage(strIntention);
       const result = yield uploadBTCTx(currentConfig.base_url, {
@@ -3061,10 +3053,6 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
       const checkAndSetupWalletButton = () => {
         const accountId = state.getAccount();
         const btcContext = window.btcContext;
-        console.log("checkAndSetupWalletButton:", {
-          nearAccountId: accountId,
-          btcAccountId: btcContext.account
-        });
         if (accountId && btcContext.account) {
           setupWalletButton(network, wallet2, btcContext);
         } else {
@@ -3160,11 +3148,31 @@ function pollTransactionStatuses(network, hashes) {
   });
 }
 
-// src/core/bridgeSupplyUtils.ts
+// src/core/btcUtils.ts
 import { providers as providers2 } from "near-api-js";
 import Big from "big.js";
-function nearViewMethod(contractId, methodName, args, network) {
+function getBtcProvider() {
+  if (typeof window === "undefined" || !window.btcContext) {
+    throw new Error("BTC Provider is not initialized.");
+  }
+  return window.btcContext;
+}
+function getNetwork() {
   return __async(this, null, function* () {
+    const network = yield getBtcProvider().getNetwork();
+    console.log("btc network:", network);
+    return network === "livenet" ? "mainnet" : "testnet";
+  });
+}
+function getBtcRpcUrl() {
+  return __async(this, null, function* () {
+    const network = yield getNetwork();
+    return btcRpcUrls[network];
+  });
+}
+function nearViewMethod(contractId, methodName, args) {
+  return __async(this, null, function* () {
+    const network = yield getNetwork();
     const nearProvider = new providers2.FailoverRpcProvider(
       nearRpcUrls[network].map(
         (url) => new providers2.JsonRpcProvider({ url })
@@ -3180,41 +3188,16 @@ function nearViewMethod(contractId, methodName, args, network) {
     return JSON.parse(Buffer.from(res.result).toString());
   });
 }
-function getDepositAddress(btcPublicKey, contractId, network) {
+function getDepositAddress(btcPublicKey, contractId) {
   return __async(this, null, function* () {
-    const res = yield nearViewMethod(
-      contractId,
-      "get_user_dapp_deposit_address",
-      {
-        deposit_type: {
-          BtcPublicKey: { btc_public_key: btcPublicKey, dapp_operation: "Burrowland->Supply" }
-        }
-      },
-      network
-    );
+    const res = yield nearViewMethod(contractId, "get_user_dapp_deposit_address", {
+      deposit_type: {
+        BtcPublicKey: { btc_public_key: btcPublicKey, dapp_operation: "Burrowland->Supply" }
+      }
+    });
     return res;
   });
 }
-function getGasPrice(network) {
-  return __async(this, null, function* () {
-    const defaultFeeRate = 100;
-    try {
-      const btcRpcUrl = btcRpcUrls[network];
-      const res = yield fetch(`${btcRpcUrl}/v1/fees/recommended`).then((res2) => res2.json());
-      const feeRate = res.fastestFee;
-      return feeRate || defaultFeeRate;
-    } catch (error) {
-      return defaultFeeRate;
-    }
-  });
-}
-function sendBitcoin(btcProvider, address, amount, feeRate) {
-  return __async(this, null, function* () {
-    const satoshis = new Big(amount).mul(__pow(10, 8)).toNumber();
-    const txHash = yield btcProvider.sendBitcoin(address, satoshis, { feeRate });
-    return txHash;
-  });
-}
 function receiveDepositMsg(_0, _1) {
   return __async(this, arguments, function* (baseUrl, {
     btcPublicKey,
@@ -3239,27 +3222,66 @@ function checkTransactionStatus(baseUrl, txHash) {
     return res;
   });
 }
+function getBtcGasPrice() {
+  return __async(this, null, function* () {
+    const defaultFeeRate = 100;
+    try {
+      const btcRpcUrl = yield getBtcRpcUrl();
+      const res = yield fetch(`${btcRpcUrl}/v1/fees/recommended`).then((res2) => res2.json());
+      const feeRate = res.fastestFee;
+      return feeRate || defaultFeeRate;
+    } catch (error) {
+      return defaultFeeRate;
+    }
+  });
+}
+var retryCount = 0;
+function getBtcBalance() {
+  return __async(this, null, function* () {
+    const { account } = getBtcProvider();
+    if (!account) {
+      retryCount++;
+      if (retryCount > 3) {
+        throw new Error("BTC Account is not available.");
+      }
+      yield delay(1e3);
+      return getBtcBalance();
+    }
+    retryCount = 0;
+    const btcRpcUrl = yield getBtcRpcUrl();
+    const res = yield fetch(`${btcRpcUrl}/address/${account}/utxo`).then((res2) => res2.json());
+    const rawBalance = res.reduce((acc, cur) => acc + cur.value, 0);
+    const balance = rawBalance / __pow(10, 8);
+    console.log("btc balance:", balance);
+    return { rawBalance, balance };
+  });
+}
+function sendBitcoin(address, amount, feeRate) {
+  return __async(this, null, function* () {
+    const { sendBitcoin: sendBitcoin2 } = getBtcProvider();
+    const satoshis = new Big(amount).mul(__pow(10, 8)).toNumber();
+    const txHash = yield sendBitcoin2(address, satoshis, { feeRate });
+    return txHash;
+  });
+}
 function executeBurrowSupply(_0) {
   return __async(this, arguments, function* ({
     amount,
     feeRate,
-    environment = "mainnet"
+    isDev = false
   }) {
     try {
-      if (typeof window === "undefined" || !window.btcContext) {
-        throw new Error("BTC Provider is not initialized.");
-      }
-      const btcProvider = window.btcContext;
-      const network = environment === "dev" ? "testnet" : environment;
-      const config = walletConfig[environment];
-      const btcPublicKey = yield btcProvider.getPublicKey();
+      const { getPublicKey } = getBtcProvider();
+      const network = yield getNetwork();
+      const config = walletConfig[isDev ? "dev" : network];
+      const btcPublicKey = yield getPublicKey();
       if (!btcPublicKey) {
         throw new Error("BTC Public Key is not available.");
       }
-      const address = yield getDepositAddress(btcPublicKey, config.contractId, network);
-      const _feeRate = feeRate || (yield getGasPrice(network));
+      const address = yield getDepositAddress(btcPublicKey, config.contractId);
+      const _feeRate = feeRate || (yield getBtcGasPrice());
       console.log("feeRate", _feeRate);
-      const txHash = yield sendBitcoin(btcProvider, address, amount, _feeRate);
+      const txHash = yield sendBitcoin(address, amount, _feeRate);
       const receiveDepositMsgRes = yield receiveDepositMsg(config.base_url, { btcPublicKey, txHash });
       console.log("receiveDepositMsg resp:", receiveDepositMsgRes);
       const checkTransactionStatusRes = yield checkTransactionStatus(config.base_url, txHash);
@@ -3272,7 +3294,7 @@ function executeBurrowSupply(_0) {
 
 // src/index.ts
 var getVersion = () => {
-  return "0.3.2";
+  return "0.3.4";
 };
 if (typeof window !== "undefined") {
   window.__PARTICLE_BTC_CONNECT_VERSION = getVersion();
@@ -3291,7 +3313,10 @@ export {
   WizzConnector,
   XverseConnector,
   executeBurrowSupply,
+  getBtcBalance,
+  getBtcGasPrice,
   getVersion,
+  sendBitcoin,
   setupBTCWallet,
   useAccountContract,
   useAccounts,