@exodus/bitcoin-api 2.1.0 → 2.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "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": "667523b6a37cb6d9755082df52c812a86cda594d"
+  "gitHead": "822be47e11cc1537913d678bc2771ac4c09eb899"
 }

package/src/btc-like-address.js

@@ -2,11 +2,12 @@ import bs58check from 'bs58check'
 import bech32 from 'bech32'
 import assert from 'minimalistic-assert'
 import { identity, pickBy } from 'lodash'
+import * as bitcoinjsOriginal from '@exodus/bitcoinjs-lib'
 
 export const createBtcLikeAddress = ({
   versions,
   coinInfo,
-  bitcoinjsLib,
+  bitcoinjsLib: bitcoinjsLibFork,
   ecc,
   useBip86 = false,
   validateFunctions = {},
@@ -50,11 +51,11 @@ export const createBtcLikeAddress = ({
   const isP2TR =
     validateFunctions.isP2TR ||
     (useBip86 &&
-      bitcoinjsLib &&
+      bitcoinjsLibFork &&
       ((addr) => {
         try {
           const network = coinInfo.toBitcoinJS()
-          bitcoinjsLib.payments.p2tr({ address: addr, network }, { eccLib: ecc })
+          bitcoinjsLibFork.payments.p2tr({ address: addr, network }, { eccLib: ecc })
           return true
         } catch (e) {
           return false
@@ -88,13 +89,16 @@ export const createBtcLikeAddress = ({
     purposeValidators.find(({ validator }) => validator(string))?.purpose
   const validate = (string) => Object.values(resolvedValidateFunctions).some((fn) => fn(string))
 
-  const toScriptPubKey =
-    coinInfo && bitcoinjsLib?.address?.toOutputScript
-      ? (string) => {
-          const network = coinInfo.toBitcoinJS()
-          return bitcoinjsLib.address.toOutputScript(string, network, ecc)
-        }
-      : undefined
+  const toScriptPubKey = (string) => {
+    const network = coinInfo.toBitcoinJS()
+    return bitcoinjsOriginal.address.toOutputScript(string, network, ecc)
+  }
+
+  const fromScriptPubKey = (scriptPubKey) => {
+    if (typeof scriptPubKey === 'string') scriptPubKey = Buffer.from(scriptPubKey, 'hex')
+    const network = coinInfo.toBitcoinJS()
+    return bitcoinjsOriginal.address.fromOutputScript(scriptPubKey, network)
+  }
 
   return pickBy(
     {
@@ -103,6 +107,7 @@ export const createBtcLikeAddress = ({
       validate,
       resolvePurpose,
       toScriptPubKey,
+      fromScriptPubKey,
       ...extraFunctions,
     },
     identity

package/src/btc-like-keys.js

@@ -1,19 +1,14 @@
 import bs58check from 'bs58check'
 import wif from 'wif'
-import createHash from 'create-hash'
 import bech32 from 'bech32'
 import assert from 'minimalistic-assert'
 import { identity, pickBy } from 'lodash'
 import * as defaultBitcoinjsLib from '@exodus/bitcoinjs-lib'
+import secp256k1 from 'secp256k1'
+import { hash160 } from './hash-utils'
 
 export const publicKeyToHashFactory = (p2pkh) => (publicKey) => {
-  const sha = createHash('sha256')
-    .update(publicKey)
-    .digest()
-  const pubKeyHash = createHash('rmd160')
-    .update(sha)
-    .digest()
-  const payload = Buffer.concat([Buffer.from([p2pkh]), pubKeyHash])
+  const payload = Buffer.concat([Buffer.from([p2pkh]), hash160(publicKey)])
   return bs58check.encode(payload)
 }
 
@@ -54,12 +49,7 @@ export const createBtcLikeKeys = ({
   const encodePublicBech32 =
     encodePublicBech32Custom || versions.bech32 !== undefined
       ? (publicKey) => {
-          const sha = createHash('sha256')
-            .update(publicKey)
-            .digest()
-          const pubKeyHash = createHash('rmd160')
-            .update(sha)
-            .digest()
+          const pubKeyHash = hash160(publicKey)
           const witnessVersion = Buffer.from([0])
           const witnessProgram = Buffer.concat([
             witnessVersion,
@@ -82,8 +72,9 @@ export const createBtcLikeKeys = ({
   const encodeNestedP2WPKH =
     encodeNestedP2WPKHCustom || bitcoinjsLib
       ? (publicKey) => {
+          const pubkey = secp256k1.publicKeyConvert(publicKey, true)
           const witnessProgram = bitcoinjsLib.payments.p2wpkh({
-            pubkey: publicKey,
+            pubkey,
           }).output
 
           const witnessProgramHash = bitcoinjsLib.crypto.hash160(witnessProgram)

package/src/hash-utils.js

@@ -0,0 +1,19 @@
+import createHash from 'create-hash'
+export function hash160(buffer) {
+  const sha256Hash = sha256(buffer)
+  try {
+    return createHash('ripemd160')
+      .update(sha256Hash)
+      .digest()
+  } catch {
+    return createHash('rmd160')
+      .update(sha256Hash)
+      .digest()
+  }
+}
+
+export function sha256(buffer) {
+  return createHash('sha256')
+    .update(buffer)
+    .digest()
+}

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-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)
   }