@exodus/bitcoin-api 2.21.4 → 2.22.1

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.22.1](https://github.com/ExodusMovement/assets/compare/@exodus/bitcoin-api@2.22.0...@exodus/bitcoin-api@2.22.1) (2024-08-18)
+
+
+### Bug Fixes
+
+* pass allowUnconfirmed option through in batch-tx ([#3177](https://github.com/ExodusMovement/assets/issues/3177)) ([d8e073b](https://github.com/ExodusMovement/assets/commit/d8e073b4c66c79dae5808877f5c4d4cc98d93444))
+* update exodus/timer ([#3134](https://github.com/ExodusMovement/assets/issues/3134)) ([e977be5](https://github.com/ExodusMovement/assets/commit/e977be5280c214c1b814409d9461ce6628bb19be))
+
+
+
+## [2.22.0](https://github.com/ExodusMovement/assets/compare/@exodus/bitcoin-api@2.21.4...@exodus/bitcoin-api@2.22.0) (2024-08-08)
+
+
+### Features
+
+* move ME BTC  monitor to the ME codebase ([#3118](https://github.com/ExodusMovement/assets/issues/3118)) ([2610e96](https://github.com/ExodusMovement/assets/commit/2610e966f5d078e6b9d87a08c4d86ad090400583))
+
+
+
 ## [2.21.4](https://github.com/ExodusMovement/assets/compare/@exodus/bitcoin-api@2.21.3...@exodus/bitcoin-api@2.21.4) (2024-08-05)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exodus/bitcoin-api",
-  "version": "2.21.4",
+  "version": "2.22.1",
   "description": "Exodus bitcoin-api",
   "main": "src/index.js",
   "files": [
@@ -30,7 +30,7 @@
     "@exodus/key-identifier": "^1.1.1",
     "@exodus/models": "^11.0.0",
     "@exodus/simple-retry": "^0.0.6",
-    "@exodus/timer": "^1.0.0",
+    "@exodus/timer": "^1.1.1",
     "bech32": "^1.1.3",
     "bip32-path": "^0.4.2",
     "bn.js": "^4.12.0",
@@ -66,5 +66,5 @@
     "type": "git",
     "url": "git+https://github.com/ExodusMovement/assets.git"
   },
-  "gitHead": "3bdc8042ea81698a2d654be9ed4fef1df1dd51c5"
+  "gitHead": "ceb41116fe6afaa75965a0ce9920e379097f2553"
 }

package/src/account-state.js

@@ -1,11 +1,6 @@
 import { AccountState, UtxoCollection } from '@exodus/models'
 
-export function createAccountState({
-  asset,
-  ordinalsEnabled = false,
-  brc20Enabled = false,
-  isMagicEdenFungibleBalancesEnabled = false,
-}) {
+export function createAccountState({ asset, ordinalsEnabled = false, brc20Enabled = false }) {
   const empty = UtxoCollection.createEmpty({
     currency: asset.currency,
   })
@@ -27,10 +22,6 @@ export function createAccountState({
     defaults.brc20Balances = {}
   }
 
-  if (isMagicEdenFungibleBalancesEnabled) {
-    defaults.magicEdenApiFungibleBalances = []
-  }
-
   return class BitcoinAccountState extends AccountState {
     static defaults = defaults
   }

package/src/tx-log/index.js

@@ -1,3 +1,2 @@
 export * from './bitcoin-monitor'
-export * from './magic-eden-bitcoin-monitor'
 export * from './bitcoin-monitor-scanner'

package/src/tx-send/batch-tx.js

@@ -1,4 +1,4 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
+// eslint-disable-next-line @exodus/import/no-extraneous-dependencies
 import BIP32 from '@exodus/bip32'
 import { Psbt } from '@exodus/bitcoinjs-lib'
 import BipPath from 'bip32-path'
@@ -19,13 +19,12 @@ export const getCreateBatchTransaction = ({
   getFeeEstimator,
   assetClientInterface,
   changeAddressType,
+  allowUnconfirmedRbfEnabledUtxos,
 }) => {
   assert(assetClientInterface, `assetClientInterface must be supplied in sendTx`)
 
-  return async ({ assetName, walletAccount, recipients, options = {} }) => {
-    const stuff = await assetClientInterface.getAssetsForNetwork({ baseAssetName: assetName })
-    const asset = stuff[assetName]
-
+  return async ({ asset, walletAccount, recipients, options = {} }) => {
+    const assetName = asset.name
     const {
       feeData = await assetClientInterface.getFeeConfig({ assetName }),
       taprootInputWitnessSize,
@@ -57,7 +56,7 @@ export const getCreateBatchTransaction = ({
       unconfirmedTxAncestor,
       taprootInputWitnessSize,
       changeAddressType,
-      allowUnconfirmedRbfEnabledUtxos: false,
+      allowUnconfirmedRbfEnabledUtxos,
     })
 
     if (!selectedUtxos) throw new Error('Not enough funds.')
@@ -76,12 +75,10 @@ export const getCreateBatchTransaction = ({
       const addressOpts = {
         walletAccount,
         assetName,
-        chainIndex: 0,
-        addressIndex: 0,
+        chainIndex,
+        addressIndex,
+        purpose: utxo.address.meta.purpose ?? 86,
       }
-      addressOpts.chainIndex = chainIndex
-      addressOpts.addressIndex = addressIndex
-      addressOpts.purpose = utxo.address.meta.purpose
 
       const [address, xpub] = await Promise.all([
         assetClientInterface.getAddress(addressOpts),

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

@@ -1,78 +0,0 @@
-import { Monitor as BitcoinMonitor } from './bitcoin-monitor'
-import fetchFlagrEvaluation from './me-flagr'
-
-const FLAGR_KEY = 'bitcoin-balance-api'
-
-export class MagicEdenBitcoinMonitor extends BitcoinMonitor {
-  constructor(args) {
-    super(args)
-    this.useMagicEdenMonitor = false
-  }
-
-  async setServer(assetConfig = {}) {
-    super.setServer(assetConfig)
-
-    const walletAccounts = await this.aci.getWalletAccounts({ assetName: this.asset.name })
-    const address = await this.aci.getReceiveAddress({
-      assetName: this.asset.name,
-      walletAccount: walletAccounts[0],
-      useCache: true,
-    })
-    await this.initFlagr(address)
-  }
-
-  async initFlagr(address) {
-    if (this.useMagicEdenMonitor) return
-    try {
-      const response = await fetchFlagrEvaluation(address, FLAGR_KEY)
-      if (response.variantKey === 'on') {
-        this.useMagicEdenMonitor = true
-      }
-    } catch (error) {
-      console.error('Failed to fetch useMagicEdenMonitor config:', error)
-    }
-  }
-
-  async fetchFungibleBalances(walletAccount) {
-    if (!this.useMagicEdenMonitor) return
-
-    const purposes = await this.aci.getSupportedPurposes({
-      assetName: this.asset.name,
-      walletAccount,
-    })
-
-    const addresses = await Promise.all(
-      purposes.map((purpose) =>
-        this.aci.getReceiveAddress({
-          assetName: this.asset.name,
-          walletAccount,
-          useCache: true,
-          purpose,
-        })
-      )
-    )
-
-    const response = await fetch('https://api-mainnet.magiceden.io/v1/wallet/balances/fungible', {
-      method: 'POST',
-      headers: {
-        Accept: 'application/json',
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify(
-        addresses.map((address) => ({ address, chain: this.asset.baseAssetName }))
-      ),
-    })
-
-    if (!response.ok) {
-      throw new Error(
-        `Unable to fetch bitcoin fungible balanes: API returned ${response.status}: ${response.statusText || 'Unknown Status Text'}`
-      )
-    }
-
-    const { balances } = await response.json()
-
-    return balances
-  }
-}
-
-export const createMagicEdenBitcoinMonitor = (args) => new MagicEdenBitcoinMonitor(args)

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

@@ -1,86 +0,0 @@
-import { Monitor as BitcoinMonitor } from './bitcoin-monitor'
-import fetchFlagrEvaluation from './me-flagr'
-
-const FLAGR_KEY = 'bitcoin-balance-api'
-
-export class MagicEdenBitcoinMonitor extends BitcoinMonitor {
-  constructor(args) {
-    super(args)
-    this.useMagicEdenMonitor = false
-  }
-
-  async setServer(assetConfig = {}) {
-    super.setServer(assetConfig)
-
-    const walletAccounts = await this.aci.getWalletAccounts({ assetName: this.asset.name })
-    const address = await this.aci.getReceiveAddress({
-      assetName: this.asset.name,
-      walletAccount: walletAccounts[0],
-      useCache: true,
-    })
-    await this.initFlagr(address)
-  }
-
-  async initFlagr(address) {
-    if (this.useMagicEdenMonitor) return
-    try {
-      const response = await fetchFlagrEvaluation(address, FLAGR_KEY)
-      if (response.variantKey === 'on') {
-        this.useMagicEdenMonitor = true
-      }
-    } catch (error) {
-      console.error('Failed to fetch useMagicEdenMonitor config:', error)
-    }
-  }
-
-  async fetchFungibleBalances(walletAccount) {
-    if (!this.useMagicEdenMonitor) return
-
-    const purposes = await this.aci.getSupportedPurposes({
-      assetName: this.asset.name,
-      walletAccount,
-    })
-
-    const addresses = await Promise.all(
-      purposes.map((purpose) =>
-        this.aci.getReceiveAddress({
-          assetName: this.asset.name,
-          walletAccount,
-          useCache: true,
-          purpose,
-        })
-      )
-    )
-
-    const response = await fetch('https://api-mainnet.magiceden.io/v1/wallet/balances/fungible', {
-      method: 'POST',
-      headers: {
-        Accept: 'application/json',
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify(
-        addresses.map((address) => ({ address, chain: this.asset.baseAssetName }))
-      ),
-    })
-
-    if (!response.ok) {
-      throw new Error(
-        `Unable to fetch bitcoin fungible balanes: API returned ${response.status}: ${response.statusText || 'Unknown Status Text'}`
-      )
-    }
-
-    const { balances } = await response.json()
-
-    const metadata = new Map()
-    balances.forEach((balance) => {
-      if (balance.asset?.id && balance.image) {
-        metadata.set(balance.asset.id, { imageURL: balance.image })
-      }
-    })
-    this.emit('token-metadata', { source: 'bitcoin', metadata })
-
-    return balances
-  }
-}
-
-export const createMagicEdenBitcoinMonitor = (args) => new MagicEdenBitcoinMonitor(args)

package/src/tx-log/me-flagr.js

@@ -1,22 +0,0 @@
-const FLAGR_URL = 'https://flagr-w.magiceden.io/api/v1/evaluation'
-
-const fetchFlagrEvaluation = async (wallet, flagKey) => {
-  const response = await fetch(FLAGR_URL, {
-    method: 'POST',
-    headers: {
-      Accept: 'application/json',
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify({ entityContext: { wallet }, flagKey }),
-  })
-
-  if (!response.ok) {
-    throw new Error(
-      `${FLAGR_URL} returned ${response.status}: ${response.statusText || 'Unknown Status Text'}`
-    )
-  }
-
-  return response.json()
-}
-
-export default fetchFlagrEvaluation