diff --git a/crates/brk_computer/src/vecs/stateful/mod.rs b/crates/brk_computer/src/vecs/stateful/mod.rs index eb5126271..f9e7f8aa1 100644 --- a/crates/brk_computer/src/vecs/stateful/mod.rs +++ b/crates/brk_computer/src/vecs/stateful/mod.rs @@ -1289,7 +1289,7 @@ impl Vecs { base_version + self.height_to_opreturn_supply.inner_version(), )?; - let mut chain_state: Vec; + let mut chain_state: Vec = vec![]; let mut chain_state_starting_height = Height::from(self.chain_state.len()); let stateful_starting_height = match separate_utxo_vecs @@ -1322,25 +1322,27 @@ impl Vecs { .collect::>(); chain_state_starting_height } - Ordering::Less => { - // todo!("rollback instead"); - chain_state = vec![]; - chain_state_starting_height = Height::ZERO; - Height::ZERO - } + Ordering::Less => Height::ZERO, }; - if stateful_starting_height.is_zero() { - info!("Starting processing utxos from the start"); - separate_utxo_vecs - .par_iter_mut() - .try_for_each(|(_, v)| v.state.price_to_amount.reset())?; - } + let starting_height = starting_indexes .height .min(stateful_starting_height) .min(Height::from(self.height_to_unspendable_supply.len())) .min(Height::from(self.height_to_opreturn_supply.len())); + if starting_height.is_zero() { + info!("Starting processing utxos from the start"); + + // todo!("rollback instead"); + chain_state = vec![]; + chain_state_starting_height = Height::ZERO; + + separate_utxo_vecs + .par_iter_mut() + .try_for_each(|(_, v)| v.state.price_to_amount.reset())?; + } + if starting_height == Height::from(height_to_date_fixed.len()) { return Ok(()); } diff --git a/crates/brk_fetcher/examples/main.rs b/crates/brk_fetcher/examples/main.rs index 9a79801e7..125fdb0bd 100644 --- a/crates/brk_fetcher/examples/main.rs +++ b/crates/brk_fetcher/examples/main.rs @@ -14,16 +14,16 @@ fn main() -> color_eyre::Result<()> { Binance::fetch_1d().map(|b| { dbg!(b.last_key_value()); - }); + })?; Kraken::fetch_1d().map(|b| { dbg!(b.last_key_value()); - }); + })?; Binance::fetch_1mn().map(|b| { dbg!(b.last_key_value()); - }); + })?; Kraken::fetch_1mn().map(|b| { dbg!(b.last_key_value()); - }); + })?; dbg!(fetcher.get_date(Date::new(2025, 6, 5))?); dbg!(fetcher.get_height( diff --git a/crates/brk_indexer/src/indexes.rs b/crates/brk_indexer/src/indexes.rs index d57787b95..1719c35da 100644 --- a/crates/brk_indexer/src/indexes.rs +++ b/crates/brk_indexer/src/indexes.rs @@ -110,13 +110,7 @@ impl TryFrom<(&mut Vecs, &Stores, &Client)> for Indexes { vecs.height_to_blockhash .iter() .get(*height) - .is_none_or(|saved_blockhash| { - let b = &rpc_blockhash != saved_blockhash.as_ref(); - if b { - dbg!(rpc_blockhash, saved_blockhash.as_ref()); - } - b - }) + .is_none_or(|saved_blockhash| &rpc_blockhash != saved_blockhash.as_ref()) }) .unwrap_or(starting_height); diff --git a/websites/default/manifest.webmanifest b/websites/default/manifest.webmanifest index 828b94ccb..1031f3750 100644 --- a/websites/default/manifest.webmanifest +++ b/websites/default/manifest.webmanifest @@ -1,6 +1,6 @@ { - "name": "kibo.money", - "short_name": "kibo", + "name": "brk", + "short_name": "brk", "description": "A better, FOSS, Bitcoin-only, self-hostable Glassnode", "categories": [ "bitcoin", diff --git a/websites/default/scripts/vecid-to-indexes.js b/websites/default/scripts/vecid-to-indexes.js index 9dfb8c649..de7f7c01b 100644 --- a/websites/default/scripts/vecid-to-indexes.js +++ b/websites/default/scripts/vecid-to-indexes.js @@ -2,7 +2,7 @@ // File auto-generated, any modifications will be overwritten // -export const VERSION = "v0.0.54"; +export const VERSION = "v0.0.55"; /** @typedef {0} DateIndex */ /** @typedef {1} DecadeIndex */