btc-wallet 0.5.55-beta → 0.5.57-beta

package/dist/utils/satoshi.d.ts

@@ -100,9 +100,12 @@ interface CalculateGasLimitParams {
     transactions: Transaction[];
     csna: string;
     env: ENV;
+    gasStrategy?: 'auto' | 'near' | 'btc';
 }
 export declare function calculateGasLimit(params: CalculateGasLimitParams): Promise<string>;
-export declare function calculateGasStrategy({ csna, transactions, env, }: CalculateGasLimitParams): Promise<{
+export declare function calculateGasStrategy({ csna, transactions, env, gasStrategy, }: CalculateGasLimitParams & {
+    gasStrategy?: 'auto' | 'near' | 'btc';
+}): Promise<{
     transferGasTransaction?: Transaction;
     useNearPayGas: boolean;
     gasLimit: string;

package/esm/index.js

@@ -478,7 +478,7 @@ var MobileWalletConnect = class {
       case "okx":
         return `okx://wallet/dapp/url?dappUrl=${encodeURIComponent(url)}`;
       case "bitget":
-        return `https://bkcode.vip?action=dapp&url=${encodeURIComponent(url)}`;
+        return `bitkeep://bkconnect?action=dapp&url=${encodeURIComponent(url)}`;
       case "xverse":
         return `xverse://browser?url=${encodeURIComponent(url)}`;
       default:
@@ -564,9 +564,13 @@ var InjectedConnector = class extends BaseConnector {
   }
   requestAccounts() {
     return __async(this, null, function* () {
-      if (isMobile() && !this.getProvider()) {
-        MobileWalletConnect.redirectToWallet(this.metadata.id);
-        return [];
+      if (isMobile()) {
+        try {
+          this.getProvider();
+        } catch (error) {
+          yield MobileWalletConnect.redirectToWallet(this.metadata.id);
+          return [];
+        }
       }
       const accounts = yield this.getProviderOrThrow().requestAccounts();
       console.log("network:", yield this.getNetwork());
@@ -2702,7 +2706,8 @@ function BtcWalletSelectorContextProvider({
     new XverseConnector(),
     new OKXConnector(),
     new BitgetConnector(),
-    new MagicEdenConnector()
+    new MagicEdenConnector(),
+    new BybitConnector()
   ];
   const walletSelectorContextValue = useMemo6(() => {
     const simpleFn = {};
@@ -2941,7 +2946,7 @@ var nearRpcUrls = {
   mainnet: [
     "https://near.lava.build",
     "https://rpc.mainnet.near.org",
-    "https://mw.rpc.fastnear.com",
+    "https://free.rpc.fastnear.com",
     "https://near.drpc.org"
   ],
   testnet: ["https://rpc.testnet.near.org"]
@@ -3514,7 +3519,8 @@ function calculateGasStrategy(_0) {
   return __async(this, arguments, function* ({
     csna,
     transactions: transactions2,
-    env
+    env,
+    gasStrategy = "auto"
   }) {
     var _a;
     const currentConfig = getWalletConfig(env);
@@ -3546,6 +3552,7 @@ function calculateGasStrategy(_0) {
     const nearAvailableBalance = new Big(nearBalance).minus(transferAmount.near).toNumber();
     console.log("available near balance:", nearAvailableBalance);
     console.log("available gas token balance:", gasTokenBalance);
+    console.log("gas strategy:", gasStrategy);
     const convertTx = yield Promise.all(
       transactions2.map(
         (transaction, index) => convertTransactionToTxHex({
@@ -3557,8 +3564,20 @@ function calculateGasStrategy(_0) {
         })
       )
     );
-    if (nearAvailableBalance > 0.5) {
-      console.log("near balance is enough, get the protocol fee of each transaction");
+    let useNearPayGas = false;
+    let perTxFee;
+    if (gasStrategy === "near") {
+      console.log("Forcing NEAR as gas token based on gasStrategy");
+      useNearPayGas = true;
+    } else if (gasStrategy === "btc") {
+      console.log("Forcing BTC token as gas token based on gasStrategy");
+      useNearPayGas = false;
+    } else if (nearAvailableBalance > 0.5) {
+      console.log("NEAR balance is enough, using NEAR to pay for gas");
+      useNearPayGas = true;
+    }
+    let gasAmount;
+    if (useNearPayGas) {
       const gasTokens = yield nearCallFunction(
         currentConfig.accountContractId,
         "list_gas_token",
@@ -3566,39 +3585,29 @@ function calculateGasStrategy(_0) {
         { network: currentConfig.network }
       );
       console.log("list_gas_token gas tokens:", gasTokens);
-      const perTxFee = Math.max(
-        Number(((_a = gasTokens[currentConfig.btcToken]) == null ? void 0 : _a.per_tx_protocol_fee) || 0),
-        100
-      );
+      const fee = Math.max(Number(((_a = gasTokens[currentConfig.btcToken]) == null ? void 0 : _a.per_tx_protocol_fee) || 0), 100);
+      perTxFee = fee.toString();
       console.log("perTxFee:", perTxFee);
-      const protocolFee = new Big(perTxFee || "0").mul(convertTx.length).toFixed(0);
-      console.log("protocolFee:", protocolFee);
-      const transferTx = yield createGasTokenTransfer({ csna, amount: protocolFee, env });
-      return recalculateGasWithTransfer({
-        csna,
-        transferTx,
-        transactions: convertTx,
-        useNearPayGas: true,
-        perTxFee: perTxFee.toString(),
-        env
-      });
+      gasAmount = new Big(perTxFee || "0").mul(convertTx.length).toFixed(0);
     } else {
-      console.log("near balance is not enough, predict the gas token amount required");
-      const adjustedGas = yield getPredictedGasAmount({
+      gasAmount = yield getPredictedGasAmount({
         accountContractId: currentConfig.accountContractId,
         tokenId: currentConfig.btcToken,
         transactions: convertTx.map((t) => t.txHex),
         env
       });
-      const transferTx = yield createGasTokenTransfer({ csna, amount: adjustedGas, env });
-      return recalculateGasWithTransfer({
-        csna,
-        transferTx,
-        transactions: convertTx,
-        useNearPayGas: false,
-        env
-      });
     }
+    console.log("useNearPayGas:", useNearPayGas);
+    console.log("gasAmount:", gasAmount);
+    const transferTx = yield createGasTokenTransfer({ csna, amount: gasAmount, env });
+    return recalculateGasWithTransfer({
+      csna,
+      transferTx,
+      transactions: convertTx,
+      useNearPayGas,
+      perTxFee,
+      env
+    });
   });
 }
 function createGasTokenTransfer(_0) {
@@ -4423,13 +4432,14 @@ function createFloatingButtonWithIframe({
     position: "fixed",
     bottom: `${bottom}px`,
     right: `${right}px`,
-    zIndex: "100000",
+    zIndex: "2147483647",
     width: "60px",
     height: "60px",
     cursor: "grab",
     transition: "transform 0.15s ease",
     userSelect: "none",
-    touchAction: "none"
+    touchAction: "none",
+    pointerEvents: "auto"
   });
   document.body.appendChild(button);
   updateIframePosition(iframe, right, bottom, windowWidth, windowHeight);
@@ -4439,17 +4449,21 @@ function createFloatingButtonWithIframe({
   let initialRight = 0;
   let initialBottom = 0;
   let dragStartTime = 0;
-  button.addEventListener("mousedown", (e) => {
+  const handleMouseDown = (e) => {
     startDrag(e.clientX, e.clientY);
     e.preventDefault();
-  });
-  button.addEventListener("touchstart", (e) => {
+    e.stopPropagation();
+  };
+  const handleTouchStart = (e) => {
     if (e.touches.length === 1) {
       const touch = e.touches[0];
       startDrag(touch.clientX, touch.clientY);
       e.preventDefault();
+      e.stopPropagation();
     }
-  });
+  };
+  button.addEventListener("mousedown", handleMouseDown, { capture: true });
+  button.addEventListener("touchstart", handleTouchStart, { capture: true });
   function startDrag(clientX, clientY) {
     isDragging = true;
     startX = clientX;
@@ -4460,18 +4474,23 @@ function createFloatingButtonWithIframe({
     button.style.cursor = "grabbing";
     button.style.transition = "none";
   }
-  document.addEventListener("mousemove", (e) => {
+  const handleMouseMove = (e) => {
     if (!isDragging)
       return;
     moveButton(e.clientX, e.clientY);
-  });
-  document.addEventListener("touchmove", (e) => {
+    e.preventDefault();
+    e.stopPropagation();
+  };
+  const handleTouchMove = (e) => {
     if (!isDragging || e.touches.length !== 1)
       return;
     const touch = e.touches[0];
     moveButton(touch.clientX, touch.clientY);
     e.preventDefault();
-  });
+    e.stopPropagation();
+  };
+  document.addEventListener("mousemove", handleMouseMove, { capture: true });
+  document.addEventListener("touchmove", handleTouchMove, { capture: true });
   function moveButton(clientX, clientY) {
     const deltaX = startX - clientX;
     const deltaY = startY - clientY;
@@ -4495,15 +4514,23 @@ function createFloatingButtonWithIframe({
     button.style.bottom = `${newBottom}px`;
     updateIframePosition(iframe, newRight, newBottom, windowWidth, windowHeight);
   }
-  document.addEventListener("mouseup", () => {
-    endDrag();
-  });
-  document.addEventListener("touchend", () => {
+  const handleMouseUp = (e) => {
+    if (isDragging) {
+      e.preventDefault();
+      e.stopPropagation();
+    }
     endDrag();
-  });
-  document.addEventListener("touchcancel", () => {
+  };
+  const handleTouchEnd = (e) => {
+    if (isDragging) {
+      e.preventDefault();
+      e.stopPropagation();
+    }
     endDrag();
-  });
+  };
+  document.addEventListener("mouseup", handleMouseUp, { capture: true });
+  document.addEventListener("touchend", handleTouchEnd, { capture: true });
+  document.addEventListener("touchcancel", handleTouchEnd, { capture: true });
   function endDrag() {
     if (!isDragging)
       return;
@@ -4553,11 +4580,12 @@ function createIframe({
     position: "fixed",
     bottom: "90px",
     right: "20px",
-    zIndex: "100000",
+    zIndex: "2147483646",
     boxShadow: "0 0 10px rgba(0, 0, 0, 0.1)",
     borderRadius: "10px",
     display: isVisible ? "block" : "none",
-    border: "none"
+    border: "none",
+    pointerEvents: "auto"
   }, iframeStyle));
   document.body.appendChild(iframe);
   return iframe;
@@ -4738,7 +4766,6 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
             });
           }
         } else {
-          removeWalletButton();
           connectionUpdateTimeout = setTimeout(() => {
             handleConnectionUpdate();
           }, 5e3);
@@ -4877,7 +4904,8 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
       const { transferGasTransaction, useNearPayGas, gasLimit } = yield calculateGasStrategy({
         csna,
         transactions: trans,
-        env
+        env,
+        gasStrategy: metadata.gasStrategy
       });
       console.log("transferGasTransaction:", transferGasTransaction);
       console.log("useNearPayGas:", useNearPayGas);
@@ -4949,9 +4977,10 @@ function setupBTCWallet({
   autoConnect = true,
   syncLogOut = true,
   env = "mainnet",
-  walletUrl
+  walletUrl,
+  gasStrategy = "auto"
 } = {}) {
-  console.log("\u26A1\uFE0F BTC Wallet Version:", getVersion(), "env:", env);
+  console.log("\u26A1\uFE0F BTC Wallet Version:", getVersion(), "env:", env, "gasStrategy:", gasStrategy);
   const btcWallet = () => __async(this, null, function* () {
     return {
       id: "btc-wallet",
@@ -4966,7 +4995,8 @@ function setupBTCWallet({
         autoConnect,
         syncLogOut,
         env,
-        walletUrl
+        walletUrl,
+        gasStrategy
       },
       init: BTCWallet
     };
@@ -5050,7 +5080,7 @@ function openChainModal() {
       return div;
     };
     return yield Dialog.openModal({
-      title: "Choose Chain",
+      title: "Choose Wallet",
       titleStyle: "font-size: 18px; font-weight: 600; color: #fff; text-align: center;padding-bottom: 10px;",
       content
     });
@@ -5069,7 +5099,7 @@ function getGroup(state) {
 
 // src/index.ts
 var getVersion = () => {
-  return "0.5.55-beta";
+  return "0.5.57-beta";
 };
 if (typeof window !== "undefined") {
   window.__BTC_WALLET_VERSION = getVersion();