@exodus/bitcoin-api 2.18.3 → 2.19.0

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.19.0](https://github.com/ExodusMovement/assets/compare/@exodus/bitcoin-api@2.18.4...@exodus/bitcoin-api@2.19.0) (2024-07-05)
+
+
+### Features
+
+* **BTC:** add taprootInputWitnessSize for tx size estimation ([#2737](https://github.com/ExodusMovement/assets/issues/2737)) ([13f727a](https://github.com/ExodusMovement/assets/commit/13f727a836f9fc620628abb6a94a49c1a6774ca5))
+
+
+
+## [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)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "2.18.3",
+  "version": "2.19.0",
   "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": "e6202a0f144b4f90ef5e438da03c10acd2395698"
+  "gitHead": "9c3024f69fbda1069a437fb19c43e6f341185c6f"
 }

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/fee/can-bump-tx.js

@@ -18,6 +18,7 @@ const _canBumpTx = ({
   getFeeEstimator,
   allowUnconfirmedRbfEnabledUtxos,
   utxosDescendingOrder,
+  taprootInputWitnessSize,
 }) => {
   assert(asset, 'asset must be provided')
   assert(tx, 'tx must be provided')
@@ -93,6 +94,7 @@ const _canBumpTx = ({
       allowUnconfirmedRbfEnabledUtxos,
       unconfirmedTxAncestor,
       utxosDescendingOrder,
+      taprootInputWitnessSize,
     })
     if (replaceTx) return { bumpType: BumpType.RBF, bumpFee: fee.sub(replaceTx.feeAmount) }
   }
@@ -107,6 +109,7 @@ const _canBumpTx = ({
     allowUnconfirmedRbfEnabledUtxos,
     unconfirmedTxAncestor,
     utxosDescendingOrder,
+    taprootInputWitnessSize,
   })
 
   return fee ? { bumpType: BumpType.CPFP, bumpFee: fee } : { errorMessage: 'insufficient funds' }

package/src/fee/fee-estimator.js

@@ -48,6 +48,11 @@ const scriptPubKeyLengths = {
   [P2TR]: 34,
 }
 
+// Only the 64 byte Schnorr signature is present for Taproot Key-Path spend
+const signatureLength = 64
+const taprootInputKeyPathWitnessSize =
+  varuint.encodingLength(1) + varuint.encodingLength(signatureLength) + signatureLength
+
 // bitcoin and bitcoin-like:
 // 10 = version: 4, locktime: 4, inputs and outputs count: 1
 // 148 = txId: 32, vout: 4, count: 1, script: 107 (max), sequence: 4
@@ -58,7 +63,12 @@ export const getSizeFactory = ({ defaultOutputType, addressApi }) => {
 
   const scriptClassifier = scriptClassifierFactory({ addressApi })
 
-  return (asset, inputs, outputs, { compressed = true } = {}) => {
+  return (
+    asset,
+    inputs,
+    outputs,
+    { compressed = true, taprootInputWitnessSize = taprootInputKeyPathWitnessSize } = {}
+  ) => {
     if (inputs instanceof UtxoCollection) {
       inputs = [...inputs].map((utxo) => utxo.script || null)
     }
@@ -136,14 +146,7 @@ export const getSizeFactory = ({ defaultOutputType, addressApi }) => {
         }
 
         if ([P2TR].includes(utxoScriptType)) {
-          // Only the 64 byte Schnorr signature is present for Taproot Key-Path spend
-          const signatureLength = 64
-          return (
-            t +
-            varuint.encodingLength(1) +
-            varuint.encodingLength(signatureLength) +
-            signatureLength
-          )
+          return t + taprootInputWitnessSize
         }
 
         // Non-witness inputs get a placeholder zero byte

package/src/fee/fee-utils.js

@@ -36,11 +36,12 @@ export default function createDefaultFeeEstimator(getSize) {
       inputs = options.inputs,
       outputs = options.outputs,
       unconfirmedTxAncestor = options.unconfirmedTxAncestor,
+      taprootInputWitnessSize,
     } = {}) => {
       const extraFee = getExtraFee({ asset, inputs, feePerKB, unconfirmedTxAncestor })
       // Yes, it's suppose to be '1000' and not '1024'
       // https://bitcoin.stackexchange.com/questions/24000/a-fee-is-added-per-kilobyte-of-data-that-means-1000-bytes-or-1024
-      const size = getSize(asset, inputs, outputs, options)
+      const size = getSize(asset, inputs, outputs, { ...options, taprootInputWitnessSize })
       const feeRaw = Math.ceil((feePerKB.toBaseNumber() * size) / 1000)
       return asset.currency.baseUnit(feeRaw + extraFee)
     }

package/src/fee/get-fee-resolver.js

@@ -35,6 +35,7 @@ export class GetFeeResolver {
     nft, // sending one nft
     brc20, // sending multiple inscriptions ids (as in sending multiple transfer ordinals)
     receiveAddress,
+    taprootInputWitnessSize,
   }) => {
     if (nft) {
       assert(!amount, 'amount must not be provided when nft is provided!!!')
@@ -60,11 +61,21 @@ export class GetFeeResolver {
       customFee,
       isSendAll,
       inscriptionIds,
+      taprootInputWitnessSize,
     })
     return { fee: resolvedFee, extraFee }
   }
 
-  getAvailableBalance = ({ asset, accountState, txSet, feeData, amount, customFee, isSendAll }) => {
+  getAvailableBalance = ({
+    asset,
+    accountState,
+    txSet,
+    feeData,
+    amount,
+    customFee,
+    isSendAll,
+    taprootInputWitnessSize,
+  }) => {
     return this.#getUtxosData({
       asset,
       accountState,
@@ -73,16 +84,18 @@ export class GetFeeResolver {
       customFee,
       isSendAll,
       amount,
+      taprootInputWitnessSize,
     }).availableBalance
   }
 
-  getSpendableBalance = ({ asset, accountState, txSet, feeData }) => {
+  getSpendableBalance = ({ asset, accountState, txSet, feeData, taprootInputWitnessSize }) => {
     return this.#getUtxosData({
       asset,
       accountState,
       txSet,
       feeData,
       isSendAll: true,
+      taprootInputWitnessSize,
     }).spendableBalance
   }
 
@@ -96,6 +109,7 @@ export class GetFeeResolver {
     customFee,
     isSendAll,
     inscriptionIds,
+    taprootInputWitnessSize,
   }) => {
     assert(asset, 'asset must be provided')
     assert(feeData, 'feeData must be provided')
@@ -136,6 +150,7 @@ export class GetFeeResolver {
       allowUnconfirmedRbfEnabledUtxos: this.#allowUnconfirmedRbfEnabledUtxos,
       unconfirmedTxAncestor,
       utxosDescendingOrder: this.#utxosDescendingOrder,
+      taprootInputWitnessSize,
     })
   }
 

package/src/fee/utxo-selector.js

@@ -35,6 +35,7 @@ export const selectUtxos = ({
   unconfirmedTxAncestor,
   inscriptionIds, // for each inscription transfer, we need to calculate one more input and one more output
   transferOrdinalsUtxos, // to calculate the size of the input
+  taprootInputWitnessSize,
 }) => {
   const resolvedReceiveAddresses = getBestReceiveAddresses({
     asset,
@@ -100,9 +101,13 @@ export const selectUtxos = ({
 
       if (isSendAll) {
         additionalUtxos = UtxoCollection.fromArray(confirmedUtxosArray, { currency })
-        fee = replaceFeeEstimator({ inputs: inputs.union(additionalUtxos), outputs })
+        fee = replaceFeeEstimator({
+          inputs: inputs.union(additionalUtxos),
+          outputs,
+          taprootInputWitnessSize,
+        })
       } else {
-        fee = replaceFeeEstimator({ inputs, outputs })
+        fee = replaceFeeEstimator({ inputs, outputs, taprootInputWitnessSize })
         additionalUtxos = UtxoCollection.createEmpty({ currency })
         while (replaceTxAmount.add(additionalUtxos.value).lt(amount.add(fee))) {
           if (confirmedUtxosArray.length === 0) {
@@ -116,6 +121,7 @@ export const selectUtxos = ({
               fee = replaceFeeEstimator({
                 inputs: inputs.union(additionalUtxos),
                 outputs: noChangeOutputs,
+                taprootInputWitnessSize,
               })
             }
 
@@ -127,6 +133,7 @@ export const selectUtxos = ({
           fee = replaceFeeEstimator({
             inputs: inputs.union(additionalUtxos),
             outputs,
+            taprootInputWitnessSize,
           })
         }
       }
@@ -136,6 +143,7 @@ export const selectUtxos = ({
         const chainFee = feeEstimator({
           inputs: changeUtxos.union(additionalUtxos),
           outputs: chainOutputs,
+          taprootInputWitnessSize,
         })
         // If batching is same or more expensive than chaining, don't replace
         // Unless we are accelerating a changeless tx, then we must replace because it can't be chained
@@ -173,7 +181,11 @@ export const selectUtxos = ({
 
   if (isSendAll) {
     const selectedUtxos = UtxoCollection.fromArray(utxosArray, { currency })
-    const fee = feeEstimator({ inputs: selectedUtxos, outputs: receiveAddresses })
+    const fee = feeEstimator({
+      inputs: selectedUtxos,
+      outputs: receiveAddresses,
+      taprootInputWitnessSize,
+    })
     if (selectedUtxos.value.lt(amount.add(fee))) {
       return { fee }
     }
@@ -208,19 +220,23 @@ export const selectUtxos = ({
       ? [changeAddressType]
       : [...receiveAddresses, changeAddressType]
 
-  let fee = feeEstimator({ inputs: selectedUtxos, outputs })
+  let fee = feeEstimator({ inputs: selectedUtxos, outputs, taprootInputWitnessSize })
 
   while (selectedUtxos.value.lt(amount.add(fee))) {
     // We ran out of UTXOs, give up now
     if (remainingUtxosArray.length === 0) {
       // Try fee with no change
-      fee = feeEstimator({ inputs: selectedUtxos, outputs: receiveAddresses })
+      fee = feeEstimator({
+        inputs: selectedUtxos,
+        outputs: receiveAddresses,
+        taprootInputWitnessSize,
+      })
       break
     }
 
     // Add a new UTXO and recalculate the fee
     selectedUtxos = selectedUtxos.addUtxo(remainingUtxosArray.shift())
-    fee = feeEstimator({ inputs: selectedUtxos, outputs })
+    fee = feeEstimator({ inputs: selectedUtxos, outputs, taprootInputWitnessSize })
   }
 
   if (selectedUtxos.value.lt(amount.add(fee))) {
@@ -246,6 +262,7 @@ export const getUtxosData = ({
   transferOrdinalsUtxos,
   unconfirmedTxAncestor,
   utxosDescendingOrder,
+  taprootInputWitnessSize,
 }) => {
   const { selectedUtxos, replaceTx, fee } = selectUtxos({
     asset,
@@ -263,6 +280,7 @@ export const getUtxosData = ({
     inscriptionIds,
     transferOrdinalsUtxos,
     utxosDescendingOrder,
+    taprootInputWitnessSize,
   })
 
   const resolvedFee = replaceTx ? fee.sub(replaceTx.feeAmount) : fee

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-send/index.js

@@ -236,6 +236,7 @@ export const getPrepareSendTransaction =
       isExchange,
       isBip70,
       isRbfAllowed,
+      taprootInputWitnessSize,
     } = options
 
     const asset = maybeToken.baseAsset
@@ -352,6 +353,7 @@ export const getPrepareSendTransaction =
       inscriptionIds,
       transferOrdinalsUtxos,
       utxosDescendingOrder,
+      taprootInputWitnessSize,
     })
 
     if (!selectedUtxos && !replaceTx) throw new Error('Not enough funds.')
@@ -474,7 +476,15 @@ export const createAndBroadcastTXFactory =
   }) =>
   async ({ asset: maybeToken, walletAccount, address, amount: tokenAmount, options }) => {
     // Prepare transaction
-    const { bumpTxId, nft, isExchange, isBip70, isRbfAllowed = true, feeOpts } = options
+    const {
+      bumpTxId,
+      nft,
+      isExchange,
+      isBip70,
+      isRbfAllowed = true,
+      feeOpts,
+      taprootInputWitnessSize,
+    } = options
 
     const asset = maybeToken.baseAsset
     const assetName = asset.name
@@ -498,6 +508,7 @@ export const createAndBroadcastTXFactory =
       utxosDescendingOrder,
       rbfEnabled,
       assetClientInterface,
+      taprootInputWitnessSize,
     })({ asset: maybeToken, walletAccount, address, amount: tokenAmount, options })
     const {
       amount,

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