@exodus/bitcoin-api 2.18.2 → 2.18.4

package/CHANGELOG.md

@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.18.4](https://github.com/ExodusMovement/assets/compare/@exodus/bitcoin-api@2.18.3...@exodus/bitcoin-api@2.18.4) (2024-06-20)
+
+
+### Bug Fixes
+
+* bitcoinjs-lib bump, ecc cleanup ([#2634](https://github.com/ExodusMovement/assets/issues/2634)) ([96d47a5](https://github.com/ExodusMovement/assets/commit/96d47a508657389ba766bfd44feef7365eb0de9b))
+
+
+
+## [2.18.3](https://github.com/ExodusMovement/assets/compare/@exodus/bitcoin-api@2.18.2...@exodus/bitcoin-api@2.18.3) (2024-06-20)
+
+
+### Bug Fixes
+
+* **bitcoin:** skip adding redeem script ([#2630](https://github.com/ExodusMovement/assets/issues/2630)) ([bc92eb5](https://github.com/ExodusMovement/assets/commit/bc92eb596aebab78a796eb2b76b3bc5cbad05b87))
+
+
+
 ## [2.18.2](https://github.com/ExodusMovement/assets/compare/@exodus/bitcoin-api@2.18.1...@exodus/bitcoin-api@2.18.2) (2024-06-18)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "2.18.2",
+  "version": "2.18.4",
   "description": "Exodus bitcoin-api",
   "main": "src/index.js",
   "files": [
@@ -24,8 +24,7 @@
     "@exodus/bip322-js": "^1.1.0-exodus.4",
     "@exodus/bip44-constants": "^195.0.0",
     "@exodus/bitcoin-lib": "^2.4.1",
-    "@exodus/bitcoinerlab-secp256k1": "^1.0.5-exodus.1",
-    "@exodus/bitcoinjs-lib": "^6.1.5-exodus.1",
+    "@exodus/bitcoinjs-lib": "^6.1.5-exodus.2",
     "@exodus/currency": "^2.3.2",
     "@exodus/fetch": "^1.3.0",
     "@exodus/key-identifier": "^1.1.1",
@@ -67,5 +66,5 @@
     "type": "git",
     "url": "git+https://github.com/ExodusMovement/assets.git"
   },
-  "gitHead": "fb7b6fa3c13387a821628ce7577951571471b353"
+  "gitHead": "b7cc185dce729a04f48833e29c606eeb7b24407b"
 }

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

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

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

@@ -1,9 +1,4 @@
-import { initEccLib } from '@exodus/bitcoinjs-lib'
-
-import bitcoinerlab from '@exodus/bitcoinerlab-secp256k1'
-
-export const ecc = bitcoinerlab
-
-initEccLib(ecc)
+import { eccLib } from '@exodus/bitcoinjs-lib'
 
+export const ecc = eccLib
 export const eccFactory = () => ecc

package/src/btc-like-keys.js

@@ -7,7 +7,7 @@ import * as defaultBitcoinjsLib from '@exodus/bitcoinjs-lib'
 import * as secp256k1 from 'secp256k1'
 import { hash160 } from './hash-utils'
 import { toXOnly } from './bitcoinjs-lib/ecc-utils'
-import { eccFactory } from './bitcoinjs-lib/ecc'
+import { ecc } from './bitcoinjs-lib/ecc'
 
 export const publicKeyToHashFactory = (p2pkh) => (publicKey) => {
   const payload = Buffer.concat([Buffer.from([p2pkh]), hash160(publicKey)])
@@ -23,7 +23,6 @@ export const createBtcLikeKeys = ({
 }) => {
   assert(coinInfo, 'coinInfo is required')
   assert(versions, 'versions is required')
-  const ecc = eccFactory()
   const {
     encodePrivate: encodePrivateCustom,
     encodePublic: encodePublicCustom,

package/src/multisig-address.js

@@ -1,6 +1,6 @@
 import * as defaultBitcoinjsLib from '@exodus/bitcoinjs-lib'
 import { toXOnly } from './bitcoinjs-lib/ecc-utils'
-import { eccFactory } from './bitcoinjs-lib/ecc'
+import { ecc as defaultEcc } from './bitcoinjs-lib/ecc'
 
 // Key to use when key path spending is disabled https://github.com/bitcoin/bips/blob/master/bip-0341.mediawiki#constructing-and-spending-taproot-outputs
 const DUMMY_TAPROOT_PUBKEY = Buffer.from(
@@ -18,7 +18,7 @@ export const createEncodeMultisigContract =
   ({
     bitcoinjsLib = defaultBitcoinjsLib,
     network = bitcoinjsLib.Network.bitcoin,
-    ecc = eccFactory(),
+    ecc = defaultEcc,
   }) =>
   (publicKeys, { threshold = publicKeys.length, version = 0 } = Object.create(null)) => {
     if (

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

@@ -25,7 +25,7 @@ export function createSignWithWallet({
     getKeyIdentifier,
   })
 
-  return async (psbt, inputsToSign) => {
+  return async (psbt, inputsToSign, skipFinalize) => {
     // The Taproot SIGHASH flag includes all previous outputs,
     // so signing is only done AFTER all inputs have been updated
     const signingPromises = []
@@ -55,7 +55,7 @@ export function createSignWithWallet({
           // so modifying it here is fine.
           psbt.updateInput(index, { tapInternalKey: toXOnly(publicKey) })
         }
-      } else if (purpose === 49) {
+      } else if (purpose === 49 && !skipFinalize) {
         // If spending from a P2SH address, we assume the address is P2SH wrapping
         // P2WPKH. Exodus doesn't use P2SH addresses so we should only ever be
         // signing a P2SH input if we are importing a private key

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

@@ -50,9 +50,8 @@ export const signTxFactory = ({
       },
     })
 
-    await signWithWallet(psbt, inputsToSign)
-
     const skipFinalize = !!unsignedTx.txData.psbtBuffer || unsignedTx.txMeta.returnPsbt
+    await signWithWallet(psbt, inputsToSign, skipFinalize)
     return extractTransaction({ psbt, skipFinalize })
   }
 }

package/src/tx-sign/taproot.js

@@ -2,10 +2,9 @@ import { crypto } from '@exodus/bitcoinjs-lib'
 import assert from 'minimalistic-assert'
 
 import { getSchnorrEntropy } from './default-entropy'
-import { eccFactory } from '../bitcoinjs-lib/ecc'
+import { ecc } from '../bitcoinjs-lib/ecc'
 import { getECPair } from '../bitcoinjs-lib'
 
-const ecc = eccFactory()
 const ECPair = getECPair()
 
 function tweakSigner({ signer, tweakHash, network }) {