btc-wallet 0.3.32 → 0.3.34

package/dist/core/btcUtils.d.ts

@@ -10,7 +10,6 @@ export interface AccountInfo {
 }
 export interface DebtInfo {
     gas_token_id: string;
-    transfer_amount: string;
     near_gas_debt_amount: string;
     protocol_fee_debt_amount: string;
 }
@@ -67,4 +66,5 @@ interface ExecuteBTCDepositAndActionParams<T extends boolean = true> {
  */
 type ExecuteBTCDepositAndActionReturn<T extends boolean> = T extends true ? FinalExecutionOutcome[] : string;
 export declare function executeBTCDepositAndAction<T extends boolean = true>({ action, amount, feeRate, fixedAmount, pollResult, registerDeposit, env, }: ExecuteBTCDepositAndActionParams<T>): Promise<ExecuteBTCDepositAndActionReturn<T>>;
+export declare function checkSatoshiWhitelist(btcAccountId: string, env?: ENV): Promise<void>;
 export {};

package/dist/index.js

@@ -92,6 +92,7 @@ __export(src_exports, {
   XverseConnector: () => XverseConnector,
   checkGasTokenArrears: () => checkGasTokenArrears,
   checkGasTokenBalance: () => checkGasTokenBalance,
+  checkSatoshiWhitelist: () => checkSatoshiWhitelist,
   estimateDepositAmount: () => estimateDepositAmount,
   executeBTCDepositAndAction: () => executeBTCDepositAndAction,
   getAccountInfo: () => getAccountInfo,
@@ -2428,10 +2429,8 @@ function BtcWalletSelectorContextProvider({
   const [isProcessing, setIsProcessing] = (0, import_react11.useState)(false);
   const connectors = [
     new UnisatConnector(),
-    new XverseConnector(),
     new OKXConnector(),
-    new BitgetConnector(),
-    new MagicEdenConnector()
+    new BitgetConnector()
   ];
   const walletSelectorContextValue = (0, import_react11.useMemo)(() => {
     const simpleFn = {};
@@ -2644,7 +2643,7 @@ var walletConfig = {
     accountContractId: "acc.toalice.near",
     bridgeContractId: "brg.toalice.near",
     walletUrl: "https://wallet-stg.satoshibridge.top",
-    bridgeUrl: "https://stg.satoshibridge.top/"
+    bridgeUrl: "https://ramp.satos.network/"
   },
   mainnet: {
     base_url: "https://api.mainnet.satoshibridge.top",
@@ -2991,14 +2990,24 @@ function receiveTransaction(url, data) {
     return result_data;
   });
 }
+function preReceiveDepositMsg(_0, _1) {
+  return __async(this, arguments, function* (url, { btcPublicKey, depositType = 1, postActions, extraMsg }) {
+    const { result_code, result_message, result_data } = yield request(
+      `${url}/v1/preReceiveDepositMsg`,
+      {
+        method: "POST",
+        body: { btcPublicKey, depositType, postActions, extraMsg }
+      }
+    );
+    console.log("preReceiveDepositMsg resp:", { result_code, result_message, result_data });
+    if (result_code !== 0) {
+      throw new Error(result_message);
+    }
+    return result_data;
+  });
+}
 function receiveDepositMsg(_0, _1) {
-  return __async(this, arguments, function* (url, {
-    btcPublicKey,
-    txHash,
-    depositType = 1,
-    postActions,
-    extraMsg
-  }) {
+  return __async(this, arguments, function* (url, { btcPublicKey, txHash, depositType = 1, postActions, extraMsg }) {
     const { result_code, result_message, result_data } = yield request(
       `${url}/v1/receiveDepositMsg`,
       {
@@ -3049,6 +3058,15 @@ function checkBtcTransactionStatus(url, sig) {
     return result_data;
   });
 }
+function getWhitelist(url) {
+  return __async(this, null, function* () {
+    const data = yield request(`${url}/v1/whitelist/users`).catch((error) => {
+      console.error("getWhitelist error:", error);
+      return [];
+    });
+    return data;
+  });
+}
 
 // src/utils/Dialog.ts
 var Dialog = class {
@@ -3090,13 +3108,22 @@ var Dialog = class {
     });
   }
   static alert(options) {
+    const messageEl = options.dangerouslyUseHTML ? { dangerouslySetInnerHTML: { __html: options.message } } : { children: options.message };
     return new Promise((resolve) => {
+      var _a;
       this.injectStyles();
       const container = document.createElement("div");
       container.innerHTML = this.template;
+      (_a = container.querySelector(".dialog-overlay")) == null ? void 0 : _a.classList.add("dialog-alert");
+      if (options.closable === false) {
+        const overlay = container.querySelector(".dialog-overlay");
+        overlay.style.pointerEvents = "none";
+        const dialogContainer = container.querySelector(".dialog-container");
+        dialogContainer.style.pointerEvents = "auto";
+      }
       document.body.appendChild(container);
       const titleEl = container.querySelector(".dialog-title");
-      const messageEl = container.querySelector(".dialog-message");
+      const messageEl2 = container.querySelector(".dialog-message");
       const confirmBtn = container.querySelector(".dialog-confirm-btn");
       const cancelBtn = container.querySelector(".dialog-cancel-btn");
       if (options.title) {
@@ -3104,9 +3131,15 @@ var Dialog = class {
       } else {
         titleEl.style.display = "none";
       }
-      messageEl.textContent = options.message;
+      messageEl2.innerHTML = options.message;
       cancelBtn.style.display = "none";
+      if (options.closable === false) {
+        confirmBtn.style.display = "none";
+      }
       const cleanup = () => {
+        if (options.closable === false) {
+          return;
+        }
         document.body.removeChild(container);
       };
       confirmBtn.addEventListener("click", () => {
@@ -3124,7 +3157,7 @@ Dialog.template = `
           <div class="dialog-message"></div>
           <div class="dialog-buttons">
             <button class="dialog-cancel-btn">Cancel</button>
-            <button class="dialog-confirm-btn">Confirm</button>
+            <button class="dialog-confirm-btn">OK</button>
           </div>
         </div>
       </div>
@@ -3168,6 +3201,9 @@ Dialog.style = `
       justify-content: flex-end;
       gap: 12px;
     }
+    .dialog-alert .dialog-buttons {
+      justify-content: center;
+    }
     .dialog-confirm-btn {
       padding: 8px 24px;
       background-color: #ff7a00;
@@ -3292,23 +3328,26 @@ function checkGasTokenBalance(csna, gasToken, minAmount, env) {
 }
 function checkGasTokenArrears(accountInfo, env, autoDeposit) {
   return __async(this, null, function* () {
-    var _a, _b, _c, _d;
-    if (!((_a = accountInfo == null ? void 0 : accountInfo.debt_info) == null ? void 0 : _a.transfer_amount) || !((_b = accountInfo == null ? void 0 : accountInfo.relayer_fee) == null ? void 0 : _b.amount))
+    var _a, _b, _c;
+    const debtAmount = new import_big.default(((_a = accountInfo == null ? void 0 : accountInfo.debt_info) == null ? void 0 : _a.near_gas_debt_amount) || 0).plus(((_b = accountInfo == null ? void 0 : accountInfo.debt_info) == null ? void 0 : _b.protocol_fee_debt_amount) || 0).toString();
+    const relayerFeeAmount = ((_c = accountInfo == null ? void 0 : accountInfo.relayer_fee) == null ? void 0 : _c.amount) || "0";
+    const hasDebtArrears = new import_big.default(debtAmount).gt(0);
+    const hasRelayerFeeArrears = new import_big.default(relayerFeeAmount).gt(0);
+    if (!hasDebtArrears && !hasRelayerFeeArrears)
       return;
     const config = yield getConfig(env);
-    const arrearsType = accountInfo.debt_info.transfer_amount ? "Deposit" : ((_c = accountInfo.relayer_fee) == null ? void 0 : _c.amount) ? "RelayerFee" : void 0;
-    const transferAmount = arrearsType === "Deposit" ? accountInfo.debt_info.transfer_amount : (_d = accountInfo.relayer_fee) == null ? void 0 : _d.amount;
+    const transferAmount = hasDebtArrears ? debtAmount : relayerFeeAmount;
     console.log("get_account:", accountInfo);
     const action = {
       receiver_id: config.accountContractId,
       amount: transferAmount,
-      msg: JSON.stringify(arrearsType)
+      msg: JSON.stringify(hasDebtArrears ? "Repay" : "RelayerFee")
     };
     if (!autoDeposit)
       return action;
     const confirmed = yield Dialog.confirm({
-      title: arrearsType === "Deposit" ? "Has gas token arrears" : "Has relayer fee arrears",
-      message: arrearsType === "Deposit" ? "You have gas token arrears, please deposit gas token to continue." : "You have relayer fee arrears, please deposit relayer fee to continue."
+      title: hasDebtArrears ? "Has gas token arrears" : "Has relayer fee arrears",
+      message: hasDebtArrears ? "You have gas token arrears, please deposit gas token to continue." : "You have relayer fee arrears, please deposit relayer fee to continue."
     });
     if (confirmed) {
       yield executeBTCDepositAndAction({ action, env });
@@ -3502,8 +3541,14 @@ function executeBTCDepositAndAction(_0) {
       console.log("user deposit address:", userDepositAddress);
       console.log("send amount:", sendAmount);
       console.log("fee rate:", _feeRate);
-      const txHash = yield sendBitcoin(userDepositAddress, Number(sendAmount), _feeRate);
       const postActionsStr = newActions.length > 0 ? JSON.stringify(newActions) : void 0;
+      yield preReceiveDepositMsg(config.base_url, {
+        btcPublicKey,
+        depositType: postActionsStr || depositMsg.extra_msg ? 1 : 0,
+        postActions: postActionsStr,
+        extraMsg: depositMsg.extra_msg
+      });
+      const txHash = yield sendBitcoin(userDepositAddress, Number(sendAmount), _feeRate);
       yield receiveDepositMsg(config.base_url, {
         btcPublicKey,
         txHash,
@@ -3525,6 +3570,28 @@ function executeBTCDepositAndAction(_0) {
     }
   });
 }
+function checkSatoshiWhitelist(btcAccountId, env = "mainnet") {
+  return __async(this, null, function* () {
+    if (env !== "private_mainnet")
+      return;
+    if (!btcAccountId)
+      return;
+    const config = yield getConfig(env);
+    const whitelist = yield getWhitelist(config.base_url);
+    if (!(whitelist == null ? void 0 : whitelist.length))
+      return;
+    const isWhitelisted = whitelist.includes(btcAccountId);
+    if (!isWhitelisted) {
+      Dialog.alert({
+        title: "Account is not whitelisted",
+        message: `Sorry, you are not whitelisted. Please fill out the form to get whitelisted. <a style="color: #ff7a00; text-decoration: underline;" href="https://forms.gle/rrTP1ZbGU5mRZpHdA" target="_blank">https://forms.gle/rrTP1ZbGU5mRZpHdA</a>`,
+        dangerouslyUseHTML: true,
+        closable: false
+      });
+      throw new Error("Account is not whitelisted");
+    }
+  });
+}
 
 // src/core/setupBTCWallet.ts
 var { transfer, functionCall } = import_transactions.actionCreators;
@@ -3583,7 +3650,8 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
     signMessage,
     isSignedIn,
     signAndSendTransaction,
-    signAndSendTransactions
+    signAndSendTransactions,
+    calculateGasLimit
   };
   const env = metadata.env || options.network.networkId || "mainnet";
   const currentConfig = walletConfig[env];
@@ -3596,6 +3664,7 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
         const accountId = state.getAccount();
         const btcContext = window.btcContext;
         if (accountId && btcContext.account) {
+          yield checkSatoshiWhitelist(btcContext.account, env);
           removeWalletButton();
           setupWalletButton(env, wallet, btcContext);
         } else {
@@ -3792,6 +3861,17 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
       return result;
     });
   }
+  function calculateGasLimit(params) {
+    return __async(this, null, function* () {
+      const accountId = state.getAccount();
+      const accountInfo = yield getAccountInfo(accountId, currentConfig.accountContractId);
+      const trans = [...params.transactions];
+      console.log("raw trans:", trans);
+      const gasTokenBalance = (accountInfo == null ? void 0 : accountInfo.gas_token[currentConfig.token]) || "0";
+      const { gasLimit } = yield calculateGasStrategy(gasTokenBalance, trans);
+      return gasLimit;
+    });
+  }
   function createGasTokenTransfer(accountId, amount) {
     return __async(this, null, function* () {
       return {
@@ -3845,58 +3925,17 @@ 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))
       );
-      if (availableBalance > 0.2) {
-        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);
-        }
-      }
+      const adjustedGas = yield getPredictedGasAmount(
+        currentConfig.accountContractId,
+        currentConfig.token,
+        convertTx.map((t) => t.txHex)
+      );
+      const transferTx = yield createGasTokenTransfer(accountId, adjustedGas);
+      return recalculateGasWithTransfer(transferTx, convertTx, false);
     });
   }
   function convertTransactionToTxHex(transaction, index = 0) {
@@ -3912,9 +3951,12 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
         account_id: accountId,
         public_key: publicKey,
         finality: "final"
+      }).catch((e) => {
+        console.log("view_access_key error:", e);
+        return void 0;
       });
       const accessKey = __spreadProps(__spreadValues({}, rawAccessKey), {
-        nonce: BigInt(rawAccessKey.nonce || 0)
+        nonce: BigInt((rawAccessKey == null ? void 0 : rawAccessKey.nonce) || 0)
       });
       const nearNonceFromApi = yield getNearNonce(currentConfig.base_url, accountId);
       let nearNonceNumber = accessKey.nonce + BigInt(1);
@@ -3975,6 +4017,18 @@ 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 Bridge"
+        });
+        localStorage.setItem("satoshi_private_mainnet_notice", "true");
+      }
+    }, 1e3);
+  }
   const btcWallet = () => __async(this, null, function* () {
     return {
       id: "btc-wallet",
@@ -3998,7 +4052,7 @@ function setupBTCWallet({
 
 // src/index.ts
 var getVersion = () => {
-  return "0.3.32";
+  return "0.3.34";
 };
 if (typeof window !== "undefined") {
   window.__BTC_WALLET_VERSION = getVersion();