@exodus/bitcoin-api 2.9.3 → 2.9.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "2.9.3",
+  "version": "2.9.5",
   "description": "Exodus bitcoin-api",
   "main": "src/index.js",
   "files": [
@@ -18,12 +18,10 @@
     "lint:fix": "yarn lint --fix"
   },
   "dependencies": {
-    "@exodus/asset-lib": "^4.0.0",
+    "@exodus/asset-lib": "^4.1.0",
     "@exodus/basic-utils": "^2.1.0",
-    "@exodus/bip-schnorr": "0.6.6-fork-1",
     "@exodus/bip44-constants": "^195.0.0",
     "@exodus/bitcoin-lib": "2.3.0",
-    "@exodus/bitcoinjs-lib": "^6.1.5-exodus.0",
     "@exodus/currency": "^2.3.2",
     "@exodus/fetch": "^1.3.0",
     "@exodus/models": "^11.0.0",
@@ -33,6 +31,7 @@
     "@noble/secp256k1": "~1.7.1",
     "bech32": "^1.1.3",
     "bip32-path": "^0.4.2",
+    "bitcoinjs-lib": "^6.1.5",
     "bn.js": "4.12.0",
     "bs58check": "^2.1.2",
     "coininfo": "5.1.0",
@@ -58,5 +57,5 @@
     "jest-when": "^3.5.1",
     "safe-buffer": "^5.2.1"
   },
-  "gitHead": "fe5b49b00fff26b6090cad149ca522db8aa971f8"
+  "gitHead": "fe502508d90e04ca63c4a7d134c7ef83082f7fce"
 }

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

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

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

@@ -1,4 +1,4 @@
-import { payments } from '@exodus/bitcoinjs-lib'
+import { payments } from '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 '@exodus/bitcoinjs-lib'
+import * as bitcoinjsOriginal from '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 '@exodus/bitcoinjs-lib'
+import * as defaultBitcoinjsLib from 'bitcoinjs-lib'
 import secp256k1 from 'secp256k1'
 import { hash160 } from './hash-utils'
 import { toXOnly } from './bitcoinjs-lib/ecc-utils'

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 '@exodus/bitcoinjs-lib'
+import { Transaction as BitcoinTransactionClass } from 'bitcoinjs-lib'
 
 export const parseUnsignedTxFactory =
   ({ Transaction = BitcoinTransactionClass } = {}) =>

package/src/tx-send/index.js

@@ -21,7 +21,7 @@ import {
   getUtxos,
 } from '../utxos-utils'
 
-import * as defaultBitcoinjsLib from '@exodus/bitcoinjs-lib'
+import * as defaultBitcoinjsLib from 'bitcoinjs-lib'
 import { getUnconfirmedTxAncestorMap } from '../unconfirmed-ancestor-data'
 
 const ASSETS_SUPPORTED_BIP_174 = new Set([

package/src/tx-sign/create-sign-with-wallet.js

@@ -1,4 +1,4 @@
-import { Transaction, payments } from '@exodus/bitcoinjs-lib'
+import { Transaction, payments } from 'bitcoinjs-lib'
 
 import { getECPair } from '../bitcoinjs-lib'
 import { toXOnly } from '../bitcoinjs-lib/ecc-utils'

package/src/tx-sign/default-prepare-for-signing.js

@@ -1,5 +1,5 @@
 import assert from 'minimalistic-assert'
-import { Psbt, Transaction } from '@exodus/bitcoinjs-lib'
+import { Psbt, Transaction } from 'bitcoinjs-lib'
 
 const _MAXIMUM_FEE_RATES = {
   qtumignition: 25_000,

package/src/tx-sign/taproot.js

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

package/src/bitcoinjs-lib/ecc/index.native.js

@@ -1,3 +0,0 @@
-import { mobileEcc } from './mobile'
-
-export const eccFactory = () => mobileEcc

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

@@ -1,102 +0,0 @@
-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'
-import { common, toPubKey } from './common'
-import schnorr from '@exodus/bip-schnorr'
-
-/**
- * Wrapper around `secp256k1` in order to follow the bitcoinjs-lib `TinySecp256k1Interface`
- * Schnorr signatures are offered by @exodus/bip-schnorr
- *
- */
-
-export const mobileEcc = {
-  ...common,
-
-  /**
-   *
-   * @param message  {Uint8Array}
-   * @param seckey  {Uint8Array}
-   * @param extraEntropy {Uint8Array}
-   * @returns {Promise<(function(*): Uint8Array)|*>}
-   */
-  signAsync: async (message, seckey, extraEntropy) =>
-    secp256k1.ecdsaSign(message, seckey, { data: extraEntropy }).signature,
-
-  /**
-   *
-   * @param message {Uint8Array}
-   * @param privateKey {Uint8Array}
-   * @param extraEntropy {Uint8Array}
-   * @returns {Buffer}
-   */
-  signSchnorr: (message, privateKey, extraEntropy) =>
-    schnorr.sign(privateKey.toString('hex'), message, extraEntropy),
-
-  /**
-   * @param message  {Uint8Array}
-   * @param privateKey {Uint8Array}
-   * @param extraEntropy {Uint8Array}
-   * @returns {Promise<Buffer>}
-   */
-  signSchnorrAsync: async (message, privateKey, extraEntropy) =>
-    mobileEcc.signSchnorr(message, privateKey, extraEntropy),
-
-  /**
-   * @param publicKey {Uint8Array}
-   * @param message {Uint8Array}
-   * @param signature {Uint8Array}
-   * @returns {boolean}
-   */
-  verifySchnorr: (publicKey, message, signature) => {
-    try {
-      schnorr.verify(message, publicKey, signature)
-      return true
-    } catch {
-      return false
-    }
-  },
-
-  /**
-   * @param publicKey {Uint8Array}
-   * @param message {Uint8Array}
-   * @param signature {Uint8Array}
-   * @returns {Promise<boolean>}
-   */
-  verifySchnorrAsync: async (publicKey, message, signature) =>
-    mobileEcc.verifySchnorr(publicKey, message, signature),
-
-  /**
-   * @param publicKey {Uint8Array}
-   * @returns {boolean}
-   */
-  isPoint: (publicKey) => {
-    try {
-      // temp solution secp256k1 does not actually verify the value range, only the data length
-      return isPoint(Buffer.from(publicKey))
-    } catch {
-      return false
-    }
-  },
-
-  /**
-   * @param publicKey {Uint8Array}
-   * @returns {boolean}
-   */
-  isXOnlyPoint: (publicKey) => {
-    try {
-      // temp solution secp256k1 does not actually verify the value range, only the data length
-      return isPoint(Buffer.from(toPubKey(publicKey)))
-    } catch {
-      return false
-    }
-  },
-
-  /**
-   * @param publicKey {Uint8Array}
-   */
-  pointCompress: (publicKey, compressed) => secp256k1.publicKeyConvert(publicKey, compressed),
-}
-
-initEccLib(mobileEcc)