@exodus/bitcoin-api 2.29.2 → 2.29.4

package/CHANGELOG.md

@@ -3,6 +3,26 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.29.4](https://github.com/ExodusMovement/assets/compare/@exodus/bitcoin-api@2.29.3...@exodus/bitcoin-api@2.29.4) (2024-12-13)
+
+
+### Bug Fixes
+
+
+* fix: allow uncompressed private key import (#4705)
+
+
+
+## [2.29.3](https://github.com/ExodusMovement/assets/compare/@exodus/bitcoin-api@2.29.2...@exodus/bitcoin-api@2.29.3) (2024-11-22)
+
+
+### Bug Fixes
+
+
+* fix: track coinbase confirmation depth until maturity (#4522)
+
+
+
 ## [2.29.2](https://github.com/ExodusMovement/assets/compare/@exodus/bitcoin-api@2.29.1...@exodus/bitcoin-api@2.29.2) (2024-11-19)
 
 

package/README.md

@@ -0,0 +1,3 @@
+# @exodus/bitcoin-api
+
+Transaction monitors, fee monitors, RPC with the blockchain node, and other networking code for Bitcoin and Bitcoin-like assets (e.g. dogecoin, litecoin, zcash). See [Asset Packages](../../docs/asset-packages.md) for more detail on this package's role.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "2.29.2",
-  "description": "Exodus bitcoin-api",
+  "version": "2.29.4",
+  "description": "Bitcoin transaction and fee monitors, RPC with the blockchain node, other networking code.",
   "type": "module",
   "main": "src/index.js",
   "files": [
@@ -56,5 +56,5 @@
     "type": "git",
     "url": "git+https://github.com/ExodusMovement/assets.git"
   },
-  "gitHead": "ebe9c86c8ecb6e6810613402e27ee62e8c308753"
+  "gitHead": "79d093bff0e8fdecac19d96f161ae4dc842408bc"
 }

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

@@ -14,6 +14,8 @@ const { compact, isEqual, uniq } = lodash
 // Time to check whether to drop a sent tx
 const SENT_TIME_TO_DROP = ms('2m')
 
+const COINBASE_MATURITY_HEIGHT = 100
+
 export class BitcoinMonitorScanner {
   #asset
   #insightClient
@@ -403,12 +405,18 @@ export class BitcoinMonitorScanner {
     const existingTxs = []
 
     allTxs.forEach((txItem) => {
+      const isCoinbase = txItem.vin.length === 0
+
       const txLogItem = {
         txId: txItem.txid,
         coinAmount: currency.ZERO,
         date: txItem.time ? new Date(txItem.time * 1000) : new Date(),
         coinName: assetName,
-        confirmations: txItem.confirmations ? 1 : 0, // we don't care about a count - this should really be block height based if we want a count
+        confirmations: txItem.confirmations
+          ? isCoinbase
+            ? Math.min(COINBASE_MATURITY_HEIGHT + 1, txItem.confirmations)
+            : 1
+          : 0, // we don't care about a count - this should really be block height based if we want a count
         addresses: [],
         error: null,
         dropped: false,
@@ -418,7 +426,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),
+          ...(isCoinbase ? { isCoinbase: true } : undefined),
         },
         currencies: { [assetName]: currency },
       }
@@ -546,7 +554,7 @@ export class BitcoinMonitorScanner {
           value: val,
           rbfEnabled: txItem.rbf,
           derivationPath: address.meta.keyIdentifier?.derivationPath,
-          ...(txItem.vin.length === 0 ? { isCoinbase: true } : undefined),
+          ...(isCoinbase ? { isCoinbase: true } : undefined),
         }
 
         if (this.#ordinalsEnabled) {
@@ -690,9 +698,20 @@ export class BitcoinMonitorScanner {
     const unconfirmedTxIds = uniq([
       ...storedUtxos
         .toArray()
-        .filter((utxos) => !utxos.confirmations)
+        .filter(
+          (utxos) =>
+            !utxos.confirmations ||
+            (utxos.isCoinbase && utxos.confirmations < COINBASE_MATURITY_HEIGHT)
+        )
         .map((utxos) => utxos.txId),
-      ...currentTxs.filter((tx) => !tx.dropped && !tx.confirmations).map((tx) => tx.txId),
+      ...currentTxs
+        .filter(
+          (tx) =>
+            !tx.dropped &&
+            (!tx.confirmations ||
+              (tx.data.isCoinbase && tx.confirmations < COINBASE_MATURITY_HEIGHT))
+        )
+        .map((tx) => tx.txId),
     ])
 
     const maybeConfirmationList = await Promise.all(
@@ -711,8 +730,8 @@ export class BitcoinMonitorScanner {
       .map((tx) => {
         const updatedProperties = {}
         const confirmations = confirmationsList.find(({ txId }) => tx.txId === txId)?.confirmations
-        if (!tx.dropped && !tx.confirmations && confirmations > 0) {
-          updatedProperties.confirmations = confirmations
+        if (!tx.dropped && (!tx.confirmations || tx.data.isCoinbase) && confirmations > 0) {
+          updatedProperties.confirmations = Math.min(COINBASE_MATURITY_HEIGHT + 1, confirmations)
         }
 
         return { txId: tx.txId, ...updatedProperties }

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

@@ -230,6 +230,12 @@ export class Monitor extends BaseMonitor {
     this.#runningByWalletAccount[walletAccount] = { refresh, promise }
     try {
       await promise
+
+      if (!refresh) {
+        try {
+          await this.onNewBlock()
+        } catch {}
+      }
     } finally {
       delete this.#runningByWalletAccount[walletAccount]
     }

package/src/tx-sign/create-get-key-and-purpose.js

@@ -39,8 +39,8 @@ export const createGetKeyWithMetadata = ({
 function getPrivateKeyFromMap(privateKeysAddressMap, networkInfo, purpose, address) {
   const privateWif = getOwnProperty(privateKeysAddressMap, address, 'string')
   assert(privateWif, `there is no private key for address ${address}`)
-  const { privateKey } = ECPair.fromWIF(privateWif, networkInfo)
-  const publicKey = privateKeyToPublicKey({ privateKey, format: 'buffer' })
+  const { privateKey, compressed } = ECPair.fromWIF(privateWif, networkInfo)
+  const publicKey = privateKeyToPublicKey({ privateKey, compressed, format: 'buffer' })
   return { privateKey, publicKey, purpose }
 }
 

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

@@ -77,7 +77,7 @@ export function createSignWithWallet({
 
       const asyncSigner = signer
         ? await toAsyncBufferSigner({ signer, isTaprootKeySpend, keyId })
-        : toAsyncSigner({ privateKey, isTaprootKeySpend })
+        : toAsyncSigner({ privateKey, publicKey, isTaprootKeySpend })
 
       // desktop / BE / mobile with bip-schnorr signing
       signingPromises.push(psbt.signInputAsync(index, asyncSigner, allowedSigHashTypes))

package/src/tx-sign/taproot.js

@@ -23,19 +23,14 @@ export const tapTweakHash = (publicKey, h) => {
   return crypto.taggedHash('TapTweak', Buffer.concat(h ? [xOnly, h] : [xOnly]))
 }
 
-export function toAsyncSigner({ keyPair, privateKey, isTaprootKeySpend }) {
-  if (keyPair && !privateKey) {
-    // compat mode to avoid a breaking change
-    // TODO: remove in semver-major
-    privateKey = keyPair.privateKey
-    keyPair = null
-  }
-
+export function toAsyncSigner({ privateKey, publicKey, isTaprootKeySpend }) {
   assert(privateKey, 'privateKey is required')
-  assert(!keyPair, 'keyPair is not supported, use privateKey')
+  assert(publicKey, 'publicKey is required')
 
-  if (isTaprootKeySpend) privateKey = tweakPrivateKey({ privateKey })
-  const publicKey = secp256k1.privateKeyToPublicKey({ privateKey, format: 'buffer' })
+  if (isTaprootKeySpend) {
+    privateKey = tweakPrivateKey({ privateKey })
+    publicKey = tweakPublicKey({ publicKey, tweak: tapTweakHash(publicKey) })
+  }
 
   return {
     sign: async (hash) =>