btc-wallet 0.5.2-beta → 0.5.4-beta

package/dist/core/btcUtils.d.ts

@@ -1,5 +1,13 @@
 import type { ENV } from '../config';
 import type { FinalExecutionOutcome, Transaction } from '@near-wallet-selector/core';
+export declare function getConfig(env: ENV): Promise<{
+    base_url: string;
+    token: string;
+    accountContractId: string;
+    bridgeContractId: string;
+    walletUrl: string;
+    bridgeUrl: string;
+}>;
 export interface AccountInfo {
     nonce: string;
     gas_token: Record<string, string>;

package/dist/index.js

@@ -99,6 +99,7 @@ __export(src_exports, {
   getAccountInfo: () => getAccountInfo,
   getBtcBalance: () => getBtcBalance,
   getBtcGasPrice: () => getBtcGasPrice,
+  getConfig: () => getConfig,
   getCsnaAccountId: () => getCsnaAccountId,
   getDepositAmount: () => getDepositAmount,
   getNBTCBalance: () => getNBTCBalance,
@@ -2951,231 +2952,8 @@ var btcRpcUrls = {
   testnet: "https://mempool.space/testnet/api"
 };
 
-// src/utils/initWalletButton.ts
-function setupWalletButton(env, wallet, originalWallet) {
-  console.log("setupWalletButton");
-  if (document.getElementById("satoshi-wallet-button")) {
-    return;
-  }
-  const iframe = createIframe({
-    iframeUrl: walletConfig[env].walletUrl,
-    iframeStyle: { width: "400px", height: "650px" }
-  });
-  iframe.addEventListener("mouseenter", () => {
-    var _a;
-    if (document.activeElement !== iframe) {
-      (_a = document.activeElement) == null ? void 0 : _a.setAttribute("tabindex", "null");
-      setTimeout(() => {
-        iframe.focus();
-      }, 0);
-    }
-  });
-  const button = createFloatingButtonWithIframe({
-    openImageUrl: "https://assets.deltatrade.ai/wallet-assets/wallet-btn.png",
-    closeImageUrl: "https://assets.deltatrade.ai/wallet-assets/wallet-btn-active.png",
-    iframe
-  });
-  setupButtonClickHandler(button, iframe, wallet, originalWallet);
-}
-function createFloatingButtonWithIframe({
-  openImageUrl,
-  closeImageUrl,
-  iframe
-}) {
-  const button = document.createElement("img");
-  button.id = "satoshi-wallet-button";
-  const isIframeVisible = localStorage.getItem("btc-wallet-iframe-visible") === "true";
-  button.src = isIframeVisible ? closeImageUrl : openImageUrl;
-  iframe.style.display = isIframeVisible ? "block" : "none";
-  const windowWidth = window.innerWidth;
-  const windowHeight = window.innerHeight;
-  const savedPosition = JSON.parse(
-    localStorage.getItem("btc-wallet-button-position") || '{"right": "20px", "bottom": "20px"}'
-  );
-  const right = Math.min(Math.max(20, parseInt(savedPosition.right)), windowWidth - 80);
-  const bottom = Math.min(Math.max(20, parseInt(savedPosition.bottom)), windowHeight - 80);
-  Object.assign(button.style, {
-    position: "fixed",
-    bottom: `${bottom}px`,
-    right: `${right}px`,
-    zIndex: "100000",
-    width: "60px",
-    height: "60px",
-    borderRadius: "50%",
-    cursor: "grab",
-    transition: "transform 0.15s ease",
-    userSelect: "none"
-  });
-  document.body.appendChild(button);
-  updateIframePosition(iframe, right, bottom, windowWidth, windowHeight);
-  let isDragging = false;
-  let startX = 0;
-  let startY = 0;
-  let initialRight = 0;
-  let initialBottom = 0;
-  let dragStartTime = 0;
-  button.addEventListener("mousedown", (e) => {
-    isDragging = true;
-    startX = e.clientX;
-    startY = e.clientY;
-    initialRight = parseInt(button.style.right);
-    initialBottom = parseInt(button.style.bottom);
-    dragStartTime = Date.now();
-    button.style.cursor = "grabbing";
-    button.style.transition = "none";
-    e.preventDefault();
-  });
-  document.addEventListener("mousemove", (e) => {
-    if (!isDragging)
-      return;
-    const deltaX = startX - e.clientX;
-    const deltaY = startY - e.clientY;
-    let newRight = initialRight + deltaX;
-    let newBottom = initialBottom + deltaY;
-    newRight = Math.min(Math.max(20, newRight), windowWidth - 80);
-    newBottom = Math.min(Math.max(20, newBottom), windowHeight - 80);
-    const snapThreshold = 20;
-    const buttonLeft = windowWidth - newRight - 60;
-    if (buttonLeft < snapThreshold) {
-      newRight = windowWidth - 80;
-    } else if (buttonLeft > windowWidth - snapThreshold - 60) {
-      newRight = 20;
-    }
-    if (newBottom < snapThreshold) {
-      newBottom = 20;
-    } else if (newBottom > windowHeight - snapThreshold - 60) {
-      newBottom = windowHeight - 80;
-    }
-    button.style.right = `${newRight}px`;
-    button.style.bottom = `${newBottom}px`;
-    updateIframePosition(iframe, newRight, newBottom, windowWidth, windowHeight);
-  });
-  document.addEventListener("mouseup", () => {
-    if (!isDragging)
-      return;
-    const dragEndTime = Date.now();
-    const isDragEvent = dragEndTime - dragStartTime > 200;
-    isDragging = false;
-    button.style.cursor = "grab";
-    button.style.transition = "transform 0.15s ease";
-    localStorage.setItem(
-      "btc-wallet-button-position",
-      JSON.stringify({
-        right: button.style.right,
-        bottom: button.style.bottom
-      })
-    );
-    if (!isDragEvent) {
-      handleButtonClick();
-    }
-  });
-  const handleButtonClick = () => {
-    const isCurrentlyVisible = iframe.style.display === "block";
-    button.style.transform = "scale(0.8)";
-    setTimeout(() => {
-      button.style.transform = "scale(1)";
-    }, 150);
-    const newVisibleState = !isCurrentlyVisible;
-    iframe.style.display = newVisibleState ? "block" : "none";
-    button.src = newVisibleState ? closeImageUrl : openImageUrl;
-    localStorage.setItem("btc-wallet-iframe-visible", String(newVisibleState));
-    setTimeout(() => {
-      if (newVisibleState) {
-        iframe.focus();
-      }
-    }, 0);
-  };
-  button.onclick = null;
-  return button;
-}
-function createIframe({
-  iframeUrl,
-  iframeStyle = {}
-}) {
-  const iframe = document.createElement("iframe");
-  iframe.id = "satoshi-wallet-iframe";
-  iframe.allow = "clipboard-read; clipboard-write";
-  iframe.src = iframeUrl;
-  const isVisible = localStorage.getItem("btc-wallet-iframe-visible") === "true";
-  Object.assign(iframe.style, __spreadValues({
-    position: "fixed",
-    bottom: "90px",
-    right: "20px",
-    zIndex: "100000",
-    boxShadow: "0 0 10px rgba(0, 0, 0, 0.1)",
-    borderRadius: "10px",
-    display: isVisible ? "block" : "none",
-    border: "none"
-  }, iframeStyle));
-  document.body.appendChild(iframe);
-  return iframe;
-}
-function setupButtonClickHandler(button, iframe, wallet, originalWallet) {
-  return __async(this, null, function* () {
-    var _a;
-    const accountId = (_a = yield wallet == null ? void 0 : wallet.getAccounts()) == null ? void 0 : _a[0].accountId;
-    const originalAccountId = originalWallet.account;
-    const originalPublicKey = yield originalWallet.getPublicKey();
-    console.log({ accountId, originalAccountId, originalPublicKey });
-    const iframeSrc = new URL(iframe.src);
-    iframeSrc.searchParams.set("origin", window.location.origin);
-    accountId && iframeSrc.searchParams.set("accountId", accountId);
-    originalAccountId && iframeSrc.searchParams.set("originalAccountId", originalAccountId);
-    originalPublicKey && iframeSrc.searchParams.set("originalPublicKey", originalPublicKey);
-    iframe.src = iframeSrc.toString();
-    window.addEventListener("message", (event) => __async(this, null, function* () {
-      var _a2, _b;
-      if (event.origin !== iframeSrc.origin)
-        return;
-      const { action, requestId, data } = event.data;
-      if (action === "signAndSendTransaction") {
-        console.log("signAndSendTransaction message", event.data);
-        try {
-          const result = yield wallet.signAndSendTransaction(data);
-          console.log("signAndSendTransaction result", result);
-          (_a2 = event.source) == null ? void 0 : _a2.postMessage(
-            {
-              requestId,
-              data,
-              success: true
-            },
-            { targetOrigin: event.origin }
-          );
-        } catch (error) {
-          console.error("signAndSendTransaction error", error);
-          (_b = event.source) == null ? void 0 : _b.postMessage(
-            {
-              requestId,
-              error: error.message,
-              success: false
-            },
-            { targetOrigin: event.origin }
-          );
-        }
-      }
-    }));
-  });
-}
-function removeWalletButton() {
-  const button = document.getElementById("satoshi-wallet-button");
-  button == null ? void 0 : button.remove();
-  const iframe = document.getElementById("satoshi-wallet-iframe");
-  iframe == null ? void 0 : iframe.remove();
-}
-function updateIframePosition(iframe, buttonRight, buttonBottom, windowWidth, windowHeight) {
-  const iframeWidth = parseInt(iframe.style.width);
-  const iframeHeight = parseInt(iframe.style.height);
-  let iframeRight = buttonRight;
-  let iframeBottom = buttonBottom + 70;
-  if (iframeRight + iframeWidth > windowWidth - 20) {
-    iframeRight = Math.max(20, windowWidth - iframeWidth - 20);
-  }
-  if (iframeBottom + iframeHeight > windowHeight - 20) {
-    iframeBottom = Math.max(20, buttonBottom - iframeHeight - 10);
-  }
-  iframe.style.right = `${iframeRight}px`;
-  iframe.style.bottom = `${iframeBottom}px`;
-}
+// src/core/btcUtils.ts
+var import_big = __toESM(require("big.js"), 1);
 
 // src/utils/nearUtils.ts
 var import_near_api_js = require("near-api-js");
@@ -3239,12 +3017,6 @@ function pollTransactionStatuses(network, hashes) {
   });
 }
 
-// src/core/setupBTCWallet.ts
-var import_big2 = __toESM(require("big.js"), 1);
-
-// src/core/btcUtils.ts
-var import_big = __toESM(require("big.js"), 1);
-
 // src/utils/request.ts
 var cache = /* @__PURE__ */ new Map();
 var defaultCacheTimeout = 3e3;
@@ -3447,11 +3219,10 @@ var NBTC_STORAGE_DEPOSIT_AMOUNT = "3000";
 var GAS_LIMIT = "50000000000000";
 var NEW_ACCOUNT_MIN_DEPOSIT_AMOUNT = "1000";
 function getBtcProvider() {
-  var _a, _b;
-  if (typeof window === "undefined" || !window.btcContext && !((_a = window.top) == null ? void 0 : _a.btcContext)) {
+  if (typeof window === "undefined" || !window.btcContext) {
     throw new Error("BTC Provider is not initialized.");
   }
-  return window.btcContext || ((_b = window.top) == null ? void 0 : _b.btcContext);
+  return window.btcContext;
 }
 function getNetwork() {
   return __async(this, null, function* () {
@@ -3514,7 +3285,6 @@ function checkGasTokenDebt(accountInfo, env, autoDeposit) {
       return;
     const config = yield getConfig(env);
     const transferAmount = hasDebtArrears ? debtAmount : relayerFeeAmount;
-    console.log("get_account:", accountInfo);
     const action = {
       receiver_id: config.accountContractId,
       amount: transferAmount.toString(),
@@ -3925,7 +3695,239 @@ function uint8ArrayToHex(uint8Array) {
   return Array.from(uint8Array).map((byte) => byte.toString(16).padStart(2, "0")).join("");
 }
 
+// src/utils/initWalletButton.ts
+function setupWalletButton(env, wallet, originalWallet) {
+  console.log("setupWalletButton");
+  if (document.getElementById("satoshi-wallet-button")) {
+    return;
+  }
+  const iframe = createIframe({
+    iframeUrl: walletConfig[env].walletUrl,
+    iframeStyle: { width: "400px", height: "650px" }
+  });
+  iframe.addEventListener("mouseenter", () => {
+    var _a;
+    if (document.activeElement !== iframe) {
+      (_a = document.activeElement) == null ? void 0 : _a.setAttribute("tabindex", "null");
+      setTimeout(() => {
+        iframe.focus();
+      }, 0);
+    }
+  });
+  const button = createFloatingButtonWithIframe({
+    openImageUrl: "https://assets.deltatrade.ai/wallet-assets/wallet-btn.png",
+    closeImageUrl: "https://assets.deltatrade.ai/wallet-assets/wallet-btn-active.png",
+    iframe
+  });
+  setupButtonClickHandler(button, iframe, wallet, originalWallet);
+}
+function createFloatingButtonWithIframe({
+  openImageUrl,
+  closeImageUrl,
+  iframe
+}) {
+  const button = document.createElement("img");
+  button.id = "satoshi-wallet-button";
+  const isIframeVisible = localStorage.getItem("btc-wallet-iframe-visible") === "true";
+  button.src = isIframeVisible ? closeImageUrl : openImageUrl;
+  iframe.style.display = isIframeVisible ? "block" : "none";
+  const windowWidth = window.innerWidth;
+  const windowHeight = window.innerHeight;
+  const savedPosition = JSON.parse(
+    localStorage.getItem("btc-wallet-button-position") || '{"right": "20px", "bottom": "20px"}'
+  );
+  const right = Math.min(Math.max(20, parseInt(savedPosition.right)), windowWidth - 80);
+  const bottom = Math.min(Math.max(20, parseInt(savedPosition.bottom)), windowHeight - 80);
+  Object.assign(button.style, {
+    position: "fixed",
+    bottom: `${bottom}px`,
+    right: `${right}px`,
+    zIndex: "100000",
+    width: "60px",
+    height: "60px",
+    borderRadius: "50%",
+    cursor: "grab",
+    transition: "transform 0.15s ease",
+    userSelect: "none"
+  });
+  document.body.appendChild(button);
+  updateIframePosition(iframe, right, bottom, windowWidth, windowHeight);
+  let isDragging = false;
+  let startX = 0;
+  let startY = 0;
+  let initialRight = 0;
+  let initialBottom = 0;
+  let dragStartTime = 0;
+  button.addEventListener("mousedown", (e) => {
+    isDragging = true;
+    startX = e.clientX;
+    startY = e.clientY;
+    initialRight = parseInt(button.style.right);
+    initialBottom = parseInt(button.style.bottom);
+    dragStartTime = Date.now();
+    button.style.cursor = "grabbing";
+    button.style.transition = "none";
+    e.preventDefault();
+  });
+  document.addEventListener("mousemove", (e) => {
+    if (!isDragging)
+      return;
+    const deltaX = startX - e.clientX;
+    const deltaY = startY - e.clientY;
+    let newRight = initialRight + deltaX;
+    let newBottom = initialBottom + deltaY;
+    newRight = Math.min(Math.max(20, newRight), windowWidth - 80);
+    newBottom = Math.min(Math.max(20, newBottom), windowHeight - 80);
+    const snapThreshold = 20;
+    const buttonLeft = windowWidth - newRight - 60;
+    if (buttonLeft < snapThreshold) {
+      newRight = windowWidth - 80;
+    } else if (buttonLeft > windowWidth - snapThreshold - 60) {
+      newRight = 20;
+    }
+    if (newBottom < snapThreshold) {
+      newBottom = 20;
+    } else if (newBottom > windowHeight - snapThreshold - 60) {
+      newBottom = windowHeight - 80;
+    }
+    button.style.right = `${newRight}px`;
+    button.style.bottom = `${newBottom}px`;
+    updateIframePosition(iframe, newRight, newBottom, windowWidth, windowHeight);
+  });
+  document.addEventListener("mouseup", () => {
+    if (!isDragging)
+      return;
+    const dragEndTime = Date.now();
+    const isDragEvent = dragEndTime - dragStartTime > 200;
+    isDragging = false;
+    button.style.cursor = "grab";
+    button.style.transition = "transform 0.15s ease";
+    localStorage.setItem(
+      "btc-wallet-button-position",
+      JSON.stringify({
+        right: button.style.right,
+        bottom: button.style.bottom
+      })
+    );
+    if (!isDragEvent) {
+      handleButtonClick();
+    }
+  });
+  const handleButtonClick = () => {
+    const isCurrentlyVisible = iframe.style.display === "block";
+    button.style.transform = "scale(0.8)";
+    setTimeout(() => {
+      button.style.transform = "scale(1)";
+    }, 150);
+    const newVisibleState = !isCurrentlyVisible;
+    iframe.style.display = newVisibleState ? "block" : "none";
+    button.src = newVisibleState ? closeImageUrl : openImageUrl;
+    localStorage.setItem("btc-wallet-iframe-visible", String(newVisibleState));
+    setTimeout(() => {
+      if (newVisibleState) {
+        iframe.focus();
+      }
+    }, 0);
+  };
+  button.onclick = null;
+  return button;
+}
+function createIframe({
+  iframeUrl,
+  iframeStyle = {}
+}) {
+  const iframe = document.createElement("iframe");
+  iframe.id = "satoshi-wallet-iframe";
+  iframe.allow = "clipboard-read; clipboard-write";
+  iframe.src = iframeUrl;
+  const isVisible = localStorage.getItem("btc-wallet-iframe-visible") === "true";
+  Object.assign(iframe.style, __spreadValues({
+    position: "fixed",
+    bottom: "90px",
+    right: "20px",
+    zIndex: "100000",
+    boxShadow: "0 0 10px rgba(0, 0, 0, 0.1)",
+    borderRadius: "10px",
+    display: isVisible ? "block" : "none",
+    border: "none"
+  }, iframeStyle));
+  document.body.appendChild(iframe);
+  return iframe;
+}
+function setupButtonClickHandler(button, iframe, wallet, originalWallet) {
+  return __async(this, null, function* () {
+    var _a;
+    const accountId = (_a = yield wallet == null ? void 0 : wallet.getAccounts()) == null ? void 0 : _a[0].accountId;
+    const originalAccountId = originalWallet.account;
+    const originalPublicKey = yield originalWallet.getPublicKey();
+    console.log({ accountId, originalAccountId, originalPublicKey });
+    const iframeSrc = new URL(iframe.src);
+    iframeSrc.searchParams.set("origin", window.location.origin);
+    accountId && iframeSrc.searchParams.set("accountId", accountId);
+    originalAccountId && iframeSrc.searchParams.set("originalAccountId", originalAccountId);
+    originalPublicKey && iframeSrc.searchParams.set("originalPublicKey", originalPublicKey);
+    iframe.src = iframeSrc.toString();
+    const actions = {
+      signAndSendTransaction: wallet.signAndSendTransaction,
+      executeBTCDepositAndAction
+    };
+    window.addEventListener("message", (event) => __async(this, null, function* () {
+      var _a2, _b;
+      if (event.origin !== iframeSrc.origin)
+        return;
+      const { action, requestId, data } = event.data;
+      try {
+        const actionFn = actions[action];
+        if (!actionFn)
+          return;
+        console.log("handleWalletAction", action, event.data);
+        const result = yield actionFn(data);
+        console.log("handleWalletAction result", action, result);
+        (_a2 = event.source) == null ? void 0 : _a2.postMessage(
+          {
+            requestId,
+            data,
+            success: true
+          },
+          { targetOrigin: event.origin }
+        );
+      } catch (error) {
+        console.error("handleWalletAction error", action, error);
+        (_b = event.source) == null ? void 0 : _b.postMessage(
+          {
+            requestId,
+            error: error.message,
+            success: false
+          },
+          { targetOrigin: event.origin }
+        );
+      }
+    }));
+  });
+}
+function removeWalletButton() {
+  const button = document.getElementById("satoshi-wallet-button");
+  button == null ? void 0 : button.remove();
+  const iframe = document.getElementById("satoshi-wallet-iframe");
+  iframe == null ? void 0 : iframe.remove();
+}
+function updateIframePosition(iframe, buttonRight, buttonBottom, windowWidth, windowHeight) {
+  const iframeWidth = parseInt(iframe.style.width);
+  const iframeHeight = parseInt(iframe.style.height);
+  let iframeRight = buttonRight;
+  let iframeBottom = buttonBottom + 70;
+  if (iframeRight + iframeWidth > windowWidth - 20) {
+    iframeRight = Math.max(20, windowWidth - iframeWidth - 20);
+  }
+  if (iframeBottom + iframeHeight > windowHeight - 20) {
+    iframeBottom = Math.max(20, buttonBottom - iframeHeight - 10);
+  }
+  iframe.style.right = `${iframeRight}px`;
+  iframe.style.bottom = `${iframeBottom}px`;
+}
+
 // src/core/setupBTCWallet.ts
+var import_big2 = __toESM(require("big.js"), 1);
 var { transfer, functionCall } = import_transactions.actionCreators;
 var STORAGE_KEYS = {
   ACCOUNT: "btc-wallet-account",
@@ -4323,17 +4325,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) {
@@ -4438,7 +4481,7 @@ function setupBTCWallet({
 
 // src/index.ts
 var getVersion = () => {
-  return "0.5.2-beta";
+  return "0.5.4-beta";
 };
 if (typeof window !== "undefined") {
   window.__BTC_WALLET_VERSION = getVersion();