@exodus/bitcoin-api 1.0.0 → 1.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Exodus bitcoin-api",
   "main": "src/index.js",
   "files": [
@@ -35,5 +35,6 @@
   },
   "devDependencies": {
     "@noble/secp256k1": "~1.5.3"
-  }
+  },
+  "gitHead": "16aa341d1ce1b6a86dba8516bf19b361a547d880"
 }

package/src/fee/fee-estimator.js

@@ -1,6 +1,5 @@
 // @flow
 import assert from 'minimalistic-assert'
-import { get } from 'lodash'
 import * as varuint from 'varuint-bitcoin'
 import { UtxoCollection } from '@exodus/models'
 
@@ -53,13 +52,16 @@ const scriptPubKeyLengths = {
 // 10 = version: 4, locktime: 4, inputs and outputs count: 1
 // 148 = txId: 32, vout: 4, count: 1, script: 107 (max), sequence: 4
 // 34 = value: 8, count: 1, scriptPubKey: 25 (P2PKH) and 23 (P2SH)
-export const getSizeFactory = ({ ecc }) => (
+export const getSizeFactory = ({ ecc, defaultOutputType, addressApi }) => (
   asset: Object,
   inputs: Array | UtxoCollection,
   outputs: Array,
   { compressed = true } = {}
 ) => {
   assert(ecc, 'ecc is required')
+  assert(defaultOutputType, 'defaultOutputType is required')
+  assert(addressApi, 'addressApi is required')
+  const assetName = asset.name
   if (inputs instanceof UtxoCollection) {
     inputs = Array.from(inputs).map((utxo) => utxo.script || null)
   }
@@ -78,7 +80,7 @@ export const getSizeFactory = ({ ecc }) => (
       const scriptBuffer = Buffer.from(script, 'hex')
       const scriptType = classifyOutput(scriptBuffer)
 
-      const supportedTypes = supportedInputTypes[asset.name] || supportedInputTypes.default
+      const supportedTypes = supportedInputTypes[assetName] || supportedInputTypes.default
       assert(
         supportedTypes.includes(scriptType),
         `Only ${supportedTypes.join(', ')} inputs supported right now`
@@ -93,19 +95,21 @@ export const getSizeFactory = ({ ecc }) => (
     varuint.encodingLength(outputs.length) + // outputs_len
     // output[]
     outputs.reduce((t, output) => {
-      if (output === null) output = get(asset, 'address.versions.bech32') ? 'P2WSH' : 'P2PKH'
+      // if (output === null) output = get(asset, 'address.versions.bech32') ? 'P2WSH' : 'P2PKH'
+
+      if (output === null) output = defaultOutputType
 
       let scriptType = scriptClassify.types[output]
-      const supportedTypes = supportedOutputTypes[asset.name] || supportedOutputTypes.default
+      const supportedTypes = supportedOutputTypes[assetName] || supportedOutputTypes.default
 
       if (!supportedTypes.includes(scriptType)) {
-        if (asset.address.isP2PKH(output)) scriptType = P2PKH
-        else if (asset.address.isP2SH(output)) scriptType = P2SH
-        else if (asset.address.isP2WPKH && asset.address.isP2WPKH(output)) scriptType = P2WPKH
-        else if (asset.address.isP2TR && asset.address.isP2TR(output)) scriptType = P2TR
-        else if (asset.address.isP2WSH && asset.address.isP2WSH(output)) scriptType = P2WSH
+        if (addressApi.isP2PKH(output)) scriptType = P2PKH
+        else if (addressApi.isP2SH(output)) scriptType = P2SH
+        else if (addressApi.isP2WPKH && addressApi.isP2WPKH(output)) scriptType = P2WPKH
+        else if (addressApi.isP2TR && addressApi.isP2TR(output)) scriptType = P2TR
+        else if (addressApi.isP2WSH && addressApi.isP2WSH(output)) scriptType = P2WSH
         else {
-          scriptType = classifyOutput(asset.address.toScriptPubKey(output))
+          scriptType = classifyOutput(addressApi.toScriptPubKey(output))
         }
       }
       assert(
@@ -160,5 +164,8 @@ export const getSizeFactory = ({ ecc }) => (
   return Math.ceil(weight / 4)
 }
 
-const getFeeEstimatorFactory = ({ ecc }) => createDefaultFeeEstimator(getSizeFactory({ ecc }))
+const getFeeEstimatorFactory = ({ ecc, defaultOutputType, addressApi }) => {
+  const getSize = getSizeFactory({ ecc, defaultOutputType, addressApi })
+  return createDefaultFeeEstimator(getSize)
+}
 export default getFeeEstimatorFactory

package/src/utxos-utils.js

@@ -2,7 +2,6 @@
 import { UtxoCollection } from '@exodus/models'
 import { findLargeUnconfirmedTxs } from './tx-utils'
 import assert from 'minimalistic-assert'
-import { mapValues } from '@exodus/basic-utils'
 
 export function getUtxos({ accountState, asset }) {
   return (
@@ -28,19 +27,18 @@ export const getBalancesFactory = ({ taprootEnabled, feeData }) => {
       feeData,
       taprootEnabled,
     }).value
-    return mapValues({ balance, spendableBalance }, (balance) => (balance.isZero ? null : balance))
+    return { balance, spendableBalance }
   }
 }
 
-const isTaprootUtxo = (asset, utxo) =>
-  String(utxo.address).startsWith(asset.address.versions.taproot)
+const isTaprootUtxo = ({ utxo }) => String(utxo.address).length === 62
 
 export function getSpendableUtxos({ asset, utxos, feeData, txSet, taprootEnabled }) {
   if (!['bitcoin', 'bitcointestnet', 'bitcoinregtest'].includes(asset.name)) return utxos
 
   if (!taprootEnabled) {
     utxos = UtxoCollection.fromArray(
-      utxos.toArray().filter((utxo) => !isTaprootUtxo(asset, utxo)),
+      utxos.toArray().filter((utxo) => !isTaprootUtxo({ utxo })),
       { currency: asset.currency }
     )
   }