@exodus/bitcoin-api 2.3.13 → 2.3.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "2.3.13",
+  "version": "2.3.15",
   "description": "Exodus bitcoin-api",
   "main": "src/index.js",
   "files": [
@@ -41,5 +41,5 @@
     "@exodus/bitcoin-meta": "^1.0.1",
     "jest-when": "^3.5.1"
   },
-  "gitHead": "f21eede554fe7a0b99f2f65121457ece5d18f2b6"
+  "gitHead": "90be61265b73fc6f3238604aea72368cf684faa5"
 }

package/src/move-funds.js

@@ -4,26 +4,39 @@ import { createInputs, createOutput, getNonWitnessTxs } from './tx-send'
 import assert from 'minimalistic-assert'
 import secp256k1 from 'secp256k1'
 
-function wifToPublicKey({ coinInfo, privateKeyWIF }) {
+const isValidPrivateKey = (privateKey) => {
+  try {
+    wif.decode(privateKey)
+    return true
+  } catch (err) {
+    return false
+  }
+}
+
+const wifToPublicKey = ({ coinInfo, privateKeyWIF }) => {
   assert(coinInfo, 'coinInfo is required')
   assert(privateKeyWIF, 'privateKeyWIF is required')
   const { versions } = coinInfo
 
   const { privateKey, compressed } = wif.decode(privateKeyWIF, versions.private)
-  return secp256k1.publicKeyCreate(privateKey, compressed)
+  return { compressed, publicKey: secp256k1.publicKeyCreate(privateKey, compressed) }
 }
-
 export const getAddressesFromPrivateKeyFactory = ({ purposes, keys, coinInfo }) => {
   assert(purposes, 'purposes is required')
   assert(keys, 'keys is required')
   assert(coinInfo, 'coinInfo is required')
+
   return ({ privateKey }) => {
-    const publicKey = wifToPublicKey({ coinInfo, privateKeyWIF: privateKey })
-    return purposes.map((purpose) =>
+    if (!isValidPrivateKey(privateKey)) {
+      return { invalid: true }
+    }
+    const { publicKey, compressed } = wifToPublicKey({ coinInfo, privateKeyWIF: privateKey })
+    const addresses = purposes.map((purpose) =>
       keys.encodePublic(purpose === 49 ? secp256k1.publicKeyConvert(publicKey, true) : publicKey, {
         purpose,
       })
     )
+    return { addresses, compressed }
   }
 }
 
@@ -44,6 +57,7 @@ export const moveFundsFactory = ({
   signTx,
   address,
   getAddressesFromPrivateKey,
+  shouldExcludeVoutUtxo = () => false,
 }) => {
   assert(asset, 'asset is required')
   assert(insightClient, 'insightClient is required')
@@ -51,6 +65,7 @@ export const moveFundsFactory = ({
   assert(address, 'address is required')
   assert(signTx, 'signTx is required')
   assert(getAddressesFromPrivateKey, 'getAddressesFromPrivateKey is required')
+  assert(typeof shouldExcludeVoutUtxo === 'function', 'shouldExcludeVoutUtxo must be a function')
 
   async function prepareSendFundsTx({
     assetName,
@@ -73,21 +88,31 @@ export const moveFundsFactory = ({
     // WIF format private key
     const privateKey = input
 
-    if (!isValidPrivateKey(privateKey)) {
+    const { addresses, compressed, invalid } = getAddressesFromPrivateKey({
+      privateKey,
+      formatProps,
+      MoveFundsError,
+    })
+
+    if (invalid) {
       throw new MoveFundsError('private-key-invalid', formatProps)
     }
 
-    const { compressed } = wif.decode(privateKey)
-    const addresses = getAddressesFromPrivateKey({ privateKey })
-
-    const receiveAddresses = await assetClientInterface.getReceiveAddresses({
-      walletAccount,
-      assetName,
-      multiAddressMode: true,
-    })
+    const receiveAddresses = (
+      await assetClientInterface.getReceiveAddresses({
+        walletAccount,
+        assetName,
+        multiAddressMode: true,
+      })
+    ).map(
+      (receiveAddress) =>
+        address.toLegacyAddress?.(receiveAddress.toString()) || receiveAddress.toString()
+    )
 
     const findFromAddress = async () => {
-      for (const currentAddress of addresses) {
+      for (const originalCurrentAddress of addresses) {
+        const currentAddress =
+          address.toLegacyAddress?.(originalCurrentAddress) || originalCurrentAddress
         const selfSend = receiveAddresses.some(
           (receiveAddress) => String(receiveAddress) === String(currentAddress)
         )
@@ -95,7 +120,8 @@ export const moveFundsFactory = ({
           throw new MoveFundsError('private-key-own-key', formatProps)
         }
 
-        const utxos = await getUtxos({ asset, address: currentAddress })
+        const collectedUtxos = await getUtxos({ asset, address: currentAddress })
+        const utxos = collectedUtxos.filter((utxo) => !shouldExcludeVoutUtxo({ output: utxo }))
 
         if (!utxos.value.isZero) {
           return { fromAddress: currentAddress, utxos }
@@ -121,7 +147,9 @@ export const moveFundsFactory = ({
     const unsignedTx = {
       txData: {
         inputs: createInputs(assetName, utxos.toArray()),
-        outputs: [createOutput(assetName, toAddress, amount)],
+        outputs: [
+          createOutput(assetName, address.toLegacyAddress?.(toAddress) || toAddress, amount),
+        ],
       },
       txMeta: {
         addressPathsMap: utxos.getAddressPathsMap(),
@@ -188,15 +216,6 @@ export const moveFundsFactory = ({
     return { fee, sizeKB }
   }
 
-  function isValidPrivateKey(privateKey) {
-    try {
-      wif.decode(privateKey)
-      return true
-    } catch (err) {
-      return false
-    }
-  }
-
   return {
     prepareSendFundsTx,
     sendFunds,