@exodus/bitcoin-api 2.2.1 → 2.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "description": "Exodus bitcoin-api",
   "main": "src/index.js",
   "files": [
@@ -41,5 +41,5 @@
     "@exodus/bitcoin-meta": "^1.0.0",
     "@noble/secp256k1": "~1.5.3"
   },
-  "gitHead": "17fcd32b82150b04903edc83c72b16a73ee00e86"
+  "gitHead": "2d223c3c71d00fbd5246af3f39410eec113d0029"
 }

package/src/move-funds.js

@@ -2,21 +2,45 @@ import wif from 'wif'
 import { UtxoCollection, Address } from '@exodus/models'
 import { createInputs, createOutput, getNonWitnessTxs } from './tx-send'
 import assert from 'minimalistic-assert'
+import secp256k1 from 'secp256k1'
+
+function wifToPublicKey({ coinInfo, privateKeyWIF }) {
+  assert(coinInfo, 'coinInfo is required')
+  assert(privateKeyWIF, 'privateKeyWIF is required')
+  const { versions } = coinInfo
+
+  const { privateKey, compressed } = wif.decode(privateKeyWIF, versions.private)
+  return secp256k1.publicKeyCreate(privateKey, compressed)
+}
+
+export const getAddressesFromPrivateKeyFactory = ({ purposes, keys, coinInfo }) => {
+  assert(purposes, 'purposes is required')
+  assert(keys, 'keys is required')
+  assert(coinInfo, 'coinInfo is required')
+  return ({ privateKey }) => {
+    const publicKey = wifToPublicKey({ coinInfo, privateKeyWIF: privateKey })
+    return purposes.map((purpose) =>
+      keys.encodePublic(purpose === 49 ? secp256k1.publicKeyConvert(publicKey, true) : publicKey, {
+        purpose,
+      })
+    )
+  }
+}
 
 export const moveFundsFactory = ({
   asset,
   insightClient,
   getFeeEstimator,
-  keys,
   signTx,
   address,
+  getAddressesFromPrivateKey,
 }) => {
   assert(asset, 'asset is required')
   assert(insightClient, 'insightClient is required')
   assert(getFeeEstimator, 'getFeeEstimator is required')
   assert(address, 'address is required')
-  assert(keys, 'keys is required')
   assert(signTx, 'signTx is required')
+  assert(getAddressesFromPrivateKey, 'getAddressesFromPrivateKey is required')
   async function prepareFunds(assetName, input, options = {}) {
     const { toAddress, assetClientInterface, MoveFundsError, walletAccount } = options
     assert(MoveFundsError, 'MoveFundsError is required') // should we move MoveFundsError to asset libs?
@@ -29,6 +53,7 @@ export const moveFundsFactory = ({
       asset,
       input,
     }
+    // WIF format private key
     const privateKey = input
 
     if (!isValidPrivateKey(privateKey)) {
@@ -36,7 +61,7 @@ export const moveFundsFactory = ({
     }
 
     const { compressed } = wif.decode(privateKey)
-    const addresses = getAllAddressesFromWIF(privateKey)
+    const addresses = getAddressesFromPrivateKey({ privateKey })
 
     const receiveAddresses = await assetClientInterface.getReceiveAddresses({
       walletAccount,
@@ -61,7 +86,9 @@ export const moveFundsFactory = ({
       }
     }
     if (!found) {
-      formatProps.fromAddress = addresses.join(' or ')
+      formatProps.fromAddress = `${addresses.slice(0, -1).join(', ')}, or ${
+        addresses[addresses.length - 1]
+      }`
       throw new MoveFundsError('balance-zero', formatProps)
     }
     const fromAddress = address
@@ -114,35 +141,6 @@ export const moveFundsFactory = ({
     return { txId, fromAddress, toAddress, amount, fee }
   }
 
-  function getAllAddressesFromWIF(privateKeyWIF) {
-    const { compressed } = wif.decode(privateKeyWIF)
-    const legacyAddress = keys.encodePublicFromWIF(privateKeyWIF)
-    // TODO: support nested segwit address, right now we don't support send
-    // const nestedSegwitAddress = encodeNestedSegwitFromWIF(privateKeyWIF, { asset })
-    const nativeSegwitAddress = keys.encodePublicBech32FromWIF(privateKeyWIF)
-
-    if (compressed) {
-      return [nativeSegwitAddress, legacyAddress]
-    } else {
-      return [legacyAddress]
-    }
-  }
-
-  /*
-function getPublicFromWIF(privateKeyWIF, { asset }) {
-  const { versions } = asset.coinInfo
-  const { privateKey, compressed } = wif.decode(privateKeyWIF, versions.private)
-  return secp256k1.pointFromScalar(privateKey, compressed)
-}
-
-function encodeNestedSegwitFromWIF(privateKeyWIF, { asset }) {
-  const publicKey = getPublicFromWIF(privateKeyWIF, { asset })
-  const witnessProgram = bitcoinjs.payments.p2wpkh({ pubkey: publicKey }).output
-  const witnessProgramHash = bitcoinjs.crypto.hash160(witnessProgram)
-  return bitcoinjs.address.toBase58Check(witnessProgramHash, asset.coinInfo.versions.scripthash)
-}
-*/
-
   async function getUtxos({ asset, address }) {
     const rawUtxos = await insightClient.fetchUTXOs([address])
     return UtxoCollection.fromArray(

package/src/tx-send/index.js

@@ -363,7 +363,7 @@ export const createAndBroadcastTXFactory = ({
           sent: selfSend ? [] : receivers,
           rbfEnabled,
           feePerKB: ['bitcoin', 'bitcoinregtest', 'bitcointestnet'].includes(assetName)
-            ? fee.div(tx.virtualSize() / 1000).toBaseNumber()
+            ? fee.div(tx.virtualSize / 1000).toBaseNumber()
             : undefined,
           changeAddress: changeOutput ? ourAddress : undefined,
           blockHeight,

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

@@ -115,6 +115,7 @@ export const signTxFactory = ({ assetName, resolvePurpose, keys, coinInfo, netwo
     const rawTx = tx.toBuffer()
     const txId = tx.getId()
 
-    return { rawTx, txId, tx }
+    // tx needs to be serializable for desktop RPC send => sign communication
+    return { rawTx, txId, tx: { ...tx, virtualSize: tx.virtualSize?.() } }
   }
 }