BitcoinCash/riftenlabs-indexer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rebase fix

Browse source
This commit is contained in:
Hossein Zoda 2026-06-10 21:40:11 +00:00
parent 856b374a6d
commit edf7955a23
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/index.rs
View file

@ -76,11 +76,7 @@ pub async fn update_mempool(
db::cauldron::mempool::load_mempool(&db.cauldron_w).await?; db::cauldron::mempool::load_mempool(&db.cauldron_w).await?;
let electrum_clone = electrum.clone(); let electrum_clone = electrum.clone();
<<<<<<< HEAD
let (defi_txs, oracle_txs) = tokio::task::spawn_blocking(move || {
=======
let (cauldron_txs, oracle_txs, ido_txs) = tokio::task::spawn_blocking(move || { let (cauldron_txs, oracle_txs, ido_txs) = tokio::task::spawn_blocking(move || {
>>>>>>> 7fb15f6 (ido: index unconfirmed txs from the mempool)
electrum_fetch_mempool(&electrum_clone.lock().unwrap()) electrum_fetch_mempool(&electrum_clone.lock().unwrap())
}) })
.await??; .await??;