btc-wallet 0.3.6 → 0.3.7

package/dist/core/btcUtils.d.ts

@@ -1,9 +1,19 @@
 export declare function getBtcGasPrice(): Promise<number>;
 export declare function getBtcBalance(): Promise<{
+    rawBalance: number;
+    balance: number;
+    maxSpendableBalance: number;
+    availableBalance?: undefined;
+} | {
     rawBalance: any;
     balance: number;
+    availableBalance: number;
+    maxSpendableBalance?: undefined;
 }>;
 export declare function sendBitcoin(address: string, amount: number, feeRate: number): Promise<string>;
+export declare function estimateDepositAmount(amount: string, option?: {
+    isDev: boolean;
+}): Promise<string>;
 interface ExecuteBTCDepositAndActionParams {
     action: {
         receiver_id: string;

package/dist/index.js

@@ -90,6 +90,7 @@ __export(src_exports, {
   UnisatConnector: () => UnisatConnector,
   WizzConnector: () => WizzConnector,
   XverseConnector: () => XverseConnector,
+  estimateDepositAmount: () => estimateDepositAmount,
   executeBTCDepositAndAction: () => executeBTCDepositAndAction,
   getBtcBalance: () => getBtcBalance,
   getBtcGasPrice: () => getBtcGasPrice,
@@ -3268,6 +3269,12 @@ function getBtcRpcUrl() {
     return btcRpcUrls[network];
   });
 }
+function getConfig(isDev) {
+  return __async(this, null, function* () {
+    const network = yield getNetwork();
+    return walletConfig[isDev ? "dev" : network];
+  });
+}
 function nearCall(contractId, methodName, args) {
   return __async(this, null, function* () {
     const network = yield getNetwork();
@@ -3322,13 +3329,20 @@ function getBtcBalance() {
     const { account } = yield retryOperation(getBtcProvider, (res2) => !!res2.account);
     if (!account) {
       console.error("BTC Account is not available.");
-      return { rawBalance: 0, balance: 0 };
+      return { rawBalance: 0, balance: 0, maxSpendableBalance: 0 };
     }
     const btcRpcUrl = yield getBtcRpcUrl();
     const res = yield fetch(`${btcRpcUrl}/address/${account}/utxo`).then((res2) => res2.json());
     const rawBalance = res == null ? void 0 : res.reduce((acc, cur) => acc + cur.value, 0);
     const balance = rawBalance / __pow(10, 8);
-    return { rawBalance, balance };
+    const feeRate = yield getBtcGasPrice();
+    const maxGasFee = feeRate * 250 / __pow(10, 8);
+    const availableBalance = Math.max(0, balance - maxGasFee);
+    return {
+      rawBalance,
+      balance,
+      availableBalance
+    };
   });
 }
 function sendBitcoin(address, amount, feeRate) {
@@ -3338,6 +3352,20 @@ function sendBitcoin(address, amount, feeRate) {
     return txHash;
   });
 }
+function estimateDepositAmount(amount, option) {
+  return __async(this, null, function* () {
+    const config = yield getConfig((option == null ? void 0 : option.isDev) || false);
+    const {
+      deposit_bridge_fee: { fee_min, fee_rate }
+    } = yield nearCall(
+      config.bridgeContractId,
+      "get_config",
+      {}
+    );
+    const fee = Math.max(Number(fee_min), Number(amount) * fee_rate);
+    return new import_big.default(amount).minus(fee).toFixed(0);
+  });
+}
 function executeBTCDepositAndAction(_0) {
   return __async(this, arguments, function* ({
     action,
@@ -3346,18 +3374,26 @@ function executeBTCDepositAndAction(_0) {
   }) {
     try {
       const { getPublicKey } = getBtcProvider();
-      const network = yield getNetwork();
-      const config = walletConfig[isDev ? "dev" : network];
+      const config = yield getConfig(isDev);
       const btcPublicKey = yield getPublicKey();
-      const _action = Object.assign({}, action);
+      const _action = Object.assign(
+        {},
+        __spreadProps(__spreadValues({}, action), {
+          gas: new import_big.default(100).mul(__pow(10, 12)).toFixed(0)
+        })
+      );
       if (!btcPublicKey) {
         throw new Error("BTC Public Key is not available.");
       }
       if (!_action.receiver_id) {
         throw new Error("action.receiver_id is required");
       }
+      const amountWithFee = yield estimateDepositAmount(_action.amount, {
+        isDev
+      });
+      _action.amount = amountWithFee;
       if (!_action.amount || !new import_big.default(_action.amount || 0).gt(0)) {
-        throw new Error("action.amount is required and must be greater than 0");
+        throw new Error("action.amount is required or deposit amount is not enough");
       }
       const csna = yield nearCall(
         config.accountContractId,
@@ -3366,34 +3402,41 @@ function executeBTCDepositAndAction(_0) {
           btc_public_key: btcPublicKey
         }
       );
-      _action.amount = new import_big.default(_action.amount).toString();
-      _action.gas = new import_big.default(100).mul(__pow(10, 12)).toFixed(0);
       const depositMsg = {
         recipient_id: csna,
         post_actions: [_action]
       };
+      const storageDepositMsg = {};
+      const accountInfo = yield nearCall(config.accountContractId, "get_account", {
+        account_id: csna
+      });
+      if (!accountInfo.nonce) {
+        storageDepositMsg.btc_public_key = btcPublicKey;
+      }
       const registerRes = yield nearCall(action.receiver_id, "storage_balance_of", {
         account_id: csna
       });
       if (!(registerRes == null ? void 0 : registerRes.available)) {
-        const storageDepositMsg = {
-          storage_deposit_msg: {
-            contract_id: action.receiver_id,
-            deposit: new import_big.default(0.25).mul(__pow(10, 24)).toFixed(0),
-            registration_only: true
-          },
-          btc_public_key: btcPublicKey
+        storageDepositMsg.storage_deposit_msg = {
+          contract_id: action.receiver_id,
+          deposit: new import_big.default(0.25).mul(__pow(10, 24)).toFixed(0),
+          registration_only: true
         };
+      }
+      if (Object.keys(storageDepositMsg).length > 0) {
         depositMsg.extra_msg = JSON.stringify(storageDepositMsg);
       }
-      console.log("depositMsg", depositMsg);
+      console.log("deposit msg:", depositMsg);
       const userDepositAddress = yield nearCall(
         config.bridgeContractId,
         "get_user_deposit_address",
         { deposit_msg: depositMsg }
       );
-      console.log("userDepositAddress", userDepositAddress);
       const _feeRate = feeRate || (yield getBtcGasPrice());
+      console.log("user deposit address:", userDepositAddress);
+      console.log("deposit amount:", new import_big.default(action.amount).toNumber());
+      console.log("receive amount:", new import_big.default(_action.amount).toNumber());
+      console.log("fee rate:", _feeRate);
       const txHash = yield sendBitcoin(
         userDepositAddress,
         new import_big.default(action.amount).toNumber(),
@@ -3417,7 +3460,7 @@ function executeBTCDepositAndAction(_0) {
 
 // src/index.ts
 var getVersion = () => {
-  return "0.3.6";
+  return "0.3.7";
 };
 if (typeof window !== "undefined") {
   window.__PARTICLE_BTC_CONNECT_VERSION = getVersion();