btc-wallet 0.3.21 → 0.3.23

package/dist/core/btcUtils.d.ts

@@ -17,6 +17,7 @@ type CheckGasTokenArrearsReturnType<T extends boolean> = T extends true ? void :
     msg: string;
 } | undefined;
 export declare function checkGasTokenArrears<T extends boolean>(debtInfo: DebtInfo | undefined, isDev: boolean, autoDeposit?: T): Promise<CheckGasTokenArrearsReturnType<T>>;
+export declare function queryGasTokenArrears(isDev?: boolean): Promise<DebtInfo | undefined>;
 export declare function getBtcGasPrice(): Promise<number>;
 export declare function getBtcBalance(): Promise<{
     rawBalance: number;
@@ -41,6 +42,7 @@ export declare function getDepositAmount(amount: string, option?: {
     receiveAmount: number;
     fee: number;
 }>;
+export declare function getCsnaAccountId(isDev?: boolean): Promise<string>;
 interface ExecuteBTCDepositAndActionParams<T extends boolean = true> {
     action?: {
         receiver_id: string;

package/dist/index.js

@@ -97,8 +97,10 @@ __export(src_exports, {
   getAccountInfo: () => getAccountInfo,
   getBtcBalance: () => getBtcBalance,
   getBtcGasPrice: () => getBtcGasPrice,
+  getCsnaAccountId: () => getCsnaAccountId,
   getDepositAmount: () => getDepositAmount,
   getVersion: () => getVersion,
+  queryGasTokenArrears: () => queryGasTokenArrears,
   sendBitcoin: () => sendBitcoin,
   setupBTCWallet: () => setupBTCWallet,
   useAccountContract: () => useAccountContract,
@@ -2832,10 +2834,10 @@ function pollTransactionStatuses(network, hashes) {
       currentAttempt++;
       const promises = Array.from(pendingHashes).map((hash) => __async(this, null, function* () {
         try {
-          const result = yield provider.txStatus(hash, "unused", "FINAL");
-          if (result && result.status) {
-            console.log(`Transaction ${hash} result:`, result);
-            results.set(hash, result);
+          const result2 = yield provider.txStatus(hash, "unused", "FINAL");
+          if (result2 && result2.status) {
+            console.log(`Transaction ${hash} result:`, result2);
+            results.set(hash, result2);
             pendingHashes.delete(hash);
           }
         } catch (error) {
@@ -2855,7 +2857,8 @@ function pollTransactionStatuses(network, hashes) {
         yield delay(1e4);
       }
     }
-    return hashes.map((hash) => results.get(hash));
+    const result = hashes.map((hash) => results.get(hash)).filter(Boolean);
+    return result;
   });
 }
 
@@ -3306,6 +3309,14 @@ function checkGasTokenArrears(debtInfo, isDev, autoDeposit) {
     }
   });
 }
+function queryGasTokenArrears(isDev) {
+  return __async(this, null, function* () {
+    const config = yield getConfig(isDev || false);
+    const csna = yield getCsnaAccountId(isDev);
+    const accountInfo = yield getAccountInfo(csna, config.accountContractId);
+    return accountInfo == null ? void 0 : accountInfo.debt_info;
+  });
+}
 function getBtcGasPrice() {
   return __async(this, null, function* () {
     const network = yield getNetwork();
@@ -3381,6 +3392,21 @@ function getDepositAmount(amount, option) {
     };
   });
 }
+function getCsnaAccountId(isDev) {
+  return __async(this, null, function* () {
+    const config = yield getConfig(isDev || false);
+    const { getPublicKey } = getBtcProvider();
+    const btcPublicKey = yield getPublicKey();
+    const csna = yield nearCall(
+      config.accountContractId,
+      "get_chain_signature_near_account_id",
+      {
+        btc_public_key: btcPublicKey
+      }
+    );
+    return csna;
+  });
+}
 function executeBTCDepositAndAction(_0) {
   return __async(this, arguments, function* ({
     action,
@@ -3401,13 +3427,7 @@ function executeBTCDepositAndAction(_0) {
       if (!amount && !action) {
         throw new Error("amount or action is required");
       }
-      const csna = yield nearCall(
-        config.accountContractId,
-        "get_chain_signature_near_account_id",
-        {
-          btc_public_key: btcPublicKey
-        }
-      );
+      const csna = yield getCsnaAccountId(isDev);
       const rawDepositAmount = (_a = action ? action.amount : amount) != null ? _a : "0";
       if (new import_big.default(rawDepositAmount).lt(0)) {
         throw new Error("amount must be greater than 0");
@@ -3424,11 +3444,18 @@ function executeBTCDepositAndAction(_0) {
           gas: gasLimit
         }));
       }
-      if (action) {
-        newActions.push(__spreadProps(__spreadValues({}, action), {
-          amount: (repayAction == null ? void 0 : repayAction.amount) && !fixedAmount ? new import_big.default(receiveAmount).minus(repayAction.amount).toString() : receiveAmount.toString(),
-          gas: gasLimit
-        }));
+      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(),
+            gas: gasLimit
+          }) : {
+            receiver_id: config.accountContractId,
+            amount: MINIMUM_DEPOSIT_AMOUNT_BASE.toString(),
+            msg: JSON.stringify("Deposit"),
+            gas: gasLimit
+          }
+        );
       }
       const depositMsg = {
         recipient_id: csna,
@@ -3618,21 +3645,17 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
   }
   function getNearAccountByBtcPublicKey(btcPublicKey) {
     return __async(this, null, function* () {
-      const nearAddress = yield nearCall2(
-        currentConfig.accountContractId,
-        "get_chain_signature_near_account_id",
-        { btc_public_key: btcPublicKey }
-      );
+      const csna = yield getCsnaAccountId(isDev);
       const nearPublicKey = yield nearCall2(
         currentConfig.accountContractId,
         "get_chain_signature_near_account_public_key",
         { btc_public_key: btcPublicKey }
       );
-      state.saveAccount(nearAddress);
+      state.saveAccount(csna);
       state.savePublicKey(nearPublicKey);
       state.saveBtcPublicKey(btcPublicKey);
       return {
-        nearAddress,
+        nearAddress: csna,
         nearPublicKey
       };
     });
@@ -3971,7 +3994,7 @@ function setupBTCWallet({
 
 // src/index.ts
 var getVersion = () => {
-  return "0.3.21";
+  return "0.3.23";
 };
 if (typeof window !== "undefined") {
   window.__BTC_WALLET_VERSION = getVersion();