btc-wallet 0.5.43-beta → 0.5.45-beta

package/dist/core/btcUtils.d.ts

@@ -1,7 +1,7 @@
 import type { ENV } from '../config';
-import { calculateWithdraw, calculateGasLimit } from '../utils/satoshi';
+import { calculateGasLimit } from '../utils/satoshi';
 import type { FinalExecutionOutcome, Transaction } from '@near-wallet-selector/core';
-export { calculateGasLimit, calculateWithdraw };
+export { calculateGasLimit };
 type CheckGasTokenDebtReturnType<T extends boolean> = T extends true ? void : {
     receiver_id: string;
     amount: string;
@@ -69,3 +69,21 @@ interface WithdrawParams {
     env?: ENV;
 }
 export declare function getWithdrawTransaction({ amount, feeRate, csna, btcAddress, env, }: WithdrawParams): Promise<Transaction>;
+interface CalculateWithdrawParams {
+    amount: string | number;
+    feeRate?: number;
+    csna?: string;
+    btcAddress?: string;
+    env: ENV;
+}
+interface CalculateWithdrawResult {
+    withdrawFee: number;
+    gasFee?: number;
+    inputs?: any[];
+    outputs?: any[];
+    fromAmount?: number;
+    receiveAmount?: string;
+    isError: boolean;
+    errorMsg?: string;
+}
+export declare function calculateWithdraw({ amount, feeRate: _feeRate, csna: _csna, btcAddress: _btcAddress, env, }: CalculateWithdrawParams): Promise<CalculateWithdrawResult>;

package/dist/index.d.ts

@@ -6,5 +6,4 @@ export * from './core/setupBTCWallet/index';
 export * from './core/btcUtils';
 export * from './config';
 export * from './core/setupModal';
-export * from './utils/satoshi';
 export declare const getVersion: () => string;

package/dist/index.js

@@ -94,35 +94,20 @@ __export(src_exports, {
   btcRpcUrls: () => btcRpcUrls,
   calculateGasFee: () => calculateGasFee,
   calculateGasLimit: () => calculateGasLimit,
-  calculateGasStrategy: () => calculateGasStrategy,
   calculateWithdraw: () => calculateWithdraw,
-  checkBridgeTransactionStatus: () => checkBridgeTransactionStatus,
-  checkBtcTransactionStatus: () => checkBtcTransactionStatus,
-  checkGasTokenBalance: () => checkGasTokenBalance,
   checkGasTokenDebt: () => checkGasTokenDebt,
   checkSatoshiWhitelist: () => checkSatoshiWhitelist,
-  convertTransactionToTxHex: () => convertTransactionToTxHex,
   estimateDepositAmount: () => estimateDepositAmount,
   executeBTCDepositAndAction: () => executeBTCDepositAndAction,
-  getAccountInfo: () => getAccountInfo,
-  getBridgeConfig: () => getBridgeConfig,
   getBtcBalance: () => getBtcBalance,
   getBtcGasPrice: () => getBtcGasPrice,
   getBtcUtxos: () => getBtcUtxos,
   getCsnaAccountId: () => getCsnaAccountId,
   getDepositAmount: () => getDepositAmount,
-  getNearNonce: () => getNearNonce,
-  getNonce: () => getNonce,
-  getTokenBalance: () => getTokenBalance,
   getVersion: () => getVersion,
   getWalletConfig: () => getWalletConfig,
-  getWhitelist: () => getWhitelist,
   getWithdrawTransaction: () => getWithdrawTransaction,
   nearRpcUrls: () => nearRpcUrls,
-  preReceiveDepositMsg: () => preReceiveDepositMsg,
-  receiveDepositMsg: () => receiveDepositMsg,
-  receiveTransaction: () => receiveTransaction,
-  receiveWithdrawMsg: () => receiveWithdrawMsg,
   sendBitcoin: () => sendBitcoin,
   setupBTCWallet: () => setupBTCWallet,
   setupWalletSelectorModal: () => setupWalletSelectorModal,
@@ -3226,7 +3211,6 @@ var state_default = {
 };
 
 // src/utils/satoshi.ts
-var import_coinselect = __toESM(require("coinselect"), 1);
 function getNonce(url, accountId) {
   return __async(this, null, function* () {
     const { result_code, result_message, result_data } = yield request(
@@ -3343,22 +3327,6 @@ function getWhitelist(url) {
     return data;
   });
 }
-function receiveWithdrawMsg(url, txHash) {
-  return __async(this, null, function* () {
-    const { result_code, result_message, result_data } = yield request(
-      `${url}/v1/receiveWithdrawMsg`,
-      {
-        method: "POST",
-        body: { txHash }
-      }
-    );
-    console.log("receiveWithdrawMsg resp:", { result_code, result_message, result_data });
-    if (result_code !== 0) {
-      throw new Error(result_message);
-    }
-    return result_data;
-  });
-}
 function getAccountInfo(_0) {
   return __async(this, arguments, function* ({ csna, env }) {
     const config = getWalletConfig(env);
@@ -3684,196 +3652,10 @@ function getPredictedGasAmount(_0) {
     return gasAmount.toString();
   });
 }
-function calculateWithdraw(_0) {
-  return __async(this, arguments, function* ({
-    amount,
-    feeRate,
-    csna,
-    btcAddress,
-    env
-  }) {
-    try {
-      const config = getWalletConfig(env);
-      const _feeRate = feeRate || (yield getBtcGasPrice());
-      const gasLimit = yield calculateGasLimit({
-        csna,
-        transactions: [
-          {
-            signerId: "",
-            receiverId: config.btcToken,
-            actions: [
-              {
-                type: "FunctionCall",
-                params: {
-                  methodName: "ft_transfer_call",
-                  args: {
-                    receiver_id: config.btcToken,
-                    amount: "100",
-                    msg: ""
-                  },
-                  gas: "300000000000000",
-                  deposit: "1"
-                }
-              }
-            ]
-          }
-        ],
-        env
-      });
-      let satoshis = Number(amount);
-      if (Number(gasLimit) > 0) {
-        satoshis = new import_big.default(amount).minus(gasLimit).toNumber();
-      }
-      const brgConfig = yield getBridgeConfig({ env });
-      const allUTXO = yield nearCallFunction(config.bridgeContractId, "get_utxos_paged", {}, { network: config.network });
-      if (brgConfig.min_withdraw_amount) {
-        if (Number(satoshis) < Number(brgConfig.min_withdraw_amount)) {
-          return {
-            withdrawFee: 0,
-            isError: true,
-            errorMsg: `Mini withdraw amount is ${Number(brgConfig.min_withdraw_amount) + Number(gasLimit)} sats`
-          };
-        }
-      }
-      const feePercent = Number(brgConfig.withdraw_bridge_fee.fee_rate) * Number(satoshis);
-      const withdrawFee = feePercent > Number(brgConfig.withdraw_bridge_fee.fee_min) ? feePercent : Number(brgConfig.withdraw_bridge_fee.fee_min);
-      const withdrawChangeAddress = brgConfig.change_address;
-      const utxos = Object.keys(allUTXO).map((key) => {
-        const txid = key.split("@");
-        return {
-          txid: txid[0],
-          vout: allUTXO[key].vout,
-          value: Number(allUTXO[key].balance),
-          script: allUTXO[key].script
-        };
-      }).filter((utxo) => utxo.value > Number(brgConfig.min_change_amount));
-      if (!utxos || utxos.length === 0) {
-        return {
-          withdrawFee,
-          isError: true,
-          errorMsg: "The network is busy, please try again later."
-        };
-      }
-      const userSatoshis = Number(satoshis);
-      const maxBtcFee = Number(brgConfig.max_btc_gas_fee);
-      const { inputs, outputs, fee } = (0, import_coinselect.default)(
-        utxos,
-        [{ address: btcAddress, value: userSatoshis }],
-        Math.ceil(_feeRate)
-      );
-      const newInputs = inputs;
-      let newOutputs = outputs;
-      let newFee = fee;
-      if (!newOutputs || newOutputs.length === 0) {
-        return {
-          withdrawFee,
-          isError: true,
-          errorMsg: "The network is busy, please try again later."
-        };
-      }
-      let userOutput, noUserOutput;
-      for (let i = 0; i < newOutputs.length; i++) {
-        const output = newOutputs[i];
-        if (output.value.toString() === userSatoshis.toString()) {
-          userOutput = output;
-        } else {
-          noUserOutput = output;
-        }
-        if (!output.address) {
-          output.address = withdrawChangeAddress;
-        }
-      }
-      let dis = 0;
-      if (newFee > maxBtcFee) {
-        dis = newFee - maxBtcFee;
-        newFee = maxBtcFee;
-        return {
-          gasFee: newFee,
-          withdrawFee,
-          isError: true,
-          errorMsg: "Gas exceeds maximum value"
-        };
-      }
-      userOutput.value = new import_big.default(userOutput.value).minus(newFee).minus(withdrawFee).toNumber();
-      if (userOutput.value < 0) {
-        return {
-          gasFee: newFee,
-          withdrawFee,
-          isError: true,
-          errorMsg: "Not enough gas"
-        };
-      }
-      if (noUserOutput) {
-        if (!noUserOutput.address) {
-          noUserOutput.address = withdrawChangeAddress;
-        }
-        noUserOutput.value = new import_big.default(noUserOutput.value).plus(newFee).plus(withdrawFee).plus(dis).toNumber();
-      } else {
-        noUserOutput = {
-          address: withdrawChangeAddress,
-          value: new import_big.default(newFee).plus(withdrawFee).plus(dis).toNumber()
-        };
-        newOutputs.push(noUserOutput);
-      }
-      let minValue = Math.min(...newInputs.map((input) => input.value));
-      let totalNoUserOutputValue = noUserOutput.value;
-      while (totalNoUserOutputValue >= minValue && minValue > 0 && newInputs.length > 0) {
-        totalNoUserOutputValue -= minValue;
-        noUserOutput.value = totalNoUserOutputValue;
-        const minValueIndex = newInputs.findIndex((input) => input.value === minValue);
-        if (minValueIndex > -1) {
-          newInputs.splice(minValueIndex, 1);
-        }
-        minValue = Math.min(...newInputs.map((input) => input.value));
-      }
-      let gasMore = 0;
-      if (noUserOutput.value === 0) {
-        newOutputs = newOutputs.filter((item) => item.value !== 0);
-      } else if (noUserOutput.value < Number(brgConfig.min_change_amount)) {
-        gasMore = Number(brgConfig.min_change_amount) - noUserOutput.value;
-        userOutput.value -= gasMore;
-        noUserOutput.value = Number(brgConfig.min_change_amount);
-      }
-      const insufficientOutput = newOutputs.some((item) => item.value < 0);
-      if (insufficientOutput) {
-        return {
-          gasFee: newFee,
-          withdrawFee,
-          isError: true,
-          errorMsg: "Not enough gas"
-        };
-      }
-      const inputSum = newInputs.reduce((sum, cur) => sum + Number(cur.value), 0);
-      const outputSum = newOutputs.reduce((sum, cur) => sum + Number(cur.value), 0);
-      if (newFee + outputSum !== inputSum) {
-        return {
-          withdrawFee,
-          isError: true,
-          errorMsg: "Service busy, please try again later"
-        };
-      }
-      return {
-        withdrawFee: new import_big.default(withdrawFee).plus(gasLimit).plus(gasMore).toNumber(),
-        gasFee: new import_big.default(newFee).toNumber(),
-        inputs: newInputs,
-        outputs: newOutputs,
-        fromAmount: satoshis,
-        receiveAmount: userOutput.value,
-        isError: false
-      };
-    } catch (error) {
-      return {
-        withdrawFee: 0,
-        isError: true,
-        errorMsg: error.message
-      };
-    }
-  });
-}
 
 // src/core/btcUtils.ts
 var bitcoin = __toESM(require("bitcoinjs-lib"), 1);
-var import_coinselect2 = __toESM(require("coinselect"), 1);
+var import_coinselect = __toESM(require("coinselect"), 1);
 var ecc = __toESM(require("@bitcoinerlab/secp256k1"), 1);
 bitcoin.initEccLib(ecc);
 var NEAR_STORAGE_DEPOSIT_AMOUNT = "1250000000000000000000";
@@ -3969,7 +3751,7 @@ function calculateGasFee(account, amount, feeRate) {
   return __async(this, null, function* () {
     const _feeRate = feeRate || (yield getBtcGasPrice());
     const utxos = yield getBtcUtxos(account);
-    const { fee } = (0, import_coinselect2.default)(utxos, [{ address: account, value: amount }], Math.ceil(_feeRate));
+    const { fee } = (0, import_coinselect.default)(utxos, [{ address: account, value: amount }], Math.ceil(_feeRate));
     console.log("calculateGasFee fee:", fee);
     return fee;
   });
@@ -4019,19 +3801,23 @@ 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();
+    let receiveAmount = new import_big2.default(depositAmount).minus(protocolFee).minus(repayAmount).round(0, import_big2.default.roundDown).toNumber();
+    receiveAmount = Math.max(receiveAmount, 0);
     if (Number(newAccountMinDepositAmount) > 0 && receiveAmount < Number(newAccountMinDepositAmount)) {
-      throw new Error(
-        `Receive amount (${receiveAmount}) is less than minimum required amount for new account (${newAccountMinDepositAmount})`
+      console.error(
+        `Receive amount (${receiveAmount}) is less than minimum required amount for new account (${newAccountMinDepositAmount} sat)`
       );
     }
+    if (receiveAmount <= 0) {
+      console.error(`Receive amount (${receiveAmount}) is less than 0`);
+    }
     return {
       depositAmount,
       receiveAmount,
@@ -4091,17 +3877,20 @@ 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");
+        throw new Error("Deposit amount must be greater than 0");
       }
       const { receiveAmount, protocolFee, repayAmount } = yield getDepositAmount(depositAmount, {
         env,
         newAccountMinDepositAmount
       });
+      if (receiveAmount <= 0) {
+        throw new Error("Invalid deposit amount, too small");
+      }
       const accountInfo = yield getAccountInfo({ csna, env });
       const newActions = [];
       const debtAction = yield checkGasTokenDebt(csna, env, false);
@@ -4309,6 +4098,201 @@ function getWithdrawTransaction(_0) {
     return transaction;
   });
 }
+function calculateWithdraw(_0) {
+  return __async(this, arguments, function* ({
+    amount,
+    feeRate: _feeRate,
+    csna: _csna,
+    btcAddress: _btcAddress,
+    env
+  }) {
+    try {
+      const config = getWalletConfig(env);
+      let btcAddress = _btcAddress || getBtcProvider().account;
+      if (!btcAddress) {
+        yield getBtcProvider().autoConnect();
+        btcAddress = getBtcProvider().account;
+        if (!btcAddress) {
+          throw new Error("BTC Account is not available.");
+        }
+      }
+      const csna = _csna || (yield getCsnaAccountId(env));
+      const feeRate = _feeRate || (yield getBtcGasPrice());
+      const gasLimit = yield calculateGasLimit({
+        csna,
+        transactions: [
+          {
+            signerId: "",
+            receiverId: config.btcToken,
+            actions: [
+              {
+                type: "FunctionCall",
+                params: {
+                  methodName: "ft_transfer_call",
+                  args: {
+                    receiver_id: config.btcToken,
+                    amount: "100",
+                    msg: ""
+                  },
+                  gas: "300000000000000",
+                  deposit: "1"
+                }
+              }
+            ]
+          }
+        ],
+        env
+      });
+      let satoshis = Number(amount);
+      if (Number(gasLimit) > 0) {
+        satoshis = new import_big2.default(amount).minus(gasLimit).toNumber();
+      }
+      const brgConfig = yield getBridgeConfig({ env });
+      const allUTXO = yield nearCallFunction(config.bridgeContractId, "get_utxos_paged", {}, { network: config.network });
+      if (brgConfig.min_withdraw_amount) {
+        if (Number(satoshis) < Number(brgConfig.min_withdraw_amount)) {
+          return {
+            withdrawFee: 0,
+            isError: true,
+            errorMsg: `Mini withdraw amount is ${Number(brgConfig.min_withdraw_amount) + Number(gasLimit)} sats`
+          };
+        }
+      }
+      const feePercent = Number(brgConfig.withdraw_bridge_fee.fee_rate) * Number(satoshis);
+      const withdrawFee = feePercent > Number(brgConfig.withdraw_bridge_fee.fee_min) ? feePercent : Number(brgConfig.withdraw_bridge_fee.fee_min);
+      const withdrawChangeAddress = brgConfig.change_address;
+      const utxos = Object.keys(allUTXO).map((key) => {
+        const txid = key.split("@");
+        return {
+          txid: txid[0],
+          vout: allUTXO[key].vout,
+          value: Number(allUTXO[key].balance),
+          script: allUTXO[key].script
+        };
+      }).filter((utxo) => utxo.value > Number(brgConfig.min_change_amount));
+      if (!utxos || utxos.length === 0) {
+        return {
+          withdrawFee,
+          isError: true,
+          errorMsg: "The network is busy, please try again later."
+        };
+      }
+      const userSatoshis = Number(satoshis);
+      const maxBtcFee = Number(brgConfig.max_btc_gas_fee);
+      const { inputs, outputs, fee } = (0, import_coinselect.default)(
+        utxos,
+        [{ address: btcAddress, value: userSatoshis }],
+        Math.ceil(feeRate)
+      );
+      const newInputs = inputs;
+      let newOutputs = outputs;
+      let newFee = fee;
+      if (!newOutputs || newOutputs.length === 0) {
+        return {
+          withdrawFee,
+          isError: true,
+          errorMsg: "The network is busy, please try again later."
+        };
+      }
+      let userOutput, noUserOutput;
+      for (let i = 0; i < newOutputs.length; i++) {
+        const output = newOutputs[i];
+        if (output.value.toString() === userSatoshis.toString()) {
+          userOutput = output;
+        } else {
+          noUserOutput = output;
+        }
+        if (!output.address) {
+          output.address = withdrawChangeAddress;
+        }
+      }
+      let dis = 0;
+      if (newFee > maxBtcFee) {
+        dis = newFee - maxBtcFee;
+        newFee = maxBtcFee;
+        return {
+          gasFee: newFee,
+          withdrawFee,
+          isError: true,
+          errorMsg: "Gas exceeds maximum value"
+        };
+      }
+      userOutput.value = new import_big2.default(userOutput.value).minus(newFee).minus(withdrawFee).toNumber();
+      if (userOutput.value < 0) {
+        return {
+          gasFee: newFee,
+          withdrawFee,
+          isError: true,
+          errorMsg: "Not enough gas"
+        };
+      }
+      if (noUserOutput) {
+        if (!noUserOutput.address) {
+          noUserOutput.address = withdrawChangeAddress;
+        }
+        noUserOutput.value = new import_big2.default(noUserOutput.value).plus(newFee).plus(withdrawFee).plus(dis).toNumber();
+      } else {
+        noUserOutput = {
+          address: withdrawChangeAddress,
+          value: new import_big2.default(newFee).plus(withdrawFee).plus(dis).toNumber()
+        };
+        newOutputs.push(noUserOutput);
+      }
+      let minValue = Math.min(...newInputs.map((input) => input.value));
+      let totalNoUserOutputValue = noUserOutput.value;
+      while (totalNoUserOutputValue >= minValue && minValue > 0 && newInputs.length > 0) {
+        totalNoUserOutputValue -= minValue;
+        noUserOutput.value = totalNoUserOutputValue;
+        const minValueIndex = newInputs.findIndex((input) => input.value === minValue);
+        if (minValueIndex > -1) {
+          newInputs.splice(minValueIndex, 1);
+        }
+        minValue = Math.min(...newInputs.map((input) => input.value));
+      }
+      let gasMore = 0;
+      if (noUserOutput.value === 0) {
+        newOutputs = newOutputs.filter((item) => item.value !== 0);
+      } else if (noUserOutput.value < Number(brgConfig.min_change_amount)) {
+        gasMore = Number(brgConfig.min_change_amount) - noUserOutput.value;
+        userOutput.value -= gasMore;
+        noUserOutput.value = Number(brgConfig.min_change_amount);
+      }
+      const insufficientOutput = newOutputs.some((item) => item.value < 0);
+      if (insufficientOutput) {
+        return {
+          gasFee: newFee,
+          withdrawFee,
+          isError: true,
+          errorMsg: "Not enough gas"
+        };
+      }
+      const inputSum = newInputs.reduce((sum, cur) => sum + Number(cur.value), 0);
+      const outputSum = newOutputs.reduce((sum, cur) => sum + Number(cur.value), 0);
+      if (newFee + outputSum !== inputSum) {
+        return {
+          withdrawFee,
+          isError: true,
+          errorMsg: "Service busy, please try again later"
+        };
+      }
+      return {
+        withdrawFee: new import_big2.default(withdrawFee).plus(gasLimit).plus(gasMore).toNumber(),
+        gasFee: new import_big2.default(newFee).toNumber(),
+        inputs: newInputs,
+        outputs: newOutputs,
+        fromAmount: satoshis,
+        receiveAmount: userOutput.value,
+        isError: false
+      };
+    } catch (error) {
+      return {
+        withdrawFee: 0,
+        isError: true,
+        errorMsg: error.message
+      };
+    }
+  });
+}
 function uint8ArrayToHex(uint8Array) {
   return Array.from(uint8Array).map((byte) => byte.toString(16).padStart(2, "0")).join("");
 }
@@ -4948,7 +4932,7 @@ function getGroup(state) {
 
 // src/index.ts
 var getVersion = () => {
-  return "0.5.43-beta";
+  return "0.5.45-beta";
 };
 if (typeof window !== "undefined") {
   window.__BTC_WALLET_VERSION = getVersion();