@exodus/bitcoin-api 2.4.0 → 2.5.0-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "2.4.0",
+  "version": "2.5.0-alpha.0",
   "description": "Exodus bitcoin-api",
   "main": "src/index.js",
   "files": [
@@ -22,13 +22,13 @@
     "@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",
+    "bitcoinjs-lib": "^6.1.5",
     "coininfo": "5.1.0",
     "delay": "4.0.1",
     "ecpair": "2.0.1",
@@ -41,5 +41,5 @@
     "@exodus/bitcoin-meta": "^1.0.1",
     "jest-when": "^3.5.1"
   },
-  "gitHead": "de21cbd727cb6cbe4fac07b58cc6e3fa8af318ff"
+  "gitHead": "04641210f5ac2a4b490cf348b2917b28cf463ba2"
 }

package/src/bitcoinjs-lib/ecc/common.js

@@ -1,4 +1,5 @@
 import secp256k1 from '@exodus/secp256k1'
+import { toXOnly } from '../../tx-sign/taproot'
 
 /**
  * Common ecc functions between mobile and desktop. Once mobile accepts @noble/secp256k1, we can unify both
@@ -24,7 +25,7 @@ export const common = {
       const t = secp256k1.publicKeyTweakAdd(toPubKey(p), tweak)
       return {
         parity: t[0] === 0x02 ? 0 : 1,
-        xOnlyPubkey: t.slice(1, 33),
+        xOnlyPubkey: toXOnly(t),
       }
     } catch (err) {
       return null

package/src/bitcoinjs-lib/ecc/desktop.js

@@ -1,4 +1,4 @@
-import { TinySecp256k1Interface } from '@exodus/bitcoinjs-lib'
+import { TinySecp256k1Interface, initEccLib } from 'bitcoinjs-lib'
 import { Point, schnorr, sign } from '@noble/secp256k1'
 import { common, toPubKey } from './common'
 
@@ -48,3 +48,5 @@ export const desktopEcc: TinySecp256k1Interface = {
   pointCompress: (p: Uint8Array, compressed?: boolean): Uint8Array =>
     Point.fromHex(p).toRawBytes(compressed),
 }
+
+initEccLib(desktopEcc)

package/src/bitcoinjs-lib/ecc/mobile.js

@@ -1,4 +1,4 @@
-import { TinySecp256k1Interface } from '@exodus/bitcoinjs-lib'
+import { TinySecp256k1Interface, initEccLib } from 'bitcoinjs-lib'
 import secp256k1 from '@exodus/secp256k1'
 // TODO: temp import until '@noble/secp256k1' can be used
 import { isPoint } from 'tiny-secp256k1'
@@ -56,3 +56,5 @@ export const mobileEcc: TinySecp256k1Interface = {
   pointCompress: (p: Uint8Array, compressed?: boolean): Uint8Array =>
     secp256k1.publicKeyConvert(p, compressed),
 }
+
+initEccLib(mobileEcc)

package/src/bitcoinjs-lib/script-classify/index.js

@@ -1,4 +1,4 @@
-import { payments } from '@exodus/bitcoinjs-lib'
+import { payments } from 'bitcoinjs-lib'
 import assert from 'minimalistic-assert'
 
 function isPaymentFactory(payment: any): (script: Buffer, eccLib?: any) => boolean {

package/src/btc-like-address.js

@@ -2,7 +2,7 @@ import bs58check from 'bs58check'
 import * as bech32 from 'bech32'
 import assert from 'minimalistic-assert'
 import { identity, pickBy } from 'lodash'
-import * as bitcoinjsOriginal from '@exodus/bitcoinjs-lib'
+import * as bitcoinjsOriginal from 'bitcoinjs-lib'
 
 export const createBtcLikeAddress = ({
   versions,

package/src/btc-like-keys.js

@@ -3,9 +3,10 @@ import wif from 'wif'
 import * as bech32 from 'bech32'
 import assert from 'minimalistic-assert'
 import { identity, pickBy } from 'lodash'
-import * as defaultBitcoinjsLib from '@exodus/bitcoinjs-lib'
+import * as defaultBitcoinjsLib from 'bitcoinjs-lib'
 import secp256k1 from 'secp256k1'
 import { hash160 } from './hash-utils'
+import { toXOnly } from './tx-sign/taproot'
 
 export const publicKeyToHashFactory = (p2pkh) => (publicKey) => {
   const payload = Buffer.concat([Buffer.from([p2pkh]), hash160(publicKey)])
@@ -91,7 +92,7 @@ export const createBtcLikeKeys = ({
       ? (publicKey: Buffer): string => {
           const network = coinInfo.toBitcoinJS()
           return bitcoinjsLib.payments.p2tr(
-            { internalPubkey: publicKey.slice(1, 33), network },
+            { internalPubkey: toXOnly(publicKey), network },
             { eccLib: ecc }
           ).address
         }

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

@@ -31,7 +31,7 @@ export class GetFeeResolver {
       assert(!brc20, 'brc20 must not be provided when nft is provided!!!')
     }
     if (brc20) {
-      assert(!amount, 'amount must not be provided when brc20 is provided!!!')
+      // assert(!amount, 'amount must not be provided when brc20 is provided!!!')
       assert(!isSendAll, 'isSendAll must not be provided when brc20 is provided!!!')
       assert(!nft, 'nft must not be provided when brc20 is provided!!!')
     }
@@ -43,7 +43,7 @@ export class GetFeeResolver {
       accountState,
       txSet,
       feeData,
-      amount,
+      amount: brc20 ? undefined : amount,
       customFee,
       isSendAll,
       inscriptionIds,

package/src/parse-unsigned-tx.js

@@ -2,7 +2,7 @@ import assert from 'minimalistic-assert'
 import BIPPath from 'bip32-path'
 import BN from 'bn.js'
 import lodash from 'lodash'
-import { Transaction as BitcoinTransactionClass } from '@exodus/bitcoinjs-lib'
+import { Transaction as BitcoinTransactionClass } from 'bitcoinjs-lib'
 
 export const parseUnsignedTxFactory = ({ Transaction = BitcoinTransactionClass } = {}) => async ({
   asset,

package/src/tx-send/index.js

@@ -16,7 +16,7 @@ import {
 import { findUnconfirmedSentRbfTxs } from '../tx-utils'
 import { getOrdinalsUtxos, getUsableUtxos, getUtxos } from '../utxos-utils'
 
-import * as defaultBitcoinjsLib from '@exodus/bitcoinjs-lib'
+import * as defaultBitcoinjsLib from 'bitcoinjs-lib'
 
 const ASSETS_SUPPORTED_BIP_174 = [
   'bitcoin',
@@ -132,7 +132,10 @@ export const createAndBroadcastTXFactory = ({
   getFeeEstimator,
   getSizeAndChangeScript = getSizeAndChangeScriptFactory(), // for decred customizations
   allowUnconfirmedRbfEnabledUtxos,
-}) => async ({ asset, walletAccount, address, amount, options }, { assetClientInterface }) => {
+}) => async (
+  { asset: maybeToken, walletAccount, address, amount: tokenAmount, options },
+  { assetClientInterface }
+) => {
   const {
     multipleAddressesEnabled,
     feePerKB,
@@ -143,9 +146,21 @@ export const createAndBroadcastTXFactory = ({
     bumpTxId,
     isRbfAllowed = true,
     nft,
-    brc20,
+    feeOpts,
   } = options
 
+  const brc20 = options.brc20 || feeOpts?.brc20 // feeOpts is the only way I've found atm to pass brc20 param without changing the tx-send hydra module
+
+  const asset = maybeToken.baseAsset
+
+  const isToken = maybeToken.name !== asset.name
+
+  if (isToken) {
+    assert(brc20, 'brc20 is required when sending bitcoin token')
+  }
+
+  const amount = isToken ? asset.currency.ZERO : tokenAmount
+
   const assetName = asset.name
 
   const accountState = await assetClientInterface.getAccountState({ assetName, walletAccount })
@@ -458,15 +473,21 @@ export const createAndBroadcastTXFactory = ({
     ? replaceTx.data.sent.concat([{ address: displayReceiveAddress, amount }])
     : [{ address: displayReceiveAddress, amount }]
 
+  const coinAmount = selfSend
+    ? maybeToken.currency.ZERO
+    : isToken
+    ? tokenAmount.abs().negate()
+    : totalAmount.abs().negate()
+
   await assetClientInterface.updateTxLogAndNotify({
-    assetName,
+    assetName: maybeToken.name,
     walletAccount,
     txs: [
       {
         txId,
         confirmations: 0,
-        coinAmount: selfSend ? currency.ZERO : totalAmount.abs().negate(),
-        coinName: assetName,
+        coinAmount,
+        coinName: maybeToken.name,
         feeAmount: fee,
         feeCoinName: assetName,
         selfSend,

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

@@ -1,12 +1,12 @@
 import assert from 'minimalistic-assert'
 import lodash from 'lodash'
 import ECPairFactory from 'ecpair'
-import { payments, Psbt, Transaction } from '@exodus/bitcoinjs-lib'
+import { payments, Psbt, Transaction } from 'bitcoinjs-lib'
 import { getOwnProperty } from '@exodus/basic-utils'
 
 import secp256k1 from 'secp256k1'
 
-import { toAsyncSigner, tweakSigner } from './taproot'
+import { toAsyncSigner, toXOnly, tweakSigner } from './taproot'
 
 let ECPair
 
@@ -63,7 +63,8 @@ export const signTxFactory = ({ assetName, resolvePurpose, keys, coinInfo, netwo
         const privateKey = getOwnProperty(privateKeysAddressMap, address, 'string')
         assert(privateKey, `there is no private key for address ${address}`)
         const key = ECPair.fromWIF(privateKey, networkInfo)
-        return { key, purpose }
+        const publicKey = secp256k1.publicKeyCreate(key.privateKey, true)
+        return { key, purpose, publicKey }
       }
       const path = addressPathsMap[address]
       assert(hdkeys, 'hdkeys must be provided')
@@ -72,18 +73,24 @@ export const signTxFactory = ({ assetName, resolvePurpose, keys, coinInfo, netwo
       assert(hdkey, `hdkey for purpose for ${purpose} and address ${address} could not be resolved`)
       const derivedhdkey = hdkey.derive(path)
       const privateEncoded = keys.encodePrivate(derivedhdkey.privateKey)
-      return { key: ECPair.fromWIF(privateEncoded, networkInfo), purpose }
+      const key = ECPair.fromWIF(privateEncoded, networkInfo)
+      const publicKey = derivedhdkey.publicKey
+      return { key, publicKey, purpose }
     })
 
     // Fill tx
     for (const { txId, vout, address, value, script, sequence } of inputs) {
-      const { purpose } = getKeyAndPurpose(address)
+      const { purpose, publicKey } = getKeyAndPurpose(address)
+
       const isSegwitAddress = purpose === 84
       const isTaprootAddress = purpose === 86
       const txIn = { hash: txId, index: vout, sequence }
       if (isSegwitAddress || isTaprootAddress) {
         // witness outputs only require the value and the script, not the full transaction
         txIn.witnessUtxo = { value, script: Buffer.from(script, 'hex') }
+        if (isTaprootAddress) {
+          txIn.tapInternalKey = toXOnly(publicKey)
+        }
       } else {
         const rawTx = (rawTxs || []).find((t) => t.txId === txId)
         // non-witness outptus require the full transaction
@@ -109,14 +116,13 @@ export const signTxFactory = ({ assetName, resolvePurpose, keys, coinInfo, netwo
     // so signing is only done AFTER all inputs have been updated
     for (let index = 0; index < inputs.length; index++) {
       const { address } = inputs[index]
-      const { key, purpose } = getKeyAndPurpose(address)
+      const { key, purpose, publicKey } = getKeyAndPurpose(address)
 
       if (purpose === 49) {
         // If spending from a P2SH address, we assume the address is P2SH wrapping
         // P2WPKH. Exodus doesn't use P2SH addresses so we should only ever be
         // signing a P2SH input if we are importing a private key
         // BIP143: As a default policy, only compressed public keys are accepted in P2WPKH and P2WSH
-        const publicKey = secp256k1.publicKeyCreate(key.privateKey, true)
         const p2wpkh = payments.p2wpkh({ pubkey: publicKey })
         const p2sh = payments.p2sh({ redeem: p2wpkh })
         psbt.updateInput(index, {

package/src/tx-sign/taproot.js

@@ -1,4 +1,4 @@
-import { crypto } from '@exodus/bitcoinjs-lib'
+import { crypto } from 'bitcoinjs-lib'
 import assert from 'minimalistic-assert'
 import { getSchnorrEntropy } from './default-entropy'
 
@@ -16,7 +16,7 @@ export function tweakSigner({ signer, ECPair, ecc, tweakHash, network }) {
 
   const tweakedPrivateKey = ecc.privateAdd(
     privateKey,
-    tapTweakHash(signer.publicKey.slice(1, 33), tweakHash)
+    tapTweakHash(toXOnly(signer.publicKey), tweakHash)
   )
   if (!tweakedPrivateKey) {
     throw new Error('Invalid tweaked private key!')
@@ -48,3 +48,7 @@ export function toAsyncSigner({ keyPair, ecc }) {
   }
   return keyPair
 }
+
+export const toXOnly = (publicKey) => {
+  return publicKey.slice(1, 33)
+}