btc-wallet 0.3.12 → 0.3.13

package/dist/utils/satoshi.d.ts

@@ -5,14 +5,14 @@ export declare function receiveDepositMsg(url: string, { btcPublicKey, txHash, d
     btcPublicKey: string;
     txHash: string;
     depositType?: number;
-    postActions: string;
+    postActions?: string;
     extraMsg?: string;
 }): Promise<any>;
 export declare function checkBridgeTransactionStatus(url: string, txHash: string): Promise<{
-    status: number;
+    Status: number;
     ToTxHash: string;
 }>;
 export declare function checkBtcTransactionStatus(url: string, sig: string): Promise<{
-    status: number;
+    Status: number;
     NearHashList: string[];
 }>;

package/esm/index.js

@@ -2686,24 +2686,21 @@ var walletConfig = {
     token: "nbtc-dev.testnet",
     accountContractId: "acc-dev.testnet",
     bridgeContractId: "brg-dev.testnet",
-    walletUrl: "https://wallet-dev.satoshibridge.top",
-    gasTokenLimit: "3000"
+    walletUrl: "https://wallet-dev.satoshibridge.top"
   },
   testnet: {
     base_url: "https://api.testnet.satoshibridge.top",
     token: "nbtc2-nsp.testnet",
     accountContractId: "dev2-nsp.testnet",
     bridgeContractId: "brg2-nsp.testnet",
-    walletUrl: "https://wallet-test.satoshibridge.top",
-    gasTokenLimit: "3000"
+    walletUrl: "https://wallet-test.satoshibridge.top"
   },
   mainnet: {
     base_url: "https://api.mainnet.satoshibridge.top",
     token: "",
     accountContractId: "",
     bridgeContractId: "",
-    walletUrl: "https://wallet.satoshibridge.top",
-    gasTokenLimit: "3000"
+    walletUrl: "https://wallet.satoshibridge.top"
   }
 };
 var nearRpcUrls = {
@@ -2713,9 +2710,7 @@ var nearRpcUrls = {
     "https://free.rpc.fastnear.com",
     "https://near.drpc.org"
   ],
-  testnet: [
-    "https://rpc.testnet.near.org"
-  ]
+  testnet: ["https://rpc.testnet.near.org"]
 };
 var btcRpcUrls = {
   mainnet: "https://mempool.space/api",
@@ -2926,14 +2921,14 @@ function checkBridgeTransactionStatus(url, txHash) {
     const { result_code, result_message, result_data } = yield request(`${url}/v1/bridgeFromTx?fromTxHash=${txHash}&fromChainId=1`, {
       timeout: 3e5,
       pollingInterval: 5e3,
-      maxPollingAttempts: 30,
+      maxPollingAttempts: 60,
       shouldStopPolling: (res) => {
         var _a;
-        return res.result_code === 0 && [4, 102].includes(((_a = res.result_data) == null ? void 0 : _a.status) || 0);
+        return res.result_code === 0 && [4, 102].includes(((_a = res.result_data) == null ? void 0 : _a.Status) || 0);
       }
     });
     console.log("checkTransactionStatus resp:", { result_code, result_message, result_data });
-    if ((result_data == null ? void 0 : result_data.status) !== 4) {
+    if ((result_data == null ? void 0 : result_data.Status) !== 4) {
       throw new Error(result_message);
     }
     return result_data;
@@ -2944,201 +2939,20 @@ function checkBtcTransactionStatus(url, sig) {
     const { result_code, result_message, result_data } = yield request(`${url}/v1/btcTx?sig=${sig}`, {
       timeout: 3e5,
       pollingInterval: 5e3,
-      maxPollingAttempts: 30,
+      maxPollingAttempts: 60,
       shouldStopPolling: (res) => {
         var _a;
-        return res.result_code === 0 && [3, 101, 102].includes(((_a = res.result_data) == null ? void 0 : _a.status) || 0);
+        return res.result_code === 0 && [3, 101, 102].includes(((_a = res.result_data) == null ? void 0 : _a.Status) || 0);
       }
     });
     console.log("checkBtcTransactionStatus resp:", { result_code, result_message, result_data });
-    if ((result_data == null ? void 0 : result_data.status) !== 3) {
+    if ((result_data == null ? void 0 : result_data.Status) !== 3) {
       throw new Error(result_message);
     }
     return result_data;
   });
 }
 
-// src/core/btcUtils.ts
-function getBtcProvider() {
-  if (typeof window === "undefined" || !window.btcContext) {
-    throw new Error("BTC Provider is not initialized.");
-  }
-  return window.btcContext;
-}
-function getNetwork() {
-  return __async(this, null, function* () {
-    const network = yield getBtcProvider().getNetwork();
-    console.log("btc network:", network);
-    return network === "livenet" ? "mainnet" : "testnet";
-  });
-}
-function getBtcRpcUrl() {
-  return __async(this, null, function* () {
-    const network = yield getNetwork();
-    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();
-    return nearCallFunction(contractId, methodName, args, { network });
-  });
-}
-function getBtcGasPrice() {
-  return __async(this, null, function* () {
-    const defaultFeeRate = 100;
-    try {
-      const btcRpcUrl = yield getBtcRpcUrl();
-      const res = yield fetch(`${btcRpcUrl}/v1/fees/recommended`).then((res2) => res2.json());
-      const feeRate = res.fastestFee;
-      return feeRate || defaultFeeRate;
-    } catch (error) {
-      return defaultFeeRate;
-    }
-  });
-}
-function getBtcBalance() {
-  return __async(this, null, function* () {
-    const { account } = yield retryOperation(getBtcProvider, (res) => !!res.account);
-    if (!account) {
-      console.error("BTC Account is not available.");
-      return { rawBalance: 0, balance: 0, maxSpendableBalance: 0 };
-    }
-    const btcRpcUrl = yield getBtcRpcUrl();
-    const utxos = yield fetch(`${btcRpcUrl}/address/${account}/utxo`).then((res) => res.json());
-    const rawBalance = (utxos == null ? void 0 : utxos.reduce((acc, cur) => acc + cur.value, 0)) || 0;
-    const balance = rawBalance / __pow(10, 8);
-    const feeRate = yield getBtcGasPrice();
-    const inputSize = ((utxos == null ? void 0 : utxos.length) || 0) * 66;
-    const outputSize = 34;
-    const overheadSize = 10;
-    const estimatedTxSize = inputSize + outputSize + overheadSize;
-    const estimatedFee = estimatedTxSize * feeRate / __pow(10, 8);
-    console.log("estimated fee:", estimatedFee);
-    const availableBalance = Math.max(0, balance - estimatedFee);
-    return {
-      rawBalance,
-      balance,
-      availableBalance
-    };
-  });
-}
-function sendBitcoin(address, amount, feeRate) {
-  return __async(this, null, function* () {
-    const { sendBitcoin: sendBitcoin2 } = getBtcProvider();
-    const txHash = yield sendBitcoin2(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 Big(amount).minus(fee).toFixed(0);
-  });
-}
-function executeBTCDepositAndAction(_0) {
-  return __async(this, arguments, function* ({
-    action,
-    feeRate,
-    isDev = false
-  }) {
-    try {
-      const { getPublicKey } = getBtcProvider();
-      const config = yield getConfig(isDev);
-      const btcPublicKey = yield getPublicKey();
-      if (!btcPublicKey) {
-        throw new Error("BTC Public Key is not available.");
-      }
-      if (!action.receiver_id) {
-        throw new Error("receiver_id is required");
-      }
-      if (!action.amount) {
-        throw new Error("amount is required");
-      }
-      const csna = yield nearCall(
-        config.accountContractId,
-        "get_chain_signature_near_account_id",
-        {
-          btc_public_key: btcPublicKey
-        }
-      );
-      const depositMsg = {
-        recipient_id: csna,
-        post_actions: [
-          __spreadProps(__spreadValues({}, action), {
-            gas: new Big(100).mul(__pow(10, 12)).toFixed(0)
-          })
-        ]
-      };
-      const storageDepositMsg = {};
-      const accountInfo = yield nearCall(
-        config.accountContractId,
-        "get_account",
-        {
-          account_id: csna
-        }
-      );
-      if (!(accountInfo == null ? void 0 : 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)) {
-        storageDepositMsg.storage_deposit_msg = {
-          contract_id: action.receiver_id,
-          deposit: new Big(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("get_user_deposit_address params:", { deposit_msg: depositMsg });
-      const userDepositAddress = yield nearCall(
-        config.bridgeContractId,
-        "get_user_deposit_address",
-        { deposit_msg: depositMsg }
-      );
-      const _feeRate = feeRate || (yield getBtcGasPrice());
-      const minDepositAmount = 5e3;
-      const sendAmount = Math.max(minDepositAmount, new Big(action.amount).toNumber());
-      console.log("user deposit address:", userDepositAddress);
-      console.log("send amount:", sendAmount);
-      console.log("fee rate:", _feeRate);
-      const txHash = yield sendBitcoin(userDepositAddress, sendAmount, _feeRate);
-      yield receiveDepositMsg(config.base_url, {
-        btcPublicKey,
-        txHash,
-        postActions: JSON.stringify(depositMsg.post_actions),
-        extraMsg: depositMsg.extra_msg
-      });
-      const checkTransactionStatusRes = yield checkBridgeTransactionStatus(config.base_url, txHash);
-      console.log("checkBridgeTransactionStatus resp:", checkTransactionStatusRes);
-      const network = yield getNetwork();
-      const result = yield pollTransactionStatuses(network, [checkTransactionStatusRes.ToTxHash]);
-      return result;
-    } catch (error) {
-      console.error("executeBTCDepositAndAction error:", error);
-      throw error;
-    }
-  });
-}
-
 // src/utils/Dialog.ts
 var Dialog = class {
   static injectStyles() {
@@ -3320,6 +3134,249 @@ Dialog.style = `
     }
   `;
 
+// src/core/btcUtils.ts
+function getBtcProvider() {
+  if (typeof window === "undefined" || !window.btcContext) {
+    throw new Error("BTC Provider is not initialized.");
+  }
+  return window.btcContext;
+}
+function getNetwork() {
+  return __async(this, null, function* () {
+    const network = yield getBtcProvider().getNetwork();
+    console.log("btc network:", network);
+    return network === "livenet" ? "mainnet" : "testnet";
+  });
+}
+function getBtcRpcUrl() {
+  return __async(this, null, function* () {
+    const network = yield getNetwork();
+    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();
+    return nearCallFunction(contractId, methodName, args, { network });
+  });
+}
+function getAccountInfo(csna, accountContractId) {
+  return __async(this, null, function* () {
+    const accountInfo = yield nearCall(accountContractId, "get_account", { account_id: csna });
+    return accountInfo;
+  });
+}
+function checkGasTokenArrears(debtInfo, isDev, autoDeposit) {
+  return __async(this, null, function* () {
+    const config = yield getConfig(isDev);
+    const transferAmount = debtInfo.transfer_amount || "0";
+    console.log("get_account debtInfo:", debtInfo);
+    if (transferAmount === "0")
+      return;
+    const action = {
+      receiver_id: config.token,
+      amount: transferAmount,
+      msg: JSON.stringify("Deposit")
+    };
+    if (!autoDeposit)
+      return action;
+    const confirmed = yield Dialog.confirm({
+      title: "Has gas token arrears",
+      message: "You have gas token arrears, please deposit gas token to continue."
+    });
+    if (confirmed) {
+      yield executeBTCDepositAndAction({ action, isDev });
+      yield Dialog.alert({
+        title: "Deposit success",
+        message: "Deposit success, will continue to execute transaction."
+      });
+    } else {
+      throw new Error("Deposit failed, please deposit gas token first.");
+    }
+  });
+}
+function getBtcGasPrice() {
+  return __async(this, null, function* () {
+    const network = yield getNetwork();
+    const defaultFeeRate = network === "mainnet" ? 5 : 2500;
+    try {
+      const btcRpcUrl = yield getBtcRpcUrl();
+      const res = yield fetch(`${btcRpcUrl}/v1/fees/recommended`).then((res2) => res2.json());
+      const feeRate = res.fastestFee;
+      return feeRate || defaultFeeRate;
+    } catch (error) {
+      return defaultFeeRate;
+    }
+  });
+}
+function getBtcBalance() {
+  return __async(this, null, function* () {
+    const { account } = yield retryOperation(getBtcProvider, (res) => !!res.account);
+    if (!account) {
+      console.error("BTC Account is not available.");
+      return { rawBalance: 0, balance: 0, maxSpendableBalance: 0 };
+    }
+    const btcRpcUrl = yield getBtcRpcUrl();
+    const utxos = yield fetch(`${btcRpcUrl}/address/${account}/utxo`).then((res) => res.json());
+    const rawBalance = (utxos == null ? void 0 : utxos.reduce((acc, cur) => acc + cur.value, 0)) || 0;
+    const balance = rawBalance / __pow(10, 8);
+    const feeRate = yield getBtcGasPrice();
+    const inputSize = ((utxos == null ? void 0 : utxos.length) || 0) * 66;
+    const outputSize = 34;
+    const overheadSize = 10;
+    const estimatedTxSize = inputSize + outputSize + overheadSize;
+    const estimatedFee = estimatedTxSize * feeRate / __pow(10, 8);
+    console.log("estimated fee:", estimatedFee);
+    const availableBalance = Math.max(0, balance - estimatedFee);
+    return {
+      rawBalance,
+      balance,
+      availableBalance
+    };
+  });
+}
+function sendBitcoin(address, amount, feeRate) {
+  return __async(this, null, function* () {
+    const { sendBitcoin: sendBitcoin2 } = getBtcProvider();
+    const txHash = yield sendBitcoin2(address, amount, { feeRate });
+    return txHash;
+  });
+}
+var MINIMUM_DEPOSIT_AMOUNT = 5e3;
+var MINIMUM_DEPOSIT_AMOUNT_BASE = 1e3;
+function estimateDepositAmount(amount, option) {
+  return __async(this, null, function* () {
+    const { receiveAmount } = yield getDepositAmount(amount, __spreadProps(__spreadValues({}, option), { isEstimate: true }));
+    return receiveAmount;
+  });
+}
+function getDepositAmount(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 depositAmount = (option == null ? void 0 : option.isEstimate) ? Number(amount) : Math.max(MINIMUM_DEPOSIT_AMOUNT + MINIMUM_DEPOSIT_AMOUNT_BASE, Number(amount));
+    const fee = Math.max(Number(fee_min), Number(depositAmount) * fee_rate);
+    const receiveAmount = new Big(depositAmount).minus(fee).round(0, Big.roundDown).toNumber();
+    return {
+      depositAmount,
+      receiveAmount: Math.max(receiveAmount, 0),
+      fee
+    };
+  });
+}
+function executeBTCDepositAndAction(_0) {
+  return __async(this, arguments, function* ({
+    action,
+    amount,
+    feeRate,
+    fixedAmount = true,
+    isDev = false
+  }) {
+    var _a;
+    try {
+      const { getPublicKey } = getBtcProvider();
+      const config = yield getConfig(isDev);
+      const btcPublicKey = yield getPublicKey();
+      if (!btcPublicKey) {
+        throw new Error("BTC Public Key is not available.");
+      }
+      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 rawDepositAmount = (_a = action ? action.amount : amount) != null ? _a : "0";
+      if (new Big(rawDepositAmount).lt(0)) {
+        throw new Error("amount must be greater than 0");
+      }
+      const { depositAmount } = yield getDepositAmount(rawDepositAmount, {
+        isDev
+      });
+      const accountInfo = yield getAccountInfo(csna, config.accountContractId);
+      const newActions = [];
+      const gasLimit = new Big(50).mul(__pow(10, 12)).toFixed(0);
+      const repayAction = yield checkGasTokenArrears(accountInfo.debt_info, isDev);
+      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 Big(depositAmount).minus(repayAction.amount).toString() : depositAmount.toString(),
+          gas: gasLimit
+        }));
+      }
+      const depositMsg = {
+        recipient_id: csna,
+        post_actions: newActions.length > 0 ? newActions : void 0
+      };
+      const storageDepositMsg = {};
+      if (!(accountInfo == null ? void 0 : accountInfo.nonce)) {
+        storageDepositMsg.btc_public_key = btcPublicKey;
+      }
+      const registerRes = yield nearCall((action == null ? void 0 : action.receiver_id) || config.token, "storage_balance_of", {
+        account_id: csna
+      });
+      if (!(registerRes == null ? void 0 : registerRes.available)) {
+        storageDepositMsg.storage_deposit_msg = {
+          contract_id: (action == null ? void 0 : action.receiver_id) || config.token,
+          deposit: new Big(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("get_user_deposit_address params:", { deposit_msg: depositMsg });
+      const userDepositAddress = yield nearCall(
+        config.bridgeContractId,
+        "get_user_deposit_address",
+        { deposit_msg: depositMsg }
+      );
+      const _feeRate = feeRate || (yield getBtcGasPrice());
+      const sendAmount = (repayAction == null ? void 0 : repayAction.amount) && fixedAmount ? new Big(depositAmount).plus((repayAction == null ? void 0 : repayAction.amount) || 0).toString() : depositAmount;
+      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 receiveDepositMsg(config.base_url, {
+        btcPublicKey,
+        txHash,
+        depositType: postActionsStr || depositMsg.extra_msg ? 1 : 0,
+        postActions: postActionsStr,
+        extraMsg: depositMsg.extra_msg
+      });
+      const checkTransactionStatusRes = yield checkBridgeTransactionStatus(config.base_url, txHash);
+      console.log("checkBridgeTransactionStatus resp:", checkTransactionStatusRes);
+      const network = yield getNetwork();
+      const result = yield pollTransactionStatuses(network, [checkTransactionStatusRes.ToTxHash]);
+      return result;
+    } catch (error) {
+      console.error("executeBTCDepositAndAction error:", error);
+      throw error;
+    }
+  });
+}
+
 // src/core/setupBTCWallet.ts
 var { transfer, functionCall } = actionCreators;
 var state = {
@@ -3523,8 +3580,8 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
     return __async(this, null, function* () {
       const btcContext = window.btcContext;
       const accountId = state.getAccount();
-      const accountInfo = yield getAccountInfo();
-      yield checkGasTokenArrears(accountInfo.debt_info);
+      const accountInfo = yield getAccountInfo(accountId, currentConfig.accountContractId);
+      yield checkGasTokenArrears(accountInfo.debt_info, isDev, true);
       const trans = [...params.transactions];
       console.log("raw trans:", trans);
       const gasTokenBalance = accountInfo.gas_token[currentConfig.token] || "0";
@@ -3567,39 +3624,6 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
       return result;
     });
   }
-  function checkGasTokenArrears(debtInfo) {
-    return __async(this, null, function* () {
-      const transferAmount = (debtInfo == null ? void 0 : debtInfo.transfer_amount) || "0";
-      console.log("get_account debtInfo:", debtInfo);
-      if (transferAmount === "0")
-        return;
-      const confirmed = yield Dialog.confirm({
-        title: "Has gas token arrears",
-        message: "You have gas token arrears, please deposit gas token to continue."
-      });
-      if (confirmed) {
-        const action = {
-          receiver_id: currentConfig.token,
-          amount: transferAmount,
-          msg: JSON.stringify("Deposit")
-        };
-        yield executeBTCDepositAndAction({ action, isDev });
-        yield Dialog.alert({
-          title: "Deposit success",
-          message: "Deposit success, will continue to execute transaction."
-        });
-      } else {
-        throw new Error("Deposit failed, please deposit gas token first.");
-      }
-    });
-  }
-  function getAccountInfo() {
-    return __async(this, null, function* () {
-      const accountId = state.getAccount();
-      const accountInfo = yield nearCall2(currentConfig.accountContractId, "get_account", { account_id: accountId });
-      return accountInfo;
-    });
-  }
   function createGasTokenTransfer(accountId, amount) {
     return __async(this, null, function* () {
       return {
@@ -3667,6 +3691,7 @@ var BTCWallet = (_0) => __async(void 0, [_0], function* ({
         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",
@@ -3815,7 +3840,7 @@ function setupBTCWallet({
 
 // src/index.ts
 var getVersion = () => {
-  return "0.3.12";
+  return "0.3.13";
 };
 if (typeof window !== "undefined") {
   window.__PARTICLE_BTC_CONNECT_VERSION = getVersion();
@@ -3833,10 +3858,13 @@ export {
   UnisatConnector,
   WizzConnector,
   XverseConnector,
+  checkGasTokenArrears,
   estimateDepositAmount,
   executeBTCDepositAndAction,
+  getAccountInfo,
   getBtcBalance,
   getBtcGasPrice,
+  getDepositAmount,
   getVersion,
   sendBitcoin,
   setupBTCWallet,