btc-wallet 0.4.5-beta → 0.4.7-beta

package/dist/core/btcUtils.d.ts

@@ -50,6 +50,7 @@ export declare function getDepositAmount(amount: string, option?: {
     totalDepositAmount: number;
     protocolFee: number;
     repayAmount: string | number;
+    newAccountMinDepositAmount: string | number;
 }>;
 export declare function getCsnaAccountId(env: ENV): Promise<string>;
 interface ExecuteBTCDepositAndActionParams<T extends boolean = true> {

package/dist/index.js

@@ -2675,35 +2675,107 @@ function createFloatingButtonWithIframe({
 }) {
   const button = document.createElement("img");
   button.id = "satoshi-wallet-button";
-  button.src = openImageUrl;
+  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: "20px",
-    right: "20px",
+    bottom: `${bottom}px`,
+    right: `${right}px`,
     zIndex: "100000",
     width: "60px",
     height: "60px",
     borderRadius: "50%",
-    cursor: "pointer",
-    transition: "transform 0.15s ease"
+    cursor: "grab",
+    transition: "transform 0.15s ease",
+    userSelect: "none"
   });
   document.body.appendChild(button);
-  const iframeVisible = localStorage.getItem("iframeVisible") === "true" || localStorage.getItem("iframeVisible") === null;
-  button.src = iframeVisible ? closeImageUrl : openImageUrl;
-  iframe.style.display = iframeVisible ? "block" : "none";
-  button.onclick = function() {
+  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);
-    iframe.style.display = isCurrentlyVisible ? "none" : "block";
-    button.src = isCurrentlyVisible ? openImageUrl : closeImageUrl;
-    localStorage.setItem("iframeVisible", String(!isCurrentlyVisible));
+    const newVisibleState = !isCurrentlyVisible;
+    iframe.style.display = newVisibleState ? "block" : "none";
+    button.src = newVisibleState ? closeImageUrl : openImageUrl;
+    localStorage.setItem("btc-wallet-iframe-visible", String(newVisibleState));
     setTimeout(() => {
-      iframe.focus();
+      if (newVisibleState) {
+        iframe.focus();
+      }
     }, 0);
   };
+  button.onclick = null;
   return button;
 }
 function createIframe({
@@ -2714,6 +2786,7 @@ function createIframe({
   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",
@@ -2721,7 +2794,7 @@ function createIframe({
     zIndex: "100000",
     boxShadow: "0 0 10px rgba(0, 0, 0, 0.1)",
     borderRadius: "10px",
-    display: "block",
+    display: isVisible ? "block" : "none",
     border: "none"
   }, iframeStyle));
   document.body.appendChild(iframe);
@@ -2779,6 +2852,20 @@ function removeWalletButton() {
   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/utils/nearUtils.ts
 var import_near_api_js = require("near-api-js");
@@ -3247,6 +3334,7 @@ var import_coinselect = __toESM(require("coinselect"), 1);
 var NEAR_STORAGE_DEPOSIT_AMOUNT = "1250000000000000000000";
 var NBTC_STORAGE_DEPOSIT_AMOUNT = "3000";
 var GAS_LIMIT = "50000000000000";
+var NEW_ACCOUNT_MIN_DEPOSIT_AMOUNT = "1000";
 function getBtcProvider() {
   if (typeof window === "undefined" || !window.btcContext) {
     throw new Error("BTC Provider is not initialized.");
@@ -3416,12 +3504,14 @@ function getDepositAmount(amount, option) {
     } = yield nearCall(config.bridgeContractId, "get_config", {});
     const depositAmount = Math.max(Number(min_deposit_amount), Number(amount));
     const protocolFee = Math.max(Number(fee_min), Number(depositAmount) * fee_rate);
-    const totalDepositAmount = new import_big.default(depositAmount).plus(protocolFee).plus(repayAmount).round(0, import_big.default.roundDown).toNumber();
+    const newAccountMinDepositAmount = !(accountInfo == null ? void 0 : accountInfo.nonce) ? NEW_ACCOUNT_MIN_DEPOSIT_AMOUNT : 0;
+    const totalDepositAmount = new import_big.default(depositAmount).plus(protocolFee).plus(repayAmount).plus(newAccountMinDepositAmount).round(0, import_big.default.roundDown).toNumber();
     return {
       depositAmount,
       totalDepositAmount,
       protocolFee,
-      repayAmount
+      repayAmount,
+      newAccountMinDepositAmount
     };
   });
 }
@@ -3548,6 +3638,14 @@ function checkSatoshiWhitelist(btcAccountId, env = "mainnet") {
   return __async(this, null, function* () {
     if (env !== "private_mainnet")
       return;
+    const hasShownNotice = localStorage.getItem("btc-wallet-private-mainnet-notice");
+    if (!hasShownNotice) {
+      Dialog.alert({
+        title: "Notice",
+        message: "You are currently using Satoshi Private Mainnet. This is a private version for testing. Please try a small amount of assets in Ramp"
+      });
+      localStorage.setItem("btc-wallet-private-mainnet-notice", "true");
+    }
     if (!btcAccountId)
       return;
     const config = yield getConfig(env);
@@ -3577,13 +3675,12 @@ function getWithdrawTransaction(_0) {
     const btcAddress = yield provider.account;
     const config = yield getConfig(env);
     const brgConfig = yield nearCall(config.bridgeContractId, "get_config", {});
-    const _amount = Number(new import_big.default(amount).mul(__pow(10, 8)).toFixed(0));
     if (brgConfig.min_withdraw_amount) {
-      if (_amount < Number(brgConfig.min_withdraw_amount)) {
+      if (Number(amount) < Number(brgConfig.min_withdraw_amount)) {
         throw new Error("Mini withdraw amount is " + brgConfig.min_withdraw_amount);
       }
     }
-    const feePercent = Number(brgConfig.withdraw_bridge_fee.fee_rate) * _amount;
+    const feePercent = Number(brgConfig.withdraw_bridge_fee.fee_rate) * Number(amount);
     const withdrawFee = feePercent > Number(brgConfig.withdraw_bridge_fee.fee_min) ? feePercent : Number(brgConfig.withdraw_bridge_fee.fee_min);
     const allUTXO = yield nearCall(config.bridgeContractId, "get_utxos_paged", {});
     if (!allUTXO || Object.keys(allUTXO).length === 0) {
@@ -3601,7 +3698,7 @@ function getWithdrawTransaction(_0) {
     const _feeRate = feeRate || (yield getBtcGasPrice());
     const { inputs, outputs, fee } = (0, import_coinselect.default)(
       utxos,
-      [{ address: btcAddress, value: _amount }],
+      [{ address: btcAddress, value: Number(amount) }],
       Math.ceil(_feeRate)
     );
     if (!outputs || !inputs) {
@@ -3616,7 +3713,7 @@ function getWithdrawTransaction(_0) {
     let userOutput, noUserOutput;
     for (let i = 0; i < outputs.length; i++) {
       const output = outputs[i];
-      if (output.value.toString() === _amount.toString()) {
+      if (output.value.toString() === amount.toString()) {
         userOutput = output;
       } else {
         noUserOutput = output;
@@ -3695,7 +3792,7 @@ function getWithdrawTransaction(_0) {
             methodName: "ft_transfer_call",
             args: {
               receiver_id: config.bridgeContractId,
-              amount: _amount.toString(),
+              amount: amount.toString(),
               msg: JSON.stringify(msg)
             },
             gas: "300000000000000",
@@ -3713,24 +3810,41 @@ function uint8ArrayToHex(uint8Array) {
 
 // src/core/setupBTCWallet.ts
 var { transfer, functionCall } = import_transactions.actionCreators;
+var STORAGE_KEYS = {
+  ACCOUNT: "btc-wallet-account",
+  PUBLIC_KEY: "btc-wallet-publickey",
+  BTC_PUBLIC_KEY: "btc-wallet-btc-publickey"
+};
 var state = {
   saveAccount(account) {
-    window.localStorage.setItem("btc-wallet-account", account);
+    if (!account) {
+      this.removeAccount();
+      return;
+    }
+    window.localStorage.setItem(STORAGE_KEYS.ACCOUNT, account);
   },
   removeAccount() {
-    window.localStorage.removeItem("btc-wallet-account");
+    window.localStorage.removeItem(STORAGE_KEYS.ACCOUNT);
   },
   savePublicKey(publicKey) {
-    window.localStorage.setItem("btc-wallet-publickey", publicKey);
+    if (!publicKey) {
+      this.removePublicKey();
+      return;
+    }
+    window.localStorage.setItem(STORAGE_KEYS.PUBLIC_KEY, publicKey);
   },
   removePublicKey() {
-    window.localStorage.removeItem("btc-wallet-publickey");
+    window.localStorage.removeItem(STORAGE_KEYS.PUBLIC_KEY);
   },
   saveBtcPublicKey(publicKey) {
-    window.localStorage.setItem("btc-wallet-btc-publickey", publicKey);
+    if (!publicKey) {
+      this.removeBtcPublicKey();
+      return;
+    }
+    window.localStorage.setItem(STORAGE_KEYS.BTC_PUBLIC_KEY, publicKey);
   },
   removeBtcPublicKey() {
-    window.localStorage.removeItem("btc-wallet-btc-publickey");
+    window.localStorage.removeItem(STORAGE_KEYS.BTC_PUBLIC_KEY);
   },
   clear() {
     this.removeAccount();
@@ -3738,17 +3852,39 @@ var state = {
     this.removeBtcPublicKey();
   },
   save(account, publicKey) {
+    if (!account || !publicKey) {
+      this.clear();
+      return;
+    }
     this.saveAccount(account);
     this.savePublicKey(publicKey);
   },
   getAccount() {
-    return window.localStorage.getItem("btc-wallet-account");
+    return window.localStorage.getItem(STORAGE_KEYS.ACCOUNT);
   },
   getPublicKey() {
-    return window.localStorage.getItem("btc-wallet-publickey");
+    return window.localStorage.getItem(STORAGE_KEYS.PUBLIC_KEY);
   },
   getBtcPublicKey() {
-    return window.localStorage.getItem("btc-wallet-btc-publickey");
+    return window.localStorage.getItem(STORAGE_KEYS.BTC_PUBLIC_KEY);
+  },
+  isValid() {
+    const account = this.getAccount();
+    const publicKey = this.getPublicKey();
+    const btcPublicKey = this.getBtcPublicKey();
+    const allEmpty = !account && !publicKey && !btcPublicKey;
+    const allExist = account && publicKey && btcPublicKey;
+    return allEmpty || allExist;
+  },
+  syncSave(account, publicKey, btcPublicKey) {
+    if (!account || !publicKey || !btcPublicKey) {
+      this.clear();
+      return;
+    }
+    this.clear();
+    this.savePublicKey(publicKey);
+    this.saveBtcPublicKey(btcPublicKey);
+    this.saveAccount(account);
   }
 };
 var BTCWallet = (_0) => __async(void 0, [_0], function* ({
@@ -3775,16 +3911,33 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
   const currentConfig = walletConfig[env];
   const walletNetwork = ["mainnet", "private_mainnet"].includes(env) ? "mainnet" : "testnet";
   yield initBtcContext();
+  function validateWalletState() {
+    const accountId = state.getAccount();
+    const publicKey = state.getPublicKey();
+    const btcPublicKey = state.getBtcPublicKey();
+    if (!accountId && publicKey || accountId && !publicKey || !publicKey && btcPublicKey) {
+      state.clear();
+      return false;
+    }
+    return true;
+  }
   function setupBtcContextListeners() {
     return __async(this, null, function* () {
       const handleConnectionUpdate = () => __async(this, null, function* () {
         yield checkBtcNetwork(walletNetwork);
-        const accountId = state.getAccount();
+        if (!state.isValid()) {
+          state.clear();
+        }
+        validateWalletState();
         const btcContext = window.btcContext;
-        if (accountId && btcContext.account) {
-          yield checkSatoshiWhitelist(btcContext.account, env);
-          removeWalletButton();
-          setupWalletButton(env, wallet, btcContext);
+        if (btcContext.account) {
+          const btcPublicKey = yield btcContext.getPublicKey();
+          if (btcPublicKey) {
+            const { nearAddress, nearPublicKey } = yield getNearAccountByBtcPublicKey(btcPublicKey);
+            yield checkSatoshiWhitelist(btcContext.account, env);
+            removeWalletButton();
+            setupWalletButton(env, wallet, btcContext);
+          }
         } else {
           removeWalletButton();
           setTimeout(() => {
@@ -3795,19 +3948,31 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
       const context = window.btcContext.getContext();
       context.on("updatePublicKey", (btcPublicKey) => __async(this, null, function* () {
         console.log("updatePublicKey");
-        const { nearAddress } = yield getNearAccountByBtcPublicKey(btcPublicKey);
-        emitter.emit("accountsChanged", {
-          accounts: [{ accountId: nearAddress }]
-        });
-        yield handleConnectionUpdate();
+        state.clear();
+        try {
+          const { nearAddress, nearPublicKey } = yield getNearAccountByBtcPublicKey(btcPublicKey);
+          if (!nearAddress || !nearPublicKey) {
+            throw new Error("Failed to get near account info");
+          }
+          emitter.emit("accountsChanged", {
+            accounts: [{ accountId: nearAddress }]
+          });
+          yield handleConnectionUpdate();
+        } catch (error) {
+          console.error("Error updating public key:", error);
+          state.clear();
+          emitter.emit("accountsChanged", { accounts: [] });
+        }
       }));
       context.on("btcLoginError", () => __async(this, null, function* () {
         console.log("btcLoginError");
+        state.clear();
         emitter.emit("accountsChanged", { accounts: [] });
         yield handleConnectionUpdate();
       }));
       context.on("btcLogOut", () => __async(this, null, function* () {
         console.log("btcLogOut");
+        state.clear();
         emitter.emit("accountsChanged", { accounts: [] });
         yield handleConnectionUpdate();
       }));
@@ -3851,9 +4016,7 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
         "get_chain_signature_near_account_public_key",
         { btc_public_key: btcPublicKey }
       );
-      state.saveAccount(csna);
-      state.savePublicKey(nearPublicKey);
-      state.saveBtcPublicKey(btcPublicKey);
+      state.syncSave(csna, nearPublicKey, btcPublicKey);
       return {
         nearAddress: csna,
         nearPublicKey
@@ -3863,10 +4026,8 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
   function signIn(_02) {
     return __async(this, arguments, function* ({ contractId, methodNames }) {
       const btcContext = window.btcContext;
-      const accountId = state.getAccount();
-      const publicKey = state.getPublicKey();
-      console.log("isLogin:", accountId && publicKey);
-      if (!accountId || !publicKey) {
+      state.clear();
+      if (!state.getAccount() || !state.getPublicKey()) {
         yield btcContext.login();
       }
       const btcPublicKey = yield btcContext.getPublicKey();
@@ -3932,6 +4093,9 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
   }
   function signAndSendTransactions(params) {
     return __async(this, null, function* () {
+      if (!validateWalletState()) {
+        throw new Error("Wallet state is invalid, please reconnect your wallet.");
+      }
       const btcContext = window.btcContext;
       const accountId = state.getAccount();
       const accountInfo = yield getAccountInfo(accountId, currentConfig.accountContractId);
@@ -4138,18 +4302,6 @@ function setupBTCWallet({
   env = "mainnet"
 } = {}) {
   console.log("\u26A1\uFE0F BTC Wallet Version:", getVersion(), "env:", env);
-  if (env === "private_mainnet" && typeof window !== "undefined") {
-    setTimeout(() => {
-      const hasShownNotice = localStorage.getItem("satoshi_private_mainnet_notice");
-      if (!hasShownNotice) {
-        Dialog.alert({
-          title: "Notice",
-          message: "You are currently using Satoshi Private Mainnet. This is a private version for testing. Please try a small amount of assets in Ramp"
-        });
-        localStorage.setItem("satoshi_private_mainnet_notice", "true");
-      }
-    }, 1e3);
-  }
   const btcWallet = () => __async(this, null, function* () {
     return {
       id: "btc-wallet",
@@ -4173,7 +4325,7 @@ function setupBTCWallet({
 
 // src/index.ts
 var getVersion = () => {
-  return "0.4.5-beta";
+  return "0.4.7-beta";
 };
 if (typeof window !== "undefined") {
   window.__BTC_WALLET_VERSION = getVersion();