Mirror/brk
1
0
Fork 0
mirror of https://github.com/bitcoinresearchkit/brk.git synced 2026-04-25 23:29:58 -07:00
Code Issues Packages Projects Releases Wiki Activity

global: multiple fixes

Browse Source
This commit is contained in:
nym21
2025-06-07 09:30:42 +02:00
parent cc0f9c42df
commit 51bcbeb48f
28 changed files with 591 additions and 560 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
crates/brk_computer/src/lib.rs
View File

@@ -54,7 +54,6 @@ impl Computer {
self.fetcher.is_some(),
computation,
self.format,
indexer.keyspace(),
)?);
Ok(())
}

3
crates/brk_computer/src/vecs/mod.rs
View File

@@ -5,7 +5,6 @@ use brk_exit::Exit;
use brk_fetcher::Fetcher;
use brk_indexer::Indexer;
use brk_vec::{AnyCollectableVec, Computation, Format};
use fjall::TransactionalKeyspace;
pub mod blocks;
pub mod constants;
@@ -42,7 +41,6 @@ impl Vecs {
fetch: bool,
computation: Computation,
format: Format,
keyspace: &TransactionalKeyspace,
) -> color_eyre::Result<Self> {
fs::create_dir_all(path)?;
@@ -95,7 +93,6 @@ impl Vecs {
computation,
format,
fetched.as_ref(),
keyspace,
)?,
transactions: transactions::Vecs::forced_import(
path,

94
crates/brk_computer/src/vecs/stateful/cohort.rs
View File

@@ -11,7 +11,6 @@ use brk_vec::{
AnyCollectableVec, AnyIterableVec, AnyVec, Computation, EagerVec, Format, StoredIndex,
VecIterator,
};
use fjall::TransactionalKeyspace;
use crate::vecs::{
Indexes, fetched,
@@ -129,8 +128,7 @@ impl Vecs {
format: Format,
version: Version,
fetched: Option<&fetched::Vecs>,
keyspace: &TransactionalKeyspace,
stores_path: &Path,
states_path: &Path,
compute_relative_to_all: bool,
) -> color_eyre::Result<Self> {
let compute_dollars = fetched.is_some();
@@ -142,10 +140,8 @@ impl Vecs {
let suffix = |s: &str| cohort_name.map_or(s.to_string(), |name| format!("{name}_{s}"));
let state = CohortState::default_and_import(
keyspace,
stores_path,
states_path,
cohort_name.unwrap_or_default(),
version + VERSION + Version::ZERO,
compute_dollars,
)?;
@@ -671,7 +667,7 @@ impl Vecs {
EagerVec::forced_import(
path,
&suffix("net_unrealized_profit_and_loss_relative_to_market_cap"),
version + VERSION + Version::ZERO,
version + VERSION + Version::ONE,
format,
)
.unwrap()
@@ -683,7 +679,7 @@ impl Vecs {
path,
&suffix("net_unrealized_profit_and_loss_relative_to_market_cap"),
true,
version + VERSION + Version::ZERO,
version + VERSION + Version::ONE,
format,
StorableVecGeneatorOptions::default().add_last(),
)
@@ -740,7 +736,7 @@ impl Vecs {
EagerVec::forced_import(
path,
&suffix("supply_even_relative_to_own_supply"),
version + VERSION + Version::ZERO,
version + VERSION + Version::ONE,
format,
)
.unwrap()
@@ -749,7 +745,7 @@ impl Vecs {
EagerVec::forced_import(
path,
&suffix("supply_in_loss_relative_to_own_supply"),
version + VERSION + Version::ZERO,
version + VERSION + Version::ONE,
format,
)
.unwrap()
@@ -758,7 +754,7 @@ impl Vecs {
EagerVec::forced_import(
path,
&suffix("supply_in_profit_relative_to_own_supply"),
version + VERSION + Version::ZERO,
version + VERSION + Version::ONE,
format,
)
.unwrap()
@@ -768,7 +764,7 @@ impl Vecs {
path,
&suffix("supply_even_relative_to_own_supply"),
true,
version + VERSION + Version::ZERO,
version + VERSION + Version::ONE,
format,
StorableVecGeneatorOptions::default().add_last(),
)
@@ -779,7 +775,7 @@ impl Vecs {
path,
&suffix("supply_in_loss_relative_to_own_supply"),
true,
version + VERSION + Version::ZERO,
version + VERSION + Version::ONE,
format,
StorableVecGeneatorOptions::default().add_last(),
)
@@ -790,7 +786,7 @@ impl Vecs {
path,
&suffix("supply_in_profit_relative_to_own_supply"),
true,
version + VERSION + Version::ZERO,
version + VERSION + Version::ONE,
format,
StorableVecGeneatorOptions::default().add_last(),
)
@@ -801,7 +797,7 @@ impl Vecs {
path,
&suffix("supply_relative_to_circulating_supply"),
true,
version + VERSION + Version::ZERO,
version + VERSION + Version::ONE,
format,
StorableVecGeneatorOptions::default().add_last(),
)
@@ -813,7 +809,7 @@ impl Vecs {
EagerVec::forced_import(
path,
&suffix("supply_even_relative_to_circulating_supply"),
version + VERSION + Version::ZERO,
version + VERSION + Version::ONE,
format,
)
.unwrap()
@@ -824,7 +820,7 @@ impl Vecs {
EagerVec::forced_import(
path,
&suffix("supply_in_loss_relative_to_circulating_supply"),
version + VERSION + Version::ZERO,
version + VERSION + Version::ONE,
format,
)
.unwrap()
@@ -835,7 +831,7 @@ impl Vecs {
EagerVec::forced_import(
path,
&suffix("supply_in_profit_relative_to_circulating_supply"),
version + VERSION + Version::ZERO,
version + VERSION + Version::ONE,
format,
)
.unwrap()
@@ -847,7 +843,7 @@ impl Vecs {
path,
&suffix("supply_even_relative_to_circulating_supply"),
true,
version + VERSION + Version::ZERO,
version + VERSION + Version::ONE,
format,
StorableVecGeneatorOptions::default().add_last(),
)
@@ -860,7 +856,7 @@ impl Vecs {
path,
&suffix("supply_in_loss_relative_to_circulating_supply"),
true,
version + VERSION + Version::ZERO,
version + VERSION + Version::ONE,
format,
StorableVecGeneatorOptions::default().add_last(),
)
@@ -873,7 +869,7 @@ impl Vecs {
path,
&suffix("supply_in_profit_relative_to_circulating_supply"),
true,
version + VERSION + Version::ZERO,
version + VERSION + Version::ONE,
format,
StorableVecGeneatorOptions::default().add_last(),
)
@@ -986,8 +982,6 @@ impl Vecs {
.into_iter()
.unwrap_get_inner(prev_height);
self.state.price_to_amount.copy_db_to_puts();
if let Some(height_to_realized_cap) = self.height_to_realized_cap.as_mut() {
self.state.realized.as_mut().unwrap().cap = height_to_realized_cap
.into_iter()
@@ -1300,7 +1294,7 @@ impl Vecs {
height,
self.state
.price_to_amount
.puts_first_key_value()
.first_key_value()
.map(|(&dollars, _)| dollars)
.unwrap_or(Dollars::NAN),
exit,
@@ -1312,7 +1306,7 @@ impl Vecs {
height,
self.state
.price_to_amount
.puts_last_key_value()
.last_key_value()
.map(|(&dollars, _)| dollars)
.unwrap_or(Dollars::NAN),
exit,
@@ -2339,8 +2333,8 @@ impl Vecs {
.unwrap()
.compute_percentage(
starting_indexes.height,
self.height_to_supply_even.as_ref().unwrap(),
&self.height_to_supply,
&self.height_to_supply_even_value.as_ref().unwrap().bitcoin,
&self.height_to_supply_value.bitcoin,
exit,
)?;
self.height_to_supply_in_loss_relative_to_own_supply
@@ -2348,8 +2342,12 @@ impl Vecs {
.unwrap()
.compute_percentage(
starting_indexes.height,
self.height_to_supply_in_loss.as_ref().unwrap(),
&self.height_to_supply,
&self
.height_to_supply_in_loss_value
.as_ref()
.unwrap()
.bitcoin,
&self.height_to_supply_value.bitcoin,
exit,
)?;
self.height_to_supply_in_profit_relative_to_own_supply
@@ -2357,8 +2355,12 @@ impl Vecs {
.unwrap()
.compute_percentage(
starting_indexes.height,
self.height_to_supply_even.as_ref().unwrap(),
&self.height_to_supply,
&self
.height_to_supply_in_profit_value
.as_ref()
.unwrap()
.bitcoin,
&self.height_to_supply_value.bitcoin,
exit,
)?;
self.indexes_to_supply_even_relative_to_own_supply
@@ -2372,8 +2374,14 @@ impl Vecs {
|v, _, _, starting_indexes, exit| {
v.compute_percentage(
starting_indexes.dateindex,
self.dateindex_to_supply_even.as_ref().unwrap(),
self.indexes_to_supply.sats.dateindex.as_ref().unwrap(),
self.indexes_to_supply_even
.as_ref()
.unwrap()
.bitcoin
.dateindex
.as_ref()
.unwrap(),
self.indexes_to_supply.bitcoin.dateindex.as_ref().unwrap(),
exit,
)
},
@@ -2389,8 +2397,14 @@ impl Vecs {
|v, _, _, starting_indexes, exit| {
v.compute_percentage(
starting_indexes.dateindex,
self.dateindex_to_supply_even.as_ref().unwrap(),
self.indexes_to_supply.sats.dateindex.as_ref().unwrap(),
self.indexes_to_supply_in_loss
.as_ref()
.unwrap()
.bitcoin
.dateindex
.as_ref()
.unwrap(),
self.indexes_to_supply.bitcoin.dateindex.as_ref().unwrap(),
exit,
)
},
@@ -2406,8 +2420,14 @@ impl Vecs {
|v, _, _, starting_indexes, exit| {
v.compute_percentage(
starting_indexes.dateindex,
self.dateindex_to_supply_even.as_ref().unwrap(),
self.indexes_to_supply.sats.dateindex.as_ref().unwrap(),
self.indexes_to_supply_in_profit
.as_ref()
.unwrap()
.bitcoin
.dateindex
.as_ref()
.unwrap(),
self.indexes_to_supply.bitcoin.dateindex.as_ref().unwrap(),
exit,
)
},

303
crates/brk_computer/src/vecs/stateful/mod.rs
View File

@@ -7,7 +7,6 @@ use brk_vec::{
AnyCollectableVec, AnyVec, BaseVecIterator, CollectableVec, Computation, EagerVec, Format,
GenericStoredVec, StoredIndex, StoredVec, UnsafeSlice, VecIterator,
};
use fjall::TransactionalKeyspace;
use log::info;
use outputs::OutputCohorts;
use rayon::prelude::*;
@@ -29,7 +28,7 @@ use super::{
pub mod cohort;
mod outputs;
const VERSION: Version = Version::new(4);
const VERSION: Version = Version::new(5);
#[derive(Clone)]
pub struct Vecs {
@@ -50,15 +49,13 @@ impl Vecs {
_computation: Computation,
format: Format,
fetched: Option<&fetched::Vecs>,
keyspace: &TransactionalKeyspace,
) -> color_eyre::Result<Self> {
let compute_dollars = fetched.is_some();
let mut root_path = path.to_owned();
root_path.pop();
let states_path = root_path.join("states");
root_path.pop();
let stores_path = root_path.join("stores");
let states_path = root_path.join("states");
Ok(Self {
chain_state: StoredVec::forced_import(
@@ -107,8 +104,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
false,
)?,
by_term: OutputsByTerm {
@@ -119,8 +115,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
long: cohort::Vecs::forced_import(
@@ -130,8 +125,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
},
@@ -143,8 +137,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_1w: cohort::Vecs::forced_import(
@@ -154,8 +147,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_1m: cohort::Vecs::forced_import(
@@ -165,8 +157,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_2m: cohort::Vecs::forced_import(
@@ -176,8 +167,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_3m: cohort::Vecs::forced_import(
@@ -187,8 +177,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_4m: cohort::Vecs::forced_import(
@@ -198,8 +187,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_5m: cohort::Vecs::forced_import(
@@ -209,8 +197,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_6m: cohort::Vecs::forced_import(
@@ -220,8 +207,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_1y: cohort::Vecs::forced_import(
@@ -231,8 +217,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_2y: cohort::Vecs::forced_import(
@@ -242,8 +227,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_3y: cohort::Vecs::forced_import(
@@ -253,8 +237,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_4y: cohort::Vecs::forced_import(
@@ -264,8 +247,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_5y: cohort::Vecs::forced_import(
@@ -275,8 +257,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_6y: cohort::Vecs::forced_import(
@@ -286,8 +267,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_7y: cohort::Vecs::forced_import(
@@ -297,8 +277,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_8y: cohort::Vecs::forced_import(
@@ -308,8 +287,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_10y: cohort::Vecs::forced_import(
@@ -319,8 +297,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_15y: cohort::Vecs::forced_import(
@@ -330,8 +307,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
},
@@ -343,8 +319,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_1w: cohort::Vecs::forced_import(
@@ -354,8 +329,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_1m: cohort::Vecs::forced_import(
@@ -365,8 +339,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_2m: cohort::Vecs::forced_import(
@@ -376,8 +349,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_3m: cohort::Vecs::forced_import(
@@ -387,8 +359,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_4m: cohort::Vecs::forced_import(
@@ -398,8 +369,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_5m: cohort::Vecs::forced_import(
@@ -409,8 +379,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_6m: cohort::Vecs::forced_import(
@@ -420,8 +389,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_1y: cohort::Vecs::forced_import(
@@ -431,8 +399,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_2y: cohort::Vecs::forced_import(
@@ -442,8 +409,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_3y: cohort::Vecs::forced_import(
@@ -453,8 +419,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_4y: cohort::Vecs::forced_import(
@@ -464,8 +429,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_5y: cohort::Vecs::forced_import(
@@ -475,8 +439,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_6y: cohort::Vecs::forced_import(
@@ -486,8 +449,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_7y: cohort::Vecs::forced_import(
@@ -497,8 +459,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_8y: cohort::Vecs::forced_import(
@@ -508,8 +469,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_10y: cohort::Vecs::forced_import(
@@ -519,8 +479,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_15y: cohort::Vecs::forced_import(
@@ -530,8 +489,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
},
@@ -543,8 +501,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_1d_to_1w: cohort::Vecs::forced_import(
@@ -554,8 +511,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_1w_to_1m: cohort::Vecs::forced_import(
@@ -565,8 +521,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_1m_to_2m: cohort::Vecs::forced_import(
@@ -576,8 +531,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_2m_to_3m: cohort::Vecs::forced_import(
@@ -587,8 +541,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_3m_to_4m: cohort::Vecs::forced_import(
@@ -598,8 +551,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_4m_to_5m: cohort::Vecs::forced_import(
@@ -609,8 +561,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_5m_to_6m: cohort::Vecs::forced_import(
@@ -620,8 +571,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_6m_to_1y: cohort::Vecs::forced_import(
@@ -631,8 +581,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_1y_to_2y: cohort::Vecs::forced_import(
@@ -642,8 +591,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_2y_to_3y: cohort::Vecs::forced_import(
@@ -653,8 +601,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_3y_to_4y: cohort::Vecs::forced_import(
@@ -664,8 +611,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_4y_to_5y: cohort::Vecs::forced_import(
@@ -675,8 +621,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_5y_to_6y: cohort::Vecs::forced_import(
@@ -686,8 +631,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_6y_to_7y: cohort::Vecs::forced_import(
@@ -697,8 +641,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_7y_to_8y: cohort::Vecs::forced_import(
@@ -708,8 +651,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_8y_to_10y: cohort::Vecs::forced_import(
@@ -719,8 +661,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_10y_to_15y: cohort::Vecs::forced_import(
@@ -730,8 +671,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_15y_to_end: cohort::Vecs::forced_import(
@@ -741,8 +681,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
},
@@ -754,8 +693,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_1: cohort::Vecs::forced_import(
@@ -765,8 +703,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_2: cohort::Vecs::forced_import(
@@ -776,8 +713,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_3: cohort::Vecs::forced_import(
@@ -787,8 +723,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_4: cohort::Vecs::forced_import(
@@ -798,8 +733,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
},
@@ -811,8 +745,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
from_1sat_to_10sats: cohort::Vecs::forced_import(
@@ -822,8 +755,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
from_10sats_to_100sats: cohort::Vecs::forced_import(
@@ -833,8 +765,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
from_100sats_to_1_000sats: cohort::Vecs::forced_import(
@@ -844,8 +775,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
from_1_000sats_to_10_000sats: cohort::Vecs::forced_import(
@@ -855,8 +785,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
from_10_000sats_to_100_000sats: cohort::Vecs::forced_import(
@@ -866,8 +795,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
from_100_000sats_to_1_000_000sats: cohort::Vecs::forced_import(
@@ -877,8 +805,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
from_1_000_000sats_to_10_000_000sats: cohort::Vecs::forced_import(
@@ -888,8 +815,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
from_10_000_000sats_to_1btc: cohort::Vecs::forced_import(
@@ -899,8 +825,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
from_1btc_to_10btc: cohort::Vecs::forced_import(
@@ -910,8 +835,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
from_10btc_to_100btc: cohort::Vecs::forced_import(
@@ -921,8 +845,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
from_100btc_to_1_000btc: cohort::Vecs::forced_import(
@@ -932,8 +855,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
from_1_000btc_to_10_000btc: cohort::Vecs::forced_import(
@@ -943,8 +865,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
from_10_000btc_to_100_000btc: cohort::Vecs::forced_import(
@@ -954,8 +875,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
from_100_000btc: cohort::Vecs::forced_import(
@@ -965,8 +885,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
},
@@ -978,8 +897,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_10_000sats: cohort::Vecs::forced_import(
@@ -989,8 +907,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_1btc: cohort::Vecs::forced_import(
@@ -1000,8 +917,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_10btc: cohort::Vecs::forced_import(
@@ -1011,8 +927,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_100btc: cohort::Vecs::forced_import(
@@ -1022,8 +937,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
},
@@ -1035,8 +949,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_1btc: cohort::Vecs::forced_import(
@@ -1046,8 +959,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_10btc: cohort::Vecs::forced_import(
@@ -1057,8 +969,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
_100btc: cohort::Vecs::forced_import(
@@ -1068,8 +979,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
},
@@ -1174,8 +1084,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
p2pk33: cohort::Vecs::forced_import(
@@ -1185,8 +1094,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
p2pkh: cohort::Vecs::forced_import(
@@ -1196,8 +1104,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
p2ms: cohort::Vecs::forced_import(
@@ -1207,8 +1114,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
p2sh: cohort::Vecs::forced_import(
@@ -1218,8 +1124,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
p2wpkh: cohort::Vecs::forced_import(
@@ -1229,8 +1134,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
p2wsh: cohort::Vecs::forced_import(
@@ -1240,8 +1144,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
p2tr: cohort::Vecs::forced_import(
@@ -1251,8 +1154,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
p2a: cohort::Vecs::forced_import(
@@ -1262,8 +1164,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
empty: cohort::Vecs::forced_import(
@@ -1273,8 +1174,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
unknown: cohort::Vecs::forced_import(
@@ -1284,8 +1184,7 @@ impl Vecs {
format,
version + VERSION + Version::ZERO,
fetched,
keyspace,
&stores_path,
&states_path,
true,
)?,
},
@@ -1434,7 +1333,7 @@ impl Vecs {
info!("Starting processing utxos from the start");
separate_utxo_vecs
.par_iter_mut()
.try_for_each(|(_, v)| v.state.price_to_amount.reset_partition())?;
.try_for_each(|(_, v)| v.state.price_to_amount.reset())?;
}
let starting_height = starting_indexes
.height

11
crates/brk_computer/src/vecs/stateful/outputs.rs
View File

@@ -109,12 +109,8 @@ impl OutputCohorts for Outputs<(OutputFilter, cohort::Vecs)> {
);
});
sent.by_type
.spendable
.as_typed_vec()
.into_iter()
.filter(|(_, suply_state)| suply_state.utxos > 0)
.for_each(|(output_type, supply_state)| {
sent.by_type.spendable.as_typed_vec().into_iter().for_each(
|(output_type, supply_state)| {
self.by_type.get_mut(output_type).1.state.send(
supply_state,
current_price,
@@ -123,7 +119,8 @@ impl OutputCohorts for Outputs<(OutputFilter, cohort::Vecs)> {
days_old_foat,
older_than_hour,
)
});
},
);
sent.by_size_group
.into_iter()