btc-wallet 0.3.22 → 0.3.24

package/dist/config.d.ts

@@ -1,4 +1,5 @@
-export declare const walletConfig: Record<string, {
+export type ENV = 'mainnet' | 'testnet' | 'private_mainnet' | 'dev';
+export declare const walletConfig: Record<ENV, {
     base_url: string;
     token: string;
     accountContractId: string;

package/dist/core/btcUtils.d.ts

@@ -1,3 +1,4 @@
+import type { ENV } from '../config';
 import type { FinalExecutionOutcome } from '@near-wallet-selector/core';
 export interface DebtInfo {
     gas_token_id: string;
@@ -10,13 +11,14 @@ export declare function getAccountInfo(csna: string, accountContractId: string):
     gas_token: Record<string, string>;
     debt_info?: DebtInfo;
 } | undefined>;
-export declare function checkGasTokenBalance(csna: string, gasToken: string, minAmount: string, isDev: boolean): Promise<void>;
+export declare function checkGasTokenBalance(csna: string, gasToken: string, minAmount: string, env: ENV): Promise<void>;
 type CheckGasTokenArrearsReturnType<T extends boolean> = T extends true ? void : {
     receiver_id: string;
     amount: string;
     msg: string;
 } | undefined;
-export declare function checkGasTokenArrears<T extends boolean>(debtInfo: DebtInfo | undefined, isDev: boolean, autoDeposit?: T): Promise<CheckGasTokenArrearsReturnType<T>>;
+export declare function checkGasTokenArrears<T extends boolean>(debtInfo: DebtInfo | undefined, env: ENV, autoDeposit?: T): Promise<CheckGasTokenArrearsReturnType<T>>;
+export declare function queryGasTokenArrears(env: ENV): Promise<DebtInfo | undefined>;
 export declare function getBtcGasPrice(): Promise<number>;
 export declare function getBtcBalance(): Promise<{
     rawBalance: number;
@@ -31,16 +33,17 @@ export declare function getBtcBalance(): Promise<{
 }>;
 export declare function sendBitcoin(address: string, amount: number, feeRate: number): Promise<string>;
 export declare function estimateDepositAmount(amount: string, option?: {
-    isDev?: boolean;
+    env?: ENV;
 }): Promise<number>;
 export declare function getDepositAmount(amount: string, option?: {
     isEstimate?: boolean;
-    isDev?: boolean;
+    env?: ENV;
 }): Promise<{
     depositAmount: number;
     receiveAmount: number;
     fee: number;
 }>;
+export declare function getCsnaAccountId(env: ENV): Promise<string>;
 interface ExecuteBTCDepositAndActionParams<T extends boolean = true> {
     action?: {
         receiver_id: string;
@@ -50,12 +53,12 @@ interface ExecuteBTCDepositAndActionParams<T extends boolean = true> {
     amount?: string;
     feeRate?: number;
     fixedAmount?: boolean;
-    isDev?: boolean;
+    env?: ENV;
     pollResult?: T;
 }
 /**
  * @param T - if true, return the poll result, otherwise return the btcTxHash
  */
 type ExecuteBTCDepositAndActionReturn<T extends boolean> = T extends true ? FinalExecutionOutcome[] : string;
-export declare function executeBTCDepositAndAction<T extends boolean = true>({ action, amount, feeRate, fixedAmount, pollResult, isDev, }: ExecuteBTCDepositAndActionParams<T>): Promise<ExecuteBTCDepositAndActionReturn<T>>;
+export declare function executeBTCDepositAndAction<T extends boolean = true>({ action, amount, feeRate, fixedAmount, pollResult, env, }: ExecuteBTCDepositAndActionParams<T>): Promise<ExecuteBTCDepositAndActionReturn<T>>;
 export {};

package/dist/core/setupBTCWallet.d.ts

@@ -1,5 +1,6 @@
 import type { InjectedWallet, WalletModuleFactory } from '@near-wallet-selector/core';
 import type { useBtcWalletSelector } from './btcWalletSelectorContext';
+import type { ENV } from '../config';
 declare global {
     interface Window {
         btcContext: ReturnType<typeof useBtcWalletSelector>;
@@ -10,9 +11,9 @@ interface BTCWalletParams {
     deprecated?: boolean;
     autoConnect?: boolean;
     syncLogOut?: boolean;
-    isDev?: boolean;
+    env?: ENV;
 }
-export declare function setupBTCWallet({ iconUrl, deprecated, autoConnect, syncLogOut, isDev, }?: BTCWalletParams | undefined): WalletModuleFactory<InjectedWallet>;
+export declare function setupBTCWallet({ iconUrl, deprecated, autoConnect, syncLogOut, env, }?: BTCWalletParams | undefined): WalletModuleFactory<InjectedWallet>;
 declare const _default: {
     setupBTCWallet: typeof setupBTCWallet;
 };

package/dist/index.js

@@ -97,8 +97,10 @@ __export(src_exports, {
   getAccountInfo: () => getAccountInfo,
   getBtcBalance: () => getBtcBalance,
   getBtcGasPrice: () => getBtcGasPrice,
+  getCsnaAccountId: () => getCsnaAccountId,
   getDepositAmount: () => getDepositAmount,
   getVersion: () => getVersion,
+  queryGasTokenArrears: () => queryGasTokenArrears,
   sendBitcoin: () => sendBitcoin,
   setupBTCWallet: () => setupBTCWallet,
   useAccountContract: () => useAccountContract,
@@ -2775,6 +2777,14 @@ var walletConfig = {
     walletUrl: "https://wallet-test.satoshibridge.top",
     bridgeUrl: "https://testnet.satoshibridge.top/"
   },
+  private_mainnet: {
+    base_url: "https://api.stg.satoshibridge.top",
+    token: "nbtc.toalice.near",
+    accountContractId: "acc.toalice.near",
+    bridgeContractId: "brg.toalice.near",
+    walletUrl: "https://wallet-stg.satoshibridge.top",
+    bridgeUrl: "https://stg.satoshibridge.top/"
+  },
   mainnet: {
     base_url: "https://api.mainnet.satoshibridge.top",
     token: "nbtc.toalice.near",
@@ -3244,10 +3254,9 @@ function getBtcRpcUrl() {
     return btcRpcUrls[network];
   });
 }
-function getConfig(isDev) {
+function getConfig(env) {
   return __async(this, null, function* () {
-    const network = yield getNetwork();
-    return walletConfig[isDev ? "dev" : network];
+    return walletConfig[env];
   });
 }
 function nearCall(contractId, methodName, args) {
@@ -3263,7 +3272,7 @@ function getAccountInfo(csna, accountContractId) {
     return accountInfo;
   });
 }
-function checkGasTokenBalance(csna, gasToken, minAmount, isDev) {
+function checkGasTokenBalance(csna, gasToken, minAmount, env) {
   return __async(this, null, function* () {
     const amount = yield nearCall(gasToken, "ft_balance_of", { account_id: csna });
     console.log("gas token balance:", amount);
@@ -3272,17 +3281,17 @@ function checkGasTokenBalance(csna, gasToken, minAmount, isDev) {
         title: "Gas token balance is insufficient",
         message: "Please deposit gas token to continue, will open bridge website."
       });
-      const config = yield getConfig(isDev);
+      const config = yield getConfig(env);
       window.open(config.bridgeUrl, "_blank");
       throw new Error("Gas token balance is insufficient");
     }
   });
 }
-function checkGasTokenArrears(debtInfo, isDev, autoDeposit) {
+function checkGasTokenArrears(debtInfo, env, autoDeposit) {
   return __async(this, null, function* () {
     if (!debtInfo)
       return;
-    const config = yield getConfig(isDev);
+    const config = yield getConfig(env);
     const transferAmount = debtInfo.transfer_amount;
     console.log("get_account debtInfo:", debtInfo);
     const action = {
@@ -3297,7 +3306,7 @@ function checkGasTokenArrears(debtInfo, isDev, autoDeposit) {
       message: "You have gas token arrears, please deposit gas token to continue."
     });
     if (confirmed) {
-      yield executeBTCDepositAndAction({ action, isDev });
+      yield executeBTCDepositAndAction({ action, env });
       yield Dialog.alert({
         title: "Deposit success",
         message: "Deposit success, will continue to execute transaction."
@@ -3307,6 +3316,14 @@ function checkGasTokenArrears(debtInfo, isDev, autoDeposit) {
     }
   });
 }
+function queryGasTokenArrears(env) {
+  return __async(this, null, function* () {
+    const config = yield getConfig(env);
+    const csna = yield getCsnaAccountId(env);
+    const accountInfo = yield getAccountInfo(csna, config.accountContractId);
+    return accountInfo == null ? void 0 : accountInfo.debt_info;
+  });
+}
 function getBtcGasPrice() {
   return __async(this, null, function* () {
     const network = yield getNetwork();
@@ -3363,7 +3380,7 @@ function estimateDepositAmount(amount, option) {
 }
 function getDepositAmount(amount, option) {
   return __async(this, null, function* () {
-    const config = yield getConfig((option == null ? void 0 : option.isDev) || false);
+    const config = yield getConfig((option == null ? void 0 : option.env) || "mainnet");
     const {
       deposit_bridge_fee: { fee_min, fee_rate }
     } = yield nearCall(
@@ -3382,6 +3399,21 @@ function getDepositAmount(amount, option) {
     };
   });
 }
+function getCsnaAccountId(env) {
+  return __async(this, null, function* () {
+    const config = yield getConfig(env);
+    const { getPublicKey } = getBtcProvider();
+    const btcPublicKey = yield getPublicKey();
+    const csna = yield nearCall(
+      config.accountContractId,
+      "get_chain_signature_near_account_id",
+      {
+        btc_public_key: btcPublicKey
+      }
+    );
+    return csna;
+  });
+}
 function executeBTCDepositAndAction(_0) {
   return __async(this, arguments, function* ({
     action,
@@ -3389,12 +3421,12 @@ function executeBTCDepositAndAction(_0) {
     feeRate,
     fixedAmount = true,
     pollResult = true,
-    isDev = false
+    env = "mainnet"
   }) {
     var _a;
     try {
       const { getPublicKey } = getBtcProvider();
-      const config = yield getConfig(isDev);
+      const config = yield getConfig(env);
       const btcPublicKey = yield getPublicKey();
       if (!btcPublicKey) {
         throw new Error("BTC Public Key is not available.");
@@ -3402,34 +3434,35 @@ function executeBTCDepositAndAction(_0) {
       if (!amount && !action) {
         throw new Error("amount or action is required");
       }
-      const csna = yield nearCall(
-        config.accountContractId,
-        "get_chain_signature_near_account_id",
-        {
-          btc_public_key: btcPublicKey
-        }
-      );
+      const csna = yield getCsnaAccountId(env);
       const rawDepositAmount = (_a = action ? action.amount : amount) != null ? _a : "0";
       if (new import_big.default(rawDepositAmount).lt(0)) {
         throw new Error("amount must be greater than 0");
       }
       const { depositAmount, receiveAmount } = yield getDepositAmount(rawDepositAmount, {
-        isDev
+        env
       });
       const accountInfo = yield getAccountInfo(csna, config.accountContractId);
       const newActions = [];
       const gasLimit = new import_big.default(50).mul(__pow(10, 12)).toFixed(0);
-      const repayAction = yield checkGasTokenArrears(accountInfo == null ? void 0 : accountInfo.debt_info, isDev, false);
+      const repayAction = yield checkGasTokenArrears(accountInfo == null ? void 0 : accountInfo.debt_info, env, false);
       if (repayAction) {
         newActions.push(__spreadProps(__spreadValues({}, repayAction), {
           gas: gasLimit
         }));
       }
-      if (action) {
-        newActions.push(__spreadProps(__spreadValues({}, action), {
-          amount: (repayAction == null ? void 0 : repayAction.amount) && !fixedAmount ? new import_big.default(receiveAmount).minus(repayAction.amount).toString() : receiveAmount.toString(),
-          gas: gasLimit
-        }));
+      if (action || !action && new import_big.default((accountInfo == null ? void 0 : accountInfo.gas_token[config.token]) || 0).lt(MINIMUM_DEPOSIT_AMOUNT_BASE)) {
+        newActions.push(
+          action ? __spreadProps(__spreadValues({}, action), {
+            amount: (repayAction == null ? void 0 : repayAction.amount) && !fixedAmount ? new import_big.default(receiveAmount).minus(repayAction.amount).toString() : receiveAmount.toString(),
+            gas: gasLimit
+          }) : {
+            receiver_id: config.accountContractId,
+            amount: MINIMUM_DEPOSIT_AMOUNT_BASE.toString(),
+            msg: JSON.stringify("Deposit"),
+            gas: gasLimit
+          }
+        );
       }
       const depositMsg = {
         recipient_id: csna,
@@ -3536,7 +3569,6 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
   id,
   provider
 }) {
-  var _a;
   const wallet = {
     signIn,
     signOut,
@@ -3547,9 +3579,9 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
     signAndSendTransaction,
     signAndSendTransactions
   };
-  const isDev = (_a = "isDev" in metadata && metadata.isDev) != null ? _a : false;
-  const currentConfig = isDev ? walletConfig.dev : walletConfig[options.network.networkId];
-  const walletNetwork = isDev ? "dev" : options.network.networkId;
+  const env = options.network.networkId || metadata.env || "mainnet";
+  const currentConfig = walletConfig[env];
+  const walletNetwork = ["mainnet", "private_mainnet"].includes(env) ? "mainnet" : "testnet";
   yield initBtcContext();
   function setupBtcContextListeners() {
     return __async(this, null, function* () {
@@ -3619,21 +3651,17 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
   }
   function getNearAccountByBtcPublicKey(btcPublicKey) {
     return __async(this, null, function* () {
-      const nearAddress = yield nearCall2(
-        currentConfig.accountContractId,
-        "get_chain_signature_near_account_id",
-        { btc_public_key: btcPublicKey }
-      );
+      const csna = yield getCsnaAccountId(env);
       const nearPublicKey = yield nearCall2(
         currentConfig.accountContractId,
         "get_chain_signature_near_account_public_key",
         { btc_public_key: btcPublicKey }
       );
-      state.saveAccount(nearAddress);
+      state.saveAccount(csna);
       state.savePublicKey(nearPublicKey);
       state.saveBtcPublicKey(btcPublicKey);
       return {
-        nearAddress,
+        nearAddress: csna,
         nearPublicKey
       };
     });
@@ -3713,7 +3741,7 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
       const btcContext = window.btcContext;
       const accountId = state.getAccount();
       const accountInfo = yield getAccountInfo(accountId, currentConfig.accountContractId);
-      yield checkGasTokenArrears(accountInfo == null ? void 0 : accountInfo.debt_info, isDev, true);
+      yield checkGasTokenArrears(accountInfo == null ? void 0 : accountInfo.debt_info, env, true);
       const trans = [...params.transactions];
       console.log("raw trans:", trans);
       const gasTokenBalance = (accountInfo == null ? void 0 : accountInfo.gas_token[currentConfig.token]) || "0";
@@ -3724,7 +3752,7 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
       console.log("transferGasTransaction:", transferGasTransaction);
       console.log("useNearPayGas:", useNearPayGas);
       console.log("gasLimit:", gasLimit);
-      yield checkGasTokenBalance(accountId, currentConfig.token, gasLimit, isDev);
+      yield checkGasTokenBalance(accountId, currentConfig.token, gasLimit, env);
       if (transferGasTransaction) {
         trans.unshift(transferGasTransaction);
       }
@@ -3810,7 +3838,7 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
   }
   function calculateGasStrategy(gasTokenBalance, transactions2) {
     return __async(this, null, function* () {
-      var _a2;
+      var _a;
       const accountId = state.getAccount();
       const nearAccount = yield provider.query({
         request_type: "view_account",
@@ -3832,7 +3860,7 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
         );
         console.log("list_gas_token gas tokens:", gasTokens);
         const perTxFee = Math.max(
-          Number(((_a2 = gasTokens[currentConfig.token]) == null ? void 0 : _a2.per_tx_protocol_fee) || 0),
+          Number(((_a = gasTokens[currentConfig.token]) == null ? void 0 : _a.per_tx_protocol_fee) || 0),
           100
         );
         console.log("perTxFee:", perTxFee);
@@ -3923,7 +3951,7 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
       const btcNetwork = yield btcContext.getNetwork();
       console.log("btcNetwork:", btcNetwork, network);
       const networkMap = {
-        livenet: ["mainnet"],
+        livenet: ["mainnet", "private_mainnet"],
         testnet: ["testnet", "dev"]
       };
       if (!networkMap[btcNetwork].includes(network)) {
@@ -3946,7 +3974,7 @@ function setupBTCWallet({
   deprecated = false,
   autoConnect = true,
   syncLogOut = true,
-  isDev = false
+  env = "mainnet"
 } = {}) {
   console.log("\u26A1\uFE0F BTC Wallet Version:", getVersion());
   const btcWallet = () => __async(this, null, function* () {
@@ -3962,7 +3990,7 @@ function setupBTCWallet({
         available: true,
         autoConnect,
         syncLogOut,
-        isDev
+        env
       },
       init: BTCWallet
     };
@@ -3972,7 +4000,7 @@ function setupBTCWallet({
 
 // src/index.ts
 var getVersion = () => {
-  return "0.3.22";
+  return "0.3.24";
 };
 if (typeof window !== "undefined") {
   window.__BTC_WALLET_VERSION = getVersion();