btc-wallet 0.5.0-beta → 0.5.1-beta

package/README.md

@@ -69,6 +69,7 @@ interface ExecuteBTCDepositAndActionParams<T extends boolean = true> {
   env?: 'mainnet' | 'testnet' | 'private_mainnet' | 'dev'; // optional: defaults to NEAR network environment
   pollResult?: T;         // optional: whether to poll for transaction result
   registerDeposit?: string; // optional: whether to register deposit,default 0.000125 NEAR
+  newAccountMinDepositAmount?: boolean; // default is true, if true, new account minimum deposit BTC amount 1000sat, otherwise 0
 }
 
 // Example 1: dApp one-click BTC deposit
@@ -110,7 +111,8 @@ import { getDepositAmount } from 'btc-wallet';
 const result = await getDepositAmount(
   amount: string,           // Amount in satoshi units
   options?: {
-    env?: 'mainnet' | 'testnet' | 'private_mainnet' | 'dev' // Optional: Defaults to NEAR network environment
+    env?: 'mainnet' | 'testnet' | 'private_mainnet' | 'dev', // Optional: Defaults to NEAR network environment
+    newAccountMinDepositAmount?: boolean  // default is true, if true, new account minimum deposit amount 1000sat, otherwise 0
   }
 );
 

package/dist/core/btcUtils.d.ts

@@ -39,6 +39,8 @@ export declare function estimateDepositAmount(amount: string, option?: {
 }): Promise<string>;
 export declare function getDepositAmount(amount: string, option?: {
     env?: ENV;
+    /** default is true, if true, new account minimum deposit amount 1000sat, otherwise 0 */
+    newAccountMinDepositAmount?: boolean;
 }): Promise<{
     depositAmount: number;
     totalDepositAmount: number;
@@ -59,12 +61,13 @@ interface ExecuteBTCDepositAndActionParams<T extends boolean = true> {
     feeRate?: number;
     env?: ENV;
     pollResult?: T;
+    newAccountMinDepositAmount?: boolean;
 }
 /**
  * @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, pollResult, registerDeposit, env, }: ExecuteBTCDepositAndActionParams<T>): Promise<ExecuteBTCDepositAndActionReturn<T>>;
+export declare function executeBTCDepositAndAction<T extends boolean = true>({ action, amount, feeRate, pollResult, registerDeposit, env, newAccountMinDepositAmount, }: ExecuteBTCDepositAndActionParams<T>): Promise<ExecuteBTCDepositAndActionReturn<T>>;
 export declare function checkSatoshiWhitelist(btcAccountId: string, env?: ENV): Promise<void>;
 interface WithdrawParams {
     amount: string | number;

package/dist/index.js

@@ -2855,6 +2855,7 @@ function useBtcWalletSelector() {
       }),
       autoConnect: () => __async(this, null, function* () {
         requestDirectAccount(connectorRef.current).catch((e) => {
+          console.error("btcLoginError", e);
           context.emit("btcLoginError");
         });
       }),
@@ -2924,7 +2925,7 @@ var walletConfig = {
     token: "nbtc.toalice.near",
     accountContractId: "acc.toalice.near",
     bridgeContractId: "brg.toalice.near",
-    walletUrl: "https://wallet-stg.satoshibridge.top",
+    walletUrl: "http://localhost:3100",
     bridgeUrl: "https://old.ramp.satos.network"
   },
   mainnet: {
@@ -3446,10 +3447,11 @@ 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) {
+  var _a, _b;
+  if (typeof window === "undefined" || !window.btcContext && !((_a = window.top) == null ? void 0 : _a.btcContext)) {
     throw new Error("BTC Provider is not initialized.");
   }
-  return window.btcContext;
+  return window.btcContext || ((_b = window.top) == null ? void 0 : _b.btcContext);
 }
 function getNetwork() {
   return __async(this, null, function* () {
@@ -3603,7 +3605,9 @@ function estimateDepositAmount(amount, option) {
 }
 function getDepositAmount(amount, option) {
   return __async(this, null, function* () {
+    var _a;
     const env = (option == null ? void 0 : option.env) || "mainnet";
+    const _newAccountMinDepositAmount = (_a = option == null ? void 0 : option.newAccountMinDepositAmount) != null ? _a : true;
     const config = yield getConfig(env);
     const csna = yield getCsnaAccountId(env);
     const accountInfo = yield getAccountInfo(csna, config.accountContractId);
@@ -3615,7 +3619,7 @@ 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 newAccountMinDepositAmount = !(accountInfo == null ? void 0 : accountInfo.nonce) ? NEW_ACCOUNT_MIN_DEPOSIT_AMOUNT : 0;
+    const newAccountMinDepositAmount = !(accountInfo == null ? void 0 : accountInfo.nonce) && _newAccountMinDepositAmount ? 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,
@@ -3648,7 +3652,8 @@ function executeBTCDepositAndAction(_0) {
     feeRate,
     pollResult = true,
     registerDeposit,
-    env = "mainnet"
+    env = "mainnet",
+    newAccountMinDepositAmount
   }) {
     var _a;
     try {
@@ -3667,7 +3672,8 @@ function executeBTCDepositAndAction(_0) {
         throw new Error("amount must be greater than 0");
       }
       const { totalDepositAmount, protocolFee, repayAmount } = yield getDepositAmount(depositAmount, {
-        env
+        env,
+        newAccountMinDepositAmount
       });
       const accountInfo = yield getAccountInfo(csna, config.accountContractId);
       const newActions = [];
@@ -4044,7 +4050,7 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
         if (btcContext.account) {
           const btcPublicKey = yield btcContext.getPublicKey();
           if (btcPublicKey) {
-            const { nearAddress, nearPublicKey } = yield getNearAccountByBtcPublicKey(btcPublicKey);
+            yield getNearAccountByBtcPublicKey(btcPublicKey);
             yield checkSatoshiWhitelist(btcContext.account, env);
             removeWalletButton();
             setupWalletButton(env, wallet, btcContext);
@@ -4076,10 +4082,6 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
         }
       }));
       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");
@@ -4436,7 +4438,7 @@ function setupBTCWallet({
 
 // src/index.ts
 var getVersion = () => {
-  return "0.5.0-beta";
+  return "0.5.1-beta";
 };
 if (typeof window !== "undefined") {
   window.__BTC_WALLET_VERSION = getVersion();