btc-wallet 0.5.78-beta → 0.5.80-beta

package/dist/utils/index.d.ts

@@ -21,3 +21,4 @@ export declare function storageStore(namespace?: string, options?: {
     remove(key: string): void;
     clearAll: () => void;
 } | undefined;
+export declare const getUrlQuery: (url?: string) => Record<string, any>;

package/dist/utils/satoshi.d.ts

@@ -18,17 +18,13 @@ interface ReceiveDepositMsgParams {
     depositType?: number;
     postActions?: string;
     extraMsg?: string;
+    userDepositAddress?: string;
 }
-export declare function preReceiveDepositMsg({ env, btcPublicKey, depositType, postActions, extraMsg, }: Omit<ReceiveDepositMsgParams, 'txHash'>): Promise<any>;
+export declare function preReceiveDepositMsg({ env, btcPublicKey, depositType, postActions, extraMsg, userDepositAddress, }: Omit<ReceiveDepositMsgParams, 'txHash'>): Promise<any>;
 export declare function receiveDepositMsg({ env, btcPublicKey, txHash, depositType, postActions, extraMsg, }: ReceiveDepositMsgParams): Promise<any>;
-export declare function getBridgeTransactions({ env, fromChainId, fromAddress, page, pageSize, }: {
+export declare function hasBridgeTransaction({ env }: {
     env: ENV;
-    /** 0:ALL 1: BTC, 2: NEAR */
-    fromChainId?: number;
-    fromAddress?: string;
-    page?: number;
-    pageSize?: number;
-}): Promise<any[]>;
+}): Promise<boolean>;
 export declare function checkBridgeTransactionStatus({ txHash, fromChain, env, }: {
     txHash: string;
     fromChain?: 'BTC' | 'NEAR';

package/esm/index.js

@@ -209,6 +209,26 @@ function storageStore(namespace, options) {
     }
   };
 }
+var getUrlQuery = (url) => {
+  var _a;
+  try {
+    const search = url ? (_a = url.split("?")[1]) == null ? void 0 : _a.split("#")[0] : window.location.search.substring(1).split("#")[0];
+    const urlSearchParams = new URLSearchParams(search);
+    const entries = urlSearchParams.entries();
+    const query = {};
+    for (const [key, value] of entries) {
+      if (query[key]) {
+        query[key] = Array.isArray(query[key]) ? [...query[key], value] : [query[key], value];
+      } else {
+        query[key] = value;
+      }
+    }
+    return query;
+  } catch (error) {
+    console.error("getUrlQuery", error);
+    return {};
+  }
+};
 
 // src/utils/Dialog.ts
 var Dialog = class {
@@ -3309,14 +3329,15 @@ function preReceiveDepositMsg(_0) {
     btcPublicKey,
     depositType = 1,
     postActions,
-    extraMsg
+    extraMsg,
+    userDepositAddress
   }) {
     const config = getWalletConfig(env);
     const { result_code, result_message, result_data } = yield request(
       `${config.base_url}/v1/preReceiveDepositMsg`,
       {
         method: "POST",
-        body: { btcPublicKey, depositType, postActions, extraMsg }
+        body: { btcPublicKey, depositType, postActions, extraMsg, userDepositAddress }
       }
     );
     console.log("preReceiveDepositMsg resp:", { result_code, result_message, result_data });
@@ -3350,23 +3371,19 @@ 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 }) {
+    var _a, _b;
     try {
       const config = getWalletConfig(env);
+      const btcAccount = ((_a = window.btcContext) == null ? void 0 : _a.account) || ((_b = getUrlQuery()) == null ? void 0 : _b.originalAccountId);
       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;
     }
   });
 }
@@ -3771,10 +3788,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* () {
@@ -3806,14 +3823,10 @@ function checkGasTokenDebt(csna, env, autoDeposit) {
   return __async(this, null, function* () {
     var _a, _b, _c;
     const accountInfo = yield getAccountInfo({ csna, env });
-    const { account } = getBtcProvider();
-    const bridgeTransactions = yield getBridgeTransactions({
-      env,
-      fromAddress: account,
-      page: 1,
-      pageSize: 1
+    const bridgeTransactions = yield hasBridgeTransaction({
+      env
     });
-    const isNewAccount = !(accountInfo == null ? void 0 : accountInfo.nonce) && bridgeTransactions.length === 0;
+    const isNewAccount = !(accountInfo == null ? void 0 : accountInfo.nonce) && !bridgeTransactions;
     const debtAmount = new Big2(((_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 Big2(debtAmount).gt(0);
@@ -4079,11 +4092,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({
@@ -4091,7 +4104,8 @@ function executeBTCDepositAndAction(_0) {
         btcPublicKey,
         depositType: postActionsStr || depositMsg.extra_msg ? 1 : 0,
         postActions: postActionsStr,
-        extraMsg: depositMsg.extra_msg
+        extraMsg: depositMsg.extra_msg,
+        userDepositAddress
       });
       const txHash = yield sendBitcoin(userDepositAddress, depositAmount, _feeRate);
       yield receiveDepositMsg({
@@ -5326,7 +5340,7 @@ function getGroup(state) {
 
 // src/index.ts
 var getVersion = () => {
-  return "0.5.78-beta";
+  return "0.5.80-beta";
 };
 if (typeof window !== "undefined") {
   window.__BTC_WALLET_VERSION = getVersion();