btc-wallet 0.3.21 → 0.3.23

package/dist/utils/nearUtils.d.ts

@@ -4,4 +4,4 @@ export declare function nearCallFunction<T>(contractId: string, methodName: stri
     network?: string;
     provider?: ProviderService;
 }): Promise<T>;
-export declare function pollTransactionStatuses(network: string, hashes: string[]): Promise<(providers.FinalExecutionOutcome | undefined)[]>;
+export declare function pollTransactionStatuses(network: string, hashes: string[]): Promise<providers.FinalExecutionOutcome[]>;

package/esm/index.js

@@ -2788,10 +2788,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) {
@@ -2811,7 +2811,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;
   });
 }
 
@@ -3262,6 +3263,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();
@@ -3337,6 +3346,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,
@@ -3357,13 +3381,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 Big(rawDepositAmount).lt(0)) {
         throw new Error("amount must be greater than 0");
@@ -3380,11 +3398,18 @@ function executeBTCDepositAndAction(_0) {
           gas: gasLimit
         }));
       }
-      if (action) {
-        newActions.push(__spreadProps(__spreadValues({}, action), {
-          amount: (repayAction == null ? void 0 : repayAction.amount) && !fixedAmount ? new Big(receiveAmount).minus(repayAction.amount).toString() : receiveAmount.toString(),
-          gas: gasLimit
-        }));
+      if (action || !action && new Big((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 Big(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,
@@ -3574,21 +3599,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
       };
     });
@@ -3927,7 +3948,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();
@@ -3952,8 +3973,10 @@ export {
   getAccountInfo,
   getBtcBalance,
   getBtcGasPrice,
+  getCsnaAccountId,
   getDepositAmount,
   getVersion,
+  queryGasTokenArrears,
   sendBitcoin,
   setupBTCWallet,
   useAccountContract,