@exodus/bitcoin-api 2.6.4 → 2.6.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "2.6.4",
+  "version": "2.6.6",
   "description": "Exodus bitcoin-api",
   "main": "src/index.js",
   "files": [
@@ -22,13 +22,13 @@
     "@exodus/basic-utils": "^2.1.0",
     "@exodus/bip-schnorr": "0.6.6-fork-1",
     "@exodus/bip44-constants": "^195.0.0",
+    "@exodus/bitcoinjs-lib": "^6.1.5-exodus.0",
     "@exodus/models": "^11.0.0",
     "@exodus/secp256k1": "4.0.2-exodus.0",
     "@exodus/simple-retry": "0.0.6",
     "@exodus/timer": "^1.0.0",
     "@noble/secp256k1": "~1.7.1",
     "bech32": "^1.1.3",
-    "bitcoinjs-lib": "^6.1.5",
     "coininfo": "5.1.0",
     "delay": "4.0.1",
     "ecpair": "2.0.1",
@@ -43,5 +43,5 @@
     "@scure/btc-signer": "^1.1.0",
     "jest-when": "^3.5.1"
   },
-  "gitHead": "33c832c0c550fa4a885aee9b34f7649bfb5fa464"
+  "gitHead": "b2ed2bffe712facdd412df1a0ebc6a8ac92c4d1c"
 }

package/src/bitcoinjs-lib/ec-pair.js

@@ -0,0 +1,9 @@
+import ECPairFactory from 'ecpair'
+import { eccFactory } from './ecc'
+
+let ECPair
+
+export const getECPair = () => {
+  ECPair = ECPair || ECPairFactory(eccFactory())
+  return ECPair
+}

package/src/bitcoinjs-lib/ecc/desktop.js

@@ -1,4 +1,4 @@
-import { initEccLib } from 'bitcoinjs-lib'
+import { initEccLib } from '@exodus/bitcoinjs-lib'
 import { Point, schnorr, sign } from '@noble/secp256k1'
 import { common, toPubKey } from './common'
 

package/src/bitcoinjs-lib/ecc/mobile.js

@@ -1,4 +1,4 @@
-import { initEccLib } from 'bitcoinjs-lib'
+import { initEccLib } from '@exodus/bitcoinjs-lib'
 import secp256k1 from '@exodus/secp256k1'
 // TODO: temp import until '@noble/secp256k1' can be used
 import { isPoint } from 'tiny-secp256k1'

package/src/bitcoinjs-lib/index.js

@@ -1,2 +1,3 @@
 export * from './ecc'
 export { scriptClassify } from './script-classify'
+export * from './ec-pair'

package/src/bitcoinjs-lib/script-classify/index.js

@@ -1,4 +1,4 @@
-import { payments } from 'bitcoinjs-lib'
+import { payments } from '@exodus/bitcoinjs-lib'
 
 function isPaymentFactory(payment) {
   return (script, eccLib) => {

package/src/btc-like-address.js

@@ -2,7 +2,7 @@ import bs58check from 'bs58check'
 import * as bech32 from 'bech32'
 import assert from 'minimalistic-assert'
 import { identity, pickBy } from 'lodash'
-import * as bitcoinjsOriginal from 'bitcoinjs-lib'
+import * as bitcoinjsOriginal from '@exodus/bitcoinjs-lib'
 
 export const createBtcLikeAddress = ({
   versions,

package/src/btc-like-keys.js

@@ -3,7 +3,7 @@ import wif from 'wif'
 import * as bech32 from 'bech32'
 import assert from 'minimalistic-assert'
 import { identity, pickBy } from 'lodash'
-import * as defaultBitcoinjsLib from 'bitcoinjs-lib'
+import * as defaultBitcoinjsLib from '@exodus/bitcoinjs-lib'
 import secp256k1 from 'secp256k1'
 import { hash160 } from './hash-utils'
 import { toXOnly } from './bitcoinjs-lib/ecc-utils'

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

@@ -57,12 +57,11 @@ export default class InsightAPIClient {
     return !!peerStatus.connected
   }
 
-  /*
-  async fetchBalance (address) {
-    const addrData = await this.fetchAddress(address)
-    return (addrData.balanceSat + addrData.unconfirmedBalanceSat) | 0
+  async fetchBalance(address) {
+    const encodedAddress = encodeURIComponent(address)
+    const url = urlJoin(this._baseURL, `/balance/${encodedAddress}`)
+    return fetchJson(url)
   }
-  */
 
   async fetchBlockHeight() {
     const url = urlJoin(this._baseURL, '/status')

package/src/parse-unsigned-tx.js

@@ -2,7 +2,7 @@ import assert from 'minimalistic-assert'
 import BIPPath from 'bip32-path'
 import BN from 'bn.js'
 import lodash from 'lodash'
-import { Transaction as BitcoinTransactionClass } from 'bitcoinjs-lib'
+import { Transaction as BitcoinTransactionClass } from '@exodus/bitcoinjs-lib'
 
 export const parseUnsignedTxFactory = ({ Transaction = BitcoinTransactionClass } = {}) => async ({
   asset,

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

@@ -505,8 +505,8 @@ export class BitcoinMonitorScanner {
     let utxoCol = UtxoCollection.fromArray(utxos, { currency })
 
     const utxosToRemoveCol = UtxoCollection.fromArray(utxosToRemove, { currency })
-    // if something else can update currentStoredUtxos in the meantime, we probably need to grab it from state again
-    utxoCol = currentStoredUtxos.union(utxoCol).difference(utxosToRemoveCol)
+    // Keep new utxos when they intersect with the stored utxos.
+    utxoCol = utxoCol.union(currentStoredUtxos).difference(utxosToRemoveCol)
 
     for (let tx of Object.values(unconfirmedTxsToCheck)) {
       existingTxs.push({ ...tx, dropped: true }) // TODO: this will decrease the chain index, it shouldn't be an issue considering the gap limit

package/src/tx-send/index.js

@@ -16,7 +16,7 @@ import {
 import { findUnconfirmedSentRbfTxs } from '../tx-utils'
 import { getOrdinalsUtxos, getUsableUtxos, getUtxos } from '../utxos-utils'
 
-import * as defaultBitcoinjsLib from 'bitcoinjs-lib'
+import * as defaultBitcoinjsLib from '@exodus/bitcoinjs-lib'
 
 const ASSETS_SUPPORTED_BIP_174 = [
   'bitcoin',

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

@@ -1,14 +1,13 @@
 import assert from 'minimalistic-assert'
 import lodash from 'lodash'
-import ECPairFactory from 'ecpair'
-import { payments, Psbt, Transaction } from 'bitcoinjs-lib'
+import { payments, Psbt, Transaction } from '@exodus/bitcoinjs-lib'
 import { getOwnProperty } from '@exodus/basic-utils'
 
 import secp256k1 from 'secp256k1'
 
 import { toXOnly } from '../bitcoinjs-lib/ecc-utils'
 import { toAsyncSigner, tweakSigner } from './taproot'
-import { eccFactory } from '../bitcoinjs-lib/ecc'
+import { getECPair } from '../bitcoinjs-lib'
 
 let ECPair
 
@@ -100,7 +99,7 @@ export const signTxFactory = ({ assetName, resolvePurpose, keys, coinInfo, netwo
     const { addressPathsMap } = unsignedTx.txMeta
     const networkInfo = { ...coinInfo.toBitcoinJS(), messagePrefix: '' }
 
-    ECPair = ECPair || ECPairFactory(eccFactory())
+    ECPair = getECPair()
 
     const getKeyAndPurpose = lodash.memoize((address) => {
       const purpose = resolvePurpose(address)

package/src/tx-sign/taproot.js

@@ -1,4 +1,4 @@
-import { crypto } from 'bitcoinjs-lib'
+import { crypto } from '@exodus/bitcoinjs-lib'
 import assert from 'minimalistic-assert'
 import { getSchnorrEntropy } from './default-entropy'
 import { toXOnly } from '../bitcoinjs-lib/ecc-utils'