btc-wallet 0.3.29 → 0.3.31

package/README.md

@@ -75,11 +75,10 @@ interface ExecuteBTCDepositAndActionParams<T extends boolean = true> {
 // Example 1: dApp one-click BTC deposit
 await executeBTCDepositAndAction({
   action: {
-    receiver_id: 'account.near',
-    amount: '1000000',     // in smallest units
-    msg: 'Deposit'
+    receiver_id: 'token.near',
+    amount: '1000000',
+    msg: 'ft_transfer_call message' // ft_transfer_call message
   },
-  feeRate: 5,
   registerDeposit: '100000000000000000000000',  // default 0.000125 NEAR, you can set it according to your needs
 });
 

package/dist/core/btcUtils.d.ts

@@ -1,23 +1,27 @@
 import type { ENV } from '../config';
 import type { FinalExecutionOutcome } from '@near-wallet-selector/core';
+export interface AccountInfo {
+    nonce: string;
+    gas_token: Record<string, string>;
+    debt_info?: DebtInfo;
+    relayer_fee?: {
+        amount?: string;
+    };
+}
 export interface DebtInfo {
     gas_token_id: string;
     transfer_amount: string;
     near_gas_debt_amount: string;
     protocol_fee_debt_amount: string;
 }
-export declare function getAccountInfo(csna: string, accountContractId: string): Promise<{
-    nonce: string;
-    gas_token: Record<string, string>;
-    debt_info?: DebtInfo;
-} | undefined>;
+export declare function getAccountInfo(csna: string, accountContractId: string): Promise<AccountInfo>;
 export declare function checkGasTokenBalance(csna: string, gasToken: string, minAmount: string, env: ENV): Promise<void>;
 type CheckGasTokenArrearsReturnType<T extends boolean> = T extends true ? void : {
     receiver_id: string;
     amount: string;
     msg: string;
 } | undefined;
-export declare function checkGasTokenArrears<T extends boolean>(debtInfo: DebtInfo | undefined, env: ENV, autoDeposit?: T): Promise<CheckGasTokenArrearsReturnType<T>>;
+export declare function checkGasTokenArrears<T extends boolean>(accountInfo: AccountInfo | undefined, env: ENV, autoDeposit?: T): Promise<CheckGasTokenArrearsReturnType<T>>;
 export declare function queryGasTokenArrears(env: ENV): Promise<DebtInfo | undefined>;
 export declare function getBtcGasPrice(): Promise<number>;
 export declare function getBtcBalance(): Promise<{

package/dist/index.js

@@ -2271,7 +2271,6 @@ var ConnectProvider = ({
           })
         })
       );
-      console.log("walletEntryPlugin init");
     }
   }, [options, evmSupportChainIds, accountContract]);
   (0, import_react10.useEffect)(() => {
@@ -2280,7 +2279,6 @@ var ConnectProvider = ({
       import_wallet.walletEntryPlugin.setWalletCore({
         ethereum: smartAccount.provider
       });
-      console.log("walletEntryPlugin setWalletCore");
     }
   }, [smartAccount, options]);
   (0, import_react10.useEffect)(() => {
@@ -2288,10 +2286,8 @@ var ConnectProvider = ({
     if (((_a2 = options.walletOptions) == null ? void 0 : _a2.visible) !== false) {
       if (evmAccount) {
         import_wallet.walletEntryPlugin.walletEntryCreate();
-        console.log("walletEntryPlugin walletEntryCreate");
       } else {
         import_wallet.walletEntryPlugin.walletEntryDestroy();
-        console.log("walletEntryPlugin walletEntryDestroy");
       }
     }
   }, [evmAccount, smartAccount, options]);
@@ -3228,8 +3224,7 @@ Dialog.style = `
   `;
 
 // src/core/btcUtils.ts
-var MINIMUM_DEPOSIT_AMOUNT = 5e3;
-var MINIMUM_DEPOSIT_AMOUNT_BASE = 1e3;
+var MINIMUM_DEPOSIT_AMOUNT_BASE = 0;
 var NEAR_STORAGE_DEPOSIT_AMOUNT = "1250000000000000000000";
 var NBTC_STORAGE_DEPOSIT_AMOUNT = 3e3;
 var GAS_LIMIT = "50000000000000";
@@ -3265,7 +3260,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;
   });
@@ -3285,23 +3282,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 });
@@ -3380,13 +3379,10 @@ function getDepositAmount(amount, option) {
   return __async(this, null, function* () {
     const config = yield getConfig((option == null ? void 0 : option.env) || "mainnet");
     const {
-      deposit_bridge_fee: { fee_min, fee_rate }
-    } = yield nearCall(
-      config.bridgeContractId,
-      "get_config",
-      {}
-    );
-    const depositAmount = (option == null ? void 0 : option.isEstimate) ? Number(amount) : Math.max(MINIMUM_DEPOSIT_AMOUNT + MINIMUM_DEPOSIT_AMOUNT_BASE, Number(amount));
+      deposit_bridge_fee: { fee_min, fee_rate },
+      min_deposit_amount
+    } = yield nearCall(config.bridgeContractId, "get_config", {});
+    const depositAmount = (option == null ? void 0 : option.isEstimate) ? Number(amount) : Math.max(Number(min_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).minus(MINIMUM_DEPOSIT_AMOUNT_BASE).round(0, import_big.default.roundDown).toNumber();
     console.log("getDepositAmount:", { depositAmount, receiveAmount, fee });
@@ -3443,16 +3439,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 import_big.default((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 import_big.default(receiveAmount).minus(repayAction.amount).toString() : receiveAmount.toString(),
+            amount: (arrearsAction == null ? void 0 : arrearsAction.amount) && !fixedAmount ? new import_big.default(receiveAmount).minus(arrearsAction.amount).toString() : receiveAmount.toString(),
             gas: GAS_LIMIT
           }) : {
             receiver_id: config.accountContractId,
@@ -3494,7 +3490,7 @@ function executeBTCDepositAndAction(_0) {
         { deposit_msg: depositMsg }
       );
       const _feeRate = feeRate || (yield getBtcGasPrice());
-      const sendAmount = (repayAction == null ? void 0 : repayAction.amount) && fixedAmount ? new import_big.default(depositAmount).plus((repayAction == null ? void 0 : repayAction.amount) || 0).toString() : depositAmount;
+      const sendAmount = (arrearsAction == null ? void 0 : arrearsAction.amount) && fixedAmount ? new import_big.default(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);
@@ -3592,6 +3588,7 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
         const accountId = state.getAccount();
         const btcContext = window.btcContext;
         if (accountId && btcContext.account) {
+          removeWalletButton();
           setupWalletButton(env, wallet, btcContext);
         } else {
           removeWalletButton();
@@ -3743,7 +3740,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";
@@ -4001,7 +3998,7 @@ function setupBTCWallet({
 
 // src/index.ts
 var getVersion = () => {
-  return "0.3.29";
+  return "0.3.31";
 };
 if (typeof window !== "undefined") {
   window.__BTC_WALLET_VERSION = getVersion();