btc-wallet 0.4.2-beta → 0.4.4-beta

package/dist/core/btcUtils.d.ts

@@ -13,7 +13,7 @@ export interface DebtInfo {
     near_gas_debt_amount: string;
     protocol_fee_debt_amount: string;
 }
-export declare function getAccountInfo(csna: string, accountContractId: string): Promise<AccountInfo>;
+export declare function getAccountInfo(csna: string, accountContractId: string): Promise<AccountInfo | undefined>;
 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;

package/dist/index.js

@@ -479,39 +479,11 @@ var XverseConnector = class extends BaseConnector {
       if (!provider) {
         throw new Error(`${this.metadata.name} is not install!`);
       }
-      const { sendBtcTransaction } = yield import("sats-connect");
-      const addresses = yield this.getAccounts();
-      if (addresses.length === 0) {
-        throw new Error(`${this.metadata.name} not connected!`);
-      }
-      const result = yield new Promise((resolve, reject) => {
-        const sendBtcOptions = {
-          payload: {
-            network: {
-              type: __privateGet(this, _network)
-            },
-            recipients: [
-              {
-                address: toAddress,
-                amountSats: BigInt(satoshis)
-              }
-            ],
-            senderAddress: addresses[0]
-          },
-          onFinish: (response) => {
-            resolve(response);
-          },
-          onCancel: () => {
-            reject({
-              code: 4001,
-              message: "User rejected the request."
-            });
-          }
-        };
-        console.log("\u{1F680} ~ XverseConnector ~ sendBitcoin ~ sendBtcOptions:", sendBtcOptions);
-        sendBtcTransaction(sendBtcOptions).catch((e) => reject(e));
+      const { result } = yield provider.request("sendTransfer", {
+        recipients: [{ address: toAddress, amount: satoshis }]
       });
-      return result;
+      console.log("\u{1F680} ~ XverseConnector ~ sendBitcoin ~ res:", result);
+      return result.txid;
     });
   }
   disconnect() {
@@ -3306,6 +3278,8 @@ function getAccountInfo(csna, accountContractId) {
   return __async(this, null, function* () {
     const accountInfo = yield nearCall(accountContractId, "get_account", {
       account_id: csna
+    }).catch((error) => {
+      return void 0;
     });
     console.log("get_account accountInfo:", accountInfo);
     return accountInfo;
@@ -3418,8 +3392,11 @@ function sendBitcoin(address, amount, feeRate) {
 }
 function estimateDepositAmount(amount, option) {
   return __async(this, null, function* () {
+    const config = yield getConfig((option == null ? void 0 : option.env) || "mainnet");
+    const csna = yield getCsnaAccountId((option == null ? void 0 : option.env) || "mainnet");
+    const accountInfo = yield getAccountInfo(csna, config.accountContractId);
     const { receiveAmount } = yield getDepositAmount(amount, __spreadProps(__spreadValues({}, option), { isEstimate: true }));
-    return receiveAmount;
+    return (accountInfo == null ? void 0 : accountInfo.nonce) ? receiveAmount : new import_big.default(receiveAmount).minus(NBTC_STORAGE_DEPOSIT_AMOUNT).round(0, import_big.default.roundDown).toNumber();
   });
 }
 function getDepositAmount(amount, option) {
@@ -3492,18 +3469,11 @@ function executeBTCDepositAndAction(_0) {
           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: (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,
-            amount: MINIMUM_DEPOSIT_AMOUNT_BASE.toString(),
-            msg: JSON.stringify("Deposit"),
-            gas: GAS_LIMIT
-          }
-        );
+      if (action) {
+        newActions.push(__spreadProps(__spreadValues({}, action), {
+          amount: (arrearsAction == null ? void 0 : arrearsAction.amount) && !fixedAmount ? new import_big.default(receiveAmount).minus(arrearsAction.amount).toString() : receiveAmount.toString(),
+          gas: GAS_LIMIT
+        }));
       }
       const storageDepositMsg = {};
       const registerRes = yield nearCall((action == null ? void 0 : action.receiver_id) || config.token, "storage_balance_of", {
@@ -3887,7 +3857,7 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
               args: {
                 receiver_id: currentConfig.accountContractId,
                 amount,
-                msg: JSON.stringify("Deposit")
+                msg: JSON.stringify("Repay")
               },
               gas: new import_big2.default(50).mul(__pow(10, 12)).toFixed(0),
               deposit: "1"
@@ -3921,7 +3891,7 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
         near_transactions: transactions2
       });
       const predictedGasAmount = new import_big2.default(predictedGas).mul(1.2).toFixed(0);
-      const miniGasAmount = 200;
+      const miniGasAmount = 200 * transactions2.length;
       const gasAmount = Math.max(Number(predictedGasAmount), miniGasAmount);
       console.log("predictedGas:", predictedGasAmount);
       return gasAmount.toString();
@@ -4056,7 +4026,7 @@ function setupBTCWallet({
 
 // src/index.ts
 var getVersion = () => {
-  return "0.4.2-beta";
+  return "0.4.4-beta";
 };
 if (typeof window !== "undefined") {
   window.__BTC_WALLET_VERSION = getVersion();