btc-wallet 0.5.3-beta → 0.5.5-beta

package/dist/index.js

@@ -3405,6 +3405,9 @@ function getCsnaAccountId(env) {
     const config = yield getConfig(env);
     const { getPublicKey } = getBtcProvider();
     const btcPublicKey = yield getPublicKey();
+    if (!btcPublicKey) {
+      throw new Error("BTC Public Key is not available.");
+    }
     const csna = yield nearCall(
       config.accountContractId,
       "get_chain_signature_near_account_id",
@@ -3523,7 +3526,7 @@ function executeBTCDepositAndAction(_0) {
 }
 function checkSatoshiWhitelist(btcAccountId, env = "mainnet") {
   return __async(this, null, function* () {
-    if (env !== "private_mainnet")
+    if (env !== "mainnet")
       return;
     const hasShownNotice = localStorage.getItem("btc-wallet-private-mainnet-notice");
     if (!hasShownNotice) {
@@ -4046,6 +4049,7 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
         yield checkBtcNetwork(walletNetwork);
         if (!state.isValid()) {
           state.clear();
+          console.log("setupBtcContextListeners clear");
         }
         validateWalletState();
         const btcContext = window.btcContext;
@@ -4068,6 +4072,7 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
       context.on("updatePublicKey", (btcPublicKey) => __async(this, null, function* () {
         console.log("updatePublicKey");
         state.clear();
+        console.log("updatePublicKey clear");
         try {
           const { nearAddress, nearPublicKey } = yield getNearAccountByBtcPublicKey(btcPublicKey);
           if (!nearAddress || !nearPublicKey) {
@@ -4079,8 +4084,6 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
           yield handleConnectionUpdate();
         } catch (error) {
           console.error("Error updating public key:", error);
-          state.clear();
-          emitter.emit("accountsChanged", { accounts: [] });
         }
       }));
       context.on("btcLoginError", () => __async(this, null, function* () {
@@ -4325,17 +4328,58 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
   }
   function calculateGasStrategy(gasTokenBalance, transactions2) {
     return __async(this, null, function* () {
+      var _a;
       const accountId = state.getAccount();
+      const nearAccount = yield provider.query({
+        request_type: "view_account",
+        account_id: accountId,
+        finality: "final"
+      });
+      const availableBalance = parseFloat(nearAccount.amount) / __pow(10, 24);
+      console.log("available near balance:", availableBalance);
+      console.log("available gas token balance:", gasTokenBalance);
       const convertTx = yield Promise.all(
         transactions2.map((transaction, index) => convertTransactionToTxHex(transaction, index))
       );
-      const adjustedGas = yield getPredictedGasAmount(
-        currentConfig.accountContractId,
-        currentConfig.token,
-        convertTx.map((t) => t.txHex)
-      );
-      const transferTx = yield createGasTokenTransfer(accountId, adjustedGas);
-      return recalculateGasWithTransfer(transferTx, convertTx, false);
+      if (availableBalance > 0.5) {
+        console.log("near balance is enough, get the protocol fee of each transaction");
+        const gasTokens = yield nearCall2(
+          currentConfig.accountContractId,
+          "list_gas_token",
+          { token_ids: [currentConfig.token] }
+        );
+        console.log("list_gas_token gas tokens:", gasTokens);
+        const perTxFee = Math.max(
+          Number(((_a = gasTokens[currentConfig.token]) == null ? void 0 : _a.per_tx_protocol_fee) || 0),
+          100
+        );
+        console.log("perTxFee:", perTxFee);
+        const protocolFee = new import_big2.default(perTxFee || "0").mul(convertTx.length).toFixed(0);
+        console.log("protocolFee:", protocolFee);
+        if (new import_big2.default(gasTokenBalance).gte(protocolFee)) {
+          console.log("use near pay gas and enough gas token balance");
+          return { useNearPayGas: true, gasLimit: protocolFee };
+        } else {
+          console.log("use near pay gas and not enough gas token balance");
+          const transferTx = yield createGasTokenTransfer(accountId, protocolFee);
+          return recalculateGasWithTransfer(transferTx, convertTx, true, perTxFee.toString());
+        }
+      } else {
+        console.log("near balance is not enough, predict the gas token amount required");
+        const adjustedGas = yield getPredictedGasAmount(
+          currentConfig.accountContractId,
+          currentConfig.token,
+          convertTx.map((t) => t.txHex)
+        );
+        if (new import_big2.default(gasTokenBalance).gte(adjustedGas)) {
+          console.log("use gas token and gas token balance is enough");
+          return { useNearPayGas: false, gasLimit: adjustedGas };
+        } else {
+          console.log("use gas token and gas token balance is not enough, need to transfer");
+          const transferTx = yield createGasTokenTransfer(accountId, adjustedGas);
+          return recalculateGasWithTransfer(transferTx, convertTx, false);
+        }
+      }
     });
   }
   function convertTransactionToTxHex(transaction, index = 0) {
@@ -4440,7 +4484,7 @@ function setupBTCWallet({
 
 // src/index.ts
 var getVersion = () => {
-  return "0.5.3-beta";
+  return "0.5.5-beta";
 };
 if (typeof window !== "undefined") {
   window.__BTC_WALLET_VERSION = getVersion();