btc-wallet 0.5.44-beta → 0.5.46-beta

package/dist/core/btcUtils.d.ts

@@ -37,6 +37,7 @@ export declare function getDepositAmount(amount: string, option?: {
     protocolFee: number;
     repayAmount: string | number;
     newAccountMinDepositAmount: string | number;
+    minDepositAmount: number;
 }>;
 export declare function getCsnaAccountId(env: ENV): Promise<string>;
 interface ExecuteBTCDepositAndActionParams<T extends boolean = true> {

package/dist/index.js

@@ -3678,6 +3678,9 @@ function getNetwork() {
     }
   });
 }
+function formatBtcAmount(amount) {
+  return new import_big2.default(amount).div(__pow(10, 8)).toString();
+}
 function getBtcRpcUrl() {
   return __async(this, null, function* () {
     const network = yield getNetwork();
@@ -3709,15 +3712,20 @@ function checkGasTokenDebt(csna, env, autoDeposit) {
     };
     if (!autoDeposit)
       return action;
+    console.log("checkGasTokenDebt action:", action);
+    const { minDepositAmount } = yield getDepositAmount(action.amount, {
+      env
+    });
+    const remainingAmount = new import_big2.default(minDepositAmount).minus(transferAmount).toNumber();
     const confirmed = yield Dialog.confirm({
-      title: hasDebtArrears ? "Has gas token arrears" : "Has relayer fee arrears",
-      message: hasDebtArrears ? "You have gas token arrears, please deposit gas token to continue." : "You have relayer fee arrears, please deposit relayer fee to continue."
+      title: hasDebtArrears ? "Gas Token Arrears" : "Relayer Fee Arrears",
+      message: hasDebtArrears ? `You have gas token arrears. Minimum deposit amount is ${formatBtcAmount(minDepositAmount)} BTC, of which ${formatBtcAmount(transferAmount)} BTC will be used to repay the debt, and the remaining ${formatBtcAmount(remainingAmount)} BTC will be credited to your account.` : `You have relayer fee arrears. Minimum deposit amount is ${formatBtcAmount(minDepositAmount)} BTC, of which ${formatBtcAmount(transferAmount)} BTC will be used for relayer fee, and the remaining ${formatBtcAmount(remainingAmount)} BTC will be credited to your account.`
     });
     if (confirmed) {
-      yield executeBTCDepositAndAction({ action, env });
+      yield executeBTCDepositAndAction({ amount: minDepositAmount.toString(), action, env });
       yield Dialog.alert({
-        title: "Deposit success",
-        message: "Deposit success, will continue to execute transaction."
+        title: "Deposit Success",
+        message: `Deposit successful. ${formatBtcAmount(transferAmount)} BTC has been paid for ${hasDebtArrears ? "debt" : "relayer fee"}, and the remaining ${formatBtcAmount(remainingAmount)} BTC has been credited to your account. Transaction will continue.`
       });
     } else {
       throw new Error("Deposit failed, please deposit gas token first.");
@@ -3801,25 +3809,26 @@ function getDepositAmount(amount, option) {
     const accountInfo = yield getAccountInfo({ csna, env });
     const debtAction = yield checkGasTokenDebt(csna, env, false);
     const repayAmount = (debtAction == null ? void 0 : debtAction.amount) || 0;
+    const depositAmount = Number(amount);
     const {
       deposit_bridge_fee: { fee_min, fee_rate },
       min_deposit_amount
     } = yield getBridgeConfig({ env });
-    const depositAmount = Math.max(Number(min_deposit_amount), Number(amount));
-    const protocolFee = Math.max(Number(fee_min), Number(depositAmount) * fee_rate);
+    const protocolFee = Math.max(Number(fee_min), depositAmount * fee_rate);
     const newAccountMinDepositAmount = !(accountInfo == null ? void 0 : accountInfo.nonce) && _newAccountMinDepositAmount ? NEW_ACCOUNT_MIN_DEPOSIT_AMOUNT : 0;
-    const receiveAmount = new import_big2.default(depositAmount).minus(protocolFee).minus(repayAmount).round(0, import_big2.default.roundDown).toNumber();
-    if (Number(newAccountMinDepositAmount) > 0 && receiveAmount < Number(newAccountMinDepositAmount)) {
-      throw new Error(
-        `Receive amount (${receiveAmount}) is less than minimum required amount for new account (${newAccountMinDepositAmount})`
-      );
-    }
+    let receiveAmount = new import_big2.default(depositAmount).minus(protocolFee).minus(repayAmount).round(0, import_big2.default.roundDown).toNumber();
+    receiveAmount = Math.max(receiveAmount, 0);
+    const minDepositAmount = new import_big2.default(min_deposit_amount || 0).plus(newAccountMinDepositAmount).plus(protocolFee).plus(repayAmount).round(0, import_big2.default.roundUp).toNumber();
+    console.log(
+      `minDepositAmount: ${minDepositAmount} = ${min_deposit_amount} + ${newAccountMinDepositAmount} + ${protocolFee} + ${repayAmount}`
+    );
     return {
       depositAmount,
       receiveAmount,
       protocolFee,
       repayAmount,
-      newAccountMinDepositAmount
+      newAccountMinDepositAmount,
+      minDepositAmount
     };
   });
 }
@@ -3862,9 +3871,16 @@ function executeBTCDepositAndAction(_0) {
     newAccountMinDepositAmount,
     registerContractId
   }) {
-    var _a;
     try {
-      console.log("executeBTCDepositAndAction start", amount);
+      console.log("executeBTCDepositAndAction start", {
+        action,
+        amount,
+        feeRate,
+        pollResult,
+        registerDeposit,
+        newAccountMinDepositAmount,
+        registerContractId
+      });
       checkDepositDisabledAddress();
       const { getPublicKey } = getBtcProvider();
       const config = getWalletConfig(env);
@@ -3873,17 +3889,26 @@ function executeBTCDepositAndAction(_0) {
         throw new Error("BTC Public Key is not available.");
       }
       if (!amount && !action) {
-        throw new Error("amount or action is required");
+        throw new Error("Deposit amount or action is required");
       }
       const csna = yield getCsnaAccountId(env);
-      const depositAmount = (_a = action ? action.amount : amount) != null ? _a : "0";
-      if (new import_big2.default(depositAmount).lt(0)) {
-        throw new Error("amount must be greater than 0");
+      const depositAmount = Number(amount || (action == null ? void 0 : action.amount) || 0);
+      console.log("depositAmount", depositAmount);
+      if (depositAmount <= 0) {
+        throw new Error("Invalid deposit amount");
+      }
+      const { receiveAmount, protocolFee, repayAmount, minDepositAmount } = yield getDepositAmount(
+        depositAmount.toString(),
+        {
+          env,
+          newAccountMinDepositAmount
+        }
+      );
+      if (depositAmount < minDepositAmount) {
+        throw new Error(
+          `Invalid deposit amount, must be greater than ${formatBtcAmount(minDepositAmount)} BTC`
+        );
       }
-      const { receiveAmount, protocolFee, repayAmount } = yield getDepositAmount(depositAmount, {
-        env,
-        newAccountMinDepositAmount
-      });
       const accountInfo = yield getAccountInfo({ csna, env });
       const newActions = [];
       const debtAction = yield checkGasTokenDebt(csna, env, false);
@@ -3940,7 +3965,7 @@ function executeBTCDepositAndAction(_0) {
         postActions: postActionsStr,
         extraMsg: depositMsg.extra_msg
       });
-      const txHash = yield sendBitcoin(userDepositAddress, Number(depositAmount), _feeRate);
+      const txHash = yield sendBitcoin(userDepositAddress, depositAmount, _feeRate);
       yield receiveDepositMsg(config.base_url, {
         btcPublicKey,
         txHash,
@@ -4147,7 +4172,7 @@ function calculateWithdraw(_0) {
           return {
             withdrawFee: 0,
             isError: true,
-            errorMsg: `Mini withdraw amount is ${Number(brgConfig.min_withdraw_amount) + Number(gasLimit)} sats`
+            errorMsg: `Minimum withdraw amount is ${formatBtcAmount(Number(brgConfig.min_withdraw_amount) + Number(gasLimit))} BTC`
           };
         }
       }
@@ -4925,7 +4950,7 @@ function getGroup(state) {
 
 // src/index.ts
 var getVersion = () => {
-  return "0.5.44-beta";
+  return "0.5.46-beta";
 };
 if (typeof window !== "undefined") {
   window.__BTC_WALLET_VERSION = getVersion();