@exodus/bitcoin-api 2.3.5 → 2.3.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "2.3.5",
+  "version": "2.3.6",
   "description": "Exodus bitcoin-api",
   "main": "src/index.js",
   "files": [
@@ -20,12 +20,14 @@
   "dependencies": {
     "@exodus/asset-lib": "^3.7.2",
     "@exodus/basic-utils": "^2.0.1",
+    "@exodus/bip-schnorr": "0.6.6-fork-1",
     "@exodus/bip44-constants": "^195.0.0",
     "@exodus/bitcoinjs-lib": "6.0.2-beta.5",
     "@exodus/models": "^8.10.4",
     "@exodus/secp256k1": "4.0.2-exodus.0",
     "@exodus/simple-retry": "0.0.6",
     "@exodus/timer": "^1.0.0",
+    "@noble/secp256k1": "~1.5.3",
     "bech32": "^1.1.3",
     "coininfo": "5.1.0",
     "delay": "4.0.1",
@@ -36,11 +38,7 @@
     "url-join": "4.0.0"
   },
   "devDependencies": {
-    "@exodus/asset-lib": "^3.7.1",
-    "@exodus/bcash-meta": "^1.0.0",
-    "@exodus/bip-schnorr": "0.6.6-fork-1",
-    "@exodus/bitcoin-meta": "^1.0.1",
-    "@noble/secp256k1": "~1.5.3"
+    "@exodus/bitcoin-meta": "^1.0.1"
   },
-  "gitHead": "3dd9a1846d6f34252c12e966e1ee1f851cca4173"
+  "gitHead": "0ac89c74616ae95eee3c4628ea3babd98dd1495b"
 }

package/src/tx-send/index.js

@@ -92,21 +92,10 @@ export const getSizeAndChangeScriptFactory = ({ bitcoinJsLib = defaultBitcoinjsL
   assert(rawTx, 'rawTx is required')
   assert(typeof changeUtxoIndex === 'number', 'changeUtxoIndex must be a number')
 
-  const getSize = (tx) => {
-    if (typeof tx.size === 'number') return tx.size
-    if (typeof tx.virtualSize === 'function') {
-      return tx.virtualSize()
-    }
-    if (typeof tx.virtualSize === 'number') {
-      return tx.virtualSize
-    }
-    return undefined
-  }
-
   if (tx) {
     return {
-      script: tx.outs?.[changeUtxoIndex]?.script.toString('hex'),
-      size: getSize(tx),
+      script: tx.outs?.[changeUtxoIndex]?.script,
+      size: tx.virtualSize,
     }
   }
   // Trezor doesn't return tx!! we need to reparse it!
@@ -114,7 +103,7 @@ export const getSizeAndChangeScriptFactory = ({ bitcoinJsLib = defaultBitcoinjsL
   try {
     return {
       script: parsedTx.outs?.[changeUtxoIndex]?.script.toString('hex'),
-      size: getSize(parsedTx),
+      size: tx.virtualSize?.(),
     }
   } catch (e) {
     console.warn(

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

@@ -24,6 +24,16 @@ const canParseTx = (rawTxBuffer) => {
   }
 }
 
+export const serializeTx = ({ tx }) => {
+  // for desktop compatibility
+  return {
+    virtualSize: tx.virtualSize?.(),
+    outs: tx.outs?.map((out) => ({
+      script: out.script.toString('hex'),
+    })),
+  }
+}
+
 export const signTxFactory = ({ assetName, resolvePurpose, keys, coinInfo, network, ecc }) => {
   assert(assetName, 'assetName is required')
   assert(resolvePurpose, 'resolvePurpose is required')
@@ -134,6 +144,6 @@ export const signTxFactory = ({ assetName, resolvePurpose, keys, coinInfo, netwo
     const txId = tx.getId()
 
     // tx needs to be serializable for desktop RPC send => sign communication
-    return { rawTx, txId, tx: { ...tx, virtualSize: tx.virtualSize?.() } }
+    return { rawTx, txId, tx: serializeTx({ tx }) }
   }
 }

package/src/tx-sign/index.js

@@ -1 +1 @@
-export { signTxFactory } from './default-create-tx'
+export { signTxFactory, serializeTx } from './default-create-tx'

package/src/utxos-utils.js

@@ -12,18 +12,12 @@ export function getUtxos({ accountState, asset }) {
   )
 }
 
-export function getConfirmedUtxos({ asset, utxos }) {
-  assert(asset, 'asset is required')
+export function getConfirmedUtxos({ utxos }) {
   assert(utxos, 'utxos is required')
-  const currency = asset.currency
-  return UtxoCollection.fromArray(
-    utxos.toArray().filter(({ confirmations }) => confirmations > 0),
-    { currency }
-  )
+  return utxos.filter(({ confirmations }) => confirmations > 0)
 }
 
-export function getConfirmedOrRfbDisabledUtxos({ asset, utxos, allowUnconfirmedRbfEnabledUtxos }) {
-  assert(asset, 'asset is required')
+export function getConfirmedOrRfbDisabledUtxos({ utxos, allowUnconfirmedRbfEnabledUtxos }) {
   assert(utxos, 'utxos is required')
   assert(
     allowUnconfirmedRbfEnabledUtxos !== undefined,
@@ -32,11 +26,7 @@ export function getConfirmedOrRfbDisabledUtxos({ asset, utxos, allowUnconfirmedR
   if (allowUnconfirmedRbfEnabledUtxos) {
     return utxos
   }
-  const currency = asset.currency
-  return UtxoCollection.fromArray(
-    utxos.toArray().filter((utxo) => utxo.confirmations > 0 || !utxo.rbfEnabled),
-    { currency }
-  )
+  return utxos.filter((utxo) => utxo.confirmations > 0 || !utxo.rbfEnabled)
 }
 
 export function getUsableUtxos({ asset, utxos, feeData, txSet }) {
@@ -58,8 +48,5 @@ export function getUsableUtxos({ asset, utxos, feeData, txSet }) {
   })
   return largeUnconfirmedTxs.size === 0
     ? utxos
-    : UtxoCollection.fromArray(
-        utxos.toArray().filter((utxo) => !largeUnconfirmedTxs.has(utxo.txId)),
-        { currency: asset.currency }
-      )
+    : utxos.filter((utxo) => !largeUnconfirmedTxs.has(utxo.txId))
 }