btc-wallet 0.3.15 → 0.3.17

package/dist/core/btcUtils.d.ts

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

package/dist/index.js

@@ -2875,7 +2875,13 @@ function request(url, options) {
         if (options.shouldStopPolling(data)) {
           return data;
         }
-        throw new Error("Polling should continue");
+        if (options.maxPollingAttempts && options.maxPollingAttempts > 0) {
+          yield new Promise((resolve) => setTimeout(resolve, options.pollingInterval));
+          return request(url, __spreadProps(__spreadValues({}, options), {
+            maxPollingAttempts: options.maxPollingAttempts - 1
+          }));
+        }
+        throw new Error("Polling failed: maximum attempts reached without meeting the condition");
       }
       if (cacheKey) {
         cache.set(cacheKey, { timestamp: Date.now(), data });
@@ -3218,6 +3224,7 @@ function nearCall(contractId, methodName, args) {
 function getAccountInfo(csna, accountContractId) {
   return __async(this, null, function* () {
     const accountInfo = yield nearCall(accountContractId, "get_account", { account_id: csna });
+    console.log("get_account accountInfo:", accountInfo);
     return accountInfo;
   });
 }
@@ -3288,20 +3295,21 @@ function getBtcBalance() {
     }
     const btcRpcUrl = yield getBtcRpcUrl();
     const utxos = yield fetch(`${btcRpcUrl}/address/${account}/utxo`).then((res) => res.json());
+    const btcDecimals = 8;
     const rawBalance = (utxos == null ? void 0 : utxos.reduce((acc, cur) => acc + cur.value, 0)) || 0;
-    const balance = rawBalance / __pow(10, 8);
+    const balance = rawBalance / __pow(10, btcDecimals);
     const feeRate = yield getBtcGasPrice();
     const inputSize = ((utxos == null ? void 0 : utxos.length) || 0) * 66;
     const outputSize = 34;
     const overheadSize = 10;
     const estimatedTxSize = inputSize + outputSize + overheadSize;
-    const estimatedFee = estimatedTxSize * feeRate / __pow(10, 8);
-    console.log("estimated fee:", estimatedFee);
-    const availableBalance = Math.max(0, balance - estimatedFee);
+    const estimatedFee = estimatedTxSize * feeRate;
+    const availableRawBalance = (rawBalance - estimatedFee).toFixed(0);
+    const availableBalance = new import_big.default(availableRawBalance).div(__pow(10, btcDecimals)).round(btcDecimals, import_big.default.roundDown).toNumber();
     return {
       rawBalance,
       balance,
-      availableBalance
+      availableBalance: Math.max(availableBalance, 0)
     };
   });
 }
@@ -3330,7 +3338,8 @@ function getDepositAmount(amount, option) {
     );
     const depositAmount = (option == null ? void 0 : option.isEstimate) ? Number(amount) : Math.max(MINIMUM_DEPOSIT_AMOUNT + MINIMUM_DEPOSIT_AMOUNT_BASE, Number(amount));
     const fee = Math.max(Number(fee_min), Number(depositAmount) * fee_rate);
-    const receiveAmount = new import_big.default(depositAmount).minus(fee).round(0, import_big.default.roundDown).toNumber();
+    const receiveAmount = new import_big.default(depositAmount).minus(fee).minus(MINIMUM_DEPOSIT_AMOUNT_BASE).round(0, import_big.default.roundDown).toNumber();
+    console.log("getDepositAmount:", { depositAmount, receiveAmount, fee });
     return {
       depositAmount,
       receiveAmount: Math.max(receiveAmount, 0),
@@ -3374,7 +3383,7 @@ function executeBTCDepositAndAction(_0) {
       const accountInfo = yield getAccountInfo(csna, config.accountContractId);
       const newActions = [];
       const gasLimit = new import_big.default(50).mul(__pow(10, 12)).toFixed(0);
-      const repayAction = yield checkGasTokenArrears(accountInfo.debt_info, isDev, false);
+      const repayAction = yield checkGasTokenArrears(accountInfo == null ? void 0 : accountInfo.debt_info, isDev, false);
       if (repayAction) {
         newActions.push(__spreadProps(__spreadValues({}, repayAction), {
           gas: gasLimit
@@ -3644,10 +3653,10 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
       const accountId = state.getAccount();
       const accountInfo = yield getAccountInfo(accountId, currentConfig.accountContractId);
       yield checkGasTokenBalance(accountId, currentConfig.token, isDev);
-      yield checkGasTokenArrears(accountInfo.debt_info, isDev, true);
+      yield checkGasTokenArrears(accountInfo == null ? void 0 : accountInfo.debt_info, isDev, true);
       const trans = [...params.transactions];
       console.log("raw trans:", trans);
-      const gasTokenBalance = accountInfo.gas_token[currentConfig.token] || "0";
+      const gasTokenBalance = (accountInfo == null ? void 0 : accountInfo.gas_token[currentConfig.token]) || "0";
       const { transferGasTransaction, useNearPayGas, gasLimit } = yield calculateGasStrategy(
         gasTokenBalance,
         trans
@@ -3663,7 +3672,7 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
         trans.map((transaction, index) => convertTransactionToTxHex(transaction, index))
       );
       const nonceFromApi = yield getNonce(currentConfig.base_url, accountId);
-      const nonce = Number(nonceFromApi) > Number(accountInfo.nonce) ? String(nonceFromApi) : String(accountInfo.nonce);
+      const nonce = Number(nonceFromApi) > Number(accountInfo == null ? void 0 : accountInfo.nonce) ? String(nonceFromApi) : String(accountInfo == null ? void 0 : accountInfo.nonce);
       const intention = {
         chain_id: "397",
         csna: accountId,
@@ -3880,6 +3889,7 @@ function setupBTCWallet({
   syncLogOut = true,
   isDev = false
 } = {}) {
+  console.log("\u26A1\uFE0F BTC Wallet Version:", getVersion());
   const btcWallet = () => __async(this, null, function* () {
     return {
       id: "btc-wallet",
@@ -3903,9 +3913,9 @@ function setupBTCWallet({
 
 // src/index.ts
 var getVersion = () => {
-  return "0.3.15";
+  return "0.3.17";
 };
 if (typeof window !== "undefined") {
-  window.__PARTICLE_BTC_CONNECT_VERSION = getVersion();
+  window.__BTC_WALLET_VERSION = getVersion();
 }
 //# sourceMappingURL=index.js.map