Mirror/brk
1
0
Fork 0
mirror of https://github.com/bitcoinresearchkit/brk.git synced 2026-06-08 06:01:57 -07:00
Code Issues Packages Projects Releases Wiki Activity

global: renames and fixes

Browse Source
This commit is contained in:
nym21
2025-07-08 21:33:18 +02:00
parent 8cc1f8d691
commit f45fb6efe6
39 changed files with 2355 additions and 2270 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TODO.md
+4 -1
View File
@@ -16,13 +16,15 @@
- add oracle price dataset (https://utxo.live/oracle/UTXOracle.py)
- add address counts relative to all datasets
- make decade, quarter, year datasets `computed` instead of `eager`
- add 6 months interval datasets to builder
- add 6 months (semester) interval datasets to builder
- add revived/sent supply datasets
- add `in-sats` version of all price datasets (average and co)
- add `p2pk` group (sum of `p2pk33` and `p2pk65`)
- add more date ranges (3-6 months and more)
- add puell multiple dataset
- add pi cycle dataset
- add ema of price
- add 7d and 30d ema to sell side risk ratio and sopr
- add all possible charts from:
- https://mainnet.observer
- https://glassnode.com
@@ -51,6 +53,7 @@
- _vec_
- add native lock file support (once it's available in stable rust)
- improve compressed mode (slow reads)
- add ema support
- __docs__
- _README_
- add a comparison table with alternatives
crates/brk_computer/src/states/transacted.rs
+2 -2
View File
@@ -1,6 +1,6 @@
use std::ops::{Add, AddAssign};
use brk_core::{GroupedBySizeRange, GroupedByType, OutputType, Sats};
use brk_core::{ByAmountRange, GroupedByType, OutputType, Sats};
use super::SupplyState;
@@ -8,7 +8,7 @@ use super::SupplyState;
pub struct Transacted {
pub spendable_supply: SupplyState,
pub by_type: GroupedByType<SupplyState>,
pub by_size_group: GroupedBySizeRange<SupplyState>,
pub by_size_group: ByAmountRange<SupplyState>,
}
impl Transacted {
crates/brk_computer/src/stores.rs
+3 -3
View File
@@ -1,7 +1,7 @@
use std::{path::Path, thread};
use brk_core::{
AddressData, EmptyAddressData, GroupedByAddressType, Height, OutputType, P2AAddressIndex,
AddressData, ByAddressType, EmptyAddressData, Height, OutputType, P2AAddressIndex,
P2PK33AddressIndex, P2PK65AddressIndex, P2PKHAddressIndex, P2SHAddressIndex, P2TRAddressIndex,
P2WPKHAddressIndex, P2WSHAddressIndex, Result, TypeIndex, Version,
};
@@ -375,7 +375,7 @@ impl Stores {
WithAddressDataSource<EmptyAddressData>,
>,
) -> Result<()> {
let GroupedByAddressType {
let ByAddressType {
p2pk65,
p2pk33,
p2pkh,
@@ -386,7 +386,7 @@ impl Stores {
p2a,
} = addresstype_to_typeindex_to_addressdata.unwrap();
let GroupedByAddressType {
let ByAddressType {
p2pk65: empty_p2pk65,
p2pk33: empty_p2pk33,
p2pkh: empty_p2pkh,
crates/brk_computer/src/vecs/fetched.rs
+10 -2
View File
@@ -7,7 +7,9 @@ use brk_core::{
use brk_exit::Exit;
use brk_fetcher::Fetcher;
use brk_indexer::Indexer;
use brk_vec::{AnyCollectableVec, AnyIterableVec, Computation, EagerVec, Format, StoredIndex};
use brk_vec::{
AnyCollectableVec, AnyIterableVec, AnyVec, Computation, EagerVec, Format, StoredIndex,
};
use super::{
Indexes,
@@ -426,7 +428,13 @@ impl Vecs {
starting_indexes.dateindex,
&indexes.dateindex_to_date,
|(di, d, this)| {
let mut ohlc = fetcher.get_date(d).unwrap();
let mut ohlc = fetcher.get_date(d).unwrap_or_else(|_| {
this.get_or_read(di, &this.mmap().load())
.unwrap()
.unwrap()
.into_owned()
});
if let Some(prev) = di.decremented() {
let prev_open = *this
.get_or_read(prev, &this.mmap().load())
crates/brk_computer/src/vecs/grouped/builder.rs
+3 -13
View File
@@ -45,16 +45,6 @@ where
) -> color_eyre::Result<Self> {
let only_one_active = options.is_only_one_active();
let prefix = |s: &str| format!("{s}_{name}");
let maybe_prefix = |s: &str| {
if only_one_active {
name.to_string()
} else {
prefix(s)
}
};
let suffix = |s: &str| format!("{name}_{s}");
let maybe_suffix = |s: &str| {
@@ -70,7 +60,7 @@ where
Box::new(
EagerVec::forced_import(
path,
&maybe_prefix("first"),
&maybe_suffix("first"),
version + VERSION + Version::ZERO,
format,
)
@@ -130,7 +120,7 @@ where
Box::new(
EagerVec::forced_import(
path,
&(if !options.last {
&(if !options.last && !options.average && !options.min && !options.max {
name.to_string()
} else {
maybe_suffix("sum")
@@ -145,7 +135,7 @@ where
Box::new(
EagerVec::forced_import(
path,
&prefix("cumulative"),
&suffix("cumulative"),
version + VERSION + Version::ZERO,
format,
)
crates/brk_computer/src/vecs/stateful/address_cohorts.rs
+62 -62
View File
@@ -1,7 +1,7 @@
use std::path::Path;
use brk_core::{
AddressGroups, GroupFilter, GroupedByFromSize, GroupedBySizeRange, GroupedByUpToSize, Height,
AddressGroups, ByAmountRange, ByGreatEqualAmount, ByLowerThanAmount, GroupFilter, Height,
Result, Version,
};
use brk_exit::Exit;
@@ -33,10 +33,10 @@ impl Vecs {
) -> color_eyre::Result<Self> {
Ok(Self(
AddressGroups {
by_size_range: GroupedBySizeRange {
amount_range: ByAmountRange {
_0sats: address_cohort::Vecs::forced_import(
path,
Some("addresses_0sats"),
Some("addrs_with_0sats"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -44,9 +44,9 @@ impl Vecs {
states_path,
true,
)?,
from_1sat_to_10sats: address_cohort::Vecs::forced_import(
_1sat_to_10sats: address_cohort::Vecs::forced_import(
path,
Some("addresses_from_1sat_to_10sats"),
Some("addrs_above_1sat_under_10sats"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -54,9 +54,9 @@ impl Vecs {
states_path,
true,
)?,
from_10sats_to_100sats: address_cohort::Vecs::forced_import(
_10sats_to_100sats: address_cohort::Vecs::forced_import(
path,
Some("addresses_from_10sats_to_100sats"),
Some("addrs_above_10sats_under_100sats"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -64,9 +64,9 @@ impl Vecs {
states_path,
true,
)?,
from_100sats_to_1_000sats: address_cohort::Vecs::forced_import(
_100sats_to_1k_sats: address_cohort::Vecs::forced_import(
path,
Some("addresses_from_100sats_to_1_000sats"),
Some("addrs_above_100sats_under_1k_sats"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -74,9 +74,9 @@ impl Vecs {
states_path,
true,
)?,
from_1_000sats_to_10_000sats: address_cohort::Vecs::forced_import(
_1k_sats_to_10k_sats: address_cohort::Vecs::forced_import(
path,
Some("addresses_from_1_000sats_to_10_000sats"),
Some("addrs_above_1k_sats_under_10k_sats"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -84,9 +84,9 @@ impl Vecs {
states_path,
true,
)?,
from_10_000sats_to_100_000sats: address_cohort::Vecs::forced_import(
_10k_sats_to_100k_sats: address_cohort::Vecs::forced_import(
path,
Some("addresses_from_10_000sats_to_100_000sats"),
Some("addrs_above_10k_sats_under_100k_sats"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -94,9 +94,9 @@ impl Vecs {
states_path,
true,
)?,
from_100_000sats_to_1_000_000sats: address_cohort::Vecs::forced_import(
_100k_sats_to_1m_sats: address_cohort::Vecs::forced_import(
path,
Some("addresses_from_100_000sats_to_1_000_000sats"),
Some("addrs_above_100k_sats_under_1m_sats"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -104,9 +104,9 @@ impl Vecs {
states_path,
true,
)?,
from_1_000_000sats_to_10_000_000sats: address_cohort::Vecs::forced_import(
_1m_sats_to_10m_sats: address_cohort::Vecs::forced_import(
path,
Some("addresses_from_1_000_000sats_to_10_000_000sats"),
Some("addrs_above_1m_sats_under_10m_sats"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -114,9 +114,9 @@ impl Vecs {
states_path,
true,
)?,
from_10_000_000sats_to_1btc: address_cohort::Vecs::forced_import(
_10m_sats_to_1btc: address_cohort::Vecs::forced_import(
path,
Some("addresses_from_10_000_000sats_to_1btc"),
Some("addrs_above_10m_sats_under_1btc"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -124,9 +124,9 @@ impl Vecs {
states_path,
true,
)?,
from_1btc_to_10btc: address_cohort::Vecs::forced_import(
_1btc_to_10btc: address_cohort::Vecs::forced_import(
path,
Some("addresses_from_1btc_to_10btc"),
Some("addrs_above_1btc_under_10btc"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -134,9 +134,9 @@ impl Vecs {
states_path,
true,
)?,
from_10btc_to_100btc: address_cohort::Vecs::forced_import(
_10btc_to_100btc: address_cohort::Vecs::forced_import(
path,
Some("addresses_from_10btc_to_100btc"),
Some("addrs_above_10btc_under_100btc"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -144,9 +144,9 @@ impl Vecs {
states_path,
true,
)?,
from_100btc_to_1_000btc: address_cohort::Vecs::forced_import(
_100btc_to_1k_btc: address_cohort::Vecs::forced_import(
path,
Some("addresses_from_100btc_to_1_000btc"),
Some("addrs_above_100btc_under_1k_btc"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -154,9 +154,9 @@ impl Vecs {
states_path,
true,
)?,
from_1_000btc_to_10_000btc: address_cohort::Vecs::forced_import(
_1k_btc_to_10k_btc: address_cohort::Vecs::forced_import(
path,
Some("addresses_from_1_000btc_to_10_000btc"),
Some("addrs_above_1k_btc_under_10k_btc"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -164,9 +164,9 @@ impl Vecs {
states_path,
true,
)?,
from_10_000btc_to_100_000btc: address_cohort::Vecs::forced_import(
_10k_btc_to_100k_btc: address_cohort::Vecs::forced_import(
path,
Some("addresses_from_10_000btc_to_100_000btc"),
Some("addrs_above_10k_btc_under_100k_btc"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -174,9 +174,9 @@ impl Vecs {
states_path,
true,
)?,
from_100_000btc: address_cohort::Vecs::forced_import(
_100k_btc_or_more: address_cohort::Vecs::forced_import(
path,
Some("addresses_from_100_000btc"),
Some("addrs_above_100k_btc"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -185,10 +185,10 @@ impl Vecs {
true,
)?,
},
by_up_to_size: GroupedByUpToSize {
lt_amount: ByLowerThanAmount {
_10sats: address_cohort::Vecs::forced_import(
path,
Some("addresses_up_to_10sats"),
Some("addrs_under_10sats"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -198,7 +198,7 @@ impl Vecs {
)?,
_100sats: address_cohort::Vecs::forced_import(
path,
Some("addresses_up_to_100sats"),
Some("addrs_under_100sats"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -208,7 +208,7 @@ impl Vecs {
)?,
_1k_sats: address_cohort::Vecs::forced_import(
path,
Some("addresses_up_to_1k_sats"),
Some("addrs_under_1k_sats"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -218,7 +218,7 @@ impl Vecs {
)?,
_10k_sats: address_cohort::Vecs::forced_import(
path,
Some("addresses_up_to_10k_sats"),
Some("addrs_under_10k_sats"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -228,7 +228,7 @@ impl Vecs {
)?,
_100k_sats: address_cohort::Vecs::forced_import(
path,
Some("addresses_up_to_100k_sats"),
Some("addrs_under_100k_sats"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -238,7 +238,7 @@ impl Vecs {
)?,
_1m_sats: address_cohort::Vecs::forced_import(
path,
Some("addresses_up_to_1m_sats"),
Some("addrs_under_1m_sats"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -248,7 +248,7 @@ impl Vecs {
)?,
_10m_sats: address_cohort::Vecs::forced_import(
path,
Some("addresses_up_to_10m_sats"),
Some("addrs_under_10m_sats"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -258,7 +258,7 @@ impl Vecs {
)?,
_1btc: address_cohort::Vecs::forced_import(
path,
Some("addresses_up_to_1btc"),
Some("addrs_under_1btc"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -268,7 +268,7 @@ impl Vecs {
)?,
_10btc: address_cohort::Vecs::forced_import(
path,
Some("addresses_up_to_10btc"),
Some("addrs_under_10btc"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -278,7 +278,7 @@ impl Vecs {
)?,
_100btc: address_cohort::Vecs::forced_import(
path,
Some("addresses_up_to_100btc"),
Some("addrs_under_100btc"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -288,7 +288,7 @@ impl Vecs {
)?,
_1k_btc: address_cohort::Vecs::forced_import(
path,
Some("addresses_up_to_1k_btc"),
Some("addrs_under_1k_btc"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -298,7 +298,7 @@ impl Vecs {
)?,
_10k_btc: address_cohort::Vecs::forced_import(
path,
Some("addresses_up_to_10k_btc"),
Some("addrs_under_10k_btc"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -308,7 +308,7 @@ impl Vecs {
)?,
_100k_btc: address_cohort::Vecs::forced_import(
path,
Some("addresses_up_to_100k_btc"),
Some("addrs_under_100k_btc"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -317,10 +317,10 @@ impl Vecs {
true,
)?,
},
by_from_size: GroupedByFromSize {
ge_amount: ByGreatEqualAmount {
_1sat: address_cohort::Vecs::forced_import(
path,
Some("addresses_from_1sat"),
Some("addrs_above_1sat"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -330,7 +330,7 @@ impl Vecs {
)?,
_10sats: address_cohort::Vecs::forced_import(
path,
Some("addresses_from_10sats"),
Some("addrs_above_10sats"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -340,7 +340,7 @@ impl Vecs {
)?,
_100sats: address_cohort::Vecs::forced_import(
path,
Some("addresses_from_100sats"),
Some("addrs_above_100sats"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -350,7 +350,7 @@ impl Vecs {
)?,
_1k_sats: address_cohort::Vecs::forced_import(
path,
Some("addresses_from_1k_sats"),
Some("addrs_above_1k_sats"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -360,7 +360,7 @@ impl Vecs {
)?,
_10k_sats: address_cohort::Vecs::forced_import(
path,
Some("addresses_from_10k_sats"),
Some("addrs_above_10k_sats"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -370,7 +370,7 @@ impl Vecs {
)?,
_100k_sats: address_cohort::Vecs::forced_import(
path,
Some("addresses_from_100k_sats"),
Some("addrs_above_100k_sats"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -380,7 +380,7 @@ impl Vecs {
)?,
_1m_sats: address_cohort::Vecs::forced_import(
path,
Some("addresses_from_1m_sats"),
Some("addrs_above_1m_sats"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -390,7 +390,7 @@ impl Vecs {
)?,
_10m_sats: address_cohort::Vecs::forced_import(
path,
Some("addresses_from_10m_sats"),
Some("addrs_above_10m_sats"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -400,7 +400,7 @@ impl Vecs {
)?,
_1btc: address_cohort::Vecs::forced_import(
path,
Some("addresses_from_1btc"),
Some("addrs_above_1btc"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -410,7 +410,7 @@ impl Vecs {
)?,
_10btc: address_cohort::Vecs::forced_import(
path,
Some("addresses_from_10btc"),
Some("addrs_above_10btc"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -420,7 +420,7 @@ impl Vecs {
)?,
_100btc: address_cohort::Vecs::forced_import(
path,
Some("addresses_from_100btc"),
Some("addrs_above_100btc"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -430,7 +430,7 @@ impl Vecs {
)?,
_1k_btc: address_cohort::Vecs::forced_import(
path,
Some("addresses_from_1k_btc"),
Some("addrs_above_1k_btc"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -440,7 +440,7 @@ impl Vecs {
)?,
_10k_btc: address_cohort::Vecs::forced_import(
path,
Some("addresses_from_10k_btc"),
Some("addrs_above_10k_btc"),
_computation,
format,
version + VERSION + Version::ZERO,
@@ -459,11 +459,11 @@ impl Vecs {
starting_indexes: &Indexes,
exit: &Exit,
) -> Result<()> {
let by_size_range = self.0.by_size_range.as_vec();
let by_size_range = self.0.amount_range.as_vec();
[
self.0
.by_from_size
.ge_amount
.as_mut_vec()
.into_iter()
.map(|(filter, vecs)| {
@@ -478,7 +478,7 @@ impl Vecs {
})
.collect::<Vec<_>>(),
self.0
.by_up_to_size
.lt_amount
.as_mut_vec()
.into_iter()
.map(|(filter, vecs)| {
crates/brk_computer/src/vecs/stateful/addresstype_to_addresscount.rs
+3 -3
View File
@@ -1,16 +1,16 @@
use brk_core::{GroupedByAddressType, Height};
use brk_core::{ByAddressType, Height};
use brk_vec::VecIterator;
use derive_deref::{Deref, DerefMut};
use crate::vecs::stateful::addresstype_to_height_to_addresscount::AddressTypeToHeightToAddressCount;
#[derive(Debug, Default, Deref, DerefMut)]
pub struct AddressTypeToAddressCount(GroupedByAddressType<usize>);
pub struct AddressTypeToAddressCount(ByAddressType<usize>);
impl From<(&AddressTypeToHeightToAddressCount, Height)> for AddressTypeToAddressCount {
fn from((groups, starting_height): (&AddressTypeToHeightToAddressCount, Height)) -> Self {
if let Some(prev_height) = starting_height.decremented() {
Self(GroupedByAddressType {
Self(ByAddressType {
p2pk65: groups
.p2pk65
.into_iter()
crates/brk_computer/src/vecs/stateful/addresstype_to_height_to_addresscount.rs
+4 -6
View File
@@ -1,4 +1,4 @@
use brk_core::{GroupedByAddressType, Height, Result, StoredUsize};
use brk_core::{ByAddressType, Height, Result, StoredUsize};
use brk_exit::Exit;
use brk_vec::EagerVec;
use derive_deref::{Deref, DerefMut};
@@ -6,12 +6,10 @@ use derive_deref::{Deref, DerefMut};
use crate::vecs::stateful::addresstype_to_addresscount::AddressTypeToAddressCount;
#[derive(Debug, Clone, Deref, DerefMut)]
pub struct AddressTypeToHeightToAddressCount(GroupedByAddressType<EagerVec<Height, StoredUsize>>);
pub struct AddressTypeToHeightToAddressCount(ByAddressType<EagerVec<Height, StoredUsize>>);
impl From<GroupedByAddressType<EagerVec<Height, StoredUsize>>>
for AddressTypeToHeightToAddressCount
{
fn from(value: GroupedByAddressType<EagerVec<Height, StoredUsize>>) -> Self {
impl From<ByAddressType<EagerVec<Height, StoredUsize>>> for AddressTypeToHeightToAddressCount {
fn from(value: ByAddressType<EagerVec<Height, StoredUsize>>) -> Self {
Self(value)
}
}
crates/brk_computer/src/vecs/stateful/addresstype_to_indexes_to_addresscount.rs
+4 -6
View File
@@ -1,4 +1,4 @@
use brk_core::{GroupedByAddressType, StoredUsize};
use brk_core::{ByAddressType, StoredUsize};
use brk_exit::Exit;
use brk_vec::AnyCollectableVec;
use derive_deref::{Deref, DerefMut};
@@ -9,14 +9,12 @@ use crate::vecs::{
};
#[derive(Clone, Deref, DerefMut)]
pub struct AddressTypeToIndexesToAddressCount(
GroupedByAddressType<ComputedVecsFromHeight<StoredUsize>>,
);
pub struct AddressTypeToIndexesToAddressCount(ByAddressType<ComputedVecsFromHeight<StoredUsize>>);
impl From<GroupedByAddressType<ComputedVecsFromHeight<StoredUsize>>>
impl From<ByAddressType<ComputedVecsFromHeight<StoredUsize>>>
for AddressTypeToIndexesToAddressCount
{
fn from(value: GroupedByAddressType<ComputedVecsFromHeight<StoredUsize>>) -> Self {
fn from(value: ByAddressType<ComputedVecsFromHeight<StoredUsize>>) -> Self {
Self(value)
}
}
crates/brk_computer/src/vecs/stateful/addresstype_to_typeindex_tree.rs
+4 -4
View File
@@ -3,10 +3,10 @@ use std::{collections::BTreeMap, mem};
use brk_core::TypeIndex;
use derive_deref::{Deref, DerefMut};
use super::GroupedByAddressType;
use super::ByAddressType;
#[derive(Debug, Deref, DerefMut)]
pub struct AddressTypeToTypeIndexTree<T>(GroupedByAddressType<BTreeMap<TypeIndex, T>>);
pub struct AddressTypeToTypeIndexTree<T>(ByAddressType<BTreeMap<TypeIndex, T>>);
impl<T> AddressTypeToTypeIndexTree<T> {
pub fn merge(&mut self, mut other: Self) {
@@ -29,14 +29,14 @@ impl<T> AddressTypeToTypeIndexTree<T> {
}
}
pub fn unwrap(self) -> GroupedByAddressType<BTreeMap<TypeIndex, T>> {
pub fn unwrap(self) -> ByAddressType<BTreeMap<TypeIndex, T>> {
self.0
}
}
impl<T> Default for AddressTypeToTypeIndexTree<T> {
fn default() -> Self {
Self(GroupedByAddressType {
Self(ByAddressType {
p2pk65: BTreeMap::default(),
p2pk33: BTreeMap::default(),
p2pkh: BTreeMap::default(),
crates/brk_computer/src/vecs/stateful/addresstype_to_typeindex_vec.rs
+2 -2
View File
@@ -2,10 +2,10 @@ use std::mem;
use derive_deref::{Deref, DerefMut};
use super::GroupedByAddressType;
use super::ByAddressType;
#[derive(Debug, Default, Deref, DerefMut)]
pub struct AddressTypeToVec<T>(GroupedByAddressType<Vec<T>>);
pub struct AddressTypeToVec<T>(ByAddressType<Vec<T>>);
impl<T> AddressTypeToVec<T> {
pub fn merge(&mut self, mut other: Self) {
crates/brk_computer/src/vecs/stateful/common.rs
+17 -17
View File
@@ -119,11 +119,11 @@ pub struct Vecs {
Option<ComputedVecsFromDateIndex<StoredF64>>,
pub indexes_to_supply_in_profit_relative_to_circulating_supply:
Option<ComputedVecsFromDateIndex<StoredF64>>,
pub indexes_to_cumulative_net_realized_profit_and_loss_30d_change:
pub indexes_to_net_realized_profit_and_loss_cumulative_30d_change:
Option<ComputedVecsFromDateIndex<Dollars>>,
pub indexes_to_cumulative_net_realized_profit_and_loss_30d_change_relative_to_realized_cap:
pub indexes_to_net_realized_profit_and_loss_cumulative_30d_change_relative_to_realized_cap:
Option<ComputedVecsFromDateIndex<StoredF32>>,
pub indexes_to_cumulative_net_realized_profit_and_loss_30d_change_relative_to_market_cap:
pub indexes_to_net_realized_profit_and_loss_cumulative_30d_change_relative_to_market_cap:
Option<ComputedVecsFromDateIndex<StoredF32>>,
}
@@ -929,10 +929,10 @@ impl Vecs {
format,
StorableVecGeneatorOptions::default().add_sum().add_cumulative(),
)?,
indexes_to_cumulative_net_realized_profit_and_loss_30d_change: compute_dollars.then(|| {
indexes_to_net_realized_profit_and_loss_cumulative_30d_change: compute_dollars.then(|| {
ComputedVecsFromDateIndex::forced_import(
path,
&format!("cumulative_{}", suffix("net_realized_profit_and_loss_30d_change")),
&suffix("net_realized_profit_and_loss_cumulative_30d_change"),
true,
version + VERSION + Version::new(3),
format,
@@ -940,10 +940,10 @@ impl Vecs {
)
.unwrap()
}),
indexes_to_cumulative_net_realized_profit_and_loss_30d_change_relative_to_realized_cap: compute_dollars.then(|| {
indexes_to_net_realized_profit_and_loss_cumulative_30d_change_relative_to_realized_cap: compute_dollars.then(|| {
ComputedVecsFromDateIndex::forced_import(
path,
&format!("cumulative_{}", suffix("net_realized_profit_and_loss_30d_change_relative_to_realized_cap")),
&suffix("net_realized_profit_and_loss_cumulative_30d_change_relative_to_realized_cap"),
true,
version + VERSION + Version::new(3),
format,
@@ -951,10 +951,10 @@ impl Vecs {
)
.unwrap()
}),
indexes_to_cumulative_net_realized_profit_and_loss_30d_change_relative_to_market_cap: compute_dollars.then(|| {
indexes_to_net_realized_profit_and_loss_cumulative_30d_change_relative_to_market_cap: compute_dollars.then(|| {
ComputedVecsFromDateIndex::forced_import(
path,
&format!("cumulative_{}", suffix("net_realized_profit_and_loss_30d_change_relative_to_market_cap")),
&suffix("net_realized_profit_and_loss_cumulative_30d_change_relative_to_market_cap"),
true,
version + VERSION + Version::new(3),
format,
@@ -2530,7 +2530,7 @@ impl Vecs {
},
)?;
self.indexes_to_cumulative_net_realized_profit_and_loss_30d_change
self.indexes_to_net_realized_profit_and_loss_cumulative_30d_change
.as_mut()
.unwrap()
.compute_all(
@@ -2552,7 +2552,7 @@ impl Vecs {
},
)?;
self.indexes_to_cumulative_net_realized_profit_and_loss_30d_change_relative_to_realized_cap.
self.indexes_to_net_realized_profit_and_loss_cumulative_30d_change_relative_to_realized_cap.
as_mut()
.unwrap()
.compute_all(
@@ -2563,14 +2563,14 @@ impl Vecs {
|v, _, _, starting_indexes, exit| {
v.compute_percentage(
starting_indexes.dateindex,
self.indexes_to_cumulative_net_realized_profit_and_loss_30d_change.as_ref().unwrap().dateindex.as_ref().unwrap(),
self.indexes_to_net_realized_profit_and_loss_cumulative_30d_change.as_ref().unwrap().dateindex.as_ref().unwrap(),
*dateindex_to_realized_cap.as_ref().unwrap(),
exit,
)
},
)?;
self.indexes_to_cumulative_net_realized_profit_and_loss_30d_change_relative_to_market_cap.
self.indexes_to_net_realized_profit_and_loss_cumulative_30d_change_relative_to_market_cap.
as_mut()
.unwrap()
.compute_all(
@@ -2581,7 +2581,7 @@ impl Vecs {
|v, _, _, starting_indexes, exit| {
v.compute_percentage(
starting_indexes.dateindex,
self.indexes_to_cumulative_net_realized_profit_and_loss_30d_change.as_ref().unwrap().dateindex.as_ref().unwrap(),
self.indexes_to_net_realized_profit_and_loss_cumulative_30d_change.as_ref().unwrap().dateindex.as_ref().unwrap(),
market.indexes_to_marketcap.dateindex.as_ref().unwrap(),
exit,
)
@@ -2915,11 +2915,11 @@ impl Vecs {
.map_or(vec![], |v| v.vecs()),
self.indexes_to_coinblocks_destroyed.vecs(),
self.indexes_to_coindays_destroyed.vecs(),
self.indexes_to_cumulative_net_realized_profit_and_loss_30d_change.as_ref()
self.indexes_to_net_realized_profit_and_loss_cumulative_30d_change.as_ref()
.map_or(vec![], |v| v.vecs()),
self.indexes_to_cumulative_net_realized_profit_and_loss_30d_change_relative_to_realized_cap.as_ref()
self.indexes_to_net_realized_profit_and_loss_cumulative_30d_change_relative_to_realized_cap.as_ref()
.map_or(vec![], |v| v.vecs()),
self.indexes_to_cumulative_net_realized_profit_and_loss_30d_change_relative_to_market_cap.as_ref()
self.indexes_to_net_realized_profit_and_loss_cumulative_30d_change_relative_to_market_cap.as_ref()
.map_or(vec![], |v| v.vecs()),
]
.into_iter()
crates/brk_computer/src/vecs/stateful/mod.rs
+21 -21
View File
@@ -1,7 +1,7 @@
use std::{cmp::Ordering, collections::BTreeMap, mem, path::Path, thread};
use brk_core::{
AddressData, CheckedSub, DateIndex, Dollars, EmptyAddressData, GroupedByAddressType, Height,
AddressData, ByAddressType, CheckedSub, DateIndex, Dollars, EmptyAddressData, Height,
InputIndex, OutputIndex, OutputType, Result, Sats, StoredUsize, TypeIndex, Version,
};
use brk_exit::Exit;
@@ -143,7 +143,7 @@ impl Vecs {
StorableVecGeneatorOptions::default().add_last(),
)?,
addresstype_to_height_to_address_count: AddressTypeToHeightToAddressCount::from(
GroupedByAddressType {
ByAddressType {
p2pk65: EagerVec::forced_import(
path,
"p2pk65_address_count",
@@ -195,7 +195,7 @@ impl Vecs {
},
),
addresstype_to_height_to_empty_address_count: AddressTypeToHeightToAddressCount::from(
GroupedByAddressType {
ByAddressType {
p2pk65: EagerVec::forced_import(
path,
"p2pk65_empty_address_count",
@@ -247,7 +247,7 @@ impl Vecs {
},
),
addresstype_to_indexes_to_address_count: AddressTypeToIndexesToAddressCount::from(
GroupedByAddressType {
ByAddressType {
p2pk65: ComputedVecsFromHeight::forced_import(
path,
"p2pk65_address_count",
@@ -315,7 +315,7 @@ impl Vecs {
},
),
addresstype_to_indexes_to_empty_address_count: AddressTypeToIndexesToAddressCount::from(
GroupedByAddressType {
ByAddressType {
p2pk65: ComputedVecsFromHeight::forced_import(
path,
"p2pk65_empty_address_count",
@@ -679,8 +679,8 @@ impl Vecs {
let output_count = height_to_output_count_iter.unwrap_get_inner(height);
let input_count = height_to_input_count_iter.unwrap_get_inner(height);
let first_addressindexes: GroupedByAddressType<TypeIndex> =
GroupedByAddressType {
let first_addressindexes: ByAddressType<TypeIndex> =
ByAddressType {
p2a: height_to_first_p2aaddressindex_iter
.unwrap_get_inner(height)
.into(),
@@ -1429,8 +1429,8 @@ impl AddressTypeToVec<(TypeIndex, Sats, Option<WithAddressDataSource<AddressData
WithAddressDataSource<EmptyAddressData>,
>,
price: Option<Dollars>,
addresstype_to_address_count: &mut GroupedByAddressType<usize>,
addresstype_to_empty_address_count: &mut GroupedByAddressType<usize>,
addresstype_to_address_count: &mut ByAddressType<usize>,
addresstype_to_empty_address_count: &mut ByAddressType<usize>,
) {
self.into_typed_vec().into_iter().for_each(|(_type, vec)| {
vec.into_iter()
@@ -1474,22 +1474,22 @@ impl AddressTypeToVec<(TypeIndex, Sats, Option<WithAddressDataSource<AddressData
if is_new
|| from_any_empty
|| vecs.by_size_range.get_mut(amount).0.clone()
!= vecs.by_size_range.get_mut(prev_amount).0.clone()
|| vecs.amount_range.get_mut(amount).0.clone()
!= vecs.amount_range.get_mut(prev_amount).0.clone()
{
// dbg!((prev_amount, amount, is_new));
if !is_new && !from_any_empty {
let state = &mut vecs.by_size_range.get_mut(prev_amount).1.state;
let state = &mut vecs.amount_range.get_mut(prev_amount).1.state;
// dbg!((prev_amount, &state.address_count, &addressdata));
state.subtract(addressdata);
}
addressdata.receive(value, price);
vecs.by_size_range.get_mut(amount).1.state.add(addressdata);
vecs.amount_range.get_mut(amount).1.state.add(addressdata);
} else {
vecs.by_size_range.get_mut(amount).1.state.receive(
vecs.amount_range.get_mut(amount).1.state.receive(
addressdata,
value,
price,
@@ -1521,8 +1521,8 @@ impl
WithAddressDataSource<EmptyAddressData>,
>,
price: Option<Dollars>,
addresstype_to_address_count: &mut GroupedByAddressType<usize>,
addresstype_to_empty_address_count: &mut GroupedByAddressType<usize>,
addresstype_to_address_count: &mut ByAddressType<usize>,
addresstype_to_empty_address_count: &mut ByAddressType<usize>,
) -> Result<()> {
self.into_typed_vec()
.into_iter()
@@ -1556,10 +1556,10 @@ impl
// dbg!((prev_amount, amount, will_be_empty));
if will_be_empty
|| vecs.by_size_range.get_mut(amount).0.clone()
!= vecs.by_size_range.get_mut(prev_amount).0.clone()
|| vecs.amount_range.get_mut(amount).0.clone()
!= vecs.amount_range.get_mut(prev_amount).0.clone()
{
vecs.by_size_range
vecs.amount_range
.get_mut(prev_amount)
.1
.state
@@ -1583,10 +1583,10 @@ impl
.unwrap()
.insert(type_index, addressdata.into());
} else {
vecs.by_size_range.get_mut(amount).1.state.add(addressdata);
vecs.amount_range.get_mut(amount).1.state.add(addressdata);
}
} else {
vecs.by_size_range.get_mut(amount).1.state.send(
vecs.amount_range.get_mut(amount).1.state.send(
addressdata,
value,
price,
crates/brk_computer/src/vecs/stateful/utxo_cohorts.rs
+1021 -1012
View File
File diff suppressed because it is too large Load Diff
crates/brk_core/src/groups/address.rs
+16 -16
View File
@@ -1,45 +1,45 @@
use super::{GroupFilter, GroupedByFromSize, GroupedBySizeRange, GroupedByUpToSize};
use super::{ByAmountRange, ByGreatEqualAmount, ByLowerThanAmount, GroupFilter};
#[derive(Default, Clone)]
pub struct AddressGroups<T> {
pub by_from_size: GroupedByFromSize<T>,
pub by_size_range: GroupedBySizeRange<T>,
pub by_up_to_size: GroupedByUpToSize<T>,
pub ge_amount: ByGreatEqualAmount<T>,
pub amount_range: ByAmountRange<T>,
pub lt_amount: ByLowerThanAmount<T>,
}
impl<T> AddressGroups<T> {
pub fn as_mut_vecs(&mut self) -> Vec<&mut T> {
self.by_from_size
self.ge_amount
.as_mut_vec()
.into_iter()
.chain(self.by_size_range.as_mut_vec())
.chain(self.by_up_to_size.as_mut_vec())
.chain(self.amount_range.as_mut_vec())
.chain(self.lt_amount.as_mut_vec())
.collect::<Vec<_>>()
}
pub fn as_mut_separate_vecs(&mut self) -> Vec<&mut T> {
self.by_size_range
self.amount_range
.as_mut_vec()
.into_iter()
.collect::<Vec<_>>()
}
pub fn as_mut_overlapping_vecs(&mut self) -> Vec<&mut T> {
self.by_up_to_size
self.lt_amount
.as_mut_vec()
.into_iter()
.chain(self.by_from_size.as_mut_vec())
.chain(self.ge_amount.as_mut_vec())
.collect::<Vec<_>>()
}
}
impl<T> AddressGroups<(GroupFilter, T)> {
pub fn vecs(&self) -> Vec<&T> {
self.by_size_range
self.amount_range
.vecs()
.into_iter()
.chain(self.by_up_to_size.vecs())
.chain(self.by_from_size.vecs())
.chain(self.lt_amount.vecs())
.chain(self.ge_amount.vecs())
.collect::<Vec<_>>()
}
}
@@ -47,9 +47,9 @@ impl<T> AddressGroups<(GroupFilter, T)> {
impl<T> From<AddressGroups<T>> for AddressGroups<(GroupFilter, T)> {
fn from(value: AddressGroups<T>) -> Self {
Self {
by_size_range: GroupedBySizeRange::from(value.by_size_range),
by_up_to_size: GroupedByUpToSize::from(value.by_up_to_size),
by_from_size: GroupedByFromSize::from(value.by_from_size),
amount_range: ByAmountRange::from(value.amount_range),
lt_amount: ByLowerThanAmount::from(value.lt_amount),
ge_amount: ByGreatEqualAmount::from(value.ge_amount),
}
}
}
crates/brk_core/src/groups/by_address_type.rs
+7 -7
View File
@@ -7,7 +7,7 @@ use super::GroupFilter;
use crate::OutputType;
#[derive(Default, Clone, Debug)]
pub struct GroupedByAddressType<T> {
pub struct ByAddressType<T> {
pub p2pk65: T,
pub p2pk33: T,
pub p2pkh: T,
@@ -18,7 +18,7 @@ pub struct GroupedByAddressType<T> {
pub p2a: T,
}
impl<T> GroupedByAddressType<T> {
impl<T> ByAddressType<T> {
pub fn get(&self, address_type: OutputType) -> Option<&T> {
match address_type {
OutputType::P2PK65 => Some(&self.p2pk65),
@@ -103,7 +103,7 @@ impl<T> GroupedByAddressType<T> {
}
}
impl<T> GroupedByAddressType<(GroupFilter, T)> {
impl<T> ByAddressType<(GroupFilter, T)> {
pub fn vecs(&self) -> [&T; 8] {
[
&self.p2pk65.1,
@@ -118,8 +118,8 @@ impl<T> GroupedByAddressType<(GroupFilter, T)> {
}
}
impl<T> From<GroupedByAddressType<T>> for GroupedByAddressType<(GroupFilter, T)> {
fn from(value: GroupedByAddressType<T>) -> Self {
impl<T> From<ByAddressType<T>> for ByAddressType<(GroupFilter, T)> {
fn from(value: ByAddressType<T>) -> Self {
Self {
p2pk65: (GroupFilter::Type(OutputType::P2PK65), value.p2pk65),
p2pk33: (GroupFilter::Type(OutputType::P2PK33), value.p2pk33),
@@ -133,7 +133,7 @@ impl<T> From<GroupedByAddressType<T>> for GroupedByAddressType<(GroupFilter, T)>
}
}
impl<T> Add for GroupedByAddressType<T>
impl<T> Add for ByAddressType<T>
where
T: Add<Output = T>,
{
@@ -152,7 +152,7 @@ where
}
}
impl<T> AddAssign for GroupedByAddressType<T>
impl<T> AddAssign for ByAddressType<T>
where
T: AddAssign,
{
crates/brk_core/src/groups/by_date_range.rs → crates/brk_core/src/groups/by_age_range.rs
+28 -23
View File
@@ -1,8 +1,8 @@
use super::GroupFilter;
#[derive(Default, Clone)]
pub struct GroupedByDateRange<T> {
pub start_to_1d: T,
pub struct ByAgeRange<T> {
pub up_to_1d: T,
pub _1d_to_1w: T,
pub _1w_to_1m: T,
pub _1m_to_2m: T,
@@ -19,14 +19,15 @@ pub struct GroupedByDateRange<T> {
pub _6y_to_7y: T,
pub _7y_to_8y: T,
pub _8y_to_10y: T,
pub _10y_to_15y: T,
pub _15y_to_end: T,
pub _10y_to_12y: T,
pub _12y_to_15y: T,
pub from_15y: T,
}
impl<T> From<GroupedByDateRange<T>> for GroupedByDateRange<(GroupFilter, T)> {
fn from(value: GroupedByDateRange<T>) -> Self {
impl<T> From<ByAgeRange<T>> for ByAgeRange<(GroupFilter, T)> {
fn from(value: ByAgeRange<T>) -> Self {
Self {
start_to_1d: (GroupFilter::To(1), value.start_to_1d),
up_to_1d: (GroupFilter::LowerThan(1), value.up_to_1d),
_1d_to_1w: (GroupFilter::Range(1..7), value._1d_to_1w),
_1w_to_1m: (GroupFilter::Range(7..30), value._1w_to_1m),
_1m_to_2m: (GroupFilter::Range(30..2 * 30), value._1m_to_2m),
@@ -43,16 +44,17 @@ impl<T> From<GroupedByDateRange<T>> for GroupedByDateRange<(GroupFilter, T)> {
_6y_to_7y: (GroupFilter::Range(6 * 365..7 * 365), value._6y_to_7y),
_7y_to_8y: (GroupFilter::Range(7 * 365..8 * 365), value._7y_to_8y),
_8y_to_10y: (GroupFilter::Range(8 * 365..10 * 365), value._8y_to_10y),
_10y_to_15y: (GroupFilter::Range(10 * 365..15 * 365), value._10y_to_15y),
_15y_to_end: (GroupFilter::From(15 * 365), value._15y_to_end),
_10y_to_12y: (GroupFilter::Range(10 * 365..12 * 365), value._10y_to_12y),
_12y_to_15y: (GroupFilter::Range(12 * 365..15 * 365), value._12y_to_15y),
from_15y: (GroupFilter::GreaterOrEqual(15 * 365), value.from_15y),
}
}
}
impl<T> GroupedByDateRange<T> {
pub fn as_vec(&mut self) -> [&T; 19] {
impl<T> ByAgeRange<T> {
pub fn as_vec(&mut self) -> [&T; 20] {
[
&self.start_to_1d,
&self.up_to_1d,
&self._1d_to_1w,
&self._1w_to_1m,
&self._1m_to_2m,
@@ -69,14 +71,15 @@ impl<T> GroupedByDateRange<T> {
&self._6y_to_7y,
&self._7y_to_8y,
&self._8y_to_10y,
&self._10y_to_15y,
&self._15y_to_end,
&self._10y_to_12y,
&self._12y_to_15y,
&self.from_15y,
]
}
pub fn as_mut_vec(&mut self) -> [&mut T; 19] {
pub fn as_mut_vec(&mut self) -> [&mut T; 20] {
[
&mut self.start_to_1d,
&mut self.up_to_1d,
&mut self._1d_to_1w,
&mut self._1w_to_1m,
&mut self._1m_to_2m,
@@ -93,16 +96,17 @@ impl<T> GroupedByDateRange<T> {
&mut self._6y_to_7y,
&mut self._7y_to_8y,
&mut self._8y_to_10y,
&mut self._10y_to_15y,
&mut self._15y_to_end,
&mut self._10y_to_12y,
&mut self._12y_to_15y,
&mut self.from_15y,
]
}
}
impl<T> GroupedByDateRange<(GroupFilter, T)> {
pub fn vecs(&self) -> [&T; 19] {
impl<T> ByAgeRange<(GroupFilter, T)> {
pub fn vecs(&self) -> [&T; 20] {
[
&self.start_to_1d.1,
&self.up_to_1d.1,
&self._1d_to_1w.1,
&self._1w_to_1m.1,
&self._1m_to_2m.1,
@@ -119,8 +123,9 @@ impl<T> GroupedByDateRange<(GroupFilter, T)> {
&self._6y_to_7y.1,
&self._7y_to_8y.1,
&self._8y_to_10y.1,
&self._10y_to_15y.1,
&self._15y_to_end.1,
&self._10y_to_12y.1,
&self._12y_to_15y.1,
&self.from_15y.1,
]
}
}
crates/brk_core/src/groups/by_amount_range.rs
+257
View File
@@ -0,0 +1,257 @@
use std::ops::{Add, AddAssign};
use crate::Sats;
use super::GroupFilter;
#[derive(Debug, Default, Clone)]
pub struct ByAmountRange<T> {
pub _0sats: T,
pub _1sat_to_10sats: T,
pub _10sats_to_100sats: T,
pub _100sats_to_1k_sats: T,
pub _1k_sats_to_10k_sats: T,
pub _10k_sats_to_100k_sats: T,
pub _100k_sats_to_1m_sats: T,
pub _1m_sats_to_10m_sats: T,
pub _10m_sats_to_1btc: T,
pub _1btc_to_10btc: T,
pub _10btc_to_100btc: T,
pub _100btc_to_1k_btc: T,
pub _1k_btc_to_10k_btc: T,
pub _10k_btc_to_100k_btc: T,
pub _100k_btc_or_more: T,
}
impl<T> From<ByAmountRange<T>> for ByAmountRange<(GroupFilter, T)> {
fn from(value: ByAmountRange<T>) -> Self {
#[allow(clippy::inconsistent_digit_grouping)]
Self {
_0sats: (GroupFilter::LowerThan(Sats::_1.into()), value._0sats),
_1sat_to_10sats: (
GroupFilter::Range(Sats::_1.into()..Sats::_10.into()),
value._1sat_to_10sats,
),
_10sats_to_100sats: (
GroupFilter::Range(Sats::_10.into()..Sats::_100.into()),
value._10sats_to_100sats,
),
_100sats_to_1k_sats: (
GroupFilter::Range(Sats::_100.into()..Sats::_1K.into()),
value._100sats_to_1k_sats,
),
_1k_sats_to_10k_sats: (
GroupFilter::Range(Sats::_1K.into()..Sats::_10K.into()),
value._1k_sats_to_10k_sats,
),
_10k_sats_to_100k_sats: (
GroupFilter::Range(Sats::_10K.into()..Sats::_100K.into()),
value._10k_sats_to_100k_sats,
),
_100k_sats_to_1m_sats: (
GroupFilter::Range(Sats::_100K.into()..Sats::_1M.into()),
value._100k_sats_to_1m_sats,
),
_1m_sats_to_10m_sats: (
GroupFilter::Range(Sats::_1M.into()..Sats::_10M.into()),
value._1m_sats_to_10m_sats,
),
_10m_sats_to_1btc: (
GroupFilter::Range(Sats::_10M.into()..Sats::_1BTC.into()),
value._10m_sats_to_1btc,
),
_1btc_to_10btc: (
GroupFilter::Range(Sats::_1BTC.into()..Sats::_10BTC.into()),
value._1btc_to_10btc,
),
_10btc_to_100btc: (
GroupFilter::Range(Sats::_10BTC.into()..Sats::_100BTC.into()),
value._10btc_to_100btc,
),
_100btc_to_1k_btc: (
GroupFilter::Range(Sats::_100BTC.into()..Sats::_1K_BTC.into()),
value._100btc_to_1k_btc,
),
_1k_btc_to_10k_btc: (
GroupFilter::Range(Sats::_1K_BTC.into()..Sats::_10K_BTC.into()),
value._1k_btc_to_10k_btc,
),
_10k_btc_to_100k_btc: (
GroupFilter::Range(Sats::_10K_BTC.into()..Sats::_100K_BTC.into()),
value._10k_btc_to_100k_btc,
),
_100k_btc_or_more: (
GroupFilter::GreaterOrEqual(Sats::_100K_BTC.into()),
value._100k_btc_or_more,
),
}
}
}
impl<T> ByAmountRange<T> {
#[allow(clippy::inconsistent_digit_grouping)]
pub fn get_mut(&mut self, value: Sats) -> &mut T {
if value == Sats::ZERO {
&mut self._0sats
} else if value < Sats::_10 {
&mut self._1sat_to_10sats
} else if value < Sats::_100 {
&mut self._10sats_to_100sats
} else if value < Sats::_1K {
&mut self._100sats_to_1k_sats
} else if value < Sats::_10K {
&mut self._1k_sats_to_10k_sats
} else if value < Sats::_100K {
&mut self._10k_sats_to_100k_sats
} else if value < Sats::_1M {
&mut self._100k_sats_to_1m_sats
} else if value < Sats::_10M {
&mut self._1m_sats_to_10m_sats
} else if value < Sats::_1BTC {
&mut self._10m_sats_to_1btc
} else if value < Sats::_10BTC {
&mut self._1btc_to_10btc
} else if value < Sats::_100BTC {
&mut self._10btc_to_100btc
} else if value < Sats::_1K_BTC {
&mut self._100btc_to_1k_btc
} else if value < Sats::_10K_BTC {
&mut self._1k_btc_to_10k_btc
} else if value < Sats::_100K_BTC {
&mut self._10k_btc_to_100k_btc
} else {
&mut self._100k_btc_or_more
}
}
pub fn as_vec(&self) -> [&T; 15] {
[
&self._0sats,
&self._1sat_to_10sats,
&self._10sats_to_100sats,
&self._100sats_to_1k_sats,
&self._1k_sats_to_10k_sats,
&self._10k_sats_to_100k_sats,
&self._100k_sats_to_1m_sats,
&self._1m_sats_to_10m_sats,
&self._10m_sats_to_1btc,
&self._1btc_to_10btc,
&self._10btc_to_100btc,
&self._100btc_to_1k_btc,
&self._1k_btc_to_10k_btc,
&self._10k_btc_to_100k_btc,
&self._100k_btc_or_more,
]
}
pub fn as_typed_vec(&self) -> [(Sats, &T); 15] {
[
(Sats::ZERO, &self._0sats),
(Sats::_1, &self._1sat_to_10sats),
(Sats::_10, &self._10sats_to_100sats),
(Sats::_100, &self._100sats_to_1k_sats),
(Sats::_1K, &self._1k_sats_to_10k_sats),
(Sats::_10K, &self._10k_sats_to_100k_sats),
(Sats::_100K, &self._100k_sats_to_1m_sats),
(Sats::_1M, &self._1m_sats_to_10m_sats),
(Sats::_10M, &self._10m_sats_to_1btc),
(Sats::_1BTC, &self._1btc_to_10btc),
(Sats::_10BTC, &self._10btc_to_100btc),
(Sats::_100BTC, &self._100btc_to_1k_btc),
(Sats::_1K_BTC, &self._1k_btc_to_10k_btc),
(Sats::_10K_BTC, &self._10k_btc_to_100k_btc),
(Sats::_100K_BTC, &self._100k_btc_or_more),
]
}
pub fn as_mut_vec(&mut self) -> [&mut T; 15] {
[
&mut self._0sats,
&mut self._1sat_to_10sats,
&mut self._10sats_to_100sats,
&mut self._100sats_to_1k_sats,
&mut self._1k_sats_to_10k_sats,
&mut self._10k_sats_to_100k_sats,
&mut self._100k_sats_to_1m_sats,
&mut self._1m_sats_to_10m_sats,
&mut self._10m_sats_to_1btc,
&mut self._1btc_to_10btc,
&mut self._10btc_to_100btc,
&mut self._100btc_to_1k_btc,
&mut self._1k_btc_to_10k_btc,
&mut self._10k_btc_to_100k_btc,
&mut self._100k_btc_or_more,
]
}
}
impl<T> ByAmountRange<(GroupFilter, T)> {
pub fn vecs(&self) -> [&T; 15] {
[
&self._0sats.1,
&self._1sat_to_10sats.1,
&self._10sats_to_100sats.1,
&self._100sats_to_1k_sats.1,
&self._1k_sats_to_10k_sats.1,
&self._10k_sats_to_100k_sats.1,
&self._100k_sats_to_1m_sats.1,
&self._1m_sats_to_10m_sats.1,
&self._10m_sats_to_1btc.1,
&self._1btc_to_10btc.1,
&self._10btc_to_100btc.1,
&self._100btc_to_1k_btc.1,
&self._1k_btc_to_10k_btc.1,
&self._10k_btc_to_100k_btc.1,
&self._100k_btc_or_more.1,
]
}
}
impl<T> Add for ByAmountRange<T>
where
T: Add<Output = T>,
{
type Output = Self;
fn add(self, rhs: Self) -> Self::Output {
Self {
_0sats: self._0sats + rhs._0sats,
_1sat_to_10sats: self._1sat_to_10sats + rhs._1sat_to_10sats,
_10sats_to_100sats: self._10sats_to_100sats + rhs._10sats_to_100sats,
_100sats_to_1k_sats: self._100sats_to_1k_sats + rhs._100sats_to_1k_sats,
_1k_sats_to_10k_sats: self._1k_sats_to_10k_sats + rhs._1k_sats_to_10k_sats,
_10k_sats_to_100k_sats: self._10k_sats_to_100k_sats + rhs._10k_sats_to_100k_sats,
_100k_sats_to_1m_sats: self._100k_sats_to_1m_sats + rhs._100k_sats_to_1m_sats,
_1m_sats_to_10m_sats: self._1m_sats_to_10m_sats + rhs._1m_sats_to_10m_sats,
_10m_sats_to_1btc: self._10m_sats_to_1btc + rhs._10m_sats_to_1btc,
_1btc_to_10btc: self._1btc_to_10btc + rhs._1btc_to_10btc,
_10btc_to_100btc: self._10btc_to_100btc + rhs._10btc_to_100btc,
_100btc_to_1k_btc: self._100btc_to_1k_btc + rhs._100btc_to_1k_btc,
_1k_btc_to_10k_btc: self._1k_btc_to_10k_btc + rhs._1k_btc_to_10k_btc,
_10k_btc_to_100k_btc: self._10k_btc_to_100k_btc + rhs._10k_btc_to_100k_btc,
_100k_btc_or_more: self._100k_btc_or_more + rhs._100k_btc_or_more,
}
}
}
impl<T> AddAssign for ByAmountRange<T>
where
T: AddAssign,
{
fn add_assign(&mut self, rhs: Self) {
self._0sats += rhs._0sats;
self._1sat_to_10sats += rhs._1sat_to_10sats;
self._10sats_to_100sats += rhs._10sats_to_100sats;
self._100sats_to_1k_sats += rhs._100sats_to_1k_sats;
self._1k_sats_to_10k_sats += rhs._1k_sats_to_10k_sats;
self._10k_sats_to_100k_sats += rhs._10k_sats_to_100k_sats;
self._100k_sats_to_1m_sats += rhs._100k_sats_to_1m_sats;
self._1m_sats_to_10m_sats += rhs._1m_sats_to_10m_sats;
self._10m_sats_to_1btc += rhs._10m_sats_to_1btc;
self._1btc_to_10btc += rhs._1btc_to_10btc;
self._10btc_to_100btc += rhs._10btc_to_100btc;
self._100btc_to_1k_btc += rhs._100btc_to_1k_btc;
self._1k_btc_to_10k_btc += rhs._1k_btc_to_10k_btc;
self._10k_btc_to_100k_btc += rhs._10k_btc_to_100k_btc;
self._100k_btc_or_more += rhs._100k_btc_or_more;
}
}
crates/brk_core/src/groups/by_epoch.rs
+5 -5
View File
@@ -3,7 +3,7 @@ use crate::{HalvingEpoch, Height};
use super::GroupFilter;
#[derive(Default, Clone)]
pub struct GroupedByEpoch<T> {
pub struct ByEpoch<T> {
pub _0: T,
pub _1: T,
pub _2: T,
@@ -11,8 +11,8 @@ pub struct GroupedByEpoch<T> {
pub _4: T,
}
impl<T> From<GroupedByEpoch<T>> for GroupedByEpoch<(GroupFilter, T)> {
fn from(value: GroupedByEpoch<T>) -> Self {
impl<T> From<ByEpoch<T>> for ByEpoch<(GroupFilter, T)> {
fn from(value: ByEpoch<T>) -> Self {
Self {
_0: (GroupFilter::Epoch(HalvingEpoch::new(0)), value._0),
_1: (GroupFilter::Epoch(HalvingEpoch::new(1)), value._1),
@@ -23,7 +23,7 @@ impl<T> From<GroupedByEpoch<T>> for GroupedByEpoch<(GroupFilter, T)> {
}
}
impl<T> GroupedByEpoch<T> {
impl<T> ByEpoch<T> {
pub fn as_mut_vec(&mut self) -> [&mut T; 5] {
[
&mut self._0,
@@ -52,7 +52,7 @@ impl<T> GroupedByEpoch<T> {
}
}
impl<T> GroupedByEpoch<(GroupFilter, T)> {
impl<T> ByEpoch<(GroupFilter, T)> {
pub fn vecs(&self) -> [&T; 5] {
[&self._0.1, &self._1.1, &self._2.1, &self._3.1, &self._4.1]
}
crates/brk_core/src/groups/by_from_size.rs
-80
View File
@@ -1,80 +0,0 @@
use crate::Sats;
use super::GroupFilter;
#[derive(Default, Clone)]
pub struct GroupedByFromSize<T> {
pub _1sat: T,
pub _10sats: T,
pub _100sats: T,
pub _1k_sats: T,
pub _10k_sats: T,
pub _100k_sats: T,
pub _1m_sats: T,
pub _10m_sats: T,
pub _1btc: T,
pub _10btc: T,
pub _100btc: T,
pub _1k_btc: T,
pub _10k_btc: T,
}
impl<T> GroupedByFromSize<T> {
pub fn as_mut_vec(&mut self) -> [&mut T; 13] {
[
&mut self._1sat,
&mut self._10sats,
&mut self._100sats,
&mut self._1k_sats,
&mut self._10k_sats,
&mut self._100k_sats,
&mut self._1m_sats,
&mut self._10m_sats,
&mut self._1btc,
&mut self._10btc,
&mut self._100btc,
&mut self._1k_btc,
&mut self._10k_btc,
]
}
}
impl<T> GroupedByFromSize<(GroupFilter, T)> {
pub fn vecs(&self) -> [&T; 13] {
[
&self._1sat.1,
&self._10sats.1,
&self._100sats.1,
&self._1k_sats.1,
&self._10k_sats.1,
&self._100k_sats.1,
&self._1m_sats.1,
&self._10m_sats.1,
&self._1btc.1,
&self._10btc.1,
&self._100btc.1,
&self._1k_btc.1,
&self._10k_btc.1,
]
}
}
impl<T> From<GroupedByFromSize<T>> for GroupedByFromSize<(GroupFilter, T)> {
fn from(value: GroupedByFromSize<T>) -> Self {
Self {
_1sat: (GroupFilter::From(Sats::_1.into()), value._1sat),
_10sats: (GroupFilter::From(Sats::_10.into()), value._10sats),
_100sats: (GroupFilter::From(Sats::_100.into()), value._100sats),
_1k_sats: (GroupFilter::From(Sats::_1K.into()), value._1k_sats),
_10k_sats: (GroupFilter::From(Sats::_10K.into()), value._10k_sats),
_100k_sats: (GroupFilter::From(Sats::_100K.into()), value._100k_sats),
_1m_sats: (GroupFilter::From(Sats::_1M.into()), value._1m_sats),
_10m_sats: (GroupFilter::From(Sats::_10M.into()), value._10m_sats),
_1btc: (GroupFilter::From(Sats::_1BTC.into()), value._1btc),
_10btc: (GroupFilter::From(Sats::_10BTC.into()), value._10btc),
_100btc: (GroupFilter::From(Sats::_100BTC.into()), value._100btc),
_1k_btc: (GroupFilter::From(Sats::_1K_BTC.into()), value._1k_btc),
_10k_btc: (GroupFilter::From(Sats::_10K_BTC.into()), value._10k_btc),
}
}
}
crates/brk_core/src/groups/by_ge_amount.rs
+110
View File
@@ -0,0 +1,110 @@
use crate::Sats;
use super::GroupFilter;
#[derive(Default, Clone)]
pub struct ByGreatEqualAmount<T> {
pub _1sat: T,
pub _10sats: T,
pub _100sats: T,
pub _1k_sats: T,
pub _10k_sats: T,
pub _100k_sats: T,
pub _1m_sats: T,
pub _10m_sats: T,
pub _1btc: T,
pub _10btc: T,
pub _100btc: T,
pub _1k_btc: T,
pub _10k_btc: T,
}
impl<T> ByGreatEqualAmount<T> {
pub fn as_mut_vec(&mut self) -> [&mut T; 13] {
[
&mut self._1sat,
&mut self._10sats,
&mut self._100sats,
&mut self._1k_sats,
&mut self._10k_sats,
&mut self._100k_sats,
&mut self._1m_sats,
&mut self._10m_sats,
&mut self._1btc,
&mut self._10btc,
&mut self._100btc,
&mut self._1k_btc,
&mut self._10k_btc,
]
}
}
impl<T> ByGreatEqualAmount<(GroupFilter, T)> {
pub fn vecs(&self) -> [&T; 13] {
[
&self._1sat.1,
&self._10sats.1,
&self._100sats.1,
&self._1k_sats.1,
&self._10k_sats.1,
&self._100k_sats.1,
&self._1m_sats.1,
&self._10m_sats.1,
&self._1btc.1,
&self._10btc.1,
&self._100btc.1,
&self._1k_btc.1,
&self._10k_btc.1,
]
}
}
impl<T> From<ByGreatEqualAmount<T>> for ByGreatEqualAmount<(GroupFilter, T)> {
fn from(value: ByGreatEqualAmount<T>) -> Self {
Self {
_1sat: (GroupFilter::GreaterOrEqual(Sats::_1.into()), value._1sat),
_10sats: (GroupFilter::GreaterOrEqual(Sats::_10.into()), value._10sats),
_100sats: (
GroupFilter::GreaterOrEqual(Sats::_100.into()),
value._100sats,
),
_1k_sats: (
GroupFilter::GreaterOrEqual(Sats::_1K.into()),
value._1k_sats,
),
_10k_sats: (
GroupFilter::GreaterOrEqual(Sats::_10K.into()),
value._10k_sats,
),
_100k_sats: (
GroupFilter::GreaterOrEqual(Sats::_100K.into()),
value._100k_sats,
),
_1m_sats: (
GroupFilter::GreaterOrEqual(Sats::_1M.into()),
value._1m_sats,
),
_10m_sats: (
GroupFilter::GreaterOrEqual(Sats::_10M.into()),
value._10m_sats,
),
_1btc: (GroupFilter::GreaterOrEqual(Sats::_1BTC.into()), value._1btc),
_10btc: (
GroupFilter::GreaterOrEqual(Sats::_10BTC.into()),
value._10btc,
),
_100btc: (
GroupFilter::GreaterOrEqual(Sats::_100BTC.into()),
value._100btc,
),
_1k_btc: (
GroupFilter::GreaterOrEqual(Sats::_1K_BTC.into()),
value._1k_btc,
),
_10k_btc: (
GroupFilter::GreaterOrEqual(Sats::_10K_BTC.into()),
value._10k_btc,
),
}
}
}
crates/brk_core/src/groups/by_lt_amount.rs
+86
View File
@@ -0,0 +1,86 @@
use crate::Sats;
use super::GroupFilter;
#[derive(Default, Clone)]
pub struct ByLowerThanAmount<T> {
pub _10sats: T,
pub _100sats: T,
pub _1k_sats: T,
pub _10k_sats: T,
pub _100k_sats: T,
pub _1m_sats: T,
pub _10m_sats: T,
pub _1btc: T,
pub _10btc: T,
pub _100btc: T,
pub _1k_btc: T,
pub _10k_btc: T,
pub _100k_btc: T,
}
impl<T> ByLowerThanAmount<T> {
pub fn as_mut_vec(&mut self) -> [&mut T; 13] {
[
&mut self._10sats,
&mut self._100sats,
&mut self._1k_sats,
&mut self._10k_sats,
&mut self._100k_sats,
&mut self._1m_sats,
&mut self._10m_sats,
&mut self._1btc,
&mut self._10btc,
&mut self._100btc,
&mut self._1k_btc,
&mut self._10k_btc,
&mut self._100k_btc,
]
}
}
impl<T> ByLowerThanAmount<(GroupFilter, T)> {
pub fn vecs(&self) -> [&T; 13] {
[
&self._10sats.1,
&self._100sats.1,
&self._1k_sats.1,
&self._10k_sats.1,
&self._100k_sats.1,
&self._1m_sats.1,
&self._10m_sats.1,
&self._1btc.1,
&self._10btc.1,
&self._100btc.1,
&self._1k_btc.1,
&self._10k_btc.1,
&self._100k_btc.1,
]
}
}
impl<T> From<ByLowerThanAmount<T>> for ByLowerThanAmount<(GroupFilter, T)> {
fn from(value: ByLowerThanAmount<T>) -> Self {
Self {
_10sats: (GroupFilter::LowerThan(Sats::_10.into()), value._10sats),
_100sats: (GroupFilter::LowerThan(Sats::_100.into()), value._100sats),
_1k_sats: (GroupFilter::LowerThan(Sats::_1K.into()), value._1k_sats),
_10k_sats: (GroupFilter::LowerThan(Sats::_10K.into()), value._10k_sats),
_100k_sats: (GroupFilter::LowerThan(Sats::_100K.into()), value._100k_sats),
_1m_sats: (GroupFilter::LowerThan(Sats::_1M.into()), value._1m_sats),
_10m_sats: (GroupFilter::LowerThan(Sats::_10M.into()), value._10m_sats),
_1btc: (GroupFilter::LowerThan(Sats::_1BTC.into()), value._1btc),
_10btc: (GroupFilter::LowerThan(Sats::_10BTC.into()), value._10btc),
_100btc: (GroupFilter::LowerThan(Sats::_100BTC.into()), value._100btc),
_1k_btc: (GroupFilter::LowerThan(Sats::_1K_BTC.into()), value._1k_btc),
_10k_btc: (
GroupFilter::LowerThan(Sats::_10K_BTC.into()),
value._10k_btc,
),
_100k_btc: (
GroupFilter::LowerThan(Sats::_100K_BTC.into()),
value._100k_btc,
),
}
}
}
crates/brk_core/src/groups/by_from_date.rs → crates/brk_core/src/groups/by_max_age.rs
+26 -26
View File
@@ -1,8 +1,7 @@
use super::GroupFilter;
#[derive(Default, Clone)]
pub struct GroupedByFromDate<T> {
pub _1d: T,
pub struct ByMaxAge<T> {
pub _1w: T,
pub _1m: T,
pub _2m: T,
@@ -19,13 +18,13 @@ pub struct GroupedByFromDate<T> {
pub _7y: T,
pub _8y: T,
pub _10y: T,
pub _12y: T,
pub _15y: T,
}
impl<T> GroupedByFromDate<T> {
impl<T> ByMaxAge<T> {
pub fn as_mut_vec(&mut self) -> [&mut T; 18] {
[
&mut self._1d,
&mut self._1w,
&mut self._1m,
&mut self._2m,
@@ -42,15 +41,15 @@ impl<T> GroupedByFromDate<T> {
&mut self._7y,
&mut self._8y,
&mut self._10y,
&mut self._12y,
&mut self._15y,
]
}
}
impl<T> GroupedByFromDate<(GroupFilter, T)> {
impl<T> ByMaxAge<(GroupFilter, T)> {
pub fn vecs(&self) -> [&T; 18] {
[
&self._1d.1,
&self._1w.1,
&self._1m.1,
&self._2m.1,
@@ -67,32 +66,33 @@ impl<T> GroupedByFromDate<(GroupFilter, T)> {
&self._7y.1,
&self._8y.1,
&self._10y.1,
&self._12y.1,
&self._15y.1,
]
}
}
impl<T> From<GroupedByFromDate<T>> for GroupedByFromDate<(GroupFilter, T)> {
fn from(value: GroupedByFromDate<T>) -> Self {
impl<T> From<ByMaxAge<T>> for ByMaxAge<(GroupFilter, T)> {
fn from(value: ByMaxAge<T>) -> Self {
Self {
_1d: (GroupFilter::From(1), value._1d),
_1w: (GroupFilter::From(7), value._1w),
_1m: (GroupFilter::From(30), value._1m),
_2m: (GroupFilter::From(2 * 30), value._2m),
_3m: (GroupFilter::From(3 * 30), value._3m),
_4m: (GroupFilter::From(4 * 30), value._4m),
_5m: (GroupFilter::From(5 * 30), value._5m),
_6m: (GroupFilter::From(6 * 30), value._6m),
_1y: (GroupFilter::From(365), value._1y),
_2y: (GroupFilter::From(2 * 365), value._2y),
_3y: (GroupFilter::From(3 * 365), value._3y),
_4y: (GroupFilter::From(4 * 365), value._4y),
_5y: (GroupFilter::From(5 * 365), value._5y),
_6y: (GroupFilter::From(6 * 365), value._6y),
_7y: (GroupFilter::From(7 * 365), value._7y),
_8y: (GroupFilter::From(8 * 365), value._8y),
_10y: (GroupFilter::From(10 * 365), value._10y),
_15y: (GroupFilter::From(15 * 365), value._15y),
_1w: (GroupFilter::LowerThan(7), value._1w),
_1m: (GroupFilter::LowerThan(30), value._1m),
_2m: (GroupFilter::LowerThan(2 * 30), value._2m),
_3m: (GroupFilter::LowerThan(3 * 30), value._3m),
_4m: (GroupFilter::LowerThan(4 * 30), value._4m),
_5m: (GroupFilter::LowerThan(5 * 30), value._5m),
_6m: (GroupFilter::LowerThan(6 * 30), value._6m),
_1y: (GroupFilter::LowerThan(365), value._1y),
_2y: (GroupFilter::LowerThan(2 * 365), value._2y),
_3y: (GroupFilter::LowerThan(3 * 365), value._3y),
_4y: (GroupFilter::LowerThan(4 * 365), value._4y),
_5y: (GroupFilter::LowerThan(5 * 365), value._5y),
_6y: (GroupFilter::LowerThan(6 * 365), value._6y),
_7y: (GroupFilter::LowerThan(7 * 365), value._7y),
_8y: (GroupFilter::LowerThan(8 * 365), value._8y),
_10y: (GroupFilter::LowerThan(10 * 365), value._10y),
_12y: (GroupFilter::LowerThan(12 * 365), value._12y),
_15y: (GroupFilter::LowerThan(15 * 365), value._15y),
}
}
}
crates/brk_core/src/groups/by_min_age.rs
+98
View File
@@ -0,0 +1,98 @@
use super::GroupFilter;
#[derive(Default, Clone)]
pub struct ByMinAge<T> {
pub _1d: T,
pub _1w: T,
pub _1m: T,
pub _2m: T,
pub _3m: T,
pub _4m: T,
pub _5m: T,
pub _6m: T,
pub _1y: T,
pub _2y: T,
pub _3y: T,
pub _4y: T,
pub _5y: T,
pub _6y: T,
pub _7y: T,
pub _8y: T,
pub _10y: T,
pub _12y: T,
}
impl<T> ByMinAge<T> {
pub fn as_mut_vec(&mut self) -> [&mut T; 18] {
[
&mut self._1d,
&mut self._1w,
&mut self._1m,
&mut self._2m,
&mut self._3m,
&mut self._4m,
&mut self._5m,
&mut self._6m,
&mut self._1y,
&mut self._2y,
&mut self._3y,
&mut self._4y,
&mut self._5y,
&mut self._6y,
&mut self._7y,
&mut self._8y,
&mut self._10y,
&mut self._12y,
]
}
}
impl<T> ByMinAge<(GroupFilter, T)> {
pub fn vecs(&self) -> [&T; 18] {
[
&self._1d.1,
&self._1w.1,
&self._1m.1,
&self._2m.1,
&self._3m.1,
&self._4m.1,
&self._5m.1,
&self._6m.1,
&self._1y.1,
&self._2y.1,
&self._3y.1,
&self._4y.1,
&self._5y.1,
&self._6y.1,
&self._7y.1,
&self._8y.1,
&self._10y.1,
&self._12y.1,
]
}
}
impl<T> From<ByMinAge<T>> for ByMinAge<(GroupFilter, T)> {
fn from(value: ByMinAge<T>) -> Self {
Self {
_1d: (GroupFilter::GreaterOrEqual(1), value._1d),
_1w: (GroupFilter::GreaterOrEqual(7), value._1w),
_1m: (GroupFilter::GreaterOrEqual(30), value._1m),
_2m: (GroupFilter::GreaterOrEqual(2 * 30), value._2m),
_3m: (GroupFilter::GreaterOrEqual(3 * 30), value._3m),
_4m: (GroupFilter::GreaterOrEqual(4 * 30), value._4m),
_5m: (GroupFilter::GreaterOrEqual(5 * 30), value._5m),
_6m: (GroupFilter::GreaterOrEqual(6 * 30), value._6m),
_1y: (GroupFilter::GreaterOrEqual(365), value._1y),
_2y: (GroupFilter::GreaterOrEqual(2 * 365), value._2y),
_3y: (GroupFilter::GreaterOrEqual(3 * 365), value._3y),
_4y: (GroupFilter::GreaterOrEqual(4 * 365), value._4y),
_5y: (GroupFilter::GreaterOrEqual(5 * 365), value._5y),
_6y: (GroupFilter::GreaterOrEqual(6 * 365), value._6y),
_7y: (GroupFilter::GreaterOrEqual(7 * 365), value._7y),
_8y: (GroupFilter::GreaterOrEqual(8 * 365), value._8y),
_10y: (GroupFilter::GreaterOrEqual(10 * 365), value._10y),
_12y: (GroupFilter::GreaterOrEqual(12 * 365), value._12y),
}
}
}
crates/brk_core/src/groups/by_size_range.rs
-256
View File
@@ -1,256 +0,0 @@
use std::ops::{Add, AddAssign};
use crate::Sats;
use super::GroupFilter;
#[derive(Debug, Default, Clone)]
pub struct GroupedBySizeRange<T> {
pub _0sats: T,
pub from_1sat_to_10sats: T,
pub from_10sats_to_100sats: T,
pub from_100sats_to_1_000sats: T,
pub from_1_000sats_to_10_000sats: T,
pub from_10_000sats_to_100_000sats: T,
pub from_100_000sats_to_1_000_000sats: T,
pub from_1_000_000sats_to_10_000_000sats: T,
pub from_10_000_000sats_to_1btc: T,
pub from_1btc_to_10btc: T,
pub from_10btc_to_100btc: T,
pub from_100btc_to_1_000btc: T,
pub from_1_000btc_to_10_000btc: T,
pub from_10_000btc_to_100_000btc: T,
pub from_100_000btc: T,
}
impl<T> From<GroupedBySizeRange<T>> for GroupedBySizeRange<(GroupFilter, T)> {
fn from(value: GroupedBySizeRange<T>) -> Self {
#[allow(clippy::inconsistent_digit_grouping)]
Self {
_0sats: (GroupFilter::To(1), value._0sats),
from_1sat_to_10sats: (GroupFilter::Range(1..10), value.from_1sat_to_10sats),
from_10sats_to_100sats: (GroupFilter::Range(10..100), value.from_10sats_to_100sats),
from_100sats_to_1_000sats: (
GroupFilter::Range(100..1_000),
value.from_100sats_to_1_000sats,
),
from_1_000sats_to_10_000sats: (
GroupFilter::Range(1_000..10_000),
value.from_1_000sats_to_10_000sats,
),
from_10_000sats_to_100_000sats: (
GroupFilter::Range(10_000..100_000),
value.from_10_000sats_to_100_000sats,
),
from_100_000sats_to_1_000_000sats: (
GroupFilter::Range(100_000..1_000_000),
value.from_100_000sats_to_1_000_000sats,
),
from_1_000_000sats_to_10_000_000sats: (
GroupFilter::Range(1_000_000..10_000_000),
value.from_1_000_000sats_to_10_000_000sats,
),
from_10_000_000sats_to_1btc: (
GroupFilter::Range(10_000_000..1_00_000_000),
value.from_10_000_000sats_to_1btc,
),
from_1btc_to_10btc: (
GroupFilter::Range(1_00_000_000..10_00_000_000),
value.from_1btc_to_10btc,
),
from_10btc_to_100btc: (
GroupFilter::Range(10_00_000_000..100_00_000_000),
value.from_10btc_to_100btc,
),
from_100btc_to_1_000btc: (
GroupFilter::Range(100_00_000_000..1_000_00_000_000),
value.from_100btc_to_1_000btc,
),
from_1_000btc_to_10_000btc: (
GroupFilter::Range(1_000_00_000_000..10_000_00_000_000),
value.from_1_000btc_to_10_000btc,
),
from_10_000btc_to_100_000btc: (
GroupFilter::Range(10_000_00_000_000..100_000_00_000_000),
value.from_10_000btc_to_100_000btc,
),
from_100_000btc: (GroupFilter::From(100_000_00_000_000), value.from_100_000btc),
}
}
}
impl<T> GroupedBySizeRange<T> {
#[allow(clippy::inconsistent_digit_grouping)]
pub fn get_mut(&mut self, value: Sats) -> &mut T {
if value == Sats::ZERO {
&mut self._0sats
} else if value < Sats::_10 {
&mut self.from_1sat_to_10sats
} else if value < Sats::_100 {
&mut self.from_10sats_to_100sats
} else if value < Sats::_1K {
&mut self.from_100sats_to_1_000sats
} else if value < Sats::_10K {
&mut self.from_1_000sats_to_10_000sats
} else if value < Sats::_100K {
&mut self.from_10_000sats_to_100_000sats
} else if value < Sats::_1M {
&mut self.from_100_000sats_to_1_000_000sats
} else if value < Sats::_10M {
&mut self.from_1_000_000sats_to_10_000_000sats
} else if value < Sats::_1BTC {
&mut self.from_10_000_000sats_to_1btc
} else if value < Sats::_10BTC {
&mut self.from_1btc_to_10btc
} else if value < Sats::_100BTC {
&mut self.from_10btc_to_100btc
} else if value < Sats::_1K_BTC {
&mut self.from_100btc_to_1_000btc
} else if value < Sats::_10K_BTC {
&mut self.from_1_000btc_to_10_000btc
} else if value < Sats::_100K_BTC {
&mut self.from_10_000btc_to_100_000btc
} else {
&mut self.from_100_000btc
}
}
pub fn as_vec(&self) -> [&T; 15] {
[
&self._0sats,
&self.from_1sat_to_10sats,
&self.from_10sats_to_100sats,
&self.from_100sats_to_1_000sats,
&self.from_1_000sats_to_10_000sats,
&self.from_10_000sats_to_100_000sats,
&self.from_100_000sats_to_1_000_000sats,
&self.from_1_000_000sats_to_10_000_000sats,
&self.from_10_000_000sats_to_1btc,
&self.from_1btc_to_10btc,
&self.from_10btc_to_100btc,
&self.from_100btc_to_1_000btc,
&self.from_1_000btc_to_10_000btc,
&self.from_10_000btc_to_100_000btc,
&self.from_100_000btc,
]
}
pub fn as_typed_vec(&self) -> [(Sats, &T); 15] {
[
(Sats::ZERO, &self._0sats),
(Sats::_1, &self.from_1sat_to_10sats),
(Sats::_10, &self.from_10sats_to_100sats),
(Sats::_100, &self.from_100sats_to_1_000sats),
(Sats::_1K, &self.from_1_000sats_to_10_000sats),
(Sats::_10K, &self.from_10_000sats_to_100_000sats),
(Sats::_100K, &self.from_100_000sats_to_1_000_000sats),
(Sats::_1M, &self.from_1_000_000sats_to_10_000_000sats),
(Sats::_10M, &self.from_10_000_000sats_to_1btc),
(Sats::_1BTC, &self.from_1btc_to_10btc),
(Sats::_10BTC, &self.from_10btc_to_100btc),
(Sats::_100BTC, &self.from_100btc_to_1_000btc),
(Sats::_1K_BTC, &self.from_1_000btc_to_10_000btc),
(Sats::_10K_BTC, &self.from_10_000btc_to_100_000btc),
(Sats::_100K_BTC, &self.from_100_000btc),
]
}
pub fn as_mut_vec(&mut self) -> [&mut T; 15] {
[
&mut self._0sats,
&mut self.from_1sat_to_10sats,
&mut self.from_10sats_to_100sats,
&mut self.from_100sats_to_1_000sats,
&mut self.from_1_000sats_to_10_000sats,
&mut self.from_10_000sats_to_100_000sats,
&mut self.from_100_000sats_to_1_000_000sats,
&mut self.from_1_000_000sats_to_10_000_000sats,
&mut self.from_10_000_000sats_to_1btc,
&mut self.from_1btc_to_10btc,
&mut self.from_10btc_to_100btc,
&mut self.from_100btc_to_1_000btc,
&mut self.from_1_000btc_to_10_000btc,
&mut self.from_10_000btc_to_100_000btc,
&mut self.from_100_000btc,
]
}
}
impl<T> GroupedBySizeRange<(GroupFilter, T)> {
pub fn vecs(&self) -> [&T; 15] {
[
&self._0sats.1,
&self.from_1sat_to_10sats.1,
&self.from_10sats_to_100sats.1,
&self.from_100sats_to_1_000sats.1,
&self.from_1_000sats_to_10_000sats.1,
&self.from_10_000sats_to_100_000sats.1,
&self.from_100_000sats_to_1_000_000sats.1,
&self.from_1_000_000sats_to_10_000_000sats.1,
&self.from_10_000_000sats_to_1btc.1,
&self.from_1btc_to_10btc.1,
&self.from_10btc_to_100btc.1,
&self.from_100btc_to_1_000btc.1,
&self.from_1_000btc_to_10_000btc.1,
&self.from_10_000btc_to_100_000btc.1,
&self.from_100_000btc.1,
]
}
}
impl<T> Add for GroupedBySizeRange<T>
where
T: Add<Output = T>,
{
type Output = Self;
fn add(self, rhs: Self) -> Self::Output {
Self {
_0sats: self._0sats + rhs._0sats,
from_1sat_to_10sats: self.from_1sat_to_10sats + rhs.from_1sat_to_10sats,
from_10sats_to_100sats: self.from_10sats_to_100sats + rhs.from_10sats_to_100sats,
from_100sats_to_1_000sats: self.from_100sats_to_1_000sats
+ rhs.from_100sats_to_1_000sats,
from_1_000sats_to_10_000sats: self.from_1_000sats_to_10_000sats
+ rhs.from_1_000sats_to_10_000sats,
from_10_000sats_to_100_000sats: self.from_10_000sats_to_100_000sats
+ rhs.from_10_000sats_to_100_000sats,
from_100_000sats_to_1_000_000sats: self.from_100_000sats_to_1_000_000sats
+ rhs.from_100_000sats_to_1_000_000sats,
from_1_000_000sats_to_10_000_000sats: self.from_1_000_000sats_to_10_000_000sats
+ rhs.from_1_000_000sats_to_10_000_000sats,
from_10_000_000sats_to_1btc: self.from_10_000_000sats_to_1btc
+ rhs.from_10_000_000sats_to_1btc,
from_1btc_to_10btc: self.from_1btc_to_10btc + rhs.from_1btc_to_10btc,
from_10btc_to_100btc: self.from_10btc_to_100btc + rhs.from_10btc_to_100btc,
from_100btc_to_1_000btc: self.from_100btc_to_1_000btc + rhs.from_100btc_to_1_000btc,
from_1_000btc_to_10_000btc: self.from_1_000btc_to_10_000btc
+ rhs.from_1_000btc_to_10_000btc,
from_10_000btc_to_100_000btc: self.from_10_000btc_to_100_000btc
+ rhs.from_10_000btc_to_100_000btc,
from_100_000btc: self.from_100_000btc + rhs.from_100_000btc,
}
}
}
impl<T> AddAssign for GroupedBySizeRange<T>
where
T: AddAssign,
{
fn add_assign(&mut self, rhs: Self) {
self._0sats += rhs._0sats;
self.from_1sat_to_10sats += rhs.from_1sat_to_10sats;
self.from_10sats_to_100sats += rhs.from_10sats_to_100sats;
self.from_100sats_to_1_000sats += rhs.from_100sats_to_1_000sats;
self.from_1_000sats_to_10_000sats += rhs.from_1_000sats_to_10_000sats;
self.from_10_000sats_to_100_000sats += rhs.from_10_000sats_to_100_000sats;
self.from_100_000sats_to_1_000_000sats += rhs.from_100_000sats_to_1_000_000sats;
self.from_1_000_000sats_to_10_000_000sats += rhs.from_1_000_000sats_to_10_000_000sats;
self.from_10_000_000sats_to_1btc += rhs.from_10_000_000sats_to_1btc;
self.from_1btc_to_10btc += rhs.from_1btc_to_10btc;
self.from_10btc_to_100btc += rhs.from_10btc_to_100btc;
self.from_100btc_to_1_000btc += rhs.from_100btc_to_1_000btc;
self.from_1_000btc_to_10_000btc += rhs.from_1_000btc_to_10_000btc;
self.from_10_000btc_to_100_000btc += rhs.from_10_000btc_to_100_000btc;
self.from_100_000btc += rhs.from_100_000btc;
}
}
crates/brk_core/src/groups/by_spendable_type.rs
+7 -7
View File
@@ -5,7 +5,7 @@ use crate::OutputType;
use super::GroupFilter;
#[derive(Default, Clone, Debug)]
pub struct GroupedBySpendableType<T> {
pub struct BySpendableType<T> {
pub p2pk65: T,
pub p2pk33: T,
pub p2pkh: T,
@@ -19,7 +19,7 @@ pub struct GroupedBySpendableType<T> {
pub empty: T,
}
impl<T> GroupedBySpendableType<T> {
impl<T> BySpendableType<T> {
pub fn get_mut(&mut self, output_type: OutputType) -> &mut T {
match output_type {
OutputType::P2PK65 => &mut self.p2pk65,
@@ -70,7 +70,7 @@ impl<T> GroupedBySpendableType<T> {
}
}
impl<T> GroupedBySpendableType<(GroupFilter, T)> {
impl<T> BySpendableType<(GroupFilter, T)> {
pub fn vecs(&self) -> [&T; 11] {
[
&self.p2pk65.1,
@@ -88,8 +88,8 @@ impl<T> GroupedBySpendableType<(GroupFilter, T)> {
}
}
impl<T> From<GroupedBySpendableType<T>> for GroupedBySpendableType<(GroupFilter, T)> {
fn from(value: GroupedBySpendableType<T>) -> Self {
impl<T> From<BySpendableType<T>> for BySpendableType<(GroupFilter, T)> {
fn from(value: BySpendableType<T>) -> Self {
Self {
p2pk65: (GroupFilter::Type(OutputType::P2PK65), value.p2pk65),
p2pk33: (GroupFilter::Type(OutputType::P2PK33), value.p2pk33),
@@ -106,7 +106,7 @@ impl<T> From<GroupedBySpendableType<T>> for GroupedBySpendableType<(GroupFilter,
}
}
impl<T> Add for GroupedBySpendableType<T>
impl<T> Add for BySpendableType<T>
where
T: Add<Output = T>,
{
@@ -128,7 +128,7 @@ where
}
}
impl<T> AddAssign for GroupedBySpendableType<T>
impl<T> AddAssign for BySpendableType<T>
where
T: AddAssign,
{
crates/brk_core/src/groups/by_term.rs
+7 -7
View File
@@ -1,28 +1,28 @@
use super::GroupFilter;
#[derive(Default, Clone)]
pub struct GroupedByTerm<T> {
pub struct ByTerm<T> {
pub short: T,
pub long: T,
}
impl<T> GroupedByTerm<T> {
impl<T> ByTerm<T> {
pub fn as_mut_vec(&mut self) -> [&mut T; 2] {
[&mut self.short, &mut self.long]
}
}
impl<T> GroupedByTerm<(GroupFilter, T)> {
impl<T> ByTerm<(GroupFilter, T)> {
pub fn vecs(&self) -> [&T; 2] {
[&self.short.1, &self.long.1]
}
}
impl<T> From<GroupedByTerm<T>> for GroupedByTerm<(GroupFilter, T)> {
fn from(value: GroupedByTerm<T>) -> Self {
impl<T> From<ByTerm<T>> for ByTerm<(GroupFilter, T)> {
fn from(value: ByTerm<T>) -> Self {
Self {
short: (GroupFilter::To(5 * 30), value.short),
long: (GroupFilter::From(5 * 30), value.long),
short: (GroupFilter::LowerThan(5 * 30), value.short),
long: (GroupFilter::GreaterOrEqual(5 * 30), value.long),
}
}
}
crates/brk_core/src/groups/by_type.rs
+3 -3
View File
@@ -2,12 +2,12 @@ use std::ops::{Add, AddAssign};
use crate::OutputType;
use super::{GroupedBySpendableType, GroupedByUnspendableType};
use super::{BySpendableType, ByUnspendableType};
#[derive(Default, Clone, Debug)]
pub struct GroupedByType<T> {
pub spendable: GroupedBySpendableType<T>,
pub unspendable: GroupedByUnspendableType<T>,
pub spendable: BySpendableType<T>,
pub unspendable: ByUnspendableType<T>,
}
impl<T> GroupedByType<T> {
crates/brk_core/src/groups/by_unspendable_type.rs
+4 -4
View File
@@ -1,17 +1,17 @@
use std::ops::{Add, AddAssign};
#[derive(Default, Clone, Debug)]
pub struct GroupedByUnspendableType<T> {
pub struct ByUnspendableType<T> {
pub opreturn: T,
}
impl<T> GroupedByUnspendableType<T> {
impl<T> ByUnspendableType<T> {
pub fn as_vec(&self) -> [&T; 1] {
[&self.opreturn]
}
}
impl<T> Add for GroupedByUnspendableType<T>
impl<T> Add for ByUnspendableType<T>
where
T: Add<Output = T>,
{
@@ -23,7 +23,7 @@ where
}
}
impl<T> AddAssign for GroupedByUnspendableType<T>
impl<T> AddAssign for ByUnspendableType<T>
where
T: AddAssign,
{
crates/brk_core/src/groups/by_up_to_date.rs
-98
View File
@@ -1,98 +0,0 @@
use super::GroupFilter;
#[derive(Default, Clone)]
pub struct GroupedByUpToDate<T> {
pub _1d: T,
pub _1w: T,
pub _1m: T,
pub _2m: T,
pub _3m: T,
pub _4m: T,
pub _5m: T,
pub _6m: T,
pub _1y: T,
pub _2y: T,
pub _3y: T,
pub _4y: T,
pub _5y: T,
pub _6y: T,
pub _7y: T,
pub _8y: T,
pub _10y: T,
pub _15y: T,
}
impl<T> GroupedByUpToDate<T> {
pub fn as_mut_vec(&mut self) -> [&mut T; 18] {
[
&mut self._1d,
&mut self._1w,
&mut self._1m,
&mut self._2m,
&mut self._3m,
&mut self._4m,
&mut self._5m,
&mut self._6m,
&mut self._1y,
&mut self._2y,
&mut self._3y,
&mut self._4y,
&mut self._5y,
&mut self._6y,
&mut self._7y,
&mut self._8y,
&mut self._10y,
&mut self._15y,
]
}
}
impl<T> GroupedByUpToDate<(GroupFilter, T)> {
pub fn vecs(&self) -> [&T; 18] {
[
&self._1d.1,
&self._1w.1,
&self._1m.1,
&self._2m.1,
&self._3m.1,
&self._4m.1,
&self._5m.1,
&self._6m.1,
&self._1y.1,
&self._2y.1,
&self._3y.1,
&self._4y.1,
&self._5y.1,
&self._6y.1,
&self._7y.1,
&self._8y.1,
&self._10y.1,
&self._15y.1,
]
}
}
impl<T> From<GroupedByUpToDate<T>> for GroupedByUpToDate<(GroupFilter, T)> {
fn from(value: GroupedByUpToDate<T>) -> Self {
Self {
_1d: (GroupFilter::To(1), value._1d),
_1w: (GroupFilter::To(7), value._1w),
_1m: (GroupFilter::To(30), value._1m),
_2m: (GroupFilter::To(2 * 30), value._2m),
_3m: (GroupFilter::To(3 * 30), value._3m),
_4m: (GroupFilter::To(4 * 30), value._4m),
_5m: (GroupFilter::To(5 * 30), value._5m),
_6m: (GroupFilter::To(6 * 30), value._6m),
_1y: (GroupFilter::To(365), value._1y),
_2y: (GroupFilter::To(2 * 365), value._2y),
_3y: (GroupFilter::To(3 * 365), value._3y),
_4y: (GroupFilter::To(4 * 365), value._4y),
_5y: (GroupFilter::To(5 * 365), value._5y),
_6y: (GroupFilter::To(6 * 365), value._6y),
_7y: (GroupFilter::To(7 * 365), value._7y),
_8y: (GroupFilter::To(8 * 365), value._8y),
_10y: (GroupFilter::To(10 * 365), value._10y),
_15y: (GroupFilter::To(15 * 365), value._15y),
}
}
}
crates/brk_core/src/groups/by_up_to_size.rs
-80
View File
@@ -1,80 +0,0 @@
use crate::Sats;
use super::GroupFilter;
#[derive(Default, Clone)]
pub struct GroupedByUpToSize<T> {
pub _10sats: T,
pub _100sats: T,
pub _1k_sats: T,
pub _10k_sats: T,
pub _100k_sats: T,
pub _1m_sats: T,
pub _10m_sats: T,
pub _1btc: T,
pub _10btc: T,
pub _100btc: T,
pub _1k_btc: T,
pub _10k_btc: T,
pub _100k_btc: T,
}
impl<T> GroupedByUpToSize<T> {
pub fn as_mut_vec(&mut self) -> [&mut T; 13] {
[
&mut self._10sats,
&mut self._100sats,
&mut self._1k_sats,
&mut self._10k_sats,
&mut self._100k_sats,
&mut self._1m_sats,
&mut self._10m_sats,
&mut self._1btc,
&mut self._10btc,
&mut self._100btc,
&mut self._1k_btc,
&mut self._10k_btc,
&mut self._100k_btc,
]
}
}
impl<T> GroupedByUpToSize<(GroupFilter, T)> {
pub fn vecs(&self) -> [&T; 13] {
[
&self._10sats.1,
&self._100sats.1,
&self._1k_sats.1,
&self._10k_sats.1,
&self._100k_sats.1,
&self._1m_sats.1,
&self._10m_sats.1,
&self._1btc.1,
&self._10btc.1,
&self._100btc.1,
&self._1k_btc.1,
&self._10k_btc.1,
&self._100k_btc.1,
]
}
}
impl<T> From<GroupedByUpToSize<T>> for GroupedByUpToSize<(GroupFilter, T)> {
fn from(value: GroupedByUpToSize<T>) -> Self {
Self {
_10sats: (GroupFilter::To(Sats::_10.into()), value._10sats),
_100sats: (GroupFilter::To(Sats::_100.into()), value._100sats),
_1k_sats: (GroupFilter::To(Sats::_1K.into()), value._1k_sats),
_10k_sats: (GroupFilter::To(Sats::_10K.into()), value._10k_sats),
_100k_sats: (GroupFilter::To(Sats::_100K.into()), value._100k_sats),
_1m_sats: (GroupFilter::To(Sats::_1M.into()), value._1m_sats),
_10m_sats: (GroupFilter::To(Sats::_10M.into()), value._10m_sats),
_1btc: (GroupFilter::To(Sats::_1BTC.into()), value._1btc),
_10btc: (GroupFilter::To(Sats::_10BTC.into()), value._10btc),
_100btc: (GroupFilter::To(Sats::_100BTC.into()), value._100btc),
_1k_btc: (GroupFilter::To(Sats::_1K_BTC.into()), value._1k_btc),
_10k_btc: (GroupFilter::To(Sats::_10K_BTC.into()), value._10k_btc),
_100k_btc: (GroupFilter::To(Sats::_100K_BTC.into()), value._100k_btc),
}
}
}
crates/brk_core/src/groups/filter.rs
+12 -12
View File
@@ -5,9 +5,9 @@ use crate::{HalvingEpoch, OutputType};
#[derive(Debug, Clone, PartialEq, Eq)]
pub enum GroupFilter {
All,
To(usize),
LowerThan(usize),
Range(Range<usize>),
From(usize),
GreaterOrEqual(usize),
Epoch(HalvingEpoch),
Type(OutputType),
}
@@ -16,8 +16,8 @@ impl GroupFilter {
pub fn contains(&self, value: usize) -> bool {
match self {
GroupFilter::All => true,
GroupFilter::To(to) => *to > value,
GroupFilter::From(from) => *from <= value,
GroupFilter::LowerThan(max) => *max > value,
GroupFilter::GreaterOrEqual(min) => *min <= value,
GroupFilter::Range(r) => r.contains(&value),
GroupFilter::Epoch(_) => false,
GroupFilter::Type(_) => false,
@@ -27,19 +27,19 @@ impl GroupFilter {
pub fn includes(&self, other: &GroupFilter) -> bool {
match self {
GroupFilter::All => true,
GroupFilter::To(to) => match other {
GroupFilter::LowerThan(max) => match other {
GroupFilter::All => false,
GroupFilter::To(to2) => to >= to2,
GroupFilter::Range(range) => range.end <= *to,
GroupFilter::From(_) => false,
GroupFilter::LowerThan(max2) => max >= max2,
GroupFilter::Range(range) => range.end <= *max,
GroupFilter::GreaterOrEqual(_) => false,
GroupFilter::Epoch(_) => false,
GroupFilter::Type(_) => false,
},
GroupFilter::From(from) => match other {
GroupFilter::GreaterOrEqual(min) => match other {
GroupFilter::All => false,
GroupFilter::To(_) => false,
GroupFilter::Range(range) => range.start >= *from,
GroupFilter::From(from2) => from <= from2,
GroupFilter::LowerThan(_) => false,
GroupFilter::Range(range) => range.start >= *min,
GroupFilter::GreaterOrEqual(min2) => min <= min2,
GroupFilter::Epoch(_) => false,
GroupFilter::Type(_) => false,
},
crates/brk_core/src/groups/mod.rs
+12 -12
View File
@@ -1,31 +1,31 @@
mod address;
mod by_address_type;
mod by_date_range;
mod by_age_range;
mod by_amount_range;
mod by_epoch;
mod by_from_date;
mod by_from_size;
mod by_size_range;
mod by_ge_amount;
mod by_lt_amount;
mod by_max_age;
mod by_min_age;
mod by_spendable_type;
mod by_term;
mod by_type;
mod by_unspendable_type;
mod by_up_to_date;
mod by_up_to_size;
mod filter;
mod utxo;
pub use address::*;
pub use by_address_type::*;
pub use by_date_range::*;
pub use by_age_range::*;
pub use by_amount_range::*;
pub use by_epoch::*;
pub use by_from_date::*;
pub use by_from_size::*;
pub use by_size_range::*;
pub use by_ge_amount::*;
pub use by_lt_amount::*;
pub use by_max_age::*;
pub use by_min_age::*;
pub use by_spendable_type::*;
pub use by_term::*;
pub use by_type::*;
pub use by_unspendable_type::*;
pub use by_up_to_date::*;
pub use by_up_to_size::*;
pub use filter::*;
pub use utxo::*;
crates/brk_core/src/groups/utxo.rs
+47 -48
View File
@@ -1,57 +1,56 @@
use crate::{
GroupFilter, GroupedByDateRange, GroupedByEpoch, GroupedByFromDate, GroupedByFromSize,
GroupedBySizeRange, GroupedBySpendableType, GroupedByTerm, GroupedByUpToDate,
GroupedByUpToSize,
ByAgeRange, ByAmountRange, ByEpoch, ByGreatEqualAmount, ByLowerThanAmount, ByMaxAge, ByMinAge,
BySpendableType, ByTerm, GroupFilter,
};
#[derive(Default, Clone)]
pub struct UTXOGroups<T> {
pub all: T,
pub by_date_range: GroupedByDateRange<T>,
pub by_epoch: GroupedByEpoch<T>,
pub by_from_date: GroupedByFromDate<T>,
pub by_from_size: GroupedByFromSize<T>,
pub by_size_range: GroupedBySizeRange<T>,
pub by_term: GroupedByTerm<T>,
pub by_type: GroupedBySpendableType<T>,
pub by_up_to_date: GroupedByUpToDate<T>,
pub by_up_to_size: GroupedByUpToSize<T>,
pub age_range: ByAgeRange<T>,
pub epoch: ByEpoch<T>,
pub min_age: ByMinAge<T>,
pub ge_amount: ByGreatEqualAmount<T>,
pub amount_range: ByAmountRange<T>,
pub term: ByTerm<T>,
pub _type: BySpendableType<T>,
pub max_age: ByMaxAge<T>,
pub lt_amount: ByLowerThanAmount<T>,
}
impl<T> UTXOGroups<T> {
pub fn as_mut_vecs(&mut self) -> Vec<&mut T> {
[&mut self.all]
.into_iter()
.chain(self.by_term.as_mut_vec())
.chain(self.by_up_to_date.as_mut_vec())
.chain(self.by_from_date.as_mut_vec())
.chain(self.by_from_size.as_mut_vec())
.chain(self.by_date_range.as_mut_vec())
.chain(self.by_epoch.as_mut_vec())
.chain(self.by_size_range.as_mut_vec())
.chain(self.by_up_to_size.as_mut_vec())
.chain(self.by_type.as_mut_vec())
.chain(self.term.as_mut_vec())
.chain(self.max_age.as_mut_vec())
.chain(self.min_age.as_mut_vec())
.chain(self.ge_amount.as_mut_vec())
.chain(self.age_range.as_mut_vec())
.chain(self.epoch.as_mut_vec())
.chain(self.amount_range.as_mut_vec())
.chain(self.lt_amount.as_mut_vec())
.chain(self._type.as_mut_vec())
.collect::<Vec<_>>()
}
pub fn as_mut_separate_vecs(&mut self) -> Vec<&mut T> {
self.by_date_range
self.age_range
.as_mut_vec()
.into_iter()
.chain(self.by_epoch.as_mut_vec())
.chain(self.by_size_range.as_mut_vec())
.chain(self.by_type.as_mut_vec())
.chain(self.epoch.as_mut_vec())
.chain(self.amount_range.as_mut_vec())
.chain(self._type.as_mut_vec())
.collect::<Vec<_>>()
}
pub fn as_mut_overlapping_vecs(&mut self) -> Vec<&mut T> {
[&mut self.all]
.into_iter()
.chain(self.by_term.as_mut_vec())
.chain(self.by_up_to_date.as_mut_vec())
.chain(self.by_from_date.as_mut_vec())
.chain(self.by_up_to_size.as_mut_vec())
.chain(self.by_from_size.as_mut_vec())
.chain(self.term.as_mut_vec())
.chain(self.max_age.as_mut_vec())
.chain(self.min_age.as_mut_vec())
.chain(self.lt_amount.as_mut_vec())
.chain(self.ge_amount.as_mut_vec())
.collect::<Vec<_>>()
}
}
@@ -60,15 +59,15 @@ impl<T> UTXOGroups<(GroupFilter, T)> {
pub fn vecs(&self) -> Vec<&T> {
[&self.all.1]
.into_iter()
.chain(self.by_term.vecs())
.chain(self.by_up_to_date.vecs())
.chain(self.by_from_date.vecs())
.chain(self.by_date_range.vecs())
.chain(self.by_epoch.vecs())
.chain(self.by_size_range.vecs())
.chain(self.by_type.vecs())
.chain(self.by_up_to_size.vecs())
.chain(self.by_from_size.vecs())
.chain(self.term.vecs())
.chain(self.max_age.vecs())
.chain(self.min_age.vecs())
.chain(self.age_range.vecs())
.chain(self.epoch.vecs())
.chain(self.amount_range.vecs())
.chain(self._type.vecs())
.chain(self.lt_amount.vecs())
.chain(self.ge_amount.vecs())
.collect::<Vec<_>>()
}
}
@@ -77,15 +76,15 @@ impl<T> From<UTXOGroups<T>> for UTXOGroups<(GroupFilter, T)> {
fn from(value: UTXOGroups<T>) -> Self {
Self {
all: (GroupFilter::All, value.all),
by_term: GroupedByTerm::from(value.by_term),
by_up_to_date: GroupedByUpToDate::from(value.by_up_to_date),
by_from_date: GroupedByFromDate::from(value.by_from_date),
by_date_range: GroupedByDateRange::from(value.by_date_range),
by_epoch: GroupedByEpoch::from(value.by_epoch),
by_size_range: GroupedBySizeRange::from(value.by_size_range),
by_up_to_size: GroupedByUpToSize::from(value.by_up_to_size),
by_from_size: GroupedByFromSize::from(value.by_from_size),
by_type: GroupedBySpendableType::from(value.by_type),
term: ByTerm::from(value.term),
max_age: ByMaxAge::from(value.max_age),
min_age: ByMinAge::from(value.min_age),
age_range: ByAgeRange::from(value.age_range),
epoch: ByEpoch::from(value.epoch),
amount_range: ByAmountRange::from(value.amount_range),
lt_amount: ByLowerThanAmount::from(value.lt_amount),
ge_amount: ByGreatEqualAmount::from(value.ge_amount),
_type: BySpendableType::from(value._type),
}
}
}
crates/brk_indexer/src/stores.rs
+3 -3
View File
@@ -1,7 +1,7 @@
use std::{borrow::Cow, fs, path::Path, thread};
use brk_core::{
AddressBytes, AddressBytesHash, BlockHashPrefix, GroupedByAddressType, Height, OutputIndex,
AddressBytes, AddressBytesHash, BlockHashPrefix, ByAddressType, Height, OutputIndex,
OutputType, Result, TxIndex, TxidPrefix, TypeIndex, TypeIndexWithOutputindex, Unit, Version,
};
use brk_store::{AnyStore, Store};
@@ -21,7 +21,7 @@ pub struct Stores {
pub blockhashprefix_to_height: Store<BlockHashPrefix, Height>,
pub txidprefix_to_txindex: Store<TxidPrefix, TxIndex>,
pub addresstype_to_typeindex_with_outputindex:
GroupedByAddressType<Store<TypeIndexWithOutputindex, Unit>>,
ByAddressType<Store<TypeIndexWithOutputindex, Unit>>,
}
const VERSION: Version = Version::ZERO;
@@ -145,7 +145,7 @@ impl Stores {
addressbyteshash_to_typeindex: addressbyteshash_to_typeindex.join().unwrap()?,
blockhashprefix_to_height: blockhashprefix_to_height.join().unwrap()?,
txidprefix_to_txindex: txidprefix_to_txindex.join().unwrap()?,
addresstype_to_typeindex_with_outputindex: GroupedByAddressType {
addresstype_to_typeindex_with_outputindex: ByAddressType {
p2pk65: p2pk65addressindex_with_outputindex.join().unwrap()?,
p2pk33: p2pk33addressindex_with_outputindex.join().unwrap()?,
p2pkh: p2pkhaddressindex_with_outputindex.join().unwrap()?,
crates/brk_server/README.md
+1 -1
View File
@@ -49,7 +49,7 @@ Get the count of all existing indexes.
Get the count of all existing vec ids.
#### [`GET /api/vecs/variant-count`](https://bitcoinresearchkit.org/api/vecs/variant-count)
#### [`GET /api/vecs/vec-count`](https://bitcoinresearchkit.org/api/vecs/vec-count)
Get the count of all existing vecs. \
Equals to the sum of supported Indexes of each vec id.
crates/brk_server/src/api/interface/bridge.rs
+22 -5
View File
@@ -61,17 +61,34 @@ export const VERSION = \"v{VERSION}\";
);
contents += "
/** @typedef {ReturnType<typeof createVecIdToIndexes>} VecIdToIndexes
/** @typedef {keyof VecIdToIndexes} VecId */
/** @typedef {ReturnType<typeof createIndexes>} Indexes */
export function createIndexes() {
return {
";
contents += &indexes
.iter()
.enumerate()
.map(|(i_of_i, i)| {
let lowered = i.to_string().to_lowercase();
format!(" {lowered}: /** @satisfies {{{i}}} */ ({i_of_i}),",)
})
.collect::<Vec<_>>()
.join("\n");
contents += " };\n}\n";
contents += "
/** @typedef {ReturnType<typeof createVecIdToIndexes>} VecIdToIndexes
/** @typedef {keyof VecIdToIndexes} VecId */
/**
* @returns {Record<any, number[]>}
*/
export function createVecIdToIndexes() {\n";
contents += " return {\n";
export function createVecIdToIndexes() {
return {
";
self.id_to_index_to_vec()
.iter()
websites/default/scripts/main.js
+18 -4
View File
@@ -857,7 +857,9 @@ function createUtils() {
}
if (
(!unit || thoroughUnitCheck) &&
(id.endsWith("_size") || id.endsWith("_size_sum"))
(id.endsWith("_size") ||
id.endsWith("_size_sum") ||
id.endsWith("_size_cumulative"))
) {
if (unit) throw Error(`Unit "${unit}" already assigned "${id}"`);
unit = "mb";
@@ -866,7 +868,8 @@ function createUtils() {
(!unit || thoroughUnitCheck) &&
(id.endsWith("vsize") ||
id.endsWith("vbytes") ||
id.endsWith("_vbytes_sum"))
id.endsWith("_vbytes_sum") ||
id.endsWith("_vbytes_cumulative"))
) {
if (unit) throw Error(`Unit "${unit}" already assigned "${id}"`);
unit = "vB";
@@ -1535,8 +1538,10 @@ function createUtils() {
/**
* @param {Signals} signals
* @param {Utilities} utils
* @param {Env} env
* @param {VecIdToIndexes} vecIdToIndexes
*/
function createVecsResources(signals, utils) {
function createVecsResources(signals, utils, env, vecIdToIndexes) {
const owner = signals.getOwner();
const defaultFrom = -10_000;
@@ -1563,6 +1568,10 @@ function createVecsResources(signals, utils) {
* @param {VecId} id
*/
function createVecResource(index, id) {
if (env.localhost && !(id in vecIdToIndexes)) {
throw Error(`${id} not recognized`);
}
return signals.runWithOwner(owner, () => {
/** @typedef {T extends number ? SingleValueData : CandlestickData} Value */
@@ -2140,7 +2149,12 @@ function main() {
const webSockets = initWebSockets(signals, utils);
const vecsResources = createVecsResources(signals, utils);
const vecsResources = createVecsResources(
signals,
utils,
env,
vecIdToIndexes,
);
const colors = createColors(dark, elements);
websites/default/scripts/options.js
+426 -419
View File
File diff suppressed because it is too large Load Diff