btc-wallet 0.5.46-beta → 0.5.48-beta

package/dist/index.js

@@ -24,6 +24,18 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __objRest = (source, exclude) => {
+  var target = {};
+  for (var prop in source)
+    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
+      target[prop] = source[prop];
+  if (source != null && __getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
+        target[prop] = source[prop];
+    }
+  return target;
+};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -3211,10 +3223,11 @@ var state_default = {
 };
 
 // src/utils/satoshi.ts
-function getNonce(url, accountId) {
-  return __async(this, null, function* () {
+function getNonce(_0) {
+  return __async(this, arguments, function* ({ env, accountId }) {
+    const config = getWalletConfig(env);
     const { result_code, result_message, result_data } = yield request(
-      `${url}/v1/nonce?csna=${accountId}`
+      `${config.base_url}/v1/nonce?csna=${accountId}`
     );
     if (result_code !== 0) {
       throw new Error(result_message);
@@ -3222,10 +3235,11 @@ function getNonce(url, accountId) {
     return result_data;
   });
 }
-function getNearNonce(url, accountId) {
-  return __async(this, null, function* () {
+function getNearNonce(_0) {
+  return __async(this, arguments, function* ({ env, accountId }) {
+    const config = getWalletConfig(env);
     const { result_code, result_message, result_data } = yield request(
-      `${url}/v1/nonceNear?csna=${accountId}`
+      `${config.base_url}/v1/nonceNear?csna=${accountId}`
     );
     if (result_code !== 0) {
       throw new Error(result_message);
@@ -3233,10 +3247,12 @@ function getNearNonce(url, accountId) {
     return result_data;
   });
 }
-function receiveTransaction(url, data) {
+function receiveTransaction(_a) {
   return __async(this, null, function* () {
+    var _b = _a, { env } = _b, data = __objRest(_b, ["env"]);
+    const config = getWalletConfig(env);
     const { result_code, result_message, result_data } = yield request(
-      `${url}/v1/receiveTransaction`,
+      `${config.base_url}/v1/receiveTransaction`,
       {
         method: "POST",
         body: data
@@ -3248,10 +3264,17 @@ function receiveTransaction(url, data) {
     return result_data;
   });
 }
-function preReceiveDepositMsg(_0, _1) {
-  return __async(this, arguments, function* (url, { btcPublicKey, depositType = 1, postActions, extraMsg }) {
+function preReceiveDepositMsg(_0) {
+  return __async(this, arguments, function* ({
+    env,
+    btcPublicKey,
+    depositType = 1,
+    postActions,
+    extraMsg
+  }) {
+    const config = getWalletConfig(env);
     const { result_code, result_message, result_data } = yield request(
-      `${url}/v1/preReceiveDepositMsg`,
+      `${config.base_url}/v1/preReceiveDepositMsg`,
       {
         method: "POST",
         body: { btcPublicKey, depositType, postActions, extraMsg }
@@ -3264,10 +3287,18 @@ function preReceiveDepositMsg(_0, _1) {
     return result_data;
   });
 }
-function receiveDepositMsg(_0, _1) {
-  return __async(this, arguments, function* (url, { btcPublicKey, txHash, depositType = 1, postActions, extraMsg }) {
+function receiveDepositMsg(_0) {
+  return __async(this, arguments, function* ({
+    env,
+    btcPublicKey,
+    txHash,
+    depositType = 1,
+    postActions,
+    extraMsg
+  }) {
+    const config = getWalletConfig(env);
     const { result_code, result_message, result_data } = yield request(
-      `${url}/v1/receiveDepositMsg`,
+      `${config.base_url}/v1/receiveDepositMsg`,
       {
         method: "POST",
         body: { btcPublicKey, txHash, depositType, postActions, extraMsg }
@@ -3280,28 +3311,41 @@ function receiveDepositMsg(_0, _1) {
     return result_data;
   });
 }
-function checkBridgeTransactionStatus(url, txHash) {
-  return __async(this, null, function* () {
-    const { result_code, result_message, result_data } = yield request(`${url}/v1/bridgeFromTx?fromTxHash=${txHash}&fromChainId=1`, {
-      timeout: 3 * 60 * 60 * 1e3,
-      pollingInterval: 5e3,
-      maxPollingAttempts: 3e3,
-      shouldStopPolling: (res) => {
-        var _a;
-        const status = ((_a = res.result_data) == null ? void 0 : _a.Status) || 0;
-        return res.result_code === 0 && (status === 4 || status >= 50);
+function checkBridgeTransactionStatus(_0) {
+  return __async(this, arguments, function* ({
+    txHash,
+    fromChain,
+    env
+  }) {
+    const config = getWalletConfig(env);
+    const { result_code, result_message, result_data } = yield request(
+      `${config.base_url}/v1/bridgeFromTx?fromTxHash=${txHash}&fromChainId=${fromChain === "NEAR" ? 2 : 1}`,
+      {
+        timeout: 3 * 60 * 60 * 1e3,
+        pollingInterval: 5e3,
+        maxPollingAttempts: 3e3,
+        shouldStopPolling: (res) => {
+          var _a;
+          const status = ((_a = res.result_data) == null ? void 0 : _a.Status) || 0;
+          return res.result_code === 0 && (status === 4 || status >= 50);
+        }
       }
-    });
+    );
     console.log("checkTransactionStatus resp:", { result_code, result_message, result_data });
     if ((result_data == null ? void 0 : result_data.Status) !== 4) {
       throw new Error(result_message || `Transaction failed, status: ${result_data == null ? void 0 : result_data.Status}`);
     }
+    console.log("checkBridgeTransactionStatus resp:", result_data);
     return result_data;
   });
 }
-function checkBtcTransactionStatus(url, sig) {
-  return __async(this, null, function* () {
-    const { result_code, result_message, result_data } = yield request(`${url}/v1/btcTx?sig=${toHex(sig)}`, {
+function checkBtcTransactionStatus(_0) {
+  return __async(this, arguments, function* ({
+    signature,
+    env
+  }) {
+    const config = getWalletConfig(env);
+    const { result_code, result_message, result_data } = yield request(`${config.base_url}/v1/btcTx?sig=${toHex(signature)}`, {
       timeout: 3e5,
       pollingInterval: 5e3,
       maxPollingAttempts: 60,
@@ -3311,16 +3355,17 @@ function checkBtcTransactionStatus(url, sig) {
         return res.result_code === 0 && (status === 3 || status >= 10);
       }
     });
-    console.log("checkBtcTransactionStatus resp:", { result_code, result_message, result_data });
     if ((result_data == null ? void 0 : result_data.Status) !== 3) {
       throw new Error(result_message || `Transaction failed, status: ${result_data == null ? void 0 : result_data.Status}`);
     }
+    console.log("checkBtcTransactionStatus resp:", { result_code, result_message, result_data });
     return result_data;
   });
 }
-function getWhitelist(url) {
-  return __async(this, null, function* () {
-    const data = yield request(`${url}/v1/whitelist/users`).catch((error) => {
+function getWhitelist(_0) {
+  return __async(this, arguments, function* ({ env }) {
+    const config = getWalletConfig(env);
+    const data = yield request(`${config.base_url}/v1/whitelist/users`).catch((error) => {
       console.error("getWhitelist error:", error);
       return [];
     });
@@ -3434,7 +3479,7 @@ function convertTransactionToTxHex(_0) {
     const accessKey = __spreadProps(__spreadValues({}, rawAccessKey), {
       nonce: BigInt((rawAccessKey == null ? void 0 : rawAccessKey.nonce) || 0)
     });
-    const nearNonceFromApi = yield getNearNonce(currentConfig.base_url, accountId);
+    const nearNonceFromApi = yield getNearNonce({ env, accountId });
     let nearNonceNumber = accessKey.nonce + BigInt(1);
     if (nearNonceFromApi) {
       nearNonceNumber = BigInt(nearNonceFromApi) > nearNonceNumber ? BigInt(nearNonceFromApi) : nearNonceNumber;
@@ -3471,7 +3516,7 @@ function convertTransactionToTxHex(_0) {
 function calculateGasLimit(params) {
   return __async(this, null, function* () {
     const trans = [...params.transactions];
-    console.log("raw trans:", trans);
+    console.log("calculateGasLimit raw trans:", trans);
     const { gasLimit } = yield calculateGasStrategy(params);
     return gasLimit;
   });
@@ -3959,14 +4004,16 @@ function executeBTCDepositAndAction(_0) {
         "Fee Rate": _feeRate
       });
       const postActionsStr = newActions.length > 0 ? JSON.stringify(newActions) : void 0;
-      yield preReceiveDepositMsg(config.base_url, {
+      yield preReceiveDepositMsg({
+        env,
         btcPublicKey,
         depositType: postActionsStr || depositMsg.extra_msg ? 1 : 0,
         postActions: postActionsStr,
         extraMsg: depositMsg.extra_msg
       });
       const txHash = yield sendBitcoin(userDepositAddress, depositAmount, _feeRate);
-      yield receiveDepositMsg(config.base_url, {
+      yield receiveDepositMsg({
+        env,
         btcPublicKey,
         txHash,
         depositType: postActionsStr || depositMsg.extra_msg ? 1 : 0,
@@ -3976,8 +4023,11 @@ function executeBTCDepositAndAction(_0) {
       if (!pollResult) {
         return txHash;
       }
-      const checkTransactionStatusRes = yield checkBridgeTransactionStatus(config.base_url, txHash);
-      console.log("checkBridgeTransactionStatus resp:", checkTransactionStatusRes);
+      const checkTransactionStatusRes = yield checkBridgeTransactionStatus({
+        txHash,
+        fromChain: "BTC",
+        env
+      });
       const network = yield getNetwork();
       const result = yield pollTransactionStatuses(network, [checkTransactionStatusRes.ToTxHash]);
       return result;
@@ -4001,8 +4051,7 @@ function checkSatoshiWhitelist(btcAccountId, env = "mainnet") {
     }
     if (!btcAccountId)
       return;
-    const config = getWalletConfig(env);
-    const whitelist = yield getWhitelist(config.base_url);
+    const whitelist = yield getWhitelist({ env });
     if (!(whitelist == null ? void 0 : whitelist.length))
       return;
     const isWhitelisted = whitelist.includes(btcAccountId);
@@ -4316,13 +4365,13 @@ function uint8ArrayToHex(uint8Array) {
 }
 
 // src/utils/initWalletButton.ts
-function setupWalletButton(env, wallet, originalWallet) {
-  console.log("setupWalletButton");
+function setupWalletButton(env, wallet, originalWallet, walletUrl) {
+  console.log(`setupWalletButton ${walletUrl || ""}`);
   if (document.getElementById("satoshi-wallet-button")) {
     return;
   }
   const iframe = createIframe({
-    iframeUrl: walletConfig[env].walletUrl,
+    iframeUrl: walletUrl || walletConfig[env].walletUrl,
     iframeStyle: { width: "400px", height: "650px" }
   });
   iframe.addEventListener("mouseenter", () => {
@@ -4367,7 +4416,8 @@ function createFloatingButtonWithIframe({
     height: "60px",
     cursor: "grab",
     transition: "transform 0.15s ease",
-    userSelect: "none"
+    userSelect: "none",
+    touchAction: "none"
   });
   document.body.appendChild(button);
   updateIframePosition(iframe, right, bottom, windowWidth, windowHeight);
@@ -4378,21 +4428,41 @@ function createFloatingButtonWithIframe({
   let initialBottom = 0;
   let dragStartTime = 0;
   button.addEventListener("mousedown", (e) => {
+    startDrag(e.clientX, e.clientY);
+    e.preventDefault();
+  });
+  button.addEventListener("touchstart", (e) => {
+    if (e.touches.length === 1) {
+      const touch = e.touches[0];
+      startDrag(touch.clientX, touch.clientY);
+      e.preventDefault();
+    }
+  });
+  function startDrag(clientX, clientY) {
     isDragging = true;
-    startX = e.clientX;
-    startY = e.clientY;
+    startX = clientX;
+    startY = 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;
+    moveButton(e.clientX, e.clientY);
+  });
+  document.addEventListener("touchmove", (e) => {
+    if (!isDragging || e.touches.length !== 1)
+      return;
+    const touch = e.touches[0];
+    moveButton(touch.clientX, touch.clientY);
+    e.preventDefault();
+  });
+  function moveButton(clientX, clientY) {
+    const deltaX = startX - clientX;
+    const deltaY = startY - clientY;
     let newRight = initialRight + deltaX;
     let newBottom = initialBottom + deltaY;
     newRight = Math.min(Math.max(20, newRight), windowWidth - 80);
@@ -4412,8 +4482,17 @@ function createFloatingButtonWithIframe({
     button.style.right = `${newRight}px`;
     button.style.bottom = `${newBottom}px`;
     updateIframePosition(iframe, newRight, newBottom, windowWidth, windowHeight);
-  });
+  }
   document.addEventListener("mouseup", () => {
+    endDrag();
+  });
+  document.addEventListener("touchend", () => {
+    endDrag();
+  });
+  document.addEventListener("touchcancel", () => {
+    endDrag();
+  });
+  function endDrag() {
     if (!isDragging)
       return;
     const dragEndTime = Date.now();
@@ -4431,7 +4510,7 @@ function createFloatingButtonWithIframe({
     if (!isDragEvent) {
       handleButtonClick();
     }
-  });
+  }
   const handleButtonClick = () => {
     const isCurrentlyVisible = iframe.style.display === "block";
     button.style.transform = "scale(0.8)";
@@ -4640,7 +4719,7 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
           if (btcPublicKey) {
             yield getNearAccountByBtcPublicKey(btcPublicKey);
             removeWalletButton();
-            setupWalletButton(env, wallet, btcContext);
+            setupWalletButton(env, wallet, btcContext, metadata.walletUrl);
           }
         } else {
           removeWalletButton();
@@ -4803,7 +4882,7 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
           })
         )
       );
-      const nonceFromApi = yield getNonce(currentConfig.base_url, csna);
+      const nonceFromApi = yield getNonce({ env, accountId: csna });
       const nonceFromContract = (accountInfo == null ? void 0 : accountInfo.nonce) || 0;
       const nonce = Number(nonceFromApi) > Number(nonceFromContract) ? String(nonceFromApi) : String(nonceFromContract);
       const intention = {
@@ -4814,16 +4893,17 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
         gas_limit: gasLimit,
         use_near_pay_gas: useNearPayGas,
         nonce,
-        replace: env === "private_mainnet" ? true : void 0
+        replace: true
       };
       const strIntention = JSON.stringify(intention);
       const signature = yield btcContext.signMessage(strIntention);
-      yield receiveTransaction(currentConfig.base_url, {
+      yield receiveTransaction({
+        env,
         sig: signature,
         btcPubKey: state_default.getBtcPublicKey(),
         data: toHex(strIntention)
       });
-      yield checkBtcTransactionStatus(currentConfig.base_url, signature);
+      yield checkBtcTransactionStatus({ signature, env });
       const hash = newTrans.slice(1).map((t) => t.hash);
       console.log("txHash:", hash);
       const result = yield pollTransactionStatuses(options.network.networkId, hash);
@@ -4852,7 +4932,8 @@ function setupBTCWallet({
   deprecated = false,
   autoConnect = true,
   syncLogOut = true,
-  env = "mainnet"
+  env = "mainnet",
+  walletUrl
 } = {}) {
   console.log("\u26A1\uFE0F BTC Wallet Version:", getVersion(), "env:", env);
   const btcWallet = () => __async(this, null, function* () {
@@ -4868,7 +4949,8 @@ function setupBTCWallet({
         available: true,
         autoConnect,
         syncLogOut,
-        env
+        env,
+        walletUrl
       },
       init: BTCWallet
     };
@@ -4950,7 +5032,7 @@ function getGroup(state) {
 
 // src/index.ts
 var getVersion = () => {
-  return "0.5.46-beta";
+  return "0.5.48-beta";
 };
 if (typeof window !== "undefined") {
   window.__BTC_WALLET_VERSION = getVersion();