btc-wallet 0.5.77-beta → 0.5.79-beta

package/dist/utils/satoshi.d.ts

@@ -18,9 +18,18 @@ interface ReceiveDepositMsgParams {
     depositType?: number;
     postActions?: string;
     extraMsg?: string;
+    userDepositAddress?: string;
 }
-export declare function preReceiveDepositMsg({ env, btcPublicKey, depositType, postActions, extraMsg, }: Omit<ReceiveDepositMsgParams, 'txHash'>): Promise<any>;
+export declare function preReceiveDepositMsg({ env, btcPublicKey, depositType, postActions, extraMsg, userDepositAddress, }: Omit<ReceiveDepositMsgParams, 'txHash'>): Promise<any>;
 export declare function receiveDepositMsg({ env, btcPublicKey, txHash, depositType, postActions, extraMsg, }: ReceiveDepositMsgParams): Promise<any>;
+export declare function getBridgeTransactions({ env, fromChainId, fromAddress, page, pageSize, }: {
+    env: ENV;
+    /** 0:ALL 1: BTC, 2: NEAR */
+    fromChainId?: number;
+    fromAddress?: string;
+    page?: number;
+    pageSize?: number;
+}): Promise<any[]>;
 export declare function checkBridgeTransactionStatus({ txHash, fromChain, env, }: {
     txHash: string;
     fromChain?: 'BTC' | 'NEAR';

package/esm/index.js

@@ -1141,6 +1141,35 @@ var GateConnector = class extends InjectedConnector {
       downloadUrl: "https://www.gate.io/en/web3"
     };
   }
+  sendBitcoin(toAddress, satoshis, options) {
+    return __async(this, null, function* () {
+      const addresses = yield this.getAccounts();
+      if (addresses.length === 0) {
+        throw new Error(`${this.metadata.name} not connected!`);
+      }
+      const result = yield window.gatewallet.bitcoin.sendBitcoin({
+        fromAddress: addresses[0],
+        toAddress,
+        satoshis,
+        options
+      });
+      console.log("\u{1F680} ~ GateConnector ~ sendBitcoin ~ result:", result);
+      return result.txhash;
+    });
+  }
+  signMessage(signStr, type) {
+    return __async(this, null, function* () {
+      const addresses = yield this.getAccounts();
+      if (addresses.length === 0) {
+        throw new Error(`${this.metadata.name} not connected!`);
+      }
+      return window.gatewallet.bitcoin.signMessage({
+        fromAddress: addresses[0],
+        text: signStr,
+        type
+      });
+    });
+  }
 };
 
 // src/context/index.tsx
@@ -3280,14 +3309,15 @@ function preReceiveDepositMsg(_0) {
     btcPublicKey,
     depositType = 1,
     postActions,
-    extraMsg
+    extraMsg,
+    userDepositAddress
   }) {
     const config = getWalletConfig(env);
     const { result_code, result_message, result_data } = yield request(
       `${config.base_url}/v1/preReceiveDepositMsg`,
       {
         method: "POST",
-        body: { btcPublicKey, depositType, postActions, extraMsg }
+        body: { btcPublicKey, depositType, postActions, extraMsg, userDepositAddress }
       }
     );
     console.log("preReceiveDepositMsg resp:", { result_code, result_message, result_data });
@@ -3321,6 +3351,26 @@ function receiveDepositMsg(_0) {
     return result_data;
   });
 }
+function getBridgeTransactions(_0) {
+  return __async(this, arguments, function* ({
+    env,
+    fromChainId = 0,
+    fromAddress,
+    page = 1,
+    pageSize = 10
+  }) {
+    try {
+      const config = getWalletConfig(env);
+      const { result_data = [] } = yield request(
+        `${config.base_url}/v1/history?fromChainId=${fromChainId}&fromAddress=${fromAddress}&page=${page}&pageSize=${pageSize}`
+      );
+      return result_data;
+    } catch (error) {
+      console.error("getBridgeTransactions error:", error);
+      return [];
+    }
+  });
+}
 function checkBridgeTransactionStatus(_0) {
   return __async(this, arguments, function* ({
     txHash,
@@ -3719,13 +3769,13 @@ import coinselect from "coinselect";
 import * as ecc from "@bitcoinerlab/secp256k1";
 bitcoin.initEccLib(ecc);
 var NEAR_STORAGE_DEPOSIT_AMOUNT = "1250000000000000000000";
-var NBTC_STORAGE_DEPOSIT_AMOUNT = "800";
-var NEW_ACCOUNT_MIN_DEPOSIT_AMOUNT = "1000";
+var NBTC_STORAGE_DEPOSIT_AMOUNT = 800;
+var NEW_ACCOUNT_MIN_DEPOSIT_AMOUNT = 1e3;
 function getBtcProvider() {
-  if (typeof window === "undefined" || !window.btcContext) {
+  if (typeof window === "undefined" || !(window.btcContext || (parent == null ? void 0 : parent.btcContext))) {
     throw new Error("BTC Provider is not initialized.");
   }
-  return window.btcContext;
+  return window.btcContext || parent.btcContext;
 }
 function getNetwork() {
   return __async(this, null, function* () {
@@ -3757,8 +3807,16 @@ function checkGasTokenDebt(csna, env, autoDeposit) {
   return __async(this, null, function* () {
     var _a, _b, _c;
     const accountInfo = yield getAccountInfo({ csna, env });
+    const { account } = getBtcProvider();
+    const bridgeTransactions = yield getBridgeTransactions({
+      env,
+      fromAddress: account,
+      page: 1,
+      pageSize: 1
+    });
+    const isNewAccount = !(accountInfo == null ? void 0 : accountInfo.nonce) && bridgeTransactions.length === 0;
     const debtAmount = new Big2(((_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 = !(accountInfo == null ? void 0 : accountInfo.nonce) ? NBTC_STORAGE_DEPOSIT_AMOUNT : ((_c = accountInfo == null ? void 0 : accountInfo.relayer_fee) == null ? void 0 : _c.amount) || 0;
+    const relayerFeeAmount = isNewAccount ? NBTC_STORAGE_DEPOSIT_AMOUNT : ((_c = accountInfo == null ? void 0 : accountInfo.relayer_fee) == null ? void 0 : _c.amount) || 0;
     const hasDebtArrears = new Big2(debtAmount).gt(0);
     const hasRelayerFeeArrears = new Big2(relayerFeeAmount).gt(0);
     if (!hasDebtArrears && !hasRelayerFeeArrears)
@@ -4034,7 +4092,8 @@ function executeBTCDepositAndAction(_0) {
         btcPublicKey,
         depositType: postActionsStr || depositMsg.extra_msg ? 1 : 0,
         postActions: postActionsStr,
-        extraMsg: depositMsg.extra_msg
+        extraMsg: depositMsg.extra_msg,
+        userDepositAddress
       });
       const txHash = yield sendBitcoin(userDepositAddress, depositAmount, _feeRate);
       yield receiveDepositMsg({
@@ -5269,7 +5328,7 @@ function getGroup(state) {
 
 // src/index.ts
 var getVersion = () => {
-  return "0.5.77-beta";
+  return "0.5.79-beta";
 };
 if (typeof window !== "undefined") {
   window.__BTC_WALLET_VERSION = getVersion();