btc-wallet 0.5.12-beta → 0.5.13-beta

package/esm/index.js

@@ -3558,7 +3558,7 @@ function getWithdrawTransaction(_0) {
     env = "mainnet"
   }) {
     const provider = getBtcProvider();
-    const btcAddress = yield provider.account;
+    const btcAddress = provider.account;
     const config = yield getConfig(env);
     const brgConfig = yield nearCall(config.bridgeContractId, "get_config", {});
     if (brgConfig.min_withdraw_amount) {
@@ -3582,7 +3582,7 @@ function getWithdrawTransaction(_0) {
       };
     });
     const _feeRate = feeRate || (yield getBtcGasPrice());
-    const { inputs, outputs, fee } = coinselect(
+    let { inputs, outputs, fee } = coinselect(
       utxos,
       [{ address: btcAddress, value: Number(amount) }],
       Math.ceil(_feeRate)
@@ -3591,32 +3591,61 @@ function getWithdrawTransaction(_0) {
       throw new Error("The network is busy, please try again later.");
     }
     const maxBtcFee = Number(brgConfig.max_btc_gas_fee);
-    const newFee = fee;
-    const withdrawChangeAddress = brgConfig.change_address;
-    if (newFee > maxBtcFee) {
+    const transactionFee = fee;
+    const changeAddress = brgConfig.change_address;
+    if (transactionFee > maxBtcFee) {
       throw new Error("Gas exceeds maximum value");
     }
-    let userOutput, noUserOutput;
+    let recipientOutput, changeOutput;
     for (let i = 0; i < outputs.length; i++) {
       const output = outputs[i];
       if (output.value.toString() === amount.toString()) {
-        userOutput = output;
+        recipientOutput = output;
       } else {
-        noUserOutput = output;
+        changeOutput = output;
       }
       if (!output.address) {
-        output.address = withdrawChangeAddress;
+        output.address = changeAddress;
       }
     }
-    userOutput.value = new Big(userOutput.value).minus(newFee).minus(withdrawFee).toNumber();
-    if (noUserOutput) {
-      noUserOutput.value = new Big(noUserOutput.value).plus(newFee).plus(withdrawFee).toNumber();
+    recipientOutput.value = new Big(recipientOutput.value).minus(transactionFee).minus(withdrawFee).toNumber();
+    if (changeOutput) {
+      changeOutput.value = new Big(changeOutput.value).plus(transactionFee).plus(withdrawFee).toNumber();
+      const remainingInputs = [...inputs];
+      let smallestInput = Math.min.apply(
+        null,
+        remainingInputs.map((input) => input.value)
+      );
+      let remainingChangeAmount = changeOutput.value;
+      while (remainingChangeAmount >= smallestInput && smallestInput > 0 && remainingInputs.length > 0) {
+        remainingChangeAmount -= smallestInput;
+        changeOutput.value = remainingChangeAmount;
+        const smallestInputIndex = remainingInputs.findIndex(
+          (input) => input.value === smallestInput
+        );
+        if (smallestInputIndex > -1) {
+          remainingInputs.splice(smallestInputIndex, 1);
+        }
+        smallestInput = Math.min.apply(
+          null,
+          remainingInputs.map((input) => input.value)
+        );
+      }
+      const minChangeAmount = Number(brgConfig.min_change_amount);
+      let additionalFee = 0;
+      if (changeOutput.value === 0) {
+        outputs = outputs.filter((item) => item.value !== 0);
+      } else if (changeOutput.value < minChangeAmount) {
+        additionalFee = minChangeAmount - changeOutput.value;
+        recipientOutput.value -= additionalFee;
+        changeOutput.value = minChangeAmount;
+      }
     } else {
-      noUserOutput = {
-        address: withdrawChangeAddress,
-        value: new Big(newFee).plus(withdrawFee).toNumber()
+      changeOutput = {
+        address: changeAddress,
+        value: new Big(transactionFee).plus(withdrawFee).toNumber()
       };
-      outputs.push(noUserOutput);
+      outputs.push(changeOutput);
     }
     const insufficientOutput = outputs.some((item) => item.value < 0);
     if (insufficientOutput) {
@@ -3624,7 +3653,7 @@ function getWithdrawTransaction(_0) {
     }
     const inputSum = inputs.reduce((sum, cur) => sum + Number(cur.value), 0);
     const outputSum = outputs.reduce((sum, cur) => sum + Number(cur.value), 0);
-    if (newFee + outputSum !== inputSum) {
+    if (transactionFee + outputSum !== inputSum) {
       throw new Error("compute error");
     }
     const network = yield getNetwork();
@@ -4505,7 +4534,7 @@ function setupBTCWallet({
 
 // src/index.ts
 var getVersion = () => {
-  return "0.5.12-beta";
+  return "0.5.13-beta";
 };
 if (typeof window !== "undefined") {
   window.__BTC_WALLET_VERSION = getVersion();