@exodus/bitcoin-api 2.0.1 → 2.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "2.0.1",
+  "version": "2.1.1",
   "description": "Exodus bitcoin-api",
   "main": "src/index.js",
   "files": [
@@ -40,5 +40,5 @@
     "@exodus/bip-schnorr": "0.6.6-fork-1",
     "@noble/secp256k1": "~1.5.3"
   },
-  "gitHead": "de014dde36e372655e982879a4c217cb4c4f9f07"
+  "gitHead": "d74d7ee6a7ca8da4373ea7b6aad6b245a50cae27"
 }

package/src/move-funds.js

@@ -2,21 +2,28 @@ import wif from 'wif'
 import { UtxoCollection, Address } from '@exodus/models'
 import { createInputs, createOutput, getNonWitnessTxs } from './tx-send'
 import assert from 'minimalistic-assert'
-import assets from '@exodus/assets'
 
-export const moveFundsFactory = ({ insightClient, getFeeEstimator, keys, signTx, address }) => {
+export const moveFundsFactory = ({
+  asset,
+  insightClient,
+  getFeeEstimator,
+  keys,
+  signTx,
+  address,
+}) => {
+  assert(asset, 'asset is required')
   assert(insightClient, 'insightClient is required')
   assert(getFeeEstimator, 'getFeeEstimator is required')
   assert(address, 'address is required')
   assert(keys, 'keys is required')
   assert(signTx, 'signTx is required')
   async function prepareFunds(assetName, input, options = {}) {
-    const asset = assets[assetName]
     const { toAddress, assetClientInterface, MoveFundsError, walletAccount } = options
     assert(MoveFundsError, 'MoveFundsError is required') // should we move MoveFundsError to asset libs?
     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}`)
 
     const formatProps = {
       asset,

package/src/tx-log/bitcoin-monitor-scanner.js

@@ -375,15 +375,17 @@ export class BitcoinMonitorScanner {
         // this is an array because legacy multisig has multiple addresses
         if (!Array.isArray(vout.scriptPubKey.addresses)) return
         if (vout.scriptPubKey.addresses.length === 0) return
-        if (!addrMap[vout.scriptPubKey.addresses[0]]) {
+        const sentAddress = vout.scriptPubKey.addresses[0]
+        if (!addrMap[sentAddress]) {
           if (isSent && !txLogItem.to) {
             const val = currency.defaultUnit(vout.value)
-            txLogItem.data.sent.push({ address: vout.scriptPubKey.addresses[0], amount: val })
+            const sentDisplayAddress = asset.address.displayAddress?.(sentAddress) || sentAddress
+            txLogItem.data.sent.push({ address: sentDisplayAddress, amount: val })
           }
           return
         }
 
-        const address = addrMap[vout.scriptPubKey.addresses[0]]
+        const address = addrMap[sentAddress]
         if (isReceiveAddress(address)) {
           txLogItem.addresses.push(address)
         }

package/src/tx-send/index.js

@@ -130,9 +130,10 @@ export const createAndBroadcastTXFactory = ({
 
   let replaceableTxs = findUnconfirmedSentRbfTxs(txSet)
 
-  if (assetName === 'bcash') {
+  if (asset.address.toLegacyAddress) {
     address = asset.address.toLegacyAddress(address)
   }
+
   if (assetName === 'digibyte') {
     if (asset.address.isP2SH2(address)) {
       address = asset.address.P2SH2ToP2SH(address)
@@ -216,7 +217,7 @@ export const createAndBroadcastTXFactory = ({
   const change = selectedUtxos.value.sub(totalAmount).sub(fee)
   const dust = getDustValue(asset)
   let ourAddress = replaceTx?.data?.changeAddress || changeAddress
-  if (['bcash'].includes(assetName)) {
+  if (asset.address.toLegacyAddress) {
     const legacyAddress = asset.address.toLegacyAddress(ourAddress.address)
     ourAddress = Address.create(legacyAddress, ourAddress.meta)
   }