@exodus/bitcoin-api 1.0.3 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "Exodus bitcoin-api",
   "main": "src/index.js",
   "files": [
@@ -25,6 +25,7 @@
     "@exodus/models": "^8.10.4",
     "@exodus/secp256k1": "4.0.2-exodus.0",
     "@exodus/simple-retry": "0.0.6",
+    "bech32": "^1.1.3",
     "bip44-constants": "55.0.0",
     "coininfo": "5.1.0",
     "delay": "4.0.1",
@@ -38,5 +39,5 @@
     "@exodus/bip-schnorr": "0.6.6-fork-1",
     "@noble/secp256k1": "~1.5.3"
   },
-  "gitHead": "6da3cc2b9aaba76c1e3523d9598e465c4b4f45eb"
+  "gitHead": "00377ab9ad8a29114f5064efcb0197d4257056d1"
 }

package/src/insight-api-client/index.js

@@ -4,6 +4,25 @@ import urlJoin from 'url-join'
 import qs from 'querystring'
 import delay from 'delay'
 
+const getTextFromResponse = async (response) => {
+  try {
+    const responseBody = await response.text()
+    return responseBody.substring(0, 100)
+  } catch (e) {
+    return ''
+  }
+}
+
+const fetchJson = async (url, fetchOptions) => {
+  const response = await fetch(url, fetchOptions)
+  if (!response.ok)
+    throw new Error(
+      `${url} returned ${response.status}: ${response.statusText ||
+        'Unknown Status Text'}. Body: ${await getTextFromResponse(response)}`
+    )
+  return response.json()
+}
+
 // TODO: use p-retry
 async function fetchJsonRetry(url, fetchOptions) {
   const waitTimes = [5, 10, 20, 30].map((t) => t * 1000)
@@ -22,12 +41,6 @@ async function fetchJsonRetry(url, fetchOptions) {
       }
     }
   }
-
-  async function fetchJson(url, fetchOptions) {
-    const response = await fetch(url, fetchOptions)
-    if (!response.ok) throw new Error(`${url} returned ${response.status}: ${response.statusText}`)
-    return response.json()
-  }
 }
 
 export default class InsightAPIClient {
@@ -41,9 +54,7 @@ export default class InsightAPIClient {
 
   async isNetworkConnected() {
     const url = urlJoin(this._baseURL, '/peer')
-    const resp = await fetch(url, { timeout: 10000 })
-    const peerStatus = await resp.json()
-
+    const peerStatus = await fetchJson(url, { timeout: 10000 })
     return !!peerStatus.connected
   }
 
@@ -56,9 +67,7 @@ export default class InsightAPIClient {
 
   async fetchBlockHeight() {
     const url = urlJoin(this._baseURL, '/status')
-    const resp = await fetch(url, { timeout: 10000 })
-    const status = await resp.json()
-
+    const status = await fetchJson(url, { timeout: 10000 })
     return status.info.blocks
   }
 
@@ -68,9 +77,7 @@ export default class InsightAPIClient {
       this._baseURL,
       opts.includeTxs ? `/addr/${encodedAddress}` : `/addr/${encodedAddress}?noTxList=1`
     )
-    const response = await fetch(url)
-
-    return response.json()
+    return fetchJson(url)
   }
 
   async fetchUTXOs(addresses, { assetNames = [] } = {}) {
@@ -81,8 +88,7 @@ export default class InsightAPIClient {
     }
     const encodedAddresses = encodeURIComponent(addresses)
     const url = urlJoin(this._baseURL, `/addrs/${encodedAddresses}/utxo?${query}`)
-    const response = await fetch(url)
-    const utxos = await response.json()
+    const utxos = await fetchJson(url)
 
     return utxos.map((utxo) => ({
       address: utxo.address,
@@ -111,8 +117,7 @@ export default class InsightAPIClient {
   async fetchRawTx(txId: string) {
     const encodedTxId = encodeURIComponent(txId)
     const url = urlJoin(this._baseURL, `/rawtx/${encodedTxId}`)
-    const response = await fetch(url)
-    const { rawtx } = await response.json()
+    const { rawtx } = await fetchJson(url)
     return rawtx
   }
 
@@ -155,14 +160,12 @@ export default class InsightAPIClient {
   async fetchUnconfirmedAncestorData(txId: string) {
     const encodedTxId = encodeURIComponent(txId)
     const url = urlJoin(this._baseURL, `/unconfirmed_ancestor/${encodedTxId}`)
-    const response = await fetch(url)
-    return response.json()
+    return fetchJson(url)
   }
 
   async fetchFeeRate() {
     const url = urlJoin(this._baseURL, '/v2/fees')
-    const response = await fetch(url)
-    return response.json()
+    return fetchJson(url)
   }
 
   async broadcastTx(rawTx) {
@@ -200,16 +203,12 @@ export default class InsightAPIClient {
   async getClaimable(address) {
     const encodedAddress = encodeURIComponent(address)
     const url = urlJoin(this._baseURL, `/addr/${encodedAddress}/claimable`)
-    const response = await fetch(url)
-    if (!response.ok) throw new Error(`${url} returned ${response.status}: ${response.statusText}`)
-    return response.json()
+    return fetchJson(url)
   }
 
   async getUnclaimed(address) {
     const encodedAddress = encodeURIComponent(address)
     const url = urlJoin(this._baseURL, `/addr/${encodedAddress}/unclaimed`)
-    const response = await fetch(url)
-    if (!response.ok) throw new Error(`${url} returned ${response.status}: ${response.statusText}`)
-    return response.json()
+    return fetchJson(url)
   }
 }

package/src/tx-sign/default-create-tx.js

@@ -1,7 +1,7 @@
 import assert from 'minimalistic-assert'
 import lodash from 'lodash'
 import ECPairFactory from 'ecpair'
-import { Psbt } from '@exodus/bitcoinjs-lib'
+import { Psbt, Transaction } from '@exodus/bitcoinjs-lib'
 
 import { toAsyncSigner, tweakSigner } from './taproot'
 
@@ -12,6 +12,15 @@ const _MAXIMUM_FEE_RATES = {
   ravencoin: 1000000,
 }
 
+const canParseTx = (rawTxBuffer) => {
+  try {
+    Transaction.fromBuffer(rawTxBuffer)
+    return true
+  } catch (e) {
+    return false
+  }
+}
+
 export const signTxFactory = ({ assetName, resolvePurpose, keys, coinInfo, network, ecc }) => {
   assert(assetName, 'assetName is required')
   assert(resolvePurpose, 'resolvePurpose is required')
@@ -62,10 +71,18 @@ export const signTxFactory = ({ assetName, resolvePurpose, keys, coinInfo, netwo
         // witness outputs only require the value and the script, not the full transaction
         txIn.witnessUtxo = { value, script: Buffer.from(script, 'hex') }
       } else {
-        // non-witness outptus require the full transaction
         const rawTx = (rawTxs || []).find((t) => t.txId === txId)
+        // non-witness outptus require the full transaction
         assert(!!rawTx, 'Non-witness outputs require the full previous transaction.')
-        txIn.nonWitnessUtxo = Buffer.from(rawTx.rawData, 'hex')
+        const rawTxBuffer = Buffer.from(rawTx.rawData, 'hex')
+        if (canParseTx(rawTxBuffer)) {
+          txIn.nonWitnessUtxo = rawTxBuffer
+        } else {
+          // temp fix for https://exodusio.slack.com/archives/CP202D90Q/p1671014704829939 until bitcoinjs could parse a mweb tx without failing
+          console.warn(`Setting psbt.__CACHE.__UNSAFE_SIGN_NONSEGWIT = true for asset ${assetName}`)
+          psbt.__CACHE.__UNSAFE_SIGN_NONSEGWIT = true
+          txIn.witnessUtxo = { value, script: Buffer.from(script, 'hex') }
+        }
       }
       psbt.addInput(txIn)
     }