btc-wallet 0.5.94-beta → 0.5.96-beta

package/dist/core/btcUtils.d.ts

@@ -1,7 +1,7 @@
 import type { ENV } from '../config';
-import { checkBridgeTransactionStatus, calculateGasLimit } from '../utils/satoshi';
+import { checkBridgeTransactionStatus, calculateGasLimit, calculateGasStrategy } from '../utils/satoshi';
 import type { FinalExecutionOutcome, Transaction } from '@near-wallet-selector/core';
-export { calculateGasLimit, checkBridgeTransactionStatus };
+export { calculateGasLimit, calculateGasStrategy, checkBridgeTransactionStatus };
 type CheckGasTokenDebtReturnType<T extends boolean> = T extends true ? void : {
     receiver_id: string;
     amount: string;
@@ -30,6 +30,8 @@ export declare function sendBitcoin(address: string, amount: number, feeRate: nu
 export declare function signMessage(message: string): Promise<{
     signature: string;
     publicKey: string;
+    signatureBase58: any;
+    publicKeyBase58: any;
 }>;
 /** estimate deposit receive amount, deduct protocol fee and repay amount */
 export declare function estimateDepositAmount(amount: string, option?: {

package/dist/index.js

@@ -107,6 +107,7 @@ __export(src_exports, {
   btcRpcUrls: () => btcRpcUrls,
   calculateGasFee: () => calculateGasFee,
   calculateGasLimit: () => calculateGasLimit,
+  calculateGasStrategy: () => calculateGasStrategy,
   calculateWithdraw: () => calculateWithdraw,
   checkBridgeTransactionStatus: () => checkBridgeTransactionStatus,
   checkGasTokenDebt: () => checkGasTokenDebt,
@@ -3061,7 +3062,7 @@ function getWalletConfig(env) {
   });
 }
 var nearRpcUrls = {
-  mainnet: ["https://free.rpc.fastnear.com", "https://near.lava.build"],
+  mainnet: ["https://near.lava.build", "https://free.rpc.fastnear.com"],
   testnet: ["https://rpc.testnet.near.org"]
 };
 var btcRpcUrls = {
@@ -3829,6 +3830,7 @@ function getPredictedGasAmount(_0) {
 var bitcoin = __toESM(require("bitcoinjs-lib"), 1);
 var import_coinselect = __toESM(require("coinselect"), 1);
 var ecc = __toESM(require("@bitcoinerlab/secp256k1"), 1);
+var import_bs582 = __toESM(require("bs58"), 1);
 bitcoin.initEccLib(ecc);
 var NEAR_STORAGE_DEPOSIT_AMOUNT = "1250000000000000000000";
 var NBTC_STORAGE_DEPOSIT_AMOUNT = 800;
@@ -3978,7 +3980,14 @@ function signMessage(message) {
     const { signMessage: signMessage2, getPublicKey } = getBtcProvider();
     const publicKey = yield getPublicKey();
     const signature = yield signMessage2(message);
-    return { signature, publicKey };
+    const signatureBase58 = import_bs582.default.encode(Buffer.from(signature, "base64"));
+    const publicKeyBase58 = import_bs582.default.encode(Buffer.from(publicKey, "hex"));
+    return {
+      signature,
+      publicKey,
+      signatureBase58,
+      publicKeyBase58
+    };
   });
 }
 function estimateDepositAmount(amount, option) {
@@ -4435,11 +4444,25 @@ function calculateWithdraw(_0) {
       }
       const userSatoshis = Number(satoshis);
       const maxBtcFee = Number(brgConfig.max_btc_gas_fee);
-      const { inputs, outputs, fee } = (0, import_coinselect.default)(
+      let { inputs, outputs, fee } = (0, import_coinselect.default)(
         utxos,
         [{ address: btcAddress, value: userSatoshis }],
         Math.ceil(feeRate)
       );
+      if (inputs && inputs.length > 10) {
+        const filteredUtxos = utxos.filter((utxo) => utxo.value >= userSatoshis);
+        console.log("filteredUtxos", filteredUtxos);
+        if (filteredUtxos.length > 0) {
+          const result = (0, import_coinselect.default)(
+            filteredUtxos,
+            [{ address: btcAddress, value: userSatoshis }],
+            Math.ceil(feeRate)
+          );
+          inputs = result.inputs;
+          outputs = result.outputs;
+          fee = result.fee;
+        }
+      }
       const newInputs = inputs;
       let newOutputs = outputs;
       let newFee = fee;
@@ -5411,7 +5434,7 @@ function getGroup(state) {
 
 // src/index.ts
 var getVersion = () => {
-  return "0.5.94-beta";
+  return "0.5.96-beta";
 };
 if (typeof window !== "undefined") {
   window.__BTC_WALLET_VERSION = getVersion();