btc-wallet 0.5.79-beta → 0.5.81-beta

package/dist/core/btcUtils.d.ts

@@ -7,7 +7,12 @@ type CheckGasTokenDebtReturnType<T extends boolean> = T extends true ? void : {
     amount: string;
     msg: string;
 } | undefined;
-export declare function checkGasTokenDebt<T extends boolean>(csna: string, env: ENV, autoDeposit?: T): Promise<CheckGasTokenDebtReturnType<T>>;
+export declare function checkGasTokenDebt<T extends boolean>({ csna, btcAccount, env, autoDeposit, }: {
+    csna: string;
+    btcAccount: string;
+    env: ENV;
+    autoDeposit?: T;
+}): Promise<CheckGasTokenDebtReturnType<T>>;
 export declare function getBtcGasPrice(): Promise<number>;
 export declare function getBtcUtxos(account: string): Promise<{
     value: number;
@@ -32,6 +37,7 @@ export declare function estimateDepositAmount(amount: string, option?: {
 }): Promise<string>;
 export declare function getDepositAmount(amount: string, option?: {
     csna?: string;
+    btcAccount?: string;
     env?: ENV;
     /** default is true, if true, new account minimum deposit amount 1000sat, otherwise 0 */
     newAccountMinDepositAmount?: boolean;

package/dist/index.js

@@ -3060,12 +3060,7 @@ function getWalletConfig(env) {
   });
 }
 var nearRpcUrls = {
-  mainnet: [
-    "https://near.lava.build",
-    "https://rpc.mainnet.near.org",
-    "https://free.rpc.fastnear.com",
-    "https://near.drpc.org"
-  ],
+  mainnet: ["https://near.lava.build", "https://free.rpc.fastnear.com"],
   testnet: ["https://rpc.testnet.near.org"]
 };
 var btcRpcUrls = {
@@ -3423,23 +3418,17 @@ function receiveDepositMsg(_0) {
     return result_data;
   });
 }
-function getBridgeTransactions(_0) {
-  return __async(this, arguments, function* ({
-    env,
-    fromChainId = 0,
-    fromAddress,
-    page = 1,
-    pageSize = 10
-  }) {
+function hasBridgeTransaction(_0) {
+  return __async(this, arguments, function* ({ env, btcAccount }) {
     try {
       const config = getWalletConfig(env);
       const { result_data = [] } = yield request(
-        `${config.base_url}/v1/history?fromChainId=${fromChainId}&fromAddress=${fromAddress}&page=${page}&pageSize=${pageSize}`
+        `${config.base_url}/v1/history?fromChainId=0&fromAddress=${btcAccount}&page=1&pageSize=1`
       );
-      return result_data;
+      return (result_data == null ? void 0 : result_data.length) > 0;
     } catch (error) {
-      console.error("getBridgeTransactions error:", error);
-      return [];
+      console.error("hasBridgeTransaction error:", error);
+      return false;
     }
   });
 }
@@ -3844,10 +3833,10 @@ var NEAR_STORAGE_DEPOSIT_AMOUNT = "1250000000000000000000";
 var NBTC_STORAGE_DEPOSIT_AMOUNT = 800;
 var NEW_ACCOUNT_MIN_DEPOSIT_AMOUNT = 1e3;
 function getBtcProvider() {
-  if (typeof window === "undefined" || !(window.btcContext || (parent == null ? void 0 : parent.btcContext))) {
+  if (typeof window === "undefined" || !window.btcContext) {
     throw new Error("BTC Provider is not initialized.");
   }
-  return window.btcContext || parent.btcContext;
+  return window.btcContext;
 }
 function getNetwork() {
   return __async(this, null, function* () {
@@ -3875,18 +3864,20 @@ function nearCall(contractId, methodName, args) {
     return nearCallFunction(contractId, methodName, args, { network });
   });
 }
-function checkGasTokenDebt(csna, env, autoDeposit) {
-  return __async(this, null, function* () {
+function checkGasTokenDebt(_0) {
+  return __async(this, arguments, function* ({
+    csna,
+    btcAccount,
+    env,
+    autoDeposit
+  }) {
     var _a, _b, _c;
     const accountInfo = yield getAccountInfo({ csna, env });
-    const { account } = getBtcProvider();
-    const bridgeTransactions = yield getBridgeTransactions({
+    const bridgeTransactions = yield hasBridgeTransaction({
       env,
-      fromAddress: account,
-      page: 1,
-      pageSize: 1
+      btcAccount
     });
-    const isNewAccount = !(accountInfo == null ? void 0 : accountInfo.nonce) && bridgeTransactions.length === 0;
+    const isNewAccount = !(accountInfo == null ? void 0 : accountInfo.nonce) && !bridgeTransactions;
     const debtAmount = new import_big2.default(((_a = accountInfo == null ? void 0 : accountInfo.debt_info) == null ? void 0 : _a.near_gas_debt_amount) || 0).plus(((_b = accountInfo == null ? void 0 : accountInfo.debt_info) == null ? void 0 : _b.protocol_fee_debt_amount) || 0).toString();
     const relayerFeeAmount = isNewAccount ? NBTC_STORAGE_DEPOSIT_AMOUNT : ((_c = accountInfo == null ? void 0 : accountInfo.relayer_fee) == null ? void 0 : _c.amount) || 0;
     const hasDebtArrears = new import_big2.default(debtAmount).gt(0);
@@ -4004,8 +3995,9 @@ function getDepositAmount(amount, option) {
     const env = (option == null ? void 0 : option.env) || "mainnet";
     const _newAccountMinDepositAmount = (_a = option == null ? void 0 : option.newAccountMinDepositAmount) != null ? _a : true;
     const csna = (option == null ? void 0 : option.csna) || (yield getCsnaAccountId(env));
+    const btcAccount = (option == null ? void 0 : option.btcAccount) || getBtcProvider().account;
     const accountInfo = yield getAccountInfo({ csna, env });
-    const debtAction = yield checkGasTokenDebt(csna, env, false);
+    const debtAction = yield checkGasTokenDebt({ csna, btcAccount, env, autoDeposit: false });
     const repayAmount = (debtAction == null ? void 0 : debtAction.amount) || 0;
     const depositAmount = Number(amount);
     const {
@@ -4082,7 +4074,7 @@ function executeBTCDepositAndAction(_0) {
         registerContractId
       });
       checkDepositDisabledAddress();
-      const { getPublicKey } = getBtcProvider();
+      const { getPublicKey, account: btcAccount } = getBtcProvider();
       const config = getWalletConfig(env);
       const btcPublicKey = yield getPublicKey();
       if (!btcPublicKey) {
@@ -4111,7 +4103,7 @@ function executeBTCDepositAndAction(_0) {
       }
       const accountInfo = yield getAccountInfo({ csna, env });
       const newActions = [];
-      const debtAction = yield checkGasTokenDebt(csna, env, false);
+      const debtAction = yield checkGasTokenDebt({ csna, btcAccount, env, autoDeposit: false });
       if (debtAction) {
         newActions.push(__spreadProps(__spreadValues({}, debtAction), {
           gas: "30000000000000"
@@ -4152,11 +4144,11 @@ function executeBTCDepositAndAction(_0) {
       const _feeRate = feeRate || (yield getBtcGasPrice());
       console.table({
         "User Deposit Address": userDepositAddress,
-        "Deposit Amount": depositAmount,
-        "Protocol Fee": protocolFee,
-        "Repay Amount": repayAmount,
-        "Receive Amount": receiveAmount,
-        "Fee Rate": _feeRate
+        "Deposit Amount": Number(depositAmount),
+        "Protocol Fee": Number(protocolFee),
+        "Repay Amount": Number(repayAmount),
+        "Receive Amount": Number(receiveAmount),
+        "Fee Rate": Number(_feeRate)
       });
       const postActionsStr = newActions.length > 0 ? JSON.stringify(newActions) : void 0;
       yield preReceiveDepositMsg({
@@ -5156,7 +5148,7 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
       const btcContext = window.btcContext;
       const csna = state_default.getAccount();
       const accountInfo = yield getAccountInfo({ csna, env });
-      yield checkGasTokenDebt(csna, env, true);
+      yield checkGasTokenDebt({ csna, env, btcAccount: btcContext.account, autoDeposit: true });
       const trans = [...params.transactions];
       console.log("signAndSendTransactions raw trans:", trans);
       const { transferGasTransaction, useNearPayGas, gasLimit } = yield calculateGasStrategy({
@@ -5398,7 +5390,7 @@ function getGroup(state) {
 
 // src/index.ts
 var getVersion = () => {
-  return "0.5.79-beta";
+  return "0.5.81-beta";
 };
 if (typeof window !== "undefined") {
   window.__BTC_WALLET_VERSION = getVersion();