@exodus/bitcoin-api 2.27.0 → 2.29.0

package/CHANGELOG.md

@@ -3,6 +3,34 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.29.0](https://github.com/ExodusMovement/assets/compare/@exodus/bitcoin-api@2.28.0...@exodus/bitcoin-api@2.29.0) (2024-11-10)
+
+
+### Features
+
+* filter immature coinbase utxos in getUsableUtxos ([#4507](https://github.com/ExodusMovement/assets/issues/4507)) ([3774f66](https://github.com/ExodusMovement/assets/commit/3774f66ee733ca5a3f07a7556c349d08c2d217e9))
+
+
+### Bug Fixes
+
+* fetch and require raw txs for segwit inputs ([#4399](https://github.com/ExodusMovement/assets/issues/4399)) ([f5822cc](https://github.com/ExodusMovement/assets/commit/f5822cc60d6e542f9aea88c051e1a2dbe56da13d))
+
+
+
+## [2.28.0](https://github.com/ExodusMovement/assets/compare/@exodus/bitcoin-api@2.27.0...@exodus/bitcoin-api@2.28.0) (2024-10-31)
+
+
+### Features
+
+* update bip322-js to 2.0.0 ([#4414](https://github.com/ExodusMovement/assets/issues/4414)) ([da2a7dd](https://github.com/ExodusMovement/assets/commit/da2a7dd217a6664f02fa722968bf6ff16f53ea39))
+
+
+### Bug Fixes
+
+* stringify sent amount NU's ([#4433](https://github.com/ExodusMovement/assets/issues/4433)) ([f2886a8](https://github.com/ExodusMovement/assets/commit/f2886a85060f5e347df9bb2bf892bb52257ece6b)), closes [#4437](https://github.com/ExodusMovement/assets/issues/4437)
+
+
+
 ## [2.27.0](https://github.com/ExodusMovement/assets/compare/@exodus/bitcoin-api@2.26.1...@exodus/bitcoin-api@2.27.0) (2024-10-17)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "2.27.0",
+  "version": "2.29.0",
   "description": "Exodus bitcoin-api",
   "type": "module",
   "main": "src/index.js",
@@ -23,7 +23,7 @@
     "@exodus/asset-lib": "^5.0.0",
     "@exodus/basic-utils": "^3.0.1",
     "@exodus/bip32": "^3.3.0",
-    "@exodus/bip322-js": "^1.1.0",
+    "@exodus/bip322-js": "^2.0.0",
     "@exodus/bip44-constants": "^195.0.0",
     "@exodus/bitcoin-lib": "^2.4.2",
     "@exodus/bitcoinjs": "^1.1.0",
@@ -56,5 +56,5 @@
     "type": "git",
     "url": "git+https://github.com/ExodusMovement/assets.git"
   },
-  "gitHead": "3218754fdfad087b6d789eb81f7fe9f21b636fef"
+  "gitHead": "500277d2c77cd37f7d7a93eceec09e5b8c49f253"
 }

package/src/fee/fee-utils.js

@@ -58,3 +58,11 @@ export function parseCurrency(val, currency) {
   if (typeof val === 'string') return currency.parse(val)
   return currency.parse(val.value + ' ' + val.unit)
 }
+
+export function serializeCurrency(val, currency) {
+  if (val === undefined) {
+    return val
+  }
+
+  return parseCurrency(val, currency).toDefaultString({ unit: true })
+}

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

@@ -418,6 +418,7 @@ export class BitcoinMonitorScanner {
           feePerKB: txItem.fees ? (txItem.fees / txItem.vsize) * 1000 * 1e8 : null,
           rbfEnabled: txItem.rbf,
           blocksSeen: 0,
+          ...(txItem.vin.length === 0 ? { isCoinbase: true } : undefined),
         },
         currencies: { [assetName]: currency },
       }
@@ -505,7 +506,10 @@ export class BitcoinMonitorScanner {
           if (isSent && !txLogItem.to) {
             const val = currency.defaultUnit(vout.value)
             const sentDisplayAddress = asset.address.displayAddress?.(sentAddress) || sentAddress
-            txLogItem.data.sent.push({ address: sentDisplayAddress, amount: val })
+            txLogItem.data.sent.push({
+              address: sentDisplayAddress,
+              amount: val.toDefaultString({ unit: true }),
+            })
           }
 
           return
@@ -541,6 +545,7 @@ export class BitcoinMonitorScanner {
           script: vout.scriptPubKey.hex,
           value: val,
           rbfEnabled: txItem.rbf,
+          ...(txItem.vin.length === 0 ? { isCoinbase: true } : undefined),
         }
 
         if (this.#ordinalsEnabled) {

package/src/tx-send/index.js

@@ -5,7 +5,7 @@ import { retry } from '@exodus/simple-retry'
 import lodash from 'lodash'
 import assert from 'minimalistic-assert'
 
-import { parseCurrency } from '../fee/fee-utils.js'
+import { parseCurrency, serializeCurrency } from '../fee/fee-utils.js'
 import { selectUtxos } from '../fee/utxo-selector.js'
 import { findUnconfirmedSentRbfTxs } from '../tx-utils.js'
 import { getUnconfirmedTxAncestorMap } from '../unconfirmed-ancestor-data.js'
@@ -71,7 +71,14 @@ export async function getNonWitnessTxs(asset, utxos, insightClient) {
       utxos
         .getAddressesForTxId(txId)
         .toAddressStrings()
-        .some((a) => asset.address.isP2PKH(a) || asset.address.isP2SH(a))
+        .some(
+          (a) =>
+            asset.address.isP2PKH(a) ||
+            asset.address.isP2SH(a) ||
+            asset.address.isP2SH2?.(a) ||
+            asset.address.isP2WPKH?.(a) ||
+            asset.address.isP2WSH?.(a)
+        )
     )
 
     if (nonWitnessTxIds.length > 0) {
@@ -376,7 +383,7 @@ export const getPrepareSendTransaction =
       replaceTx = replaceTx.clone()
       replaceTx = replaceTx.update({ data: { ...replaceTx.data } })
       replaceTx.data.sent = replaceTx.data.sent.map((to) => {
-        return { ...to, amount: parseCurrency(to.amount, asset.currency) }
+        return { ...to, amount: serializeCurrency(to.amount, asset.currency) }
       })
       selectedUtxos = selectedUtxos.union(
         // how to avoid replace tx inputs when inputs are ordinals? !!!!
@@ -389,7 +396,9 @@ export const getPrepareSendTransaction =
     // Inputs and Outputs
     const inputs = shuffle(createInputs(assetName, selectedUtxos.toArray(), rbfEnabled))
     let outputs = replaceTx
-      ? replaceTx.data.sent.map(({ address, amount }) => createOutput(assetName, address, amount))
+      ? replaceTx.data.sent.map(({ address, amount }) =>
+          createOutput(assetName, address, parseCurrency(amount, currency))
+        )
       : []
 
     // Send output
@@ -408,7 +417,10 @@ export const getPrepareSendTransaction =
     }
 
     const totalAmount = replaceTx
-      ? replaceTx.data.sent.reduce((total, { amount }) => total.add(amount), sendAmount)
+      ? replaceTx.data.sent.reduce(
+          (total, { amount }) => total.add(parseCurrency(amount, asset.currency)),
+          sendAmount
+        )
       : sendAmount
 
     const change = selectedUtxos.value
@@ -655,8 +667,11 @@ export const createAndBroadcastTXFactory =
         ? replaceTx.data.sent
         : []
       : replaceTx
-        ? [...replaceTx.data.sent, { address: displayReceiveAddress, amount }]
-        : [{ address: displayReceiveAddress, amount }]
+        ? [
+            ...replaceTx.data.sent,
+            { address: displayReceiveAddress, amount: serializeCurrency(amount, asset.currency) },
+          ]
+        : [{ address: displayReceiveAddress, amount: serializeCurrency(amount, asset.currency) }]
 
     const calculateCoinAmount = () => {
       if (selfSend) {

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

@@ -85,17 +85,24 @@ function createPsbtFromTxData({
     const isTaprootAddress = purpose === 86
 
     const txIn = { hash: txId, index: vout, sequence }
-    if (isSegwitAddress || isTaprootAddress) {
-      if (isTaprootAddress && tapLeafScript) {
-        txIn.tapLeafScript = tapLeafScript
-      }
 
-      // witness outputs only require the value and the script, not the full transaction
+    if (isTaprootAddress && tapLeafScript) {
+      txIn.tapLeafScript = tapLeafScript
+    }
+
+    if (isSegwitAddress || isTaprootAddress) {
+      // taproot outputs only require the value and the script, not the full transaction
       txIn.witnessUtxo = { value, script: Buffer.from(script, 'hex') }
-    } else {
-      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.')
+    }
+
+    const rawTx = (rawTxs || []).find((t) => t.txId === txId)
+
+    // Non-taproot outputs require the full transaction
+    assert(
+      isTaprootAddress || !!rawTx?.rawData,
+      `Non-taproot outputs require the full previous transaction.`
+    )
+    if (!isTaprootAddress) {
       const rawTxBuffer = Buffer.from(rawTx.rawData, 'hex')
       if (canParseTx(Transaction, rawTxBuffer)) {
         txIn.nonWitnessUtxo = rawTxBuffer

package/src/utxos-utils.js

@@ -233,11 +233,25 @@ function filterDustUtxos({ utxos, feeData }) {
   return utxos
 }
 
-export function getUsableUtxos({ asset, utxos, feeData, txSet, unconfirmedTxAncestor }) {
+const COINBASE_MATURITY_HEIGHT = 100
+
+export function getUsableUtxos({
+  asset,
+  utxos: someCoinbaseUtxos,
+  feeData,
+  txSet,
+  unconfirmedTxAncestor,
+}) {
   assert(asset, 'asset is required')
-  assert(utxos, 'utxos is required')
+  assert(someCoinbaseUtxos, 'utxos is required')
   assert(feeData, 'feeData is required')
   assert(txSet, 'txSet is required')
+
+  // Filter out immature coinbase outputs. They are not spendable.
+  const utxos = someCoinbaseUtxos.filter(
+    (utxo) => !utxo.isCoinbase || utxo.confirmations >= COINBASE_MATURITY_HEIGHT
+  )
+
   if (!['bitcoin', 'bitcointestnet', 'bitcoinregtest'].includes(asset.name))
     return filterDustUtxos({ utxos, feeData })