btc-wallet 0.3.7 → 0.3.9

package/dist/config.d.ts

@@ -4,6 +4,7 @@ export declare const walletConfig: Record<string, {
     accountContractId: string;
     bridgeContractId: string;
     walletUrl: string;
+    gasTokenLimit: string;
 }>;
 export declare const nearRpcUrls: {
     mainnet: string[];

package/dist/index.js

@@ -2726,21 +2726,24 @@ var walletConfig = {
     token: "nbtc-dev.testnet",
     accountContractId: "acc-dev.testnet",
     bridgeContractId: "brg-dev.testnet",
-    walletUrl: "https://wallet-dev.satoshibridge.top"
+    walletUrl: "https://wallet-dev.satoshibridge.top",
+    gasTokenLimit: "3000"
   },
   testnet: {
     base_url: "https://api.testnet.satoshibridge.top",
     token: "nbtc2-nsp.testnet",
     accountContractId: "dev2-nsp.testnet",
     bridgeContractId: "brg2-nsp.testnet",
-    walletUrl: "https://wallet-test.satoshibridge.top"
+    walletUrl: "https://wallet-test.satoshibridge.top",
+    gasTokenLimit: "3000"
   },
   mainnet: {
     base_url: "https://api.mainnet.satoshibridge.top",
     token: "",
     accountContractId: "",
     bridgeContractId: "",
-    walletUrl: "https://wallet.satoshibridge.top"
+    walletUrl: "https://wallet.satoshibridge.top",
+    gasTokenLimit: "3000"
   }
 };
 var nearRpcUrls = {
@@ -2884,6 +2887,7 @@ function pollTransactionStatuses(network, hashes) {
 }
 
 // src/core/setupBTCWallet.ts
+var import_big = __toESM(require("big.js"), 1);
 var { transfer, functionCall } = import_transactions.actionCreators;
 var state = {
   saveAccount(account) {
@@ -3100,6 +3104,10 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
         currentConfig.base_url,
         accountId
       );
+      const { transferGasTransaction, useNearPayGas } = yield getGasConfig();
+      if (!useNearPayGas && transferGasTransaction) {
+        params.transactions.unshift(transferGasTransaction);
+      }
       const newTransactions = params.transactions.map((transaction, index) => {
         let nearNonceNumber = accessKey.nonce + BigInt(1);
         if (nearNonceFromApi) {
@@ -3150,19 +3158,10 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
         csna: accountId,
         near_transactions: newTransactions.map((t) => t.txHex),
         gas_token: currentConfig.token,
-        gas_limit: "3000",
-        use_near_pay_gas: false,
+        gas_limit: currentConfig.gasTokenLimit,
+        use_near_pay_gas: useNearPayGas,
         nonce
       };
-      const nearAccount = yield provider.query({
-        request_type: "view_account",
-        account_id: accountId,
-        finality: "final"
-      });
-      const availableBalance = parseFloat(nearAccount.amount) / __pow(10, 24);
-      if (availableBalance > 0.2) {
-        intention.use_near_pay_gas = true;
-      }
       const strIntention = JSON.stringify(intention);
       const signature = yield btcContext.signMessage(strIntention);
       const result = yield uploadBTCTx(currentConfig.base_url, {
@@ -3180,6 +3179,48 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
       }
     });
   }
+  function getGasConfig() {
+    return __async(this, null, function* () {
+      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);
+      if (availableBalance > 0.2) {
+        return { useNearPayGas: true };
+      } else {
+        const gasTokenBalance = yield nearCall2(currentConfig.token, "ft_balance_of", {
+          account_id: accountId
+        });
+        if (new import_big.default(gasTokenBalance).gt(currentConfig.gasTokenLimit)) {
+          const transferGasTransaction = {
+            signerId: accountId,
+            receiverId: currentConfig.token,
+            actions: [
+              {
+                type: "FunctionCall",
+                params: {
+                  methodName: "ft_transfer_call",
+                  args: {
+                    receiver_id: currentConfig.accountContractId,
+                    amount: currentConfig.gasTokenLimit,
+                    msg: "Deposit"
+                  },
+                  gas: new import_big.default(50).mul(__pow(10, 12)).toFixed(0),
+                  deposit: "1"
+                }
+              }
+            ]
+          };
+          return { transferGasTransaction, useNearPayGas: false };
+        } else {
+          throw new Error("No enough gas token balance");
+        }
+      }
+    });
+  }
   function initWalletButton(network, wallet2) {
     return __async(this, null, function* () {
       const checkAndSetupWalletButton = () => {
@@ -3249,7 +3290,7 @@ function toHex(originalString) {
 }
 
 // src/core/btcUtils.ts
-var import_big = __toESM(require("big.js"), 1);
+var import_big2 = __toESM(require("big.js"), 1);
 function getBtcProvider() {
   if (typeof window === "undefined" || !window.btcContext) {
     throw new Error("BTC Provider is not initialized.");
@@ -3336,7 +3377,7 @@ function getBtcBalance() {
     const rawBalance = res == null ? void 0 : res.reduce((acc, cur) => acc + cur.value, 0);
     const balance = rawBalance / __pow(10, 8);
     const feeRate = yield getBtcGasPrice();
-    const maxGasFee = feeRate * 250 / __pow(10, 8);
+    const maxGasFee = feeRate * 350 / __pow(10, 8);
     const availableBalance = Math.max(0, balance - maxGasFee);
     return {
       rawBalance,
@@ -3363,7 +3404,7 @@ function estimateDepositAmount(amount, option) {
       {}
     );
     const fee = Math.max(Number(fee_min), Number(amount) * fee_rate);
-    return new import_big.default(amount).minus(fee).toFixed(0);
+    return new import_big2.default(amount).minus(fee).toFixed(0);
   });
 }
 function executeBTCDepositAndAction(_0) {
@@ -3379,7 +3420,7 @@ function executeBTCDepositAndAction(_0) {
       const _action = Object.assign(
         {},
         __spreadProps(__spreadValues({}, action), {
-          gas: new import_big.default(100).mul(__pow(10, 12)).toFixed(0)
+          gas: new import_big2.default(100).mul(__pow(10, 12)).toFixed(0)
         })
       );
       if (!btcPublicKey) {
@@ -3392,7 +3433,7 @@ function executeBTCDepositAndAction(_0) {
         isDev
       });
       _action.amount = amountWithFee;
-      if (!_action.amount || !new import_big.default(_action.amount || 0).gt(0)) {
+      if (!_action.amount || !new import_big2.default(_action.amount || 0).gt(0)) {
         throw new Error("action.amount is required or deposit amount is not enough");
       }
       const csna = yield nearCall(
@@ -3407,10 +3448,14 @@ function executeBTCDepositAndAction(_0) {
         post_actions: [_action]
       };
       const storageDepositMsg = {};
-      const accountInfo = yield nearCall(config.accountContractId, "get_account", {
-        account_id: csna
-      });
-      if (!accountInfo.nonce) {
+      const accountInfo = yield nearCall(
+        config.accountContractId,
+        "get_account",
+        {
+          account_id: csna
+        }
+      );
+      if (!(accountInfo == null ? void 0 : accountInfo.nonce)) {
         storageDepositMsg.btc_public_key = btcPublicKey;
       }
       const registerRes = yield nearCall(action.receiver_id, "storage_balance_of", {
@@ -3419,14 +3464,14 @@ function executeBTCDepositAndAction(_0) {
       if (!(registerRes == null ? void 0 : registerRes.available)) {
         storageDepositMsg.storage_deposit_msg = {
           contract_id: action.receiver_id,
-          deposit: new import_big.default(0.25).mul(__pow(10, 24)).toFixed(0),
+          deposit: new import_big2.default(0.25).mul(__pow(10, 24)).toFixed(0),
           registration_only: true
         };
       }
       if (Object.keys(storageDepositMsg).length > 0) {
         depositMsg.extra_msg = JSON.stringify(storageDepositMsg);
       }
-      console.log("deposit msg:", depositMsg);
+      console.log("get_user_deposit_address params:", { deposit_msg: depositMsg });
       const userDepositAddress = yield nearCall(
         config.bridgeContractId,
         "get_user_deposit_address",
@@ -3434,12 +3479,12 @@ function executeBTCDepositAndAction(_0) {
       );
       const _feeRate = feeRate || (yield getBtcGasPrice());
       console.log("user deposit address:", userDepositAddress);
-      console.log("deposit amount:", new import_big.default(action.amount).toNumber());
-      console.log("receive amount:", new import_big.default(_action.amount).toNumber());
+      console.log("deposit amount:", new import_big2.default(action.amount).toNumber());
+      console.log("receive amount:", new import_big2.default(_action.amount).toNumber());
       console.log("fee rate:", _feeRate);
       const txHash = yield sendBitcoin(
         userDepositAddress,
-        new import_big.default(action.amount).toNumber(),
+        new import_big2.default(action.amount).toNumber(),
         _feeRate
       );
       yield receiveDepositMsg(config.base_url, {
@@ -3460,7 +3505,7 @@ function executeBTCDepositAndAction(_0) {
 
 // src/index.ts
 var getVersion = () => {
-  return "0.3.7";
+  return "0.3.9";
 };
 if (typeof window !== "undefined") {
   window.__PARTICLE_BTC_CONNECT_VERSION = getVersion();