@exodus/bitcoin-api 2.3.2 → 2.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "description": "Exodus bitcoin-api",
   "main": "src/index.js",
   "files": [
@@ -40,5 +40,5 @@
     "@exodus/bitcoin-meta": "^1.0.1",
     "@noble/secp256k1": "~1.5.3"
   },
-  "gitHead": "5bc09581d58d29a80871f4fbb189ff2dcf389b96"
+  "gitHead": "87922c8e20b6e152449dd6e35185587fa78bba25"
 }

package/src/btc-like-address.js

@@ -1,5 +1,5 @@
 import bs58check from 'bs58check'
-import bech32 from 'bech32'
+import * as bech32 from 'bech32'
 import assert from 'minimalistic-assert'
 import { identity, pickBy } from 'lodash'
 import * as bitcoinjsOriginal from '@exodus/bitcoinjs-lib'

package/src/btc-like-keys.js

@@ -1,6 +1,6 @@
 import bs58check from 'bs58check'
 import wif from 'wif'
-import bech32 from 'bech32'
+import * as bech32 from 'bech32'
 import assert from 'minimalistic-assert'
 import { identity, pickBy } from 'lodash'
 import * as defaultBitcoinjsLib from '@exodus/bitcoinjs-lib'

package/src/move-funds.js

@@ -41,13 +41,20 @@ export const moveFundsFactory = ({
   assert(address, 'address is required')
   assert(signTx, 'signTx is required')
   assert(getAddressesFromPrivateKey, 'getAddressesFromPrivateKey is required')
-  async function prepareFunds(assetName, input, options = {}) {
-    const { toAddress, assetClientInterface, MoveFundsError, walletAccount } = options
-    assert(MoveFundsError, 'MoveFundsError is required') // should we move MoveFundsError to asset libs?
+
+  async function prepareSendFundsTx({
+    assetName,
+    walletAccount,
+    input,
+    toAddress,
+    assetClientInterface,
+    MoveFundsError,
+  }) {
+    assert(asset.name === assetName, `expected asset ${asset.name} but got assetName ${assetName}`)
+    assert(walletAccount, 'walletAccount is required')
     assert(toAddress, 'toAddress is required')
     assert(assetClientInterface, 'assetClientInterface is required')
-    assert(walletAccount, 'walletAccount is required')
-    assert(asset.name === assetName, `expected asset ${asset.name} but got assetName ${assetName}`)
+    assert(MoveFundsError, 'MoveFundsError is required') // should we move MoveFundsError to asset libs?
 
     const formatProps = {
       asset,
@@ -69,71 +76,78 @@ export const moveFundsFactory = ({
       multiAddressMode: true,
     })
 
-    let found, address, utxos
-    for (address of addresses) {
-      const selfSend = receiveAddresses.some(
-        (receiveAddress) => String(receiveAddress) === String(address)
-      )
-      if (selfSend) {
-        throw new MoveFundsError('private-key-own-key', formatProps)
-      }
+    const findFromAddress = async () => {
+      for (const currentAddress of addresses) {
+        const selfSend = receiveAddresses.some(
+          (receiveAddress) => String(receiveAddress) === String(currentAddress)
+        )
+        if (selfSend) {
+          throw new MoveFundsError('private-key-own-key', formatProps)
+        }
 
-      utxos = await getUtxos({ asset, address })
+        const utxos = await getUtxos({ asset, address: currentAddress })
 
-      if (!utxos.value.isZero) {
-        found = true
-        break
+        if (!utxos.value.isZero) {
+          return { fromAddress: currentAddress, utxos }
+        }
       }
+      throw new MoveFundsError('balance-zero', {
+        ...formatProps,
+        fromAddress: `${addresses.slice(0, -1).join(', ')}, or ${addresses[addresses.length - 1]}`,
+      })
     }
-    if (!found) {
-      formatProps.fromAddress = `${addresses.slice(0, -1).join(', ')}, or ${
-        addresses[addresses.length - 1]
-      }`
-      throw new MoveFundsError('balance-zero', formatProps)
-    }
-    const fromAddress = address
-    formatProps.fromAddress = fromAddress
 
+    const { fromAddress, utxos } = await findFromAddress()
+    formatProps.fromAddress = fromAddress
     const feeData = await assetClientInterface.getFeeConfig({ assetName })
-    const fee = getFee({ asset, feeData, utxos, compressed })
+    const { fee, sizeKB } = getFee({ asset, feeData, utxos, compressed })
 
     let amount = utxos.value.sub(fee)
     if (amount.isNegative) {
       throw new MoveFundsError('balance-negative', formatProps)
     }
 
-    return { fromAddress, toAddress, amount, fee, utxos, privateKey }
-  }
-
-  const sendFunds = async (
-    assetName,
-    { fromAddress, toAddress, amount, fee, utxos, privateKey }
-  ) => {
-    assert(fromAddress, 'fromAddress is required')
-    assert(toAddress, 'toAddress is required')
-    assert(fee, 'fee is required')
-    assert(utxos, 'utxos is required')
-    assert(privateKey, 'privateKey is required')
-    const selected = utxos
-    const privateKeysAddressMap = {
-      [fromAddress]: privateKey,
-    }
     const unsignedTx = {
       txData: {
-        inputs: createInputs(assetName, selected.toArray()),
+        inputs: createInputs(assetName, utxos.toArray()),
         outputs: [createOutput(assetName, toAddress, amount)],
       },
       txMeta: {
-        addressPathsMap: selected.getAddressPathsMap(),
+        addressPathsMap: utxos.getAddressPathsMap(),
       },
     }
     const nonWitnessTxs = await getNonWitnessTxs(
       { name: assetName, address }, // pretty ugly hack!
-      selected,
+      utxos,
       insightClient
     )
     Object.assign(unsignedTx.txMeta, { rawTxs: nonWitnessTxs })
 
+    return { fromAddress, toAddress, amount, fee, utxos, unsignedTx, sizeKB, privateKey }
+  }
+
+  const sendFunds = async ({
+    assetName,
+    fromAddress,
+    toAddress,
+    amount,
+    fee,
+    unsignedTx,
+    privateKey,
+  }) => {
+    // the response from prepareSendFundsTx
+    assert(assetName, 'assetName is required')
+    assert(fromAddress, 'fromAddress is required')
+    assert(toAddress, 'toAddress is required')
+    assert(amount, 'amount is required')
+    assert(fee, 'fee is required')
+    assert(unsignedTx, 'unsignedTx is required')
+    assert(privateKey, 'privateKey is required')
+
+    const privateKeysAddressMap = {
+      [fromAddress]: privateKey,
+    }
+
     const { rawTx, txId } = await signTx({ unsignedTx, privateKeysAddressMap })
 
     await insightClient.broadcastTx(rawTx.toString('hex'))
@@ -158,7 +172,9 @@ export const moveFundsFactory = ({
   function getFee({ asset, feeData, utxos, compressed }) {
     const { feePerKB } = feeData
     const feeEstimator = getFeeEstimator(asset, feePerKB, { compressed })
-    return feeEstimator({ inputs: utxos, outputs: [null] }).toDefault()
+    const fee = feeEstimator({ inputs: utxos, outputs: [null] })
+    const sizeKB = fee.toDefaultNumber() / feePerKB
+    return { fee, sizeKB }
   }
 
   function isValidPrivateKey(privateKey) {
@@ -171,7 +187,7 @@ export const moveFundsFactory = ({
   }
 
   return {
-    prepareFunds,
+    prepareSendFundsTx,
     sendFunds,
   }
 }