btc-wallet 0.3.28 → 0.3.30

package/esm/index.js

@@ -3219,7 +3219,9 @@ function nearCall(contractId, methodName, args) {
 }
 function getAccountInfo(csna, accountContractId) {
   return __async(this, null, function* () {
-    const accountInfo = yield nearCall(accountContractId, "get_account", { account_id: csna });
+    const accountInfo = yield nearCall(accountContractId, "get_account", {
+      account_id: csna
+    });
     console.log("get_account accountInfo:", accountInfo);
     return accountInfo;
   });
@@ -3239,23 +3241,25 @@ function checkGasTokenBalance(csna, gasToken, minAmount, env) {
     }
   });
 }
-function checkGasTokenArrears(debtInfo, env, autoDeposit) {
+function checkGasTokenArrears(accountInfo, env, autoDeposit) {
   return __async(this, null, function* () {
-    if (!debtInfo)
+    var _a, _b, _c, _d;
+    if (!((_a = accountInfo == null ? void 0 : accountInfo.debt_info) == null ? void 0 : _a.transfer_amount) || !((_b = accountInfo == null ? void 0 : accountInfo.relayer_fee) == null ? void 0 : _b.amount))
       return;
     const config = yield getConfig(env);
-    const transferAmount = debtInfo.transfer_amount;
-    console.log("get_account debtInfo:", debtInfo);
+    const arrearsType = accountInfo.debt_info.transfer_amount ? "Deposit" : ((_c = accountInfo.relayer_fee) == null ? void 0 : _c.amount) ? "RelayerFee" : void 0;
+    const transferAmount = arrearsType === "Deposit" ? accountInfo.debt_info.transfer_amount : (_d = accountInfo.relayer_fee) == null ? void 0 : _d.amount;
+    console.log("get_account:", accountInfo);
     const action = {
       receiver_id: config.accountContractId,
       amount: transferAmount,
-      msg: JSON.stringify("Deposit")
+      msg: JSON.stringify(arrearsType)
     };
     if (!autoDeposit)
       return action;
     const confirmed = yield Dialog.confirm({
-      title: "Has gas token arrears",
-      message: "You have gas token arrears, please deposit gas token to continue."
+      title: arrearsType === "Deposit" ? "Has gas token arrears" : "Has relayer fee arrears",
+      message: arrearsType === "Deposit" ? "You have gas token arrears, please deposit gas token to continue." : "You have relayer fee arrears, please deposit relayer fee to continue."
     });
     if (confirmed) {
       yield executeBTCDepositAndAction({ action, env });
@@ -3373,6 +3377,7 @@ function executeBTCDepositAndAction(_0) {
     feeRate,
     fixedAmount = true,
     pollResult = true,
+    registerDeposit,
     env = "mainnet"
   }) {
     var _a;
@@ -3396,16 +3401,16 @@ function executeBTCDepositAndAction(_0) {
       });
       const accountInfo = yield getAccountInfo(csna, config.accountContractId);
       const newActions = [];
-      const repayAction = yield checkGasTokenArrears(accountInfo == null ? void 0 : accountInfo.debt_info, env, false);
-      if (repayAction) {
-        newActions.push(__spreadProps(__spreadValues({}, repayAction), {
+      const arrearsAction = yield checkGasTokenArrears(accountInfo, env, false);
+      if (arrearsAction) {
+        newActions.push(__spreadProps(__spreadValues({}, arrearsAction), {
           gas: GAS_LIMIT
         }));
       }
       if (action || !action && new Big((accountInfo == null ? void 0 : accountInfo.gas_token[config.token]) || 0).lt(MINIMUM_DEPOSIT_AMOUNT_BASE)) {
         newActions.push(
           action ? __spreadProps(__spreadValues({}, action), {
-            amount: (repayAction == null ? void 0 : repayAction.amount) && !fixedAmount ? new Big(receiveAmount).minus(repayAction.amount).toString() : receiveAmount.toString(),
+            amount: (arrearsAction == null ? void 0 : arrearsAction.amount) && !fixedAmount ? new Big(receiveAmount).minus(arrearsAction.amount).toString() : receiveAmount.toString(),
             gas: GAS_LIMIT
           }) : {
             receiver_id: config.accountContractId,
@@ -3422,7 +3427,7 @@ function executeBTCDepositAndAction(_0) {
       if (!(registerRes == null ? void 0 : registerRes.available)) {
         storageDepositMsg.storage_deposit_msg = {
           contract_id: (action == null ? void 0 : action.receiver_id) || config.token,
-          deposit: NEAR_STORAGE_DEPOSIT_AMOUNT,
+          deposit: registerDeposit || NEAR_STORAGE_DEPOSIT_AMOUNT,
           registration_only: true
         };
       }
@@ -3447,7 +3452,7 @@ function executeBTCDepositAndAction(_0) {
         { deposit_msg: depositMsg }
       );
       const _feeRate = feeRate || (yield getBtcGasPrice());
-      const sendAmount = (repayAction == null ? void 0 : repayAction.amount) && fixedAmount ? new Big(depositAmount).plus((repayAction == null ? void 0 : repayAction.amount) || 0).toString() : depositAmount;
+      const sendAmount = (arrearsAction == null ? void 0 : arrearsAction.amount) && fixedAmount ? new Big(depositAmount).plus((arrearsAction == null ? void 0 : arrearsAction.amount) || 0).toString() : depositAmount;
       console.log("user deposit address:", userDepositAddress);
       console.log("send amount:", sendAmount);
       console.log("fee rate:", _feeRate);
@@ -3696,7 +3701,7 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
       const btcContext = window.btcContext;
       const accountId = state.getAccount();
       const accountInfo = yield getAccountInfo(accountId, currentConfig.accountContractId);
-      yield checkGasTokenArrears(accountInfo == null ? void 0 : accountInfo.debt_info, env, true);
+      yield checkGasTokenArrears(accountInfo, env, true);
       const trans = [...params.transactions];
       console.log("raw trans:", trans);
       const gasTokenBalance = (accountInfo == null ? void 0 : accountInfo.gas_token[currentConfig.token]) || "0";
@@ -3954,7 +3959,7 @@ function setupBTCWallet({
 
 // src/index.ts
 var getVersion = () => {
-  return "0.3.28";
+  return "0.3.30";
 };
 if (typeof window !== "undefined") {
   window.__BTC_WALLET_VERSION = getVersion();