From 66494c081c1ab1a9f6625680d03250c44ce05e51 Mon Sep 17 00:00:00 2001 From: nym21 Date: Mon, 27 Apr 2026 19:19:14 +0200 Subject: [PATCH] global: fixes --- crates/brk_client/src/lib.rs | 6502 +++-------------- crates/brk_computer/src/distribution/vecs.rs | 2 +- crates/brk_mempool/src/steps/rebuilder/mod.rs | 9 +- .../steps/rebuilder/projected_blocks/fees.rs | 79 +- .../rebuilder/projected_blocks/snapshot.rs | 8 +- crates/brk_mempool/src/stores/addr_tracker.rs | 68 +- crates/brk_rpc/src/methods.rs | 14 +- crates/brk_server/src/api/series_legacy.rs | 5 +- crates/brk_types/src/feerate.rs | 44 +- crates/brk_types/src/urpd.rs | 65 +- crates/brk_types/src/urpd_aggregation.rs | 16 +- crates/brk_types/src/urpd_bucket.rs | 6 +- modules/brk-client/index.js | 15 +- modules/brk-client/package.json | 2 +- packages/brk_client/brk_client/__init__.py | 15 +- packages/brk_client/pyproject.toml | 2 +- 16 files changed, 1453 insertions(+), 5399 deletions(-) diff --git a/crates/brk_client/src/lib.rs b/crates/brk_client/src/lib.rs index 83a75d68f..e59253705 100644 --- a/crates/brk_client/src/lib.rs +++ b/crates/brk_client/src/lib.rs @@ -7,11 +7,12 @@ #![allow(clippy::useless_format)] #![allow(clippy::unnecessary_to_owned)] +use std::sync::Arc; +use std::ops::{Bound, RangeBounds}; +use serde::de::DeserializeOwned; pub use brk_cohort::*; pub use brk_types::*; -use serde::de::DeserializeOwned; -use std::ops::{Bound, RangeBounds}; -use std::sync::Arc; + /// Error type for BRK client operations. #[derive(Debug)] @@ -56,10 +57,7 @@ pub struct BrkClientBase { impl BrkClientBase { /// Create a new client with the given base URL. pub fn new(base_url: impl Into) -> Self { - Self::with_options(BrkClientOptions { - base_url: base_url.into(), - ..Default::default() - }) + Self::with_options(BrkClientOptions { base_url: base_url.into(), ..Default::default() }) } /// Create a new client with options. @@ -80,49 +78,36 @@ impl BrkClientBase { /// Make a GET request and deserialize JSON response. pub fn get_json(&self, path: &str) -> Result { - self.agent - .get(&self.url(path)) + self.agent.get(&self.url(path)) .call() .and_then(|mut r| r.body_mut().read_json()) - .map_err(|e| BrkError { - message: e.to_string(), - }) + .map_err(|e| BrkError { message: e.to_string() }) } /// Make a GET request and return raw text response. pub fn get_text(&self, path: &str) -> Result { - self.agent - .get(&self.url(path)) + self.agent.get(&self.url(path)) .call() .and_then(|mut r| r.body_mut().read_to_string()) - .map_err(|e| BrkError { - message: e.to_string(), - }) + .map_err(|e| BrkError { message: e.to_string() }) } } /// Build series name with suffix. #[inline] fn _m(acc: &str, s: &str) -> String { - if s.is_empty() { - acc.to_string() - } else if acc.is_empty() { - s.to_string() - } else { - format!("{acc}_{s}") - } + if s.is_empty() { acc.to_string() } + else if acc.is_empty() { s.to_string() } + else { format!("{acc}_{s}") } } /// Build series name with prefix. #[inline] fn _p(prefix: &str, acc: &str) -> String { - if acc.is_empty() { - prefix.to_string() - } else { - format!("{prefix}_{acc}") - } + if acc.is_empty() { prefix.to_string() } else { format!("{prefix}_{acc}") } } + /// Non-generic trait for series patterns (usable in collections). pub trait AnySeriesPattern { /// Get the series name. @@ -138,6 +123,7 @@ pub trait SeriesPattern: AnySeriesPattern { fn get(&self, index: Index) -> Option>; } + /// Shared endpoint configuration. #[derive(Clone)] struct EndpointConfig { @@ -150,13 +136,7 @@ struct EndpointConfig { impl EndpointConfig { fn new(client: Arc, name: Arc, index: Index) -> Self { - Self { - client, - name, - index, - start: None, - end: None, - } + Self { client, name, index, start: None, end: None } } fn path(&self) -> String { @@ -165,21 +145,11 @@ impl EndpointConfig { fn build_path(&self, format: Option<&str>) -> String { let mut params = Vec::new(); - if let Some(s) = self.start { - params.push(format!("start={}", s)); - } - if let Some(e) = self.end { - params.push(format!("end={}", e)); - } - if let Some(fmt) = format { - params.push(format!("format={}", fmt)); - } + if let Some(s) = self.start { params.push(format!("start={}", s)); } + if let Some(e) = self.end { params.push(format!("end={}", e)); } + if let Some(fmt) = format { params.push(format!("format={}", fmt)); } let p = self.path(); - if params.is_empty() { - p - } else { - format!("{}?{}", p, params.join("&")) - } + if params.is_empty() { p } else { format!("{}?{}", p, params.join("&")) } } fn get_json(&self, format: Option<&str>) -> Result { @@ -219,20 +189,14 @@ pub type DateSeriesEndpoint = SeriesEndpoint>; impl SeriesEndpoint { pub fn new(client: Arc, name: Arc, index: Index) -> Self { - Self { - config: EndpointConfig::new(client, name, index), - _marker: std::marker::PhantomData, - } + Self { config: EndpointConfig::new(client, name, index), _marker: std::marker::PhantomData } } /// Select a specific index position. pub fn get(mut self, index: usize) -> SingleItemBuilder { self.config.start = Some(index as i64); self.config.end = Some(index as i64 + 1); - SingleItemBuilder { - config: self.config, - _marker: std::marker::PhantomData, - } + SingleItemBuilder { config: self.config, _marker: std::marker::PhantomData } } /// Select a range using Rust range syntax. @@ -254,10 +218,7 @@ impl SeriesEndpoint { Bound::Excluded(&n) => Some(n as i64), Bound::Unbounded => None, }; - RangeBuilder { - config: self.config, - _marker: std::marker::PhantomData, - } + RangeBuilder { config: self.config, _marker: std::marker::PhantomData } } /// Take the first n items. @@ -272,19 +233,13 @@ impl SeriesEndpoint { } else { self.config.start = Some(-(n as i64)); } - RangeBuilder { - config: self.config, - _marker: std::marker::PhantomData, - } + RangeBuilder { config: self.config, _marker: std::marker::PhantomData } } /// Skip the first n items. Chain with `take(n)` to get a range. pub fn skip(mut self, n: usize) -> SkippedBuilder { self.config.start = Some(n as i64); - SkippedBuilder { - config: self.config, - _marker: std::marker::PhantomData, - } + SkippedBuilder { config: self.config, _marker: std::marker::PhantomData } } /// Fetch all data as parsed JSON. @@ -325,11 +280,7 @@ impl SeriesEndpoint> { } /// Select a timestamp range (works for all date-based indexes including sub-daily). - pub fn timestamp_range( - self, - start: Timestamp, - end: Timestamp, - ) -> RangeBuilder> { + pub fn timestamp_range(self, start: Timestamp, end: Timestamp) -> RangeBuilder> { let s = self.config.index.timestamp_to_index(start).unwrap_or(0); let e = self.config.index.timestamp_to_index(end).unwrap_or(0); self.range(s..e) @@ -371,10 +322,7 @@ impl SkippedBuilder { pub fn take(mut self, n: usize) -> RangeBuilder { let start = self.config.start.unwrap_or(0); self.config.end = Some(start + n as i64); - RangeBuilder { - config: self.config, - _marker: std::marker::PhantomData, - } + RangeBuilder { config: self.config, _marker: std::marker::PhantomData } } /// Fetch from the skipped position to the end. @@ -409,42 +357,10 @@ impl RangeBuilder { } } + // Static index arrays -const _I1: &[Index] = &[ - Index::Minute10, - Index::Minute30, - Index::Hour1, - Index::Hour4, - Index::Hour12, - Index::Day1, - Index::Day3, - Index::Week1, - Index::Month1, - Index::Month3, - Index::Month6, - Index::Year1, - Index::Year10, - Index::Halving, - Index::Epoch, - Index::Height, -]; -const _I2: &[Index] = &[ - Index::Minute10, - Index::Minute30, - Index::Hour1, - Index::Hour4, - Index::Hour12, - Index::Day1, - Index::Day3, - Index::Week1, - Index::Month1, - Index::Month3, - Index::Month6, - Index::Year1, - Index::Year10, - Index::Halving, - Index::Epoch, -]; +const _I1: &[Index] = &[Index::Minute10, Index::Minute30, Index::Hour1, Index::Hour4, Index::Hour12, Index::Day1, Index::Day3, Index::Week1, Index::Month1, Index::Month3, Index::Month6, Index::Year1, Index::Year10, Index::Halving, Index::Epoch, Index::Height]; +const _I2: &[Index] = &[Index::Minute10, Index::Minute30, Index::Hour1, Index::Hour4, Index::Hour12, Index::Day1, Index::Day3, Index::Week1, Index::Month1, Index::Month3, Index::Month6, Index::Year1, Index::Year10, Index::Halving, Index::Epoch]; const _I3: &[Index] = &[Index::Minute10]; const _I4: &[Index] = &[Index::Minute30]; const _I5: &[Index] = &[Index::Hour1]; @@ -485,1753 +401,535 @@ fn _ep(c: &Arc, n: &Arc, i: Index) -> S } #[inline] -fn _dep( - c: &Arc, - n: &Arc, - i: Index, -) -> DateSeriesEndpoint { +fn _dep(c: &Arc, n: &Arc, i: Index) -> DateSeriesEndpoint { DateSeriesEndpoint::new(c.clone(), n.clone(), i) } // Index accessor structs -pub struct SeriesPattern1By { - client: Arc, - name: Arc, - _marker: std::marker::PhantomData, -} +pub struct SeriesPattern1By { client: Arc, name: Arc, _marker: std::marker::PhantomData } impl SeriesPattern1By { - pub fn minute10(&self) -> DateSeriesEndpoint { - _dep(&self.client, &self.name, Index::Minute10) - } - pub fn minute30(&self) -> DateSeriesEndpoint { - _dep(&self.client, &self.name, Index::Minute30) - } - pub fn hour1(&self) -> DateSeriesEndpoint { - _dep(&self.client, &self.name, Index::Hour1) - } - pub fn hour4(&self) -> DateSeriesEndpoint { - _dep(&self.client, &self.name, Index::Hour4) - } - pub fn hour12(&self) -> DateSeriesEndpoint { - _dep(&self.client, &self.name, Index::Hour12) - } - pub fn day1(&self) -> DateSeriesEndpoint { - _dep(&self.client, &self.name, Index::Day1) - } - pub fn day3(&self) -> DateSeriesEndpoint { - _dep(&self.client, &self.name, Index::Day3) - } - pub fn week1(&self) -> DateSeriesEndpoint { - _dep(&self.client, &self.name, Index::Week1) - } - pub fn month1(&self) -> DateSeriesEndpoint { - _dep(&self.client, &self.name, Index::Month1) - } - pub fn month3(&self) -> DateSeriesEndpoint { - _dep(&self.client, &self.name, Index::Month3) - } - pub fn month6(&self) -> DateSeriesEndpoint { - _dep(&self.client, &self.name, Index::Month6) - } - pub fn year1(&self) -> DateSeriesEndpoint { - _dep(&self.client, &self.name, Index::Year1) - } - pub fn year10(&self) -> DateSeriesEndpoint { - _dep(&self.client, &self.name, Index::Year10) - } - pub fn halving(&self) -> SeriesEndpoint { - _ep(&self.client, &self.name, Index::Halving) - } - pub fn epoch(&self) -> SeriesEndpoint { - _ep(&self.client, &self.name, Index::Epoch) - } - pub fn height(&self) -> SeriesEndpoint { - _ep(&self.client, &self.name, Index::Height) - } + pub fn minute10(&self) -> DateSeriesEndpoint { _dep(&self.client, &self.name, Index::Minute10) } + pub fn minute30(&self) -> DateSeriesEndpoint { _dep(&self.client, &self.name, Index::Minute30) } + pub fn hour1(&self) -> DateSeriesEndpoint { _dep(&self.client, &self.name, Index::Hour1) } + pub fn hour4(&self) -> DateSeriesEndpoint { _dep(&self.client, &self.name, Index::Hour4) } + pub fn hour12(&self) -> DateSeriesEndpoint { _dep(&self.client, &self.name, Index::Hour12) } + pub fn day1(&self) -> DateSeriesEndpoint { _dep(&self.client, &self.name, Index::Day1) } + pub fn day3(&self) -> DateSeriesEndpoint { _dep(&self.client, &self.name, Index::Day3) } + pub fn week1(&self) -> DateSeriesEndpoint { _dep(&self.client, &self.name, Index::Week1) } + pub fn month1(&self) -> DateSeriesEndpoint { _dep(&self.client, &self.name, Index::Month1) } + pub fn month3(&self) -> DateSeriesEndpoint { _dep(&self.client, &self.name, Index::Month3) } + pub fn month6(&self) -> DateSeriesEndpoint { _dep(&self.client, &self.name, Index::Month6) } + pub fn year1(&self) -> DateSeriesEndpoint { _dep(&self.client, &self.name, Index::Year1) } + pub fn year10(&self) -> DateSeriesEndpoint { _dep(&self.client, &self.name, Index::Year10) } + pub fn halving(&self) -> SeriesEndpoint { _ep(&self.client, &self.name, Index::Halving) } + pub fn epoch(&self) -> SeriesEndpoint { _ep(&self.client, &self.name, Index::Epoch) } + pub fn height(&self) -> SeriesEndpoint { _ep(&self.client, &self.name, Index::Height) } } -pub struct SeriesPattern1 { - name: Arc, - pub by: SeriesPattern1By, -} +pub struct SeriesPattern1 { name: Arc, pub by: SeriesPattern1By } impl SeriesPattern1 { - pub fn new(client: Arc, name: String) -> Self { - let name: Arc = name.into(); - Self { - name: name.clone(), - by: SeriesPattern1By { - client, - name, - _marker: std::marker::PhantomData, - }, - } - } - pub fn name(&self) -> &str { - &self.name - } + pub fn new(client: Arc, name: String) -> Self { let name: Arc = name.into(); Self { name: name.clone(), by: SeriesPattern1By { client, name, _marker: std::marker::PhantomData } } } + pub fn name(&self) -> &str { &self.name } } -impl AnySeriesPattern for SeriesPattern1 { - fn name(&self) -> &str { - &self.name - } - fn indexes(&self) -> &'static [Index] { - _I1 - } -} -impl SeriesPattern for SeriesPattern1 { - fn get(&self, index: Index) -> Option> { - _I1.contains(&index) - .then(|| _ep(&self.by.client, &self.by.name, index)) - } -} +impl AnySeriesPattern for SeriesPattern1 { fn name(&self) -> &str { &self.name } fn indexes(&self) -> &'static [Index] { _I1 } } +impl SeriesPattern for SeriesPattern1 { fn get(&self, index: Index) -> Option> { _I1.contains(&index).then(|| _ep(&self.by.client, &self.by.name, index)) } } -pub struct SeriesPattern2By { - client: Arc, - name: Arc, - _marker: std::marker::PhantomData, -} +pub struct SeriesPattern2By { client: Arc, name: Arc, _marker: std::marker::PhantomData } impl SeriesPattern2By { - pub fn minute10(&self) -> DateSeriesEndpoint { - _dep(&self.client, &self.name, Index::Minute10) - } - pub fn minute30(&self) -> DateSeriesEndpoint { - _dep(&self.client, &self.name, Index::Minute30) - } - pub fn hour1(&self) -> DateSeriesEndpoint { - _dep(&self.client, &self.name, Index::Hour1) - } - pub fn hour4(&self) -> DateSeriesEndpoint { - _dep(&self.client, &self.name, Index::Hour4) - } - pub fn hour12(&self) -> DateSeriesEndpoint { - _dep(&self.client, &self.name, Index::Hour12) - } - pub fn day1(&self) -> DateSeriesEndpoint { - _dep(&self.client, &self.name, Index::Day1) - } - pub fn day3(&self) -> DateSeriesEndpoint { - _dep(&self.client, &self.name, Index::Day3) - } - pub fn week1(&self) -> DateSeriesEndpoint { - _dep(&self.client, &self.name, Index::Week1) - } - pub fn month1(&self) -> DateSeriesEndpoint { - _dep(&self.client, &self.name, Index::Month1) - } - pub fn month3(&self) -> DateSeriesEndpoint { - _dep(&self.client, &self.name, Index::Month3) - } - pub fn month6(&self) -> DateSeriesEndpoint { - _dep(&self.client, &self.name, Index::Month6) - } - pub fn year1(&self) -> DateSeriesEndpoint { - _dep(&self.client, &self.name, Index::Year1) - } - pub fn year10(&self) -> DateSeriesEndpoint { - _dep(&self.client, &self.name, Index::Year10) - } - pub fn halving(&self) -> SeriesEndpoint { - _ep(&self.client, &self.name, Index::Halving) - } - pub fn epoch(&self) -> SeriesEndpoint { - _ep(&self.client, &self.name, Index::Epoch) - } + pub fn minute10(&self) -> DateSeriesEndpoint { _dep(&self.client, &self.name, Index::Minute10) } + pub fn minute30(&self) -> DateSeriesEndpoint { _dep(&self.client, &self.name, Index::Minute30) } + pub fn hour1(&self) -> DateSeriesEndpoint { _dep(&self.client, &self.name, Index::Hour1) } + pub fn hour4(&self) -> DateSeriesEndpoint { _dep(&self.client, &self.name, Index::Hour4) } + pub fn hour12(&self) -> DateSeriesEndpoint { _dep(&self.client, &self.name, Index::Hour12) } + pub fn day1(&self) -> DateSeriesEndpoint { _dep(&self.client, &self.name, Index::Day1) } + pub fn day3(&self) -> DateSeriesEndpoint { _dep(&self.client, &self.name, Index::Day3) } + pub fn week1(&self) -> DateSeriesEndpoint { _dep(&self.client, &self.name, Index::Week1) } + pub fn month1(&self) -> DateSeriesEndpoint { _dep(&self.client, &self.name, Index::Month1) } + pub fn month3(&self) -> DateSeriesEndpoint { _dep(&self.client, &self.name, Index::Month3) } + pub fn month6(&self) -> DateSeriesEndpoint { _dep(&self.client, &self.name, Index::Month6) } + pub fn year1(&self) -> DateSeriesEndpoint { _dep(&self.client, &self.name, Index::Year1) } + pub fn year10(&self) -> DateSeriesEndpoint { _dep(&self.client, &self.name, Index::Year10) } + pub fn halving(&self) -> SeriesEndpoint { _ep(&self.client, &self.name, Index::Halving) } + pub fn epoch(&self) -> SeriesEndpoint { _ep(&self.client, &self.name, Index::Epoch) } } -pub struct SeriesPattern2 { - name: Arc, - pub by: SeriesPattern2By, -} +pub struct SeriesPattern2 { name: Arc, pub by: SeriesPattern2By } impl SeriesPattern2 { - pub fn new(client: Arc, name: String) -> Self { - let name: Arc = name.into(); - Self { - name: name.clone(), - by: SeriesPattern2By { - client, - name, - _marker: std::marker::PhantomData, - }, - } - } - pub fn name(&self) -> &str { - &self.name - } + pub fn new(client: Arc, name: String) -> Self { let name: Arc = name.into(); Self { name: name.clone(), by: SeriesPattern2By { client, name, _marker: std::marker::PhantomData } } } + pub fn name(&self) -> &str { &self.name } } -impl AnySeriesPattern for SeriesPattern2 { - fn name(&self) -> &str { - &self.name - } - fn indexes(&self) -> &'static [Index] { - _I2 - } -} -impl SeriesPattern for SeriesPattern2 { - fn get(&self, index: Index) -> Option> { - _I2.contains(&index) - .then(|| _ep(&self.by.client, &self.by.name, index)) - } -} +impl AnySeriesPattern for SeriesPattern2 { fn name(&self) -> &str { &self.name } fn indexes(&self) -> &'static [Index] { _I2 } } +impl SeriesPattern for SeriesPattern2 { fn get(&self, index: Index) -> Option> { _I2.contains(&index).then(|| _ep(&self.by.client, &self.by.name, index)) } } -pub struct SeriesPattern3By { - client: Arc, - name: Arc, - _marker: std::marker::PhantomData, -} +pub struct SeriesPattern3By { client: Arc, name: Arc, _marker: std::marker::PhantomData } impl SeriesPattern3By { - pub fn minute10(&self) -> DateSeriesEndpoint { - _dep(&self.client, &self.name, Index::Minute10) - } + pub fn minute10(&self) -> DateSeriesEndpoint { _dep(&self.client, &self.name, Index::Minute10) } } -pub struct SeriesPattern3 { - name: Arc, - pub by: SeriesPattern3By, -} +pub struct SeriesPattern3 { name: Arc, pub by: SeriesPattern3By } impl SeriesPattern3 { - pub fn new(client: Arc, name: String) -> Self { - let name: Arc = name.into(); - Self { - name: name.clone(), - by: SeriesPattern3By { - client, - name, - _marker: std::marker::PhantomData, - }, - } - } - pub fn name(&self) -> &str { - &self.name - } + pub fn new(client: Arc, name: String) -> Self { let name: Arc = name.into(); Self { name: name.clone(), by: SeriesPattern3By { client, name, _marker: std::marker::PhantomData } } } + pub fn name(&self) -> &str { &self.name } } -impl AnySeriesPattern for SeriesPattern3 { - fn name(&self) -> &str { - &self.name - } - fn indexes(&self) -> &'static [Index] { - _I3 - } -} -impl SeriesPattern for SeriesPattern3 { - fn get(&self, index: Index) -> Option> { - _I3.contains(&index) - .then(|| _ep(&self.by.client, &self.by.name, index)) - } -} +impl AnySeriesPattern for SeriesPattern3 { fn name(&self) -> &str { &self.name } fn indexes(&self) -> &'static [Index] { _I3 } } +impl SeriesPattern for SeriesPattern3 { fn get(&self, index: Index) -> Option> { _I3.contains(&index).then(|| _ep(&self.by.client, &self.by.name, index)) } } -pub struct SeriesPattern4By { - client: Arc, - name: Arc, - _marker: std::marker::PhantomData, -} +pub struct SeriesPattern4By { client: Arc, name: Arc, _marker: std::marker::PhantomData } impl SeriesPattern4By { - pub fn minute30(&self) -> DateSeriesEndpoint { - _dep(&self.client, &self.name, Index::Minute30) - } + pub fn minute30(&self) -> DateSeriesEndpoint { _dep(&self.client, &self.name, Index::Minute30) } } -pub struct SeriesPattern4 { - name: Arc, - pub by: SeriesPattern4By, -} +pub struct SeriesPattern4 { name: Arc, pub by: SeriesPattern4By } impl SeriesPattern4 { - pub fn new(client: Arc, name: String) -> Self { - let name: Arc = name.into(); - Self { - name: name.clone(), - by: SeriesPattern4By { - client, - name, - _marker: std::marker::PhantomData, - }, - } - } - pub fn name(&self) -> &str { - &self.name - } + pub fn new(client: Arc, name: String) -> Self { let name: Arc = name.into(); Self { name: name.clone(), by: SeriesPattern4By { client, name, _marker: std::marker::PhantomData } } } + pub fn name(&self) -> &str { &self.name } } -impl AnySeriesPattern for SeriesPattern4 { - fn name(&self) -> &str { - &self.name - } - fn indexes(&self) -> &'static [Index] { - _I4 - } -} -impl SeriesPattern for SeriesPattern4 { - fn get(&self, index: Index) -> Option> { - _I4.contains(&index) - .then(|| _ep(&self.by.client, &self.by.name, index)) - } -} +impl AnySeriesPattern for SeriesPattern4 { fn name(&self) -> &str { &self.name } fn indexes(&self) -> &'static [Index] { _I4 } } +impl SeriesPattern for SeriesPattern4 { fn get(&self, index: Index) -> Option> { _I4.contains(&index).then(|| _ep(&self.by.client, &self.by.name, index)) } } -pub struct SeriesPattern5By { - client: Arc, - name: Arc, - _marker: std::marker::PhantomData, -} +pub struct SeriesPattern5By { client: Arc, name: Arc, _marker: std::marker::PhantomData } impl SeriesPattern5By { - pub fn hour1(&self) -> DateSeriesEndpoint { - _dep(&self.client, &self.name, Index::Hour1) - } + pub fn hour1(&self) -> DateSeriesEndpoint { _dep(&self.client, &self.name, Index::Hour1) } } -pub struct SeriesPattern5 { - name: Arc, - pub by: SeriesPattern5By, -} +pub struct SeriesPattern5 { name: Arc, pub by: SeriesPattern5By } impl SeriesPattern5 { - pub fn new(client: Arc, name: String) -> Self { - let name: Arc = name.into(); - Self { - name: name.clone(), - by: SeriesPattern5By { - client, - name, - _marker: std::marker::PhantomData, - }, - } - } - pub fn name(&self) -> &str { - &self.name - } + pub fn new(client: Arc, name: String) -> Self { let name: Arc = name.into(); Self { name: name.clone(), by: SeriesPattern5By { client, name, _marker: std::marker::PhantomData } } } + pub fn name(&self) -> &str { &self.name } } -impl AnySeriesPattern for SeriesPattern5 { - fn name(&self) -> &str { - &self.name - } - fn indexes(&self) -> &'static [Index] { - _I5 - } -} -impl SeriesPattern for SeriesPattern5 { - fn get(&self, index: Index) -> Option> { - _I5.contains(&index) - .then(|| _ep(&self.by.client, &self.by.name, index)) - } -} +impl AnySeriesPattern for SeriesPattern5 { fn name(&self) -> &str { &self.name } fn indexes(&self) -> &'static [Index] { _I5 } } +impl SeriesPattern for SeriesPattern5 { fn get(&self, index: Index) -> Option> { _I5.contains(&index).then(|| _ep(&self.by.client, &self.by.name, index)) } } -pub struct SeriesPattern6By { - client: Arc, - name: Arc, - _marker: std::marker::PhantomData, -} +pub struct SeriesPattern6By { client: Arc, name: Arc, _marker: std::marker::PhantomData } impl SeriesPattern6By { - pub fn hour4(&self) -> DateSeriesEndpoint { - _dep(&self.client, &self.name, Index::Hour4) - } + pub fn hour4(&self) -> DateSeriesEndpoint { _dep(&self.client, &self.name, Index::Hour4) } } -pub struct SeriesPattern6 { - name: Arc, - pub by: SeriesPattern6By, -} +pub struct SeriesPattern6 { name: Arc, pub by: SeriesPattern6By } impl SeriesPattern6 { - pub fn new(client: Arc, name: String) -> Self { - let name: Arc = name.into(); - Self { - name: name.clone(), - by: SeriesPattern6By { - client, - name, - _marker: std::marker::PhantomData, - }, - } - } - pub fn name(&self) -> &str { - &self.name - } + pub fn new(client: Arc, name: String) -> Self { let name: Arc = name.into(); Self { name: name.clone(), by: SeriesPattern6By { client, name, _marker: std::marker::PhantomData } } } + pub fn name(&self) -> &str { &self.name } } -impl AnySeriesPattern for SeriesPattern6 { - fn name(&self) -> &str { - &self.name - } - fn indexes(&self) -> &'static [Index] { - _I6 - } -} -impl SeriesPattern for SeriesPattern6 { - fn get(&self, index: Index) -> Option> { - _I6.contains(&index) - .then(|| _ep(&self.by.client, &self.by.name, index)) - } -} +impl AnySeriesPattern for SeriesPattern6 { fn name(&self) -> &str { &self.name } fn indexes(&self) -> &'static [Index] { _I6 } } +impl SeriesPattern for SeriesPattern6 { fn get(&self, index: Index) -> Option> { _I6.contains(&index).then(|| _ep(&self.by.client, &self.by.name, index)) } } -pub struct SeriesPattern7By { - client: Arc, - name: Arc, - _marker: std::marker::PhantomData, -} +pub struct SeriesPattern7By { client: Arc, name: Arc, _marker: std::marker::PhantomData } impl SeriesPattern7By { - pub fn hour12(&self) -> DateSeriesEndpoint { - _dep(&self.client, &self.name, Index::Hour12) - } + pub fn hour12(&self) -> DateSeriesEndpoint { _dep(&self.client, &self.name, Index::Hour12) } } -pub struct SeriesPattern7 { - name: Arc, - pub by: SeriesPattern7By, -} +pub struct SeriesPattern7 { name: Arc, pub by: SeriesPattern7By } impl SeriesPattern7 { - pub fn new(client: Arc, name: String) -> Self { - let name: Arc = name.into(); - Self { - name: name.clone(), - by: SeriesPattern7By { - client, - name, - _marker: std::marker::PhantomData, - }, - } - } - pub fn name(&self) -> &str { - &self.name - } + pub fn new(client: Arc, name: String) -> Self { let name: Arc = name.into(); Self { name: name.clone(), by: SeriesPattern7By { client, name, _marker: std::marker::PhantomData } } } + pub fn name(&self) -> &str { &self.name } } -impl AnySeriesPattern for SeriesPattern7 { - fn name(&self) -> &str { - &self.name - } - fn indexes(&self) -> &'static [Index] { - _I7 - } -} -impl SeriesPattern for SeriesPattern7 { - fn get(&self, index: Index) -> Option> { - _I7.contains(&index) - .then(|| _ep(&self.by.client, &self.by.name, index)) - } -} +impl AnySeriesPattern for SeriesPattern7 { fn name(&self) -> &str { &self.name } fn indexes(&self) -> &'static [Index] { _I7 } } +impl SeriesPattern for SeriesPattern7 { fn get(&self, index: Index) -> Option> { _I7.contains(&index).then(|| _ep(&self.by.client, &self.by.name, index)) } } -pub struct SeriesPattern8By { - client: Arc, - name: Arc, - _marker: std::marker::PhantomData, -} +pub struct SeriesPattern8By { client: Arc, name: Arc, _marker: std::marker::PhantomData } impl SeriesPattern8By { - pub fn day1(&self) -> DateSeriesEndpoint { - _dep(&self.client, &self.name, Index::Day1) - } + pub fn day1(&self) -> DateSeriesEndpoint { _dep(&self.client, &self.name, Index::Day1) } } -pub struct SeriesPattern8 { - name: Arc, - pub by: SeriesPattern8By, -} +pub struct SeriesPattern8 { name: Arc, pub by: SeriesPattern8By } impl SeriesPattern8 { - pub fn new(client: Arc, name: String) -> Self { - let name: Arc = name.into(); - Self { - name: name.clone(), - by: SeriesPattern8By { - client, - name, - _marker: std::marker::PhantomData, - }, - } - } - pub fn name(&self) -> &str { - &self.name - } + pub fn new(client: Arc, name: String) -> Self { let name: Arc = name.into(); Self { name: name.clone(), by: SeriesPattern8By { client, name, _marker: std::marker::PhantomData } } } + pub fn name(&self) -> &str { &self.name } } -impl AnySeriesPattern for SeriesPattern8 { - fn name(&self) -> &str { - &self.name - } - fn indexes(&self) -> &'static [Index] { - _I8 - } -} -impl SeriesPattern for SeriesPattern8 { - fn get(&self, index: Index) -> Option> { - _I8.contains(&index) - .then(|| _ep(&self.by.client, &self.by.name, index)) - } -} +impl AnySeriesPattern for SeriesPattern8 { fn name(&self) -> &str { &self.name } fn indexes(&self) -> &'static [Index] { _I8 } } +impl SeriesPattern for SeriesPattern8 { fn get(&self, index: Index) -> Option> { _I8.contains(&index).then(|| _ep(&self.by.client, &self.by.name, index)) } } -pub struct SeriesPattern9By { - client: Arc, - name: Arc, - _marker: std::marker::PhantomData, -} +pub struct SeriesPattern9By { client: Arc, name: Arc, _marker: std::marker::PhantomData } impl SeriesPattern9By { - pub fn day3(&self) -> DateSeriesEndpoint { - _dep(&self.client, &self.name, Index::Day3) - } + pub fn day3(&self) -> DateSeriesEndpoint { _dep(&self.client, &self.name, Index::Day3) } } -pub struct SeriesPattern9 { - name: Arc, - pub by: SeriesPattern9By, -} +pub struct SeriesPattern9 { name: Arc, pub by: SeriesPattern9By } impl SeriesPattern9 { - pub fn new(client: Arc, name: String) -> Self { - let name: Arc = name.into(); - Self { - name: name.clone(), - by: SeriesPattern9By { - client, - name, - _marker: std::marker::PhantomData, - }, - } - } - pub fn name(&self) -> &str { - &self.name - } + pub fn new(client: Arc, name: String) -> Self { let name: Arc = name.into(); Self { name: name.clone(), by: SeriesPattern9By { client, name, _marker: std::marker::PhantomData } } } + pub fn name(&self) -> &str { &self.name } } -impl AnySeriesPattern for SeriesPattern9 { - fn name(&self) -> &str { - &self.name - } - fn indexes(&self) -> &'static [Index] { - _I9 - } -} -impl SeriesPattern for SeriesPattern9 { - fn get(&self, index: Index) -> Option> { - _I9.contains(&index) - .then(|| _ep(&self.by.client, &self.by.name, index)) - } -} +impl AnySeriesPattern for SeriesPattern9 { fn name(&self) -> &str { &self.name } fn indexes(&self) -> &'static [Index] { _I9 } } +impl SeriesPattern for SeriesPattern9 { fn get(&self, index: Index) -> Option> { _I9.contains(&index).then(|| _ep(&self.by.client, &self.by.name, index)) } } -pub struct SeriesPattern10By { - client: Arc, - name: Arc, - _marker: std::marker::PhantomData, -} +pub struct SeriesPattern10By { client: Arc, name: Arc, _marker: std::marker::PhantomData } impl SeriesPattern10By { - pub fn week1(&self) -> DateSeriesEndpoint { - _dep(&self.client, &self.name, Index::Week1) - } + pub fn week1(&self) -> DateSeriesEndpoint { _dep(&self.client, &self.name, Index::Week1) } } -pub struct SeriesPattern10 { - name: Arc, - pub by: SeriesPattern10By, -} +pub struct SeriesPattern10 { name: Arc, pub by: SeriesPattern10By } impl SeriesPattern10 { - pub fn new(client: Arc, name: String) -> Self { - let name: Arc = name.into(); - Self { - name: name.clone(), - by: SeriesPattern10By { - client, - name, - _marker: std::marker::PhantomData, - }, - } - } - pub fn name(&self) -> &str { - &self.name - } + pub fn new(client: Arc, name: String) -> Self { let name: Arc = name.into(); Self { name: name.clone(), by: SeriesPattern10By { client, name, _marker: std::marker::PhantomData } } } + pub fn name(&self) -> &str { &self.name } } -impl AnySeriesPattern for SeriesPattern10 { - fn name(&self) -> &str { - &self.name - } - fn indexes(&self) -> &'static [Index] { - _I10 - } -} -impl SeriesPattern for SeriesPattern10 { - fn get(&self, index: Index) -> Option> { - _I10.contains(&index) - .then(|| _ep(&self.by.client, &self.by.name, index)) - } -} +impl AnySeriesPattern for SeriesPattern10 { fn name(&self) -> &str { &self.name } fn indexes(&self) -> &'static [Index] { _I10 } } +impl SeriesPattern for SeriesPattern10 { fn get(&self, index: Index) -> Option> { _I10.contains(&index).then(|| _ep(&self.by.client, &self.by.name, index)) } } -pub struct SeriesPattern11By { - client: Arc, - name: Arc, - _marker: std::marker::PhantomData, -} +pub struct SeriesPattern11By { client: Arc, name: Arc, _marker: std::marker::PhantomData } impl SeriesPattern11By { - pub fn month1(&self) -> DateSeriesEndpoint { - _dep(&self.client, &self.name, Index::Month1) - } + pub fn month1(&self) -> DateSeriesEndpoint { _dep(&self.client, &self.name, Index::Month1) } } -pub struct SeriesPattern11 { - name: Arc, - pub by: SeriesPattern11By, -} +pub struct SeriesPattern11 { name: Arc, pub by: SeriesPattern11By } impl SeriesPattern11 { - pub fn new(client: Arc, name: String) -> Self { - let name: Arc = name.into(); - Self { - name: name.clone(), - by: SeriesPattern11By { - client, - name, - _marker: std::marker::PhantomData, - }, - } - } - pub fn name(&self) -> &str { - &self.name - } + pub fn new(client: Arc, name: String) -> Self { let name: Arc = name.into(); Self { name: name.clone(), by: SeriesPattern11By { client, name, _marker: std::marker::PhantomData } } } + pub fn name(&self) -> &str { &self.name } } -impl AnySeriesPattern for SeriesPattern11 { - fn name(&self) -> &str { - &self.name - } - fn indexes(&self) -> &'static [Index] { - _I11 - } -} -impl SeriesPattern for SeriesPattern11 { - fn get(&self, index: Index) -> Option> { - _I11.contains(&index) - .then(|| _ep(&self.by.client, &self.by.name, index)) - } -} +impl AnySeriesPattern for SeriesPattern11 { fn name(&self) -> &str { &self.name } fn indexes(&self) -> &'static [Index] { _I11 } } +impl SeriesPattern for SeriesPattern11 { fn get(&self, index: Index) -> Option> { _I11.contains(&index).then(|| _ep(&self.by.client, &self.by.name, index)) } } -pub struct SeriesPattern12By { - client: Arc, - name: Arc, - _marker: std::marker::PhantomData, -} +pub struct SeriesPattern12By { client: Arc, name: Arc, _marker: std::marker::PhantomData } impl SeriesPattern12By { - pub fn month3(&self) -> DateSeriesEndpoint { - _dep(&self.client, &self.name, Index::Month3) - } + pub fn month3(&self) -> DateSeriesEndpoint { _dep(&self.client, &self.name, Index::Month3) } } -pub struct SeriesPattern12 { - name: Arc, - pub by: SeriesPattern12By, -} +pub struct SeriesPattern12 { name: Arc, pub by: SeriesPattern12By } impl SeriesPattern12 { - pub fn new(client: Arc, name: String) -> Self { - let name: Arc = name.into(); - Self { - name: name.clone(), - by: SeriesPattern12By { - client, - name, - _marker: std::marker::PhantomData, - }, - } - } - pub fn name(&self) -> &str { - &self.name - } + pub fn new(client: Arc, name: String) -> Self { let name: Arc = name.into(); Self { name: name.clone(), by: SeriesPattern12By { client, name, _marker: std::marker::PhantomData } } } + pub fn name(&self) -> &str { &self.name } } -impl AnySeriesPattern for SeriesPattern12 { - fn name(&self) -> &str { - &self.name - } - fn indexes(&self) -> &'static [Index] { - _I12 - } -} -impl SeriesPattern for SeriesPattern12 { - fn get(&self, index: Index) -> Option> { - _I12.contains(&index) - .then(|| _ep(&self.by.client, &self.by.name, index)) - } -} +impl AnySeriesPattern for SeriesPattern12 { fn name(&self) -> &str { &self.name } fn indexes(&self) -> &'static [Index] { _I12 } } +impl SeriesPattern for SeriesPattern12 { fn get(&self, index: Index) -> Option> { _I12.contains(&index).then(|| _ep(&self.by.client, &self.by.name, index)) } } -pub struct SeriesPattern13By { - client: Arc, - name: Arc, - _marker: std::marker::PhantomData, -} +pub struct SeriesPattern13By { client: Arc, name: Arc, _marker: std::marker::PhantomData } impl SeriesPattern13By { - pub fn month6(&self) -> DateSeriesEndpoint { - _dep(&self.client, &self.name, Index::Month6) - } + pub fn month6(&self) -> DateSeriesEndpoint { _dep(&self.client, &self.name, Index::Month6) } } -pub struct SeriesPattern13 { - name: Arc, - pub by: SeriesPattern13By, -} +pub struct SeriesPattern13 { name: Arc, pub by: SeriesPattern13By } impl SeriesPattern13 { - pub fn new(client: Arc, name: String) -> Self { - let name: Arc = name.into(); - Self { - name: name.clone(), - by: SeriesPattern13By { - client, - name, - _marker: std::marker::PhantomData, - }, - } - } - pub fn name(&self) -> &str { - &self.name - } + pub fn new(client: Arc, name: String) -> Self { let name: Arc = name.into(); Self { name: name.clone(), by: SeriesPattern13By { client, name, _marker: std::marker::PhantomData } } } + pub fn name(&self) -> &str { &self.name } } -impl AnySeriesPattern for SeriesPattern13 { - fn name(&self) -> &str { - &self.name - } - fn indexes(&self) -> &'static [Index] { - _I13 - } -} -impl SeriesPattern for SeriesPattern13 { - fn get(&self, index: Index) -> Option> { - _I13.contains(&index) - .then(|| _ep(&self.by.client, &self.by.name, index)) - } -} +impl AnySeriesPattern for SeriesPattern13 { fn name(&self) -> &str { &self.name } fn indexes(&self) -> &'static [Index] { _I13 } } +impl SeriesPattern for SeriesPattern13 { fn get(&self, index: Index) -> Option> { _I13.contains(&index).then(|| _ep(&self.by.client, &self.by.name, index)) } } -pub struct SeriesPattern14By { - client: Arc, - name: Arc, - _marker: std::marker::PhantomData, -} +pub struct SeriesPattern14By { client: Arc, name: Arc, _marker: std::marker::PhantomData } impl SeriesPattern14By { - pub fn year1(&self) -> DateSeriesEndpoint { - _dep(&self.client, &self.name, Index::Year1) - } + pub fn year1(&self) -> DateSeriesEndpoint { _dep(&self.client, &self.name, Index::Year1) } } -pub struct SeriesPattern14 { - name: Arc, - pub by: SeriesPattern14By, -} +pub struct SeriesPattern14 { name: Arc, pub by: SeriesPattern14By } impl SeriesPattern14 { - pub fn new(client: Arc, name: String) -> Self { - let name: Arc = name.into(); - Self { - name: name.clone(), - by: SeriesPattern14By { - client, - name, - _marker: std::marker::PhantomData, - }, - } - } - pub fn name(&self) -> &str { - &self.name - } + pub fn new(client: Arc, name: String) -> Self { let name: Arc = name.into(); Self { name: name.clone(), by: SeriesPattern14By { client, name, _marker: std::marker::PhantomData } } } + pub fn name(&self) -> &str { &self.name } } -impl AnySeriesPattern for SeriesPattern14 { - fn name(&self) -> &str { - &self.name - } - fn indexes(&self) -> &'static [Index] { - _I14 - } -} -impl SeriesPattern for SeriesPattern14 { - fn get(&self, index: Index) -> Option> { - _I14.contains(&index) - .then(|| _ep(&self.by.client, &self.by.name, index)) - } -} +impl AnySeriesPattern for SeriesPattern14 { fn name(&self) -> &str { &self.name } fn indexes(&self) -> &'static [Index] { _I14 } } +impl SeriesPattern for SeriesPattern14 { fn get(&self, index: Index) -> Option> { _I14.contains(&index).then(|| _ep(&self.by.client, &self.by.name, index)) } } -pub struct SeriesPattern15By { - client: Arc, - name: Arc, - _marker: std::marker::PhantomData, -} +pub struct SeriesPattern15By { client: Arc, name: Arc, _marker: std::marker::PhantomData } impl SeriesPattern15By { - pub fn year10(&self) -> DateSeriesEndpoint { - _dep(&self.client, &self.name, Index::Year10) - } + pub fn year10(&self) -> DateSeriesEndpoint { _dep(&self.client, &self.name, Index::Year10) } } -pub struct SeriesPattern15 { - name: Arc, - pub by: SeriesPattern15By, -} +pub struct SeriesPattern15 { name: Arc, pub by: SeriesPattern15By } impl SeriesPattern15 { - pub fn new(client: Arc, name: String) -> Self { - let name: Arc = name.into(); - Self { - name: name.clone(), - by: SeriesPattern15By { - client, - name, - _marker: std::marker::PhantomData, - }, - } - } - pub fn name(&self) -> &str { - &self.name - } + pub fn new(client: Arc, name: String) -> Self { let name: Arc = name.into(); Self { name: name.clone(), by: SeriesPattern15By { client, name, _marker: std::marker::PhantomData } } } + pub fn name(&self) -> &str { &self.name } } -impl AnySeriesPattern for SeriesPattern15 { - fn name(&self) -> &str { - &self.name - } - fn indexes(&self) -> &'static [Index] { - _I15 - } -} -impl SeriesPattern for SeriesPattern15 { - fn get(&self, index: Index) -> Option> { - _I15.contains(&index) - .then(|| _ep(&self.by.client, &self.by.name, index)) - } -} +impl AnySeriesPattern for SeriesPattern15 { fn name(&self) -> &str { &self.name } fn indexes(&self) -> &'static [Index] { _I15 } } +impl SeriesPattern for SeriesPattern15 { fn get(&self, index: Index) -> Option> { _I15.contains(&index).then(|| _ep(&self.by.client, &self.by.name, index)) } } -pub struct SeriesPattern16By { - client: Arc, - name: Arc, - _marker: std::marker::PhantomData, -} +pub struct SeriesPattern16By { client: Arc, name: Arc, _marker: std::marker::PhantomData } impl SeriesPattern16By { - pub fn halving(&self) -> SeriesEndpoint { - _ep(&self.client, &self.name, Index::Halving) - } + pub fn halving(&self) -> SeriesEndpoint { _ep(&self.client, &self.name, Index::Halving) } } -pub struct SeriesPattern16 { - name: Arc, - pub by: SeriesPattern16By, -} +pub struct SeriesPattern16 { name: Arc, pub by: SeriesPattern16By } impl SeriesPattern16 { - pub fn new(client: Arc, name: String) -> Self { - let name: Arc = name.into(); - Self { - name: name.clone(), - by: SeriesPattern16By { - client, - name, - _marker: std::marker::PhantomData, - }, - } - } - pub fn name(&self) -> &str { - &self.name - } + pub fn new(client: Arc, name: String) -> Self { let name: Arc = name.into(); Self { name: name.clone(), by: SeriesPattern16By { client, name, _marker: std::marker::PhantomData } } } + pub fn name(&self) -> &str { &self.name } } -impl AnySeriesPattern for SeriesPattern16 { - fn name(&self) -> &str { - &self.name - } - fn indexes(&self) -> &'static [Index] { - _I16 - } -} -impl SeriesPattern for SeriesPattern16 { - fn get(&self, index: Index) -> Option> { - _I16.contains(&index) - .then(|| _ep(&self.by.client, &self.by.name, index)) - } -} +impl AnySeriesPattern for SeriesPattern16 { fn name(&self) -> &str { &self.name } fn indexes(&self) -> &'static [Index] { _I16 } } +impl SeriesPattern for SeriesPattern16 { fn get(&self, index: Index) -> Option> { _I16.contains(&index).then(|| _ep(&self.by.client, &self.by.name, index)) } } -pub struct SeriesPattern17By { - client: Arc, - name: Arc, - _marker: std::marker::PhantomData, -} +pub struct SeriesPattern17By { client: Arc, name: Arc, _marker: std::marker::PhantomData } impl SeriesPattern17By { - pub fn epoch(&self) -> SeriesEndpoint { - _ep(&self.client, &self.name, Index::Epoch) - } + pub fn epoch(&self) -> SeriesEndpoint { _ep(&self.client, &self.name, Index::Epoch) } } -pub struct SeriesPattern17 { - name: Arc, - pub by: SeriesPattern17By, -} +pub struct SeriesPattern17 { name: Arc, pub by: SeriesPattern17By } impl SeriesPattern17 { - pub fn new(client: Arc, name: String) -> Self { - let name: Arc = name.into(); - Self { - name: name.clone(), - by: SeriesPattern17By { - client, - name, - _marker: std::marker::PhantomData, - }, - } - } - pub fn name(&self) -> &str { - &self.name - } + pub fn new(client: Arc, name: String) -> Self { let name: Arc = name.into(); Self { name: name.clone(), by: SeriesPattern17By { client, name, _marker: std::marker::PhantomData } } } + pub fn name(&self) -> &str { &self.name } } -impl AnySeriesPattern for SeriesPattern17 { - fn name(&self) -> &str { - &self.name - } - fn indexes(&self) -> &'static [Index] { - _I17 - } -} -impl SeriesPattern for SeriesPattern17 { - fn get(&self, index: Index) -> Option> { - _I17.contains(&index) - .then(|| _ep(&self.by.client, &self.by.name, index)) - } -} +impl AnySeriesPattern for SeriesPattern17 { fn name(&self) -> &str { &self.name } fn indexes(&self) -> &'static [Index] { _I17 } } +impl SeriesPattern for SeriesPattern17 { fn get(&self, index: Index) -> Option> { _I17.contains(&index).then(|| _ep(&self.by.client, &self.by.name, index)) } } -pub struct SeriesPattern18By { - client: Arc, - name: Arc, - _marker: std::marker::PhantomData, -} +pub struct SeriesPattern18By { client: Arc, name: Arc, _marker: std::marker::PhantomData } impl SeriesPattern18By { - pub fn height(&self) -> SeriesEndpoint { - _ep(&self.client, &self.name, Index::Height) - } + pub fn height(&self) -> SeriesEndpoint { _ep(&self.client, &self.name, Index::Height) } } -pub struct SeriesPattern18 { - name: Arc, - pub by: SeriesPattern18By, -} +pub struct SeriesPattern18 { name: Arc, pub by: SeriesPattern18By } impl SeriesPattern18 { - pub fn new(client: Arc, name: String) -> Self { - let name: Arc = name.into(); - Self { - name: name.clone(), - by: SeriesPattern18By { - client, - name, - _marker: std::marker::PhantomData, - }, - } - } - pub fn name(&self) -> &str { - &self.name - } + pub fn new(client: Arc, name: String) -> Self { let name: Arc = name.into(); Self { name: name.clone(), by: SeriesPattern18By { client, name, _marker: std::marker::PhantomData } } } + pub fn name(&self) -> &str { &self.name } } -impl AnySeriesPattern for SeriesPattern18 { - fn name(&self) -> &str { - &self.name - } - fn indexes(&self) -> &'static [Index] { - _I18 - } -} -impl SeriesPattern for SeriesPattern18 { - fn get(&self, index: Index) -> Option> { - _I18.contains(&index) - .then(|| _ep(&self.by.client, &self.by.name, index)) - } -} +impl AnySeriesPattern for SeriesPattern18 { fn name(&self) -> &str { &self.name } fn indexes(&self) -> &'static [Index] { _I18 } } +impl SeriesPattern for SeriesPattern18 { fn get(&self, index: Index) -> Option> { _I18.contains(&index).then(|| _ep(&self.by.client, &self.by.name, index)) } } -pub struct SeriesPattern19By { - client: Arc, - name: Arc, - _marker: std::marker::PhantomData, -} +pub struct SeriesPattern19By { client: Arc, name: Arc, _marker: std::marker::PhantomData } impl SeriesPattern19By { - pub fn tx_index(&self) -> SeriesEndpoint { - _ep(&self.client, &self.name, Index::TxIndex) - } + pub fn tx_index(&self) -> SeriesEndpoint { _ep(&self.client, &self.name, Index::TxIndex) } } -pub struct SeriesPattern19 { - name: Arc, - pub by: SeriesPattern19By, -} +pub struct SeriesPattern19 { name: Arc, pub by: SeriesPattern19By } impl SeriesPattern19 { - pub fn new(client: Arc, name: String) -> Self { - let name: Arc = name.into(); - Self { - name: name.clone(), - by: SeriesPattern19By { - client, - name, - _marker: std::marker::PhantomData, - }, - } - } - pub fn name(&self) -> &str { - &self.name - } + pub fn new(client: Arc, name: String) -> Self { let name: Arc = name.into(); Self { name: name.clone(), by: SeriesPattern19By { client, name, _marker: std::marker::PhantomData } } } + pub fn name(&self) -> &str { &self.name } } -impl AnySeriesPattern for SeriesPattern19 { - fn name(&self) -> &str { - &self.name - } - fn indexes(&self) -> &'static [Index] { - _I19 - } -} -impl SeriesPattern for SeriesPattern19 { - fn get(&self, index: Index) -> Option> { - _I19.contains(&index) - .then(|| _ep(&self.by.client, &self.by.name, index)) - } -} +impl AnySeriesPattern for SeriesPattern19 { fn name(&self) -> &str { &self.name } fn indexes(&self) -> &'static [Index] { _I19 } } +impl SeriesPattern for SeriesPattern19 { fn get(&self, index: Index) -> Option> { _I19.contains(&index).then(|| _ep(&self.by.client, &self.by.name, index)) } } -pub struct SeriesPattern20By { - client: Arc, - name: Arc, - _marker: std::marker::PhantomData, -} +pub struct SeriesPattern20By { client: Arc, name: Arc, _marker: std::marker::PhantomData } impl SeriesPattern20By { - pub fn txin_index(&self) -> SeriesEndpoint { - _ep(&self.client, &self.name, Index::TxInIndex) - } + pub fn txin_index(&self) -> SeriesEndpoint { _ep(&self.client, &self.name, Index::TxInIndex) } } -pub struct SeriesPattern20 { - name: Arc, - pub by: SeriesPattern20By, -} +pub struct SeriesPattern20 { name: Arc, pub by: SeriesPattern20By } impl SeriesPattern20 { - pub fn new(client: Arc, name: String) -> Self { - let name: Arc = name.into(); - Self { - name: name.clone(), - by: SeriesPattern20By { - client, - name, - _marker: std::marker::PhantomData, - }, - } - } - pub fn name(&self) -> &str { - &self.name - } + pub fn new(client: Arc, name: String) -> Self { let name: Arc = name.into(); Self { name: name.clone(), by: SeriesPattern20By { client, name, _marker: std::marker::PhantomData } } } + pub fn name(&self) -> &str { &self.name } } -impl AnySeriesPattern for SeriesPattern20 { - fn name(&self) -> &str { - &self.name - } - fn indexes(&self) -> &'static [Index] { - _I20 - } -} -impl SeriesPattern for SeriesPattern20 { - fn get(&self, index: Index) -> Option> { - _I20.contains(&index) - .then(|| _ep(&self.by.client, &self.by.name, index)) - } -} +impl AnySeriesPattern for SeriesPattern20 { fn name(&self) -> &str { &self.name } fn indexes(&self) -> &'static [Index] { _I20 } } +impl SeriesPattern for SeriesPattern20 { fn get(&self, index: Index) -> Option> { _I20.contains(&index).then(|| _ep(&self.by.client, &self.by.name, index)) } } -pub struct SeriesPattern21By { - client: Arc, - name: Arc, - _marker: std::marker::PhantomData, -} +pub struct SeriesPattern21By { client: Arc, name: Arc, _marker: std::marker::PhantomData } impl SeriesPattern21By { - pub fn txout_index(&self) -> SeriesEndpoint { - _ep(&self.client, &self.name, Index::TxOutIndex) - } + pub fn txout_index(&self) -> SeriesEndpoint { _ep(&self.client, &self.name, Index::TxOutIndex) } } -pub struct SeriesPattern21 { - name: Arc, - pub by: SeriesPattern21By, -} +pub struct SeriesPattern21 { name: Arc, pub by: SeriesPattern21By } impl SeriesPattern21 { - pub fn new(client: Arc, name: String) -> Self { - let name: Arc = name.into(); - Self { - name: name.clone(), - by: SeriesPattern21By { - client, - name, - _marker: std::marker::PhantomData, - }, - } - } - pub fn name(&self) -> &str { - &self.name - } + pub fn new(client: Arc, name: String) -> Self { let name: Arc = name.into(); Self { name: name.clone(), by: SeriesPattern21By { client, name, _marker: std::marker::PhantomData } } } + pub fn name(&self) -> &str { &self.name } } -impl AnySeriesPattern for SeriesPattern21 { - fn name(&self) -> &str { - &self.name - } - fn indexes(&self) -> &'static [Index] { - _I21 - } -} -impl SeriesPattern for SeriesPattern21 { - fn get(&self, index: Index) -> Option> { - _I21.contains(&index) - .then(|| _ep(&self.by.client, &self.by.name, index)) - } -} +impl AnySeriesPattern for SeriesPattern21 { fn name(&self) -> &str { &self.name } fn indexes(&self) -> &'static [Index] { _I21 } } +impl SeriesPattern for SeriesPattern21 { fn get(&self, index: Index) -> Option> { _I21.contains(&index).then(|| _ep(&self.by.client, &self.by.name, index)) } } -pub struct SeriesPattern22By { - client: Arc, - name: Arc, - _marker: std::marker::PhantomData, -} +pub struct SeriesPattern22By { client: Arc, name: Arc, _marker: std::marker::PhantomData } impl SeriesPattern22By { - pub fn empty_output_index(&self) -> SeriesEndpoint { - _ep(&self.client, &self.name, Index::EmptyOutputIndex) - } + pub fn empty_output_index(&self) -> SeriesEndpoint { _ep(&self.client, &self.name, Index::EmptyOutputIndex) } } -pub struct SeriesPattern22 { - name: Arc, - pub by: SeriesPattern22By, -} +pub struct SeriesPattern22 { name: Arc, pub by: SeriesPattern22By } impl SeriesPattern22 { - pub fn new(client: Arc, name: String) -> Self { - let name: Arc = name.into(); - Self { - name: name.clone(), - by: SeriesPattern22By { - client, - name, - _marker: std::marker::PhantomData, - }, - } - } - pub fn name(&self) -> &str { - &self.name - } + pub fn new(client: Arc, name: String) -> Self { let name: Arc = name.into(); Self { name: name.clone(), by: SeriesPattern22By { client, name, _marker: std::marker::PhantomData } } } + pub fn name(&self) -> &str { &self.name } } -impl AnySeriesPattern for SeriesPattern22 { - fn name(&self) -> &str { - &self.name - } - fn indexes(&self) -> &'static [Index] { - _I22 - } -} -impl SeriesPattern for SeriesPattern22 { - fn get(&self, index: Index) -> Option> { - _I22.contains(&index) - .then(|| _ep(&self.by.client, &self.by.name, index)) - } -} +impl AnySeriesPattern for SeriesPattern22 { fn name(&self) -> &str { &self.name } fn indexes(&self) -> &'static [Index] { _I22 } } +impl SeriesPattern for SeriesPattern22 { fn get(&self, index: Index) -> Option> { _I22.contains(&index).then(|| _ep(&self.by.client, &self.by.name, index)) } } -pub struct SeriesPattern23By { - client: Arc, - name: Arc, - _marker: std::marker::PhantomData, -} +pub struct SeriesPattern23By { client: Arc, name: Arc, _marker: std::marker::PhantomData } impl SeriesPattern23By { - pub fn op_return_index(&self) -> SeriesEndpoint { - _ep(&self.client, &self.name, Index::OpReturnIndex) - } + pub fn op_return_index(&self) -> SeriesEndpoint { _ep(&self.client, &self.name, Index::OpReturnIndex) } } -pub struct SeriesPattern23 { - name: Arc, - pub by: SeriesPattern23By, -} +pub struct SeriesPattern23 { name: Arc, pub by: SeriesPattern23By } impl SeriesPattern23 { - pub fn new(client: Arc, name: String) -> Self { - let name: Arc = name.into(); - Self { - name: name.clone(), - by: SeriesPattern23By { - client, - name, - _marker: std::marker::PhantomData, - }, - } - } - pub fn name(&self) -> &str { - &self.name - } + pub fn new(client: Arc, name: String) -> Self { let name: Arc = name.into(); Self { name: name.clone(), by: SeriesPattern23By { client, name, _marker: std::marker::PhantomData } } } + pub fn name(&self) -> &str { &self.name } } -impl AnySeriesPattern for SeriesPattern23 { - fn name(&self) -> &str { - &self.name - } - fn indexes(&self) -> &'static [Index] { - _I23 - } -} -impl SeriesPattern for SeriesPattern23 { - fn get(&self, index: Index) -> Option> { - _I23.contains(&index) - .then(|| _ep(&self.by.client, &self.by.name, index)) - } -} +impl AnySeriesPattern for SeriesPattern23 { fn name(&self) -> &str { &self.name } fn indexes(&self) -> &'static [Index] { _I23 } } +impl SeriesPattern for SeriesPattern23 { fn get(&self, index: Index) -> Option> { _I23.contains(&index).then(|| _ep(&self.by.client, &self.by.name, index)) } } -pub struct SeriesPattern24By { - client: Arc, - name: Arc, - _marker: std::marker::PhantomData, -} +pub struct SeriesPattern24By { client: Arc, name: Arc, _marker: std::marker::PhantomData } impl SeriesPattern24By { - pub fn p2a_addr_index(&self) -> SeriesEndpoint { - _ep(&self.client, &self.name, Index::P2AAddrIndex) - } + pub fn p2a_addr_index(&self) -> SeriesEndpoint { _ep(&self.client, &self.name, Index::P2AAddrIndex) } } -pub struct SeriesPattern24 { - name: Arc, - pub by: SeriesPattern24By, -} +pub struct SeriesPattern24 { name: Arc, pub by: SeriesPattern24By } impl SeriesPattern24 { - pub fn new(client: Arc, name: String) -> Self { - let name: Arc = name.into(); - Self { - name: name.clone(), - by: SeriesPattern24By { - client, - name, - _marker: std::marker::PhantomData, - }, - } - } - pub fn name(&self) -> &str { - &self.name - } + pub fn new(client: Arc, name: String) -> Self { let name: Arc = name.into(); Self { name: name.clone(), by: SeriesPattern24By { client, name, _marker: std::marker::PhantomData } } } + pub fn name(&self) -> &str { &self.name } } -impl AnySeriesPattern for SeriesPattern24 { - fn name(&self) -> &str { - &self.name - } - fn indexes(&self) -> &'static [Index] { - _I24 - } -} -impl SeriesPattern for SeriesPattern24 { - fn get(&self, index: Index) -> Option> { - _I24.contains(&index) - .then(|| _ep(&self.by.client, &self.by.name, index)) - } -} +impl AnySeriesPattern for SeriesPattern24 { fn name(&self) -> &str { &self.name } fn indexes(&self) -> &'static [Index] { _I24 } } +impl SeriesPattern for SeriesPattern24 { fn get(&self, index: Index) -> Option> { _I24.contains(&index).then(|| _ep(&self.by.client, &self.by.name, index)) } } -pub struct SeriesPattern25By { - client: Arc, - name: Arc, - _marker: std::marker::PhantomData, -} +pub struct SeriesPattern25By { client: Arc, name: Arc, _marker: std::marker::PhantomData } impl SeriesPattern25By { - pub fn p2ms_output_index(&self) -> SeriesEndpoint { - _ep(&self.client, &self.name, Index::P2MSOutputIndex) - } + pub fn p2ms_output_index(&self) -> SeriesEndpoint { _ep(&self.client, &self.name, Index::P2MSOutputIndex) } } -pub struct SeriesPattern25 { - name: Arc, - pub by: SeriesPattern25By, -} +pub struct SeriesPattern25 { name: Arc, pub by: SeriesPattern25By } impl SeriesPattern25 { - pub fn new(client: Arc, name: String) -> Self { - let name: Arc = name.into(); - Self { - name: name.clone(), - by: SeriesPattern25By { - client, - name, - _marker: std::marker::PhantomData, - }, - } - } - pub fn name(&self) -> &str { - &self.name - } + pub fn new(client: Arc, name: String) -> Self { let name: Arc = name.into(); Self { name: name.clone(), by: SeriesPattern25By { client, name, _marker: std::marker::PhantomData } } } + pub fn name(&self) -> &str { &self.name } } -impl AnySeriesPattern for SeriesPattern25 { - fn name(&self) -> &str { - &self.name - } - fn indexes(&self) -> &'static [Index] { - _I25 - } -} -impl SeriesPattern for SeriesPattern25 { - fn get(&self, index: Index) -> Option> { - _I25.contains(&index) - .then(|| _ep(&self.by.client, &self.by.name, index)) - } -} +impl AnySeriesPattern for SeriesPattern25 { fn name(&self) -> &str { &self.name } fn indexes(&self) -> &'static [Index] { _I25 } } +impl SeriesPattern for SeriesPattern25 { fn get(&self, index: Index) -> Option> { _I25.contains(&index).then(|| _ep(&self.by.client, &self.by.name, index)) } } -pub struct SeriesPattern26By { - client: Arc, - name: Arc, - _marker: std::marker::PhantomData, -} +pub struct SeriesPattern26By { client: Arc, name: Arc, _marker: std::marker::PhantomData } impl SeriesPattern26By { - pub fn p2pk33_addr_index(&self) -> SeriesEndpoint { - _ep(&self.client, &self.name, Index::P2PK33AddrIndex) - } + pub fn p2pk33_addr_index(&self) -> SeriesEndpoint { _ep(&self.client, &self.name, Index::P2PK33AddrIndex) } } -pub struct SeriesPattern26 { - name: Arc, - pub by: SeriesPattern26By, -} +pub struct SeriesPattern26 { name: Arc, pub by: SeriesPattern26By } impl SeriesPattern26 { - pub fn new(client: Arc, name: String) -> Self { - let name: Arc = name.into(); - Self { - name: name.clone(), - by: SeriesPattern26By { - client, - name, - _marker: std::marker::PhantomData, - }, - } - } - pub fn name(&self) -> &str { - &self.name - } + pub fn new(client: Arc, name: String) -> Self { let name: Arc = name.into(); Self { name: name.clone(), by: SeriesPattern26By { client, name, _marker: std::marker::PhantomData } } } + pub fn name(&self) -> &str { &self.name } } -impl AnySeriesPattern for SeriesPattern26 { - fn name(&self) -> &str { - &self.name - } - fn indexes(&self) -> &'static [Index] { - _I26 - } -} -impl SeriesPattern for SeriesPattern26 { - fn get(&self, index: Index) -> Option> { - _I26.contains(&index) - .then(|| _ep(&self.by.client, &self.by.name, index)) - } -} +impl AnySeriesPattern for SeriesPattern26 { fn name(&self) -> &str { &self.name } fn indexes(&self) -> &'static [Index] { _I26 } } +impl SeriesPattern for SeriesPattern26 { fn get(&self, index: Index) -> Option> { _I26.contains(&index).then(|| _ep(&self.by.client, &self.by.name, index)) } } -pub struct SeriesPattern27By { - client: Arc, - name: Arc, - _marker: std::marker::PhantomData, -} +pub struct SeriesPattern27By { client: Arc, name: Arc, _marker: std::marker::PhantomData } impl SeriesPattern27By { - pub fn p2pk65_addr_index(&self) -> SeriesEndpoint { - _ep(&self.client, &self.name, Index::P2PK65AddrIndex) - } + pub fn p2pk65_addr_index(&self) -> SeriesEndpoint { _ep(&self.client, &self.name, Index::P2PK65AddrIndex) } } -pub struct SeriesPattern27 { - name: Arc, - pub by: SeriesPattern27By, -} +pub struct SeriesPattern27 { name: Arc, pub by: SeriesPattern27By } impl SeriesPattern27 { - pub fn new(client: Arc, name: String) -> Self { - let name: Arc = name.into(); - Self { - name: name.clone(), - by: SeriesPattern27By { - client, - name, - _marker: std::marker::PhantomData, - }, - } - } - pub fn name(&self) -> &str { - &self.name - } + pub fn new(client: Arc, name: String) -> Self { let name: Arc = name.into(); Self { name: name.clone(), by: SeriesPattern27By { client, name, _marker: std::marker::PhantomData } } } + pub fn name(&self) -> &str { &self.name } } -impl AnySeriesPattern for SeriesPattern27 { - fn name(&self) -> &str { - &self.name - } - fn indexes(&self) -> &'static [Index] { - _I27 - } -} -impl SeriesPattern for SeriesPattern27 { - fn get(&self, index: Index) -> Option> { - _I27.contains(&index) - .then(|| _ep(&self.by.client, &self.by.name, index)) - } -} +impl AnySeriesPattern for SeriesPattern27 { fn name(&self) -> &str { &self.name } fn indexes(&self) -> &'static [Index] { _I27 } } +impl SeriesPattern for SeriesPattern27 { fn get(&self, index: Index) -> Option> { _I27.contains(&index).then(|| _ep(&self.by.client, &self.by.name, index)) } } -pub struct SeriesPattern28By { - client: Arc, - name: Arc, - _marker: std::marker::PhantomData, -} +pub struct SeriesPattern28By { client: Arc, name: Arc, _marker: std::marker::PhantomData } impl SeriesPattern28By { - pub fn p2pkh_addr_index(&self) -> SeriesEndpoint { - _ep(&self.client, &self.name, Index::P2PKHAddrIndex) - } + pub fn p2pkh_addr_index(&self) -> SeriesEndpoint { _ep(&self.client, &self.name, Index::P2PKHAddrIndex) } } -pub struct SeriesPattern28 { - name: Arc, - pub by: SeriesPattern28By, -} +pub struct SeriesPattern28 { name: Arc, pub by: SeriesPattern28By } impl SeriesPattern28 { - pub fn new(client: Arc, name: String) -> Self { - let name: Arc = name.into(); - Self { - name: name.clone(), - by: SeriesPattern28By { - client, - name, - _marker: std::marker::PhantomData, - }, - } - } - pub fn name(&self) -> &str { - &self.name - } + pub fn new(client: Arc, name: String) -> Self { let name: Arc = name.into(); Self { name: name.clone(), by: SeriesPattern28By { client, name, _marker: std::marker::PhantomData } } } + pub fn name(&self) -> &str { &self.name } } -impl AnySeriesPattern for SeriesPattern28 { - fn name(&self) -> &str { - &self.name - } - fn indexes(&self) -> &'static [Index] { - _I28 - } -} -impl SeriesPattern for SeriesPattern28 { - fn get(&self, index: Index) -> Option> { - _I28.contains(&index) - .then(|| _ep(&self.by.client, &self.by.name, index)) - } -} +impl AnySeriesPattern for SeriesPattern28 { fn name(&self) -> &str { &self.name } fn indexes(&self) -> &'static [Index] { _I28 } } +impl SeriesPattern for SeriesPattern28 { fn get(&self, index: Index) -> Option> { _I28.contains(&index).then(|| _ep(&self.by.client, &self.by.name, index)) } } -pub struct SeriesPattern29By { - client: Arc, - name: Arc, - _marker: std::marker::PhantomData, -} +pub struct SeriesPattern29By { client: Arc, name: Arc, _marker: std::marker::PhantomData } impl SeriesPattern29By { - pub fn p2sh_addr_index(&self) -> SeriesEndpoint { - _ep(&self.client, &self.name, Index::P2SHAddrIndex) - } + pub fn p2sh_addr_index(&self) -> SeriesEndpoint { _ep(&self.client, &self.name, Index::P2SHAddrIndex) } } -pub struct SeriesPattern29 { - name: Arc, - pub by: SeriesPattern29By, -} +pub struct SeriesPattern29 { name: Arc, pub by: SeriesPattern29By } impl SeriesPattern29 { - pub fn new(client: Arc, name: String) -> Self { - let name: Arc = name.into(); - Self { - name: name.clone(), - by: SeriesPattern29By { - client, - name, - _marker: std::marker::PhantomData, - }, - } - } - pub fn name(&self) -> &str { - &self.name - } + pub fn new(client: Arc, name: String) -> Self { let name: Arc = name.into(); Self { name: name.clone(), by: SeriesPattern29By { client, name, _marker: std::marker::PhantomData } } } + pub fn name(&self) -> &str { &self.name } } -impl AnySeriesPattern for SeriesPattern29 { - fn name(&self) -> &str { - &self.name - } - fn indexes(&self) -> &'static [Index] { - _I29 - } -} -impl SeriesPattern for SeriesPattern29 { - fn get(&self, index: Index) -> Option> { - _I29.contains(&index) - .then(|| _ep(&self.by.client, &self.by.name, index)) - } -} +impl AnySeriesPattern for SeriesPattern29 { fn name(&self) -> &str { &self.name } fn indexes(&self) -> &'static [Index] { _I29 } } +impl SeriesPattern for SeriesPattern29 { fn get(&self, index: Index) -> Option> { _I29.contains(&index).then(|| _ep(&self.by.client, &self.by.name, index)) } } -pub struct SeriesPattern30By { - client: Arc, - name: Arc, - _marker: std::marker::PhantomData, -} +pub struct SeriesPattern30By { client: Arc, name: Arc, _marker: std::marker::PhantomData } impl SeriesPattern30By { - pub fn p2tr_addr_index(&self) -> SeriesEndpoint { - _ep(&self.client, &self.name, Index::P2TRAddrIndex) - } + pub fn p2tr_addr_index(&self) -> SeriesEndpoint { _ep(&self.client, &self.name, Index::P2TRAddrIndex) } } -pub struct SeriesPattern30 { - name: Arc, - pub by: SeriesPattern30By, -} +pub struct SeriesPattern30 { name: Arc, pub by: SeriesPattern30By } impl SeriesPattern30 { - pub fn new(client: Arc, name: String) -> Self { - let name: Arc = name.into(); - Self { - name: name.clone(), - by: SeriesPattern30By { - client, - name, - _marker: std::marker::PhantomData, - }, - } - } - pub fn name(&self) -> &str { - &self.name - } + pub fn new(client: Arc, name: String) -> Self { let name: Arc = name.into(); Self { name: name.clone(), by: SeriesPattern30By { client, name, _marker: std::marker::PhantomData } } } + pub fn name(&self) -> &str { &self.name } } -impl AnySeriesPattern for SeriesPattern30 { - fn name(&self) -> &str { - &self.name - } - fn indexes(&self) -> &'static [Index] { - _I30 - } -} -impl SeriesPattern for SeriesPattern30 { - fn get(&self, index: Index) -> Option> { - _I30.contains(&index) - .then(|| _ep(&self.by.client, &self.by.name, index)) - } -} +impl AnySeriesPattern for SeriesPattern30 { fn name(&self) -> &str { &self.name } fn indexes(&self) -> &'static [Index] { _I30 } } +impl SeriesPattern for SeriesPattern30 { fn get(&self, index: Index) -> Option> { _I30.contains(&index).then(|| _ep(&self.by.client, &self.by.name, index)) } } -pub struct SeriesPattern31By { - client: Arc, - name: Arc, - _marker: std::marker::PhantomData, -} +pub struct SeriesPattern31By { client: Arc, name: Arc, _marker: std::marker::PhantomData } impl SeriesPattern31By { - pub fn p2wpkh_addr_index(&self) -> SeriesEndpoint { - _ep(&self.client, &self.name, Index::P2WPKHAddrIndex) - } + pub fn p2wpkh_addr_index(&self) -> SeriesEndpoint { _ep(&self.client, &self.name, Index::P2WPKHAddrIndex) } } -pub struct SeriesPattern31 { - name: Arc, - pub by: SeriesPattern31By, -} +pub struct SeriesPattern31 { name: Arc, pub by: SeriesPattern31By } impl SeriesPattern31 { - pub fn new(client: Arc, name: String) -> Self { - let name: Arc = name.into(); - Self { - name: name.clone(), - by: SeriesPattern31By { - client, - name, - _marker: std::marker::PhantomData, - }, - } - } - pub fn name(&self) -> &str { - &self.name - } + pub fn new(client: Arc, name: String) -> Self { let name: Arc = name.into(); Self { name: name.clone(), by: SeriesPattern31By { client, name, _marker: std::marker::PhantomData } } } + pub fn name(&self) -> &str { &self.name } } -impl AnySeriesPattern for SeriesPattern31 { - fn name(&self) -> &str { - &self.name - } - fn indexes(&self) -> &'static [Index] { - _I31 - } -} -impl SeriesPattern for SeriesPattern31 { - fn get(&self, index: Index) -> Option> { - _I31.contains(&index) - .then(|| _ep(&self.by.client, &self.by.name, index)) - } -} +impl AnySeriesPattern for SeriesPattern31 { fn name(&self) -> &str { &self.name } fn indexes(&self) -> &'static [Index] { _I31 } } +impl SeriesPattern for SeriesPattern31 { fn get(&self, index: Index) -> Option> { _I31.contains(&index).then(|| _ep(&self.by.client, &self.by.name, index)) } } -pub struct SeriesPattern32By { - client: Arc, - name: Arc, - _marker: std::marker::PhantomData, -} +pub struct SeriesPattern32By { client: Arc, name: Arc, _marker: std::marker::PhantomData } impl SeriesPattern32By { - pub fn p2wsh_addr_index(&self) -> SeriesEndpoint { - _ep(&self.client, &self.name, Index::P2WSHAddrIndex) - } + pub fn p2wsh_addr_index(&self) -> SeriesEndpoint { _ep(&self.client, &self.name, Index::P2WSHAddrIndex) } } -pub struct SeriesPattern32 { - name: Arc, - pub by: SeriesPattern32By, -} +pub struct SeriesPattern32 { name: Arc, pub by: SeriesPattern32By } impl SeriesPattern32 { - pub fn new(client: Arc, name: String) -> Self { - let name: Arc = name.into(); - Self { - name: name.clone(), - by: SeriesPattern32By { - client, - name, - _marker: std::marker::PhantomData, - }, - } - } - pub fn name(&self) -> &str { - &self.name - } + pub fn new(client: Arc, name: String) -> Self { let name: Arc = name.into(); Self { name: name.clone(), by: SeriesPattern32By { client, name, _marker: std::marker::PhantomData } } } + pub fn name(&self) -> &str { &self.name } } -impl AnySeriesPattern for SeriesPattern32 { - fn name(&self) -> &str { - &self.name - } - fn indexes(&self) -> &'static [Index] { - _I32 - } -} -impl SeriesPattern for SeriesPattern32 { - fn get(&self, index: Index) -> Option> { - _I32.contains(&index) - .then(|| _ep(&self.by.client, &self.by.name, index)) - } -} +impl AnySeriesPattern for SeriesPattern32 { fn name(&self) -> &str { &self.name } fn indexes(&self) -> &'static [Index] { _I32 } } +impl SeriesPattern for SeriesPattern32 { fn get(&self, index: Index) -> Option> { _I32.contains(&index).then(|| _ep(&self.by.client, &self.by.name, index)) } } -pub struct SeriesPattern33By { - client: Arc, - name: Arc, - _marker: std::marker::PhantomData, -} +pub struct SeriesPattern33By { client: Arc, name: Arc, _marker: std::marker::PhantomData } impl SeriesPattern33By { - pub fn unknown_output_index(&self) -> SeriesEndpoint { - _ep(&self.client, &self.name, Index::UnknownOutputIndex) - } + pub fn unknown_output_index(&self) -> SeriesEndpoint { _ep(&self.client, &self.name, Index::UnknownOutputIndex) } } -pub struct SeriesPattern33 { - name: Arc, - pub by: SeriesPattern33By, -} +pub struct SeriesPattern33 { name: Arc, pub by: SeriesPattern33By } impl SeriesPattern33 { - pub fn new(client: Arc, name: String) -> Self { - let name: Arc = name.into(); - Self { - name: name.clone(), - by: SeriesPattern33By { - client, - name, - _marker: std::marker::PhantomData, - }, - } - } - pub fn name(&self) -> &str { - &self.name - } + pub fn new(client: Arc, name: String) -> Self { let name: Arc = name.into(); Self { name: name.clone(), by: SeriesPattern33By { client, name, _marker: std::marker::PhantomData } } } + pub fn name(&self) -> &str { &self.name } } -impl AnySeriesPattern for SeriesPattern33 { - fn name(&self) -> &str { - &self.name - } - fn indexes(&self) -> &'static [Index] { - _I33 - } -} -impl SeriesPattern for SeriesPattern33 { - fn get(&self, index: Index) -> Option> { - _I33.contains(&index) - .then(|| _ep(&self.by.client, &self.by.name, index)) - } -} +impl AnySeriesPattern for SeriesPattern33 { fn name(&self) -> &str { &self.name } fn indexes(&self) -> &'static [Index] { _I33 } } +impl SeriesPattern for SeriesPattern33 { fn get(&self, index: Index) -> Option> { _I33.contains(&index).then(|| _ep(&self.by.client, &self.by.name, index)) } } -pub struct SeriesPattern34By { - client: Arc, - name: Arc, - _marker: std::marker::PhantomData, -} +pub struct SeriesPattern34By { client: Arc, name: Arc, _marker: std::marker::PhantomData } impl SeriesPattern34By { - pub fn funded_addr_index(&self) -> SeriesEndpoint { - _ep(&self.client, &self.name, Index::FundedAddrIndex) - } + pub fn funded_addr_index(&self) -> SeriesEndpoint { _ep(&self.client, &self.name, Index::FundedAddrIndex) } } -pub struct SeriesPattern34 { - name: Arc, - pub by: SeriesPattern34By, -} +pub struct SeriesPattern34 { name: Arc, pub by: SeriesPattern34By } impl SeriesPattern34 { - pub fn new(client: Arc, name: String) -> Self { - let name: Arc = name.into(); - Self { - name: name.clone(), - by: SeriesPattern34By { - client, - name, - _marker: std::marker::PhantomData, - }, - } - } - pub fn name(&self) -> &str { - &self.name - } + pub fn new(client: Arc, name: String) -> Self { let name: Arc = name.into(); Self { name: name.clone(), by: SeriesPattern34By { client, name, _marker: std::marker::PhantomData } } } + pub fn name(&self) -> &str { &self.name } } -impl AnySeriesPattern for SeriesPattern34 { - fn name(&self) -> &str { - &self.name - } - fn indexes(&self) -> &'static [Index] { - _I34 - } -} -impl SeriesPattern for SeriesPattern34 { - fn get(&self, index: Index) -> Option> { - _I34.contains(&index) - .then(|| _ep(&self.by.client, &self.by.name, index)) - } -} +impl AnySeriesPattern for SeriesPattern34 { fn name(&self) -> &str { &self.name } fn indexes(&self) -> &'static [Index] { _I34 } } +impl SeriesPattern for SeriesPattern34 { fn get(&self, index: Index) -> Option> { _I34.contains(&index).then(|| _ep(&self.by.client, &self.by.name, index)) } } -pub struct SeriesPattern35By { - client: Arc, - name: Arc, - _marker: std::marker::PhantomData, -} +pub struct SeriesPattern35By { client: Arc, name: Arc, _marker: std::marker::PhantomData } impl SeriesPattern35By { - pub fn empty_addr_index(&self) -> SeriesEndpoint { - _ep(&self.client, &self.name, Index::EmptyAddrIndex) - } + pub fn empty_addr_index(&self) -> SeriesEndpoint { _ep(&self.client, &self.name, Index::EmptyAddrIndex) } } -pub struct SeriesPattern35 { - name: Arc, - pub by: SeriesPattern35By, -} +pub struct SeriesPattern35 { name: Arc, pub by: SeriesPattern35By } impl SeriesPattern35 { - pub fn new(client: Arc, name: String) -> Self { - let name: Arc = name.into(); - Self { - name: name.clone(), - by: SeriesPattern35By { - client, - name, - _marker: std::marker::PhantomData, - }, - } - } - pub fn name(&self) -> &str { - &self.name - } + pub fn new(client: Arc, name: String) -> Self { let name: Arc = name.into(); Self { name: name.clone(), by: SeriesPattern35By { client, name, _marker: std::marker::PhantomData } } } + pub fn name(&self) -> &str { &self.name } } -impl AnySeriesPattern for SeriesPattern35 { - fn name(&self) -> &str { - &self.name - } - fn indexes(&self) -> &'static [Index] { - _I35 - } -} -impl SeriesPattern for SeriesPattern35 { - fn get(&self, index: Index) -> Option> { - _I35.contains(&index) - .then(|| _ep(&self.by.client, &self.by.name, index)) - } -} +impl AnySeriesPattern for SeriesPattern35 { fn name(&self) -> &str { &self.name } fn indexes(&self) -> &'static [Index] { _I35 } } +impl SeriesPattern for SeriesPattern35 { fn get(&self, index: Index) -> Option> { _I35.contains(&index).then(|| _ep(&self.by.client, &self.by.name, index)) } } // Reusable pattern structs /// Pattern struct for repeated tree structure. -pub struct Pct05Pct10Pct15Pct20Pct25Pct30Pct35Pct40Pct45Pct50Pct55Pct60Pct65Pct70Pct75Pct80Pct85Pct90Pct95Pattern -{ +pub struct Pct05Pct10Pct15Pct20Pct25Pct30Pct35Pct40Pct45Pct50Pct55Pct60Pct65Pct70Pct75Pct80Pct85Pct90Pct95Pattern { pub pct05: CentsSatsUsdPattern, pub pct10: CentsSatsUsdPattern, pub pct15: CentsSatsUsdPattern, @@ -2321,51 +1019,18 @@ impl AllEmptyOpP2aP2msP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshUnknownPattern { pub fn new(client: Arc, acc: String) -> Self { Self { all: AverageBlockCumulativeSumPattern::new(client.clone(), _m(&acc, "bis")), - empty: AverageBlockCumulativeSumPattern::new( - client.clone(), - _m(&acc, "with_empty_outputs_output"), - ), - op_return: AverageBlockCumulativeSumPattern::new( - client.clone(), - _m(&acc, "with_op_return_output"), - ), + empty: AverageBlockCumulativeSumPattern::new(client.clone(), _m(&acc, "with_empty_outputs_output")), + op_return: AverageBlockCumulativeSumPattern::new(client.clone(), _m(&acc, "with_op_return_output")), p2a: AverageBlockCumulativeSumPattern::new(client.clone(), _m(&acc, "with_p2a_output")), - p2ms: AverageBlockCumulativeSumPattern::new( - client.clone(), - _m(&acc, "with_p2ms_output"), - ), - p2pk33: AverageBlockCumulativeSumPattern::new( - client.clone(), - _m(&acc, "with_p2pk33_output"), - ), - p2pk65: AverageBlockCumulativeSumPattern::new( - client.clone(), - _m(&acc, "with_p2pk65_output"), - ), - p2pkh: AverageBlockCumulativeSumPattern::new( - client.clone(), - _m(&acc, "with_p2pkh_output"), - ), - p2sh: AverageBlockCumulativeSumPattern::new( - client.clone(), - _m(&acc, "with_p2sh_output"), - ), - p2tr: AverageBlockCumulativeSumPattern::new( - client.clone(), - _m(&acc, "with_p2tr_output"), - ), - p2wpkh: AverageBlockCumulativeSumPattern::new( - client.clone(), - _m(&acc, "with_p2wpkh_output"), - ), - p2wsh: AverageBlockCumulativeSumPattern::new( - client.clone(), - _m(&acc, "with_p2wsh_output"), - ), - unknown: AverageBlockCumulativeSumPattern::new( - client.clone(), - _m(&acc, "with_unknown_outputs_output"), - ), + p2ms: AverageBlockCumulativeSumPattern::new(client.clone(), _m(&acc, "with_p2ms_output")), + p2pk33: AverageBlockCumulativeSumPattern::new(client.clone(), _m(&acc, "with_p2pk33_output")), + p2pk65: AverageBlockCumulativeSumPattern::new(client.clone(), _m(&acc, "with_p2pk65_output")), + p2pkh: AverageBlockCumulativeSumPattern::new(client.clone(), _m(&acc, "with_p2pkh_output")), + p2sh: AverageBlockCumulativeSumPattern::new(client.clone(), _m(&acc, "with_p2sh_output")), + p2tr: AverageBlockCumulativeSumPattern::new(client.clone(), _m(&acc, "with_p2tr_output")), + p2wpkh: AverageBlockCumulativeSumPattern::new(client.clone(), _m(&acc, "with_p2wpkh_output")), + p2wsh: AverageBlockCumulativeSumPattern::new(client.clone(), _m(&acc, "with_p2wsh_output")), + unknown: AverageBlockCumulativeSumPattern::new(client.clone(), _m(&acc, "with_unknown_outputs_output")), } } } @@ -2494,36 +1159,18 @@ impl EmptyOpP2aP2msP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshUnknownPattern2 { /// Create a new pattern node with accumulated series name. pub fn new(client: Arc, acc: String) -> Self { Self { - empty: _1m1w1y24hBpsPercentRatioPattern::new( - client.clone(), - _m(&acc, "empty_outputs_output"), - ), - op_return: _1m1w1y24hBpsPercentRatioPattern::new( - client.clone(), - _m(&acc, "op_return_output"), - ), + empty: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), _m(&acc, "empty_outputs_output")), + op_return: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), _m(&acc, "op_return_output")), p2a: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), _m(&acc, "p2a_output")), p2ms: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), _m(&acc, "p2ms_output")), - p2pk33: _1m1w1y24hBpsPercentRatioPattern::new( - client.clone(), - _m(&acc, "p2pk33_output"), - ), - p2pk65: _1m1w1y24hBpsPercentRatioPattern::new( - client.clone(), - _m(&acc, "p2pk65_output"), - ), + p2pk33: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), _m(&acc, "p2pk33_output")), + p2pk65: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), _m(&acc, "p2pk65_output")), p2pkh: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), _m(&acc, "p2pkh_output")), p2sh: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), _m(&acc, "p2sh_output")), p2tr: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), _m(&acc, "p2tr_output")), - p2wpkh: _1m1w1y24hBpsPercentRatioPattern::new( - client.clone(), - _m(&acc, "p2wpkh_output"), - ), + p2wpkh: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), _m(&acc, "p2wpkh_output")), p2wsh: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), _m(&acc, "p2wsh_output")), - unknown: _1m1w1y24hBpsPercentRatioPattern::new( - client.clone(), - _m(&acc, "unknown_outputs_output"), - ), + unknown: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), _m(&acc, "unknown_outputs_output")), } } } @@ -2581,32 +1228,17 @@ impl EmptyP2aP2msP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshUnknownPattern2 { /// Create a new pattern node with accumulated series name. pub fn new(client: Arc, acc: String) -> Self { Self { - empty: _1m1w1y24hBpsPercentRatioPattern::new( - client.clone(), - _m(&acc, "empty_outputs_prevout"), - ), + empty: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), _m(&acc, "empty_outputs_prevout")), p2a: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), _m(&acc, "p2a_prevout")), p2ms: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), _m(&acc, "p2ms_prevout")), - p2pk33: _1m1w1y24hBpsPercentRatioPattern::new( - client.clone(), - _m(&acc, "p2pk33_prevout"), - ), - p2pk65: _1m1w1y24hBpsPercentRatioPattern::new( - client.clone(), - _m(&acc, "p2pk65_prevout"), - ), + p2pk33: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), _m(&acc, "p2pk33_prevout")), + p2pk65: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), _m(&acc, "p2pk65_prevout")), p2pkh: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), _m(&acc, "p2pkh_prevout")), p2sh: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), _m(&acc, "p2sh_prevout")), p2tr: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), _m(&acc, "p2tr_prevout")), - p2wpkh: _1m1w1y24hBpsPercentRatioPattern::new( - client.clone(), - _m(&acc, "p2wpkh_prevout"), - ), + p2wpkh: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), _m(&acc, "p2wpkh_prevout")), p2wsh: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), _m(&acc, "p2wsh_prevout")), - unknown: _1m1w1y24hBpsPercentRatioPattern::new( - client.clone(), - _m(&acc, "unknown_outputs_prevout"), - ), + unknown: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), _m(&acc, "unknown_outputs_prevout")), } } } @@ -2858,14 +1490,8 @@ impl CapitalizedGrossInvestedLossNetNuplProfitSentimentPattern2 { /// Create a new pattern node with accumulated series name. pub fn new(client: Arc, acc: String) -> Self { Self { - capitalized_cap_in_loss_raw: SeriesPattern18::new( - client.clone(), - _m(&acc, "capitalized_cap_in_loss_raw"), - ), - capitalized_cap_in_profit_raw: SeriesPattern18::new( - client.clone(), - _m(&acc, "capitalized_cap_in_profit_raw"), - ), + capitalized_cap_in_loss_raw: SeriesPattern18::new(client.clone(), _m(&acc, "capitalized_cap_in_loss_raw")), + capitalized_cap_in_profit_raw: SeriesPattern18::new(client.clone(), _m(&acc, "capitalized_cap_in_profit_raw")), gross_pnl: CentsUsdPattern3::new(client.clone(), _m(&acc, "unrealized_gross_pnl")), invested_capital: InPattern2::new(client.clone(), _m(&acc, "invested_capital_in")), loss: CentsNegativeToUsdPattern2::new(client.clone(), _m(&acc, "unrealized_loss")), @@ -2998,10 +1624,7 @@ impl CapLossMvrvNetPriceProfitSoprPattern { cap: CentsDeltaUsdPattern::new(client.clone(), _m(&acc, "realized_cap")), loss: BlockCumulativeNegativeSumPattern::new(client.clone(), _m(&acc, "realized_loss")), mvrv: SeriesPattern1::new(client.clone(), _m(&acc, "mvrv")), - net_pnl: BlockCumulativeDeltaSumPattern::new( - client.clone(), - _m(&acc, "net_realized_pnl"), - ), + net_pnl: BlockCumulativeDeltaSumPattern::new(client.clone(), _m(&acc, "net_realized_pnl")), price: BpsCentsRatioSatsUsdPattern::new(client.clone(), _m(&acc, "realized_price")), profit: BlockCumulativeSumPattern::new(client.clone(), _m(&acc, "realized_profit")), sopr: RatioValuePattern::new(client.clone(), acc.clone()), @@ -3153,10 +1776,7 @@ impl AverageBlockCumulativeInSumPattern { block: BtcCentsSatsUsdPattern3::new(client.clone(), acc.clone()), cumulative: BtcCentsSatsUsdPattern::new(client.clone(), _m(&acc, "cumulative")), in_loss: AverageBlockCumulativeSumPattern3::new(client.clone(), _m(&acc, "in_loss")), - in_profit: AverageBlockCumulativeSumPattern3::new( - client.clone(), - _m(&acc, "in_profit"), - ), + in_profit: AverageBlockCumulativeSumPattern3::new(client.clone(), _m(&acc, "in_profit")), sum: _1m1w1y24hPattern4::new(client.clone(), _m(&acc, "sum")), } } @@ -3203,10 +1823,7 @@ impl CentsNegativeToUsdPattern2 { cents: SeriesPattern1::new(client.clone(), _m(&acc, "cents")), negative: SeriesPattern1::new(client.clone(), _m(&acc, "neg")), to_mcap: BpsPercentRatioPattern2::new(client.clone(), _m(&acc, "to_mcap")), - to_own_gross_pnl: BpsPercentRatioPattern2::new( - client.clone(), - _m(&acc, "to_own_gross_pnl"), - ), + to_own_gross_pnl: BpsPercentRatioPattern2::new(client.clone(), _m(&acc, "to_own_gross_pnl")), to_own_mcap: BpsPercentRatioPattern4::new(client.clone(), _m(&acc, "to_own_mcap")), usd: SeriesPattern1::new(client.clone(), acc.clone()), } @@ -3319,10 +1936,7 @@ impl ActiveBidirectionalReactivatedReceivingSendingPattern { pub fn new(client: Arc, acc: String) -> Self { Self { active: _1m1w1y24hBlockPattern::new(client.clone(), _m(&acc, "active_addrs")), - bidirectional: _1m1w1y24hBlockPattern::new( - client.clone(), - _m(&acc, "bidirectional_addrs"), - ), + bidirectional: _1m1w1y24hBlockPattern::new(client.clone(), _m(&acc, "bidirectional_addrs")), reactivated: _1m1w1y24hBlockPattern::new(client.clone(), _m(&acc, "reactivated_addrs")), receiving: _1m1w1y24hBlockPattern::new(client.clone(), _m(&acc, "receiving_addrs")), sending: _1m1w1y24hBlockPattern::new(client.clone(), _m(&acc, "sending_addrs")), @@ -3521,10 +2135,7 @@ impl CentsToUsdPattern4 { Self { cents: SeriesPattern1::new(client.clone(), _m(&acc, "cents")), to_mcap: BpsPercentRatioPattern2::new(client.clone(), _m(&acc, "to_mcap")), - to_own_gross_pnl: BpsPercentRatioPattern2::new( - client.clone(), - _m(&acc, "to_own_gross_pnl"), - ), + to_own_gross_pnl: BpsPercentRatioPattern2::new(client.clone(), _m(&acc, "to_own_gross_pnl")), to_own_mcap: BpsPercentRatioPattern2::new(client.clone(), _m(&acc, "to_own_mcap")), usd: SeriesPattern1::new(client.clone(), acc.clone()), } @@ -3903,10 +2514,7 @@ impl CentsToUsdPattern3 { pub fn new(client: Arc, acc: String) -> Self { Self { cents: SeriesPattern1::new(client.clone(), _m(&acc, "cents")), - to_own_gross_pnl: BpsPercentRatioPattern::new( - client.clone(), - _m(&acc, "to_own_gross_pnl"), - ), + to_own_gross_pnl: BpsPercentRatioPattern::new(client.clone(), _m(&acc, "to_own_gross_pnl")), to_own_mcap: BpsPercentRatioPattern::new(client.clone(), _m(&acc, "to_own_mcap")), usd: SeriesPattern1::new(client.clone(), acc.clone()), } @@ -3925,19 +2533,10 @@ impl CoindaysCoinyearsDormancyTransferPattern { /// Create a new pattern node with accumulated series name. pub fn new(client: Arc, acc: String) -> Self { Self { - coindays_destroyed: AverageBlockCumulativeSumPattern::new( - client.clone(), - _m(&acc, "coindays_destroyed"), - ), - coinyears_destroyed: SeriesPattern1::new( - client.clone(), - _m(&acc, "coinyears_destroyed"), - ), + coindays_destroyed: AverageBlockCumulativeSumPattern::new(client.clone(), _m(&acc, "coindays_destroyed")), + coinyears_destroyed: SeriesPattern1::new(client.clone(), _m(&acc, "coinyears_destroyed")), dormancy: _1m1w1y24hPattern::new(client.clone(), _m(&acc, "dormancy")), - transfer_volume: AverageBlockCumulativeInSumPattern::new( - client.clone(), - _m(&acc, "transfer_volume"), - ), + transfer_volume: AverageBlockCumulativeInSumPattern::new(client.clone(), _m(&acc, "transfer_volume")), } } } @@ -3975,17 +2574,9 @@ impl NuplRealizedSupplyUnrealizedPattern { pub fn new(client: Arc, acc: String) -> Self { Self { nupl: BpsRatioPattern::new(client.clone(), _m(&acc, "nupl")), - realized_cap: AllSthPattern::new( - client.clone(), - acc.clone(), - "realized_cap".to_string(), - ), + realized_cap: AllSthPattern::new(client.clone(), acc.clone(), "realized_cap".to_string()), supply: AllSthPattern2::new(client.clone(), acc.clone()), - unrealized_pnl: AllSthPattern::new( - client.clone(), - acc.clone(), - "unrealized_pnl".to_string(), - ), + unrealized_pnl: AllSthPattern::new(client.clone(), acc.clone(), "unrealized_pnl".to_string()), } } } @@ -4043,10 +2634,7 @@ impl AdjustedRatioValuePattern { Self { adjusted: RatioTransferValuePattern::new(client.clone(), acc.clone()), ratio: _1m1w1y24hPattern::new(client.clone(), _m(&acc, "sopr")), - value_destroyed: AverageBlockCumulativeSumPattern::new( - client.clone(), - _m(&acc, "value_destroyed"), - ), + value_destroyed: AverageBlockCumulativeSumPattern::new(client.clone(), _m(&acc, "value_destroyed")), } } } @@ -4080,10 +2668,7 @@ impl BlocksDominanceRewardsPattern { /// Create a new pattern node with accumulated series name. pub fn new(client: Arc, acc: String) -> Self { Self { - blocks_mined: AverageBlockCumulativeSumPattern2::new( - client.clone(), - _m(&acc, "blocks_mined"), - ), + blocks_mined: AverageBlockCumulativeSumPattern2::new(client.clone(), _m(&acc, "blocks_mined")), dominance: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), _m(&acc, "dominance")), rewards: AverageBlockCumulativeSumPattern3::new(client.clone(), _m(&acc, "rewards")), } @@ -4137,15 +2722,9 @@ impl BpsPriceRatioPattern { /// Create a new pattern node with accumulated series name. pub fn new(client: Arc, acc: String, disc: String) -> Self { Self { - bps: SeriesPattern1::new( - client.clone(), - _m(&acc, &format!("ratio_{disc}_bps", disc = disc)), - ), + bps: SeriesPattern1::new(client.clone(), _m(&acc, &format!("ratio_{disc}_bps", disc=disc))), price: CentsSatsUsdPattern::new(client.clone(), _m(&acc, &disc)), - ratio: SeriesPattern1::new( - client.clone(), - _m(&acc, &format!("ratio_{disc}", disc = disc)), - ), + ratio: SeriesPattern1::new(client.clone(), _m(&acc, &format!("ratio_{disc}", disc=disc))), } } } @@ -4277,10 +2856,7 @@ impl CumulativeRollingSumPattern { pub fn new(client: Arc, acc: String) -> Self { Self { cumulative: SeriesPattern1::new(client.clone(), _m(&acc, "cumulative")), - rolling: AverageMaxMedianMinPct10Pct25Pct75Pct90SumPattern::new( - client.clone(), - acc.clone(), - ), + rolling: AverageMaxMedianMinPct10Pct25Pct75Pct90SumPattern::new(client.clone(), acc.clone()), sum: SeriesPattern18::new(client.clone(), _m(&acc, "sum")), } } @@ -4352,14 +2928,8 @@ impl RatioTransferValuePattern { pub fn new(client: Arc, acc: String) -> Self { Self { ratio: _1m1w1y24hPattern::new(client.clone(), _m(&acc, "asopr")), - transfer_volume: AverageBlockCumulativeSumPattern::new( - client.clone(), - _m(&acc, "adj_value_created"), - ), - value_destroyed: AverageBlockCumulativeSumPattern::new( - client.clone(), - _m(&acc, "adj_value_destroyed"), - ), + transfer_volume: AverageBlockCumulativeSumPattern::new(client.clone(), _m(&acc, "adj_value_created")), + value_destroyed: AverageBlockCumulativeSumPattern::new(client.clone(), _m(&acc, "adj_value_destroyed")), } } } @@ -4376,14 +2946,8 @@ impl RsiStochPattern { pub fn new(client: Arc, acc: String, disc: String) -> Self { Self { rsi: BpsPercentRatioPattern2::new(client.clone(), _m(&acc, &disc)), - stoch_rsi_d: BpsPercentRatioPattern2::new( - client.clone(), - _m(&acc, &format!("stoch_d_{disc}", disc = disc)), - ), - stoch_rsi_k: BpsPercentRatioPattern2::new( - client.clone(), - _m(&acc, &format!("stoch_k_{disc}", disc = disc)), - ), + stoch_rsi_d: BpsPercentRatioPattern2::new(client.clone(), _m(&acc, &format!("stoch_d_{disc}", disc=disc))), + stoch_rsi_k: BpsPercentRatioPattern2::new(client.clone(), _m(&acc, &format!("stoch_k_{disc}", disc=disc))), } } } @@ -4400,10 +2964,7 @@ impl SpendingSpentUnspentPattern { pub fn new(client: Arc, acc: String) -> Self { Self { spending_rate: SeriesPattern1::new(client.clone(), _m(&acc, "spending_rate")), - spent_count: AverageBlockCumulativeSumPattern2::new( - client.clone(), - _m(&acc, "spent_utxo_count"), - ), + spent_count: AverageBlockCumulativeSumPattern2::new(client.clone(), _m(&acc, "spent_utxo_count")), unspent_count: BaseDeltaPattern::new(client.clone(), _m(&acc, "utxo_count")), } } @@ -4518,10 +3079,7 @@ impl AllSthPattern { pub fn new(client: Arc, acc: String, disc: String) -> Self { Self { all: SeriesPattern1::new(client.clone(), _m(&acc, &disc)), - sth: SeriesPattern1::new( - client.clone(), - _m(&acc, &format!("sth_{disc}", disc = disc)), - ), + sth: SeriesPattern1::new(client.clone(), _m(&acc, &format!("sth_{disc}", disc=disc))), } } } @@ -4584,10 +3142,7 @@ impl BlocksDominancePattern { /// Create a new pattern node with accumulated series name. pub fn new(client: Arc, acc: String) -> Self { Self { - blocks_mined: AverageBlockCumulativeSumPattern2::new( - client.clone(), - _m(&acc, "blocks_mined"), - ), + blocks_mined: AverageBlockCumulativeSumPattern2::new(client.clone(), _m(&acc, "blocks_mined")), dominance: BpsPercentRatioPattern2::new(client.clone(), _m(&acc, "dominance")), } } @@ -4715,14 +3270,8 @@ impl CoindaysTransferPattern { /// Create a new pattern node with accumulated series name. pub fn new(client: Arc, acc: String) -> Self { Self { - coindays_destroyed: AverageBlockCumulativeSumPattern::new( - client.clone(), - _m(&acc, "coindays_destroyed"), - ), - transfer_volume: AverageBlockCumulativeInSumPattern::new( - client.clone(), - _m(&acc, "transfer_volume"), - ), + coindays_destroyed: AverageBlockCumulativeSumPattern::new(client.clone(), _m(&acc, "coindays_destroyed")), + transfer_volume: AverageBlockCumulativeInSumPattern::new(client.clone(), _m(&acc, "transfer_volume")), } } } @@ -4737,14 +3286,8 @@ impl FundedTotalPattern { /// Create a new pattern node with accumulated series name. pub fn new(client: Arc, acc: String) -> Self { Self { - funded: AllP2aP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshPattern4::new( - client.clone(), - acc.clone(), - ), - total: AllP2aP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshPattern4::new( - client.clone(), - _p("total", &acc), - ), + funded: AllP2aP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshPattern4::new(client.clone(), acc.clone()), + total: AllP2aP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshPattern4::new(client.clone(), _p("total", &acc)), } } } @@ -4808,10 +3351,7 @@ impl PriceRatioPattern { pub fn new(client: Arc, acc: String, disc: String) -> Self { Self { price: CentsSatsUsdPattern::new(client.clone(), _m(&acc, &disc)), - ratio: SeriesPattern1::new( - client.clone(), - _m(&acc, &format!("ratio_{disc}", disc = disc)), - ), + ratio: SeriesPattern1::new(client.clone(), _m(&acc, &format!("ratio_{disc}", disc=disc))), } } } @@ -4827,10 +3367,7 @@ impl RatioValuePattern { pub fn new(client: Arc, acc: String) -> Self { Self { ratio: _24hPattern::new(client.clone(), _m(&acc, "sopr_24h")), - value_destroyed: AverageBlockCumulativeSumPattern::new( - client.clone(), - _m(&acc, "value_destroyed"), - ), + value_destroyed: AverageBlockCumulativeSumPattern::new(client.clone(), _m(&acc, "value_destroyed")), } } } @@ -4954,10 +3491,7 @@ impl SeriesTree { pub fn new(client: Arc, base_path: String) -> Self { Self { blocks: SeriesTree_Blocks::new(client.clone(), format!("{base_path}_blocks")), - transactions: SeriesTree_Transactions::new( - client.clone(), - format!("{base_path}_transactions"), - ), + transactions: SeriesTree_Transactions::new(client.clone(), format!("{base_path}_transactions")), inputs: SeriesTree_Inputs::new(client.clone(), format!("{base_path}_inputs")), outputs: SeriesTree_Outputs::new(client.clone(), format!("{base_path}_outputs")), addrs: SeriesTree_Addrs::new(client.clone(), format!("{base_path}_addrs")), @@ -4966,10 +3500,7 @@ impl SeriesTree { cointime: SeriesTree_Cointime::new(client.clone(), format!("{base_path}_cointime")), constants: SeriesTree_Constants::new(client.clone(), format!("{base_path}_constants")), indexes: SeriesTree_Indexes::new(client.clone(), format!("{base_path}_indexes")), - indicators: SeriesTree_Indicators::new( - client.clone(), - format!("{base_path}_indicators"), - ), + indicators: SeriesTree_Indicators::new(client.clone(), format!("{base_path}_indicators")), investing: SeriesTree_Investing::new(client.clone(), format!("{base_path}_investing")), market: SeriesTree_Market::new(client.clone(), format!("{base_path}_market")), pools: SeriesTree_Pools::new(client.clone(), format!("{base_path}_pools")), @@ -5004,36 +3535,18 @@ impl SeriesTree_Blocks { Self { blockhash: SeriesPattern18::new(client.clone(), "blockhash".to_string()), coinbase_tag: SeriesPattern18::new(client.clone(), "coinbase_tag".to_string()), - difficulty: SeriesTree_Blocks_Difficulty::new( - client.clone(), - format!("{base_path}_difficulty"), - ), + difficulty: SeriesTree_Blocks_Difficulty::new(client.clone(), format!("{base_path}_difficulty")), time: SeriesTree_Blocks_Time::new(client.clone(), format!("{base_path}_time")), size: SeriesTree_Blocks_Size::new(client.clone(), format!("{base_path}_size")), - weight: AverageBaseCumulativeMaxMedianMinPct10Pct25Pct75Pct90SumPattern::new( - client.clone(), - "block_weight".to_string(), - ), + weight: AverageBaseCumulativeMaxMedianMinPct10Pct25Pct75Pct90SumPattern::new(client.clone(), "block_weight".to_string()), segwit_txs: SeriesPattern18::new(client.clone(), "segwit_txs".to_string()), segwit_size: SeriesPattern18::new(client.clone(), "segwit_size".to_string()), segwit_weight: SeriesPattern18::new(client.clone(), "segwit_weight".to_string()), count: SeriesTree_Blocks_Count::new(client.clone(), format!("{base_path}_count")), - lookback: SeriesTree_Blocks_Lookback::new( - client.clone(), - format!("{base_path}_lookback"), - ), - interval: SeriesTree_Blocks_Interval::new( - client.clone(), - format!("{base_path}_interval"), - ), - vbytes: AverageBlockCumulativeMaxMedianMinPct10Pct25Pct75Pct90SumPattern::new( - client.clone(), - "block_vbytes".to_string(), - ), - fullness: SeriesTree_Blocks_Fullness::new( - client.clone(), - format!("{base_path}_fullness"), - ), + lookback: SeriesTree_Blocks_Lookback::new(client.clone(), format!("{base_path}_lookback")), + interval: SeriesTree_Blocks_Interval::new(client.clone(), format!("{base_path}_interval")), + vbytes: AverageBlockCumulativeMaxMedianMinPct10Pct25Pct75Pct90SumPattern::new(client.clone(), "block_vbytes".to_string()), + fullness: SeriesTree_Blocks_Fullness::new(client.clone(), format!("{base_path}_fullness")), halving: SeriesTree_Blocks_Halving::new(client.clone(), format!("{base_path}_halving")), } } @@ -5054,15 +3567,9 @@ impl SeriesTree_Blocks_Difficulty { Self { value: SeriesPattern1::new(client.clone(), "difficulty".to_string()), hashrate: SeriesPattern1::new(client.clone(), "difficulty_hashrate".to_string()), - adjustment: BpsPercentRatioPattern::new( - client.clone(), - "difficulty_adjustment".to_string(), - ), + adjustment: BpsPercentRatioPattern::new(client.clone(), "difficulty_adjustment".to_string()), epoch: SeriesPattern1::new(client.clone(), "difficulty_epoch".to_string()), - blocks_to_retarget: SeriesPattern1::new( - client.clone(), - "blocks_to_retarget".to_string(), - ), + blocks_to_retarget: SeriesPattern1::new(client.clone(), "blocks_to_retarget".to_string()), days_to_retarget: SeriesPattern1::new(client.clone(), "days_to_retarget".to_string()), } } @@ -5124,10 +3631,7 @@ impl SeriesTree_Blocks_Count { pub fn new(client: Arc, base_path: String) -> Self { Self { target: _1m1w1y24hPattern::new(client.clone(), "block_count_target".to_string()), - total: AverageBlockCumulativeSumPattern2::new( - client.clone(), - "block_count".to_string(), - ), + total: AverageBlockCumulativeSumPattern2::new(client.clone(), "block_count".to_string()), } } } @@ -5301,14 +3805,8 @@ impl SeriesTree_Transactions { count: SeriesTree_Transactions_Count::new(client.clone(), format!("{base_path}_count")), size: SeriesTree_Transactions_Size::new(client.clone(), format!("{base_path}_size")), fees: SeriesTree_Transactions_Fees::new(client.clone(), format!("{base_path}_fees")), - versions: SeriesTree_Transactions_Versions::new( - client.clone(), - format!("{base_path}_versions"), - ), - volume: SeriesTree_Transactions_Volume::new( - client.clone(), - format!("{base_path}_volume"), - ), + versions: SeriesTree_Transactions_Versions::new(client.clone(), format!("{base_path}_versions")), + volume: SeriesTree_Transactions_Volume::new(client.clone(), format!("{base_path}_volume")), } } } @@ -5335,15 +3833,9 @@ impl SeriesTree_Transactions_Raw { raw_locktime: SeriesPattern19::new(client.clone(), "raw_locktime".to_string()), base_size: SeriesPattern19::new(client.clone(), "base_size".to_string()), total_size: SeriesPattern19::new(client.clone(), "total_size".to_string()), - is_explicitly_rbf: SeriesPattern19::new( - client.clone(), - "is_explicitly_rbf".to_string(), - ), + is_explicitly_rbf: SeriesPattern19::new(client.clone(), "is_explicitly_rbf".to_string()), first_txin_index: SeriesPattern19::new(client.clone(), "first_txin_index".to_string()), - first_txout_index: SeriesPattern19::new( - client.clone(), - "first_txout_index".to_string(), - ), + first_txout_index: SeriesPattern19::new(client.clone(), "first_txout_index".to_string()), } } } @@ -5356,10 +3848,7 @@ pub struct SeriesTree_Transactions_Count { impl SeriesTree_Transactions_Count { pub fn new(client: Arc, base_path: String) -> Self { Self { - total: AverageBlockCumulativeMaxMedianMinPct10Pct25Pct75Pct90SumPattern::new( - client.clone(), - "tx_count".to_string(), - ), + total: AverageBlockCumulativeMaxMedianMinPct10Pct25Pct75Pct90SumPattern::new(client.clone(), "tx_count".to_string()), } } } @@ -5374,10 +3863,7 @@ impl SeriesTree_Transactions_Size { pub fn new(client: Arc, base_path: String) -> Self { Self { vsize: _6bBlockTxPattern::new(client.clone(), "tx_vsize".to_string()), - weight: SeriesTree_Transactions_Size_Weight::new( - client.clone(), - format!("{base_path}_weight"), - ), + weight: SeriesTree_Transactions_Size_Weight::new(client.clone(), format!("{base_path}_weight")), } } } @@ -5393,14 +3879,8 @@ impl SeriesTree_Transactions_Size_Weight { pub fn new(client: Arc, base_path: String) -> Self { Self { tx_index: SeriesPattern19::new(client.clone(), "tx_weight".to_string()), - block: MaxMedianMinPct10Pct25Pct75Pct90Pattern2::new( - client.clone(), - "tx_weight".to_string(), - ), - _6b: MaxMedianMinPct10Pct25Pct75Pct90Pattern2::new( - client.clone(), - "tx_weight_6b".to_string(), - ), + block: MaxMedianMinPct10Pct25Pct75Pct90Pattern2::new(client.clone(), "tx_weight".to_string()), + _6b: MaxMedianMinPct10Pct25Pct75Pct90Pattern2::new(client.clone(), "tx_weight_6b".to_string()), } } } @@ -5421,10 +3901,7 @@ impl SeriesTree_Transactions_Fees { output_value: SeriesPattern19::new(client.clone(), "output_value".to_string()), fee: _6bBlockTxPattern::new(client.clone(), "fee".to_string()), fee_rate: SeriesPattern19::new(client.clone(), "fee_rate".to_string()), - effective_fee_rate: _6bBlockTxPattern::new( - client.clone(), - "effective_fee_rate".to_string(), - ), + effective_fee_rate: _6bBlockTxPattern::new(client.clone(), "effective_fee_rate".to_string()), } } } @@ -5455,10 +3932,7 @@ pub struct SeriesTree_Transactions_Volume { impl SeriesTree_Transactions_Volume { pub fn new(client: Arc, base_path: String) -> Self { Self { - transfer_volume: AverageBlockCumulativeSumPattern3::new( - client.clone(), - "transfer_volume_bis".to_string(), - ), + transfer_volume: AverageBlockCumulativeSumPattern3::new(client.clone(), "transfer_volume_bis".to_string()), tx_per_sec: _1m1w1y24hPattern::new(client.clone(), "tx_per_sec".to_string()), } } @@ -5532,22 +4006,10 @@ pub struct SeriesTree_Inputs_ByType { impl SeriesTree_Inputs_ByType { pub fn new(client: Arc, base_path: String) -> Self { Self { - input_count: SeriesTree_Inputs_ByType_InputCount::new( - client.clone(), - format!("{base_path}_input_count"), - ), - input_share: SeriesTree_Inputs_ByType_InputShare::new( - client.clone(), - format!("{base_path}_input_share"), - ), - tx_count: SeriesTree_Inputs_ByType_TxCount::new( - client.clone(), - format!("{base_path}_tx_count"), - ), - tx_share: EmptyP2aP2msP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshUnknownPattern2::new( - client.clone(), - "tx_share_with".to_string(), - ), + input_count: SeriesTree_Inputs_ByType_InputCount::new(client.clone(), format!("{base_path}_input_count")), + input_share: SeriesTree_Inputs_ByType_InputShare::new(client.clone(), format!("{base_path}_input_share")), + tx_count: SeriesTree_Inputs_ByType_TxCount::new(client.clone(), format!("{base_path}_tx_count")), + tx_share: EmptyP2aP2msP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshUnknownPattern2::new(client.clone(), "tx_share_with".to_string()), } } } @@ -5571,54 +4033,18 @@ pub struct SeriesTree_Inputs_ByType_InputCount { impl SeriesTree_Inputs_ByType_InputCount { pub fn new(client: Arc, base_path: String) -> Self { Self { - all: AverageBlockCumulativeSumPattern::new( - client.clone(), - "input_count_bis".to_string(), - ), - p2pk65: AverageBlockCumulativeSumPattern::new( - client.clone(), - "p2pk65_prevout_count".to_string(), - ), - p2pk33: AverageBlockCumulativeSumPattern::new( - client.clone(), - "p2pk33_prevout_count".to_string(), - ), - p2pkh: AverageBlockCumulativeSumPattern::new( - client.clone(), - "p2pkh_prevout_count".to_string(), - ), - p2ms: AverageBlockCumulativeSumPattern::new( - client.clone(), - "p2ms_prevout_count".to_string(), - ), - p2sh: AverageBlockCumulativeSumPattern::new( - client.clone(), - "p2sh_prevout_count".to_string(), - ), - p2wpkh: AverageBlockCumulativeSumPattern::new( - client.clone(), - "p2wpkh_prevout_count".to_string(), - ), - p2wsh: AverageBlockCumulativeSumPattern::new( - client.clone(), - "p2wsh_prevout_count".to_string(), - ), - p2tr: AverageBlockCumulativeSumPattern::new( - client.clone(), - "p2tr_prevout_count".to_string(), - ), - p2a: AverageBlockCumulativeSumPattern::new( - client.clone(), - "p2a_prevout_count".to_string(), - ), - unknown: AverageBlockCumulativeSumPattern::new( - client.clone(), - "unknown_outputs_prevout_count".to_string(), - ), - empty: AverageBlockCumulativeSumPattern::new( - client.clone(), - "empty_outputs_prevout_count".to_string(), - ), + all: AverageBlockCumulativeSumPattern::new(client.clone(), "input_count_bis".to_string()), + p2pk65: AverageBlockCumulativeSumPattern::new(client.clone(), "p2pk65_prevout_count".to_string()), + p2pk33: AverageBlockCumulativeSumPattern::new(client.clone(), "p2pk33_prevout_count".to_string()), + p2pkh: AverageBlockCumulativeSumPattern::new(client.clone(), "p2pkh_prevout_count".to_string()), + p2ms: AverageBlockCumulativeSumPattern::new(client.clone(), "p2ms_prevout_count".to_string()), + p2sh: AverageBlockCumulativeSumPattern::new(client.clone(), "p2sh_prevout_count".to_string()), + p2wpkh: AverageBlockCumulativeSumPattern::new(client.clone(), "p2wpkh_prevout_count".to_string()), + p2wsh: AverageBlockCumulativeSumPattern::new(client.clone(), "p2wsh_prevout_count".to_string()), + p2tr: AverageBlockCumulativeSumPattern::new(client.clone(), "p2tr_prevout_count".to_string()), + p2a: AverageBlockCumulativeSumPattern::new(client.clone(), "p2a_prevout_count".to_string()), + unknown: AverageBlockCumulativeSumPattern::new(client.clone(), "unknown_outputs_prevout_count".to_string()), + empty: AverageBlockCumulativeSumPattern::new(client.clone(), "empty_outputs_prevout_count".to_string()), } } } @@ -5641,50 +4067,17 @@ pub struct SeriesTree_Inputs_ByType_InputShare { impl SeriesTree_Inputs_ByType_InputShare { pub fn new(client: Arc, base_path: String) -> Self { Self { - p2pk65: _1m1w1y24hBpsPercentRatioPattern::new( - client.clone(), - "p2pk65_prevout_share".to_string(), - ), - p2pk33: _1m1w1y24hBpsPercentRatioPattern::new( - client.clone(), - "p2pk33_prevout_share".to_string(), - ), - p2pkh: _1m1w1y24hBpsPercentRatioPattern::new( - client.clone(), - "p2pkh_prevout_share".to_string(), - ), - p2ms: _1m1w1y24hBpsPercentRatioPattern::new( - client.clone(), - "p2ms_prevout_share".to_string(), - ), - p2sh: _1m1w1y24hBpsPercentRatioPattern::new( - client.clone(), - "p2sh_prevout_share".to_string(), - ), - p2wpkh: _1m1w1y24hBpsPercentRatioPattern::new( - client.clone(), - "p2wpkh_prevout_share".to_string(), - ), - p2wsh: _1m1w1y24hBpsPercentRatioPattern::new( - client.clone(), - "p2wsh_prevout_share".to_string(), - ), - p2tr: _1m1w1y24hBpsPercentRatioPattern::new( - client.clone(), - "p2tr_prevout_share".to_string(), - ), - p2a: _1m1w1y24hBpsPercentRatioPattern::new( - client.clone(), - "p2a_prevout_share".to_string(), - ), - unknown: _1m1w1y24hBpsPercentRatioPattern::new( - client.clone(), - "unknown_outputs_prevout_share".to_string(), - ), - empty: _1m1w1y24hBpsPercentRatioPattern::new( - client.clone(), - "empty_outputs_prevout_share".to_string(), - ), + p2pk65: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), "p2pk65_prevout_share".to_string()), + p2pk33: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), "p2pk33_prevout_share".to_string()), + p2pkh: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), "p2pkh_prevout_share".to_string()), + p2ms: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), "p2ms_prevout_share".to_string()), + p2sh: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), "p2sh_prevout_share".to_string()), + p2wpkh: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), "p2wpkh_prevout_share".to_string()), + p2wsh: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), "p2wsh_prevout_share".to_string()), + p2tr: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), "p2tr_prevout_share".to_string()), + p2a: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), "p2a_prevout_share".to_string()), + unknown: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), "unknown_outputs_prevout_share".to_string()), + empty: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), "empty_outputs_prevout_share".to_string()), } } } @@ -5708,54 +4101,18 @@ pub struct SeriesTree_Inputs_ByType_TxCount { impl SeriesTree_Inputs_ByType_TxCount { pub fn new(client: Arc, base_path: String) -> Self { Self { - all: AverageBlockCumulativeSumPattern::new( - client.clone(), - "non_coinbase_tx_count".to_string(), - ), - p2pk65: AverageBlockCumulativeSumPattern::new( - client.clone(), - "tx_count_with_p2pk65_prevout".to_string(), - ), - p2pk33: AverageBlockCumulativeSumPattern::new( - client.clone(), - "tx_count_with_p2pk33_prevout".to_string(), - ), - p2pkh: AverageBlockCumulativeSumPattern::new( - client.clone(), - "tx_count_with_p2pkh_prevout".to_string(), - ), - p2ms: AverageBlockCumulativeSumPattern::new( - client.clone(), - "tx_count_with_p2ms_prevout".to_string(), - ), - p2sh: AverageBlockCumulativeSumPattern::new( - client.clone(), - "tx_count_with_p2sh_prevout".to_string(), - ), - p2wpkh: AverageBlockCumulativeSumPattern::new( - client.clone(), - "tx_count_with_p2wpkh_prevout".to_string(), - ), - p2wsh: AverageBlockCumulativeSumPattern::new( - client.clone(), - "tx_count_with_p2wsh_prevout".to_string(), - ), - p2tr: AverageBlockCumulativeSumPattern::new( - client.clone(), - "tx_count_with_p2tr_prevout".to_string(), - ), - p2a: AverageBlockCumulativeSumPattern::new( - client.clone(), - "tx_count_with_p2a_prevout".to_string(), - ), - unknown: AverageBlockCumulativeSumPattern::new( - client.clone(), - "tx_count_with_unknown_outputs_prevout".to_string(), - ), - empty: AverageBlockCumulativeSumPattern::new( - client.clone(), - "tx_count_with_empty_outputs_prevout".to_string(), - ), + all: AverageBlockCumulativeSumPattern::new(client.clone(), "non_coinbase_tx_count".to_string()), + p2pk65: AverageBlockCumulativeSumPattern::new(client.clone(), "tx_count_with_p2pk65_prevout".to_string()), + p2pk33: AverageBlockCumulativeSumPattern::new(client.clone(), "tx_count_with_p2pk33_prevout".to_string()), + p2pkh: AverageBlockCumulativeSumPattern::new(client.clone(), "tx_count_with_p2pkh_prevout".to_string()), + p2ms: AverageBlockCumulativeSumPattern::new(client.clone(), "tx_count_with_p2ms_prevout".to_string()), + p2sh: AverageBlockCumulativeSumPattern::new(client.clone(), "tx_count_with_p2sh_prevout".to_string()), + p2wpkh: AverageBlockCumulativeSumPattern::new(client.clone(), "tx_count_with_p2wpkh_prevout".to_string()), + p2wsh: AverageBlockCumulativeSumPattern::new(client.clone(), "tx_count_with_p2wsh_prevout".to_string()), + p2tr: AverageBlockCumulativeSumPattern::new(client.clone(), "tx_count_with_p2tr_prevout".to_string()), + p2a: AverageBlockCumulativeSumPattern::new(client.clone(), "tx_count_with_p2a_prevout".to_string()), + unknown: AverageBlockCumulativeSumPattern::new(client.clone(), "tx_count_with_unknown_outputs_prevout".to_string()), + empty: AverageBlockCumulativeSumPattern::new(client.clone(), "tx_count_with_empty_outputs_prevout".to_string()), } } } @@ -5778,10 +4135,7 @@ impl SeriesTree_Outputs { spent: SeriesTree_Outputs_Spent::new(client.clone(), format!("{base_path}_spent")), count: SeriesTree_Outputs_Count::new(client.clone(), format!("{base_path}_count")), per_sec: _1m1w1y24hPattern::new(client.clone(), "outputs_per_sec".to_string()), - unspent: SeriesTree_Outputs_Unspent::new( - client.clone(), - format!("{base_path}_unspent"), - ), + unspent: SeriesTree_Outputs_Unspent::new(client.clone(), format!("{base_path}_unspent")), by_type: SeriesTree_Outputs_ByType::new(client.clone(), format!("{base_path}_by_type")), value: SeriesTree_Outputs_Value::new(client.clone(), format!("{base_path}_value")), } @@ -5800,10 +4154,7 @@ pub struct SeriesTree_Outputs_Raw { impl SeriesTree_Outputs_Raw { pub fn new(client: Arc, base_path: String) -> Self { Self { - first_txout_index: SeriesPattern18::new( - client.clone(), - "first_txout_index".to_string(), - ), + first_txout_index: SeriesPattern18::new(client.clone(), "first_txout_index".to_string()), value: SeriesPattern21::new(client.clone(), "value".to_string()), output_type: SeriesPattern21::new(client.clone(), "output_type".to_string()), type_index: SeriesPattern21::new(client.clone(), "type_index".to_string()), @@ -5863,26 +4214,11 @@ pub struct SeriesTree_Outputs_ByType { impl SeriesTree_Outputs_ByType { pub fn new(client: Arc, base_path: String) -> Self { Self { - output_count: SeriesTree_Outputs_ByType_OutputCount::new( - client.clone(), - format!("{base_path}_output_count"), - ), - spendable_output_count: AverageBlockCumulativeSumPattern::new( - client.clone(), - "spendable_output_count".to_string(), - ), - output_share: SeriesTree_Outputs_ByType_OutputShare::new( - client.clone(), - format!("{base_path}_output_share"), - ), - tx_count: AllEmptyOpP2aP2msP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshUnknownPattern::new( - client.clone(), - "tx_count".to_string(), - ), - tx_share: EmptyOpP2aP2msP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshUnknownPattern2::new( - client.clone(), - "tx_share_with".to_string(), - ), + output_count: SeriesTree_Outputs_ByType_OutputCount::new(client.clone(), format!("{base_path}_output_count")), + spendable_output_count: AverageBlockCumulativeSumPattern::new(client.clone(), "spendable_output_count".to_string()), + output_share: SeriesTree_Outputs_ByType_OutputShare::new(client.clone(), format!("{base_path}_output_share")), + tx_count: AllEmptyOpP2aP2msP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshUnknownPattern::new(client.clone(), "tx_count".to_string()), + tx_share: EmptyOpP2aP2msP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshUnknownPattern2::new(client.clone(), "tx_share_with".to_string()), } } } @@ -5907,58 +4243,19 @@ pub struct SeriesTree_Outputs_ByType_OutputCount { impl SeriesTree_Outputs_ByType_OutputCount { pub fn new(client: Arc, base_path: String) -> Self { Self { - all: AverageBlockCumulativeSumPattern::new( - client.clone(), - "output_count_bis".to_string(), - ), - p2pk65: AverageBlockCumulativeSumPattern::new( - client.clone(), - "p2pk65_output_count".to_string(), - ), - p2pk33: AverageBlockCumulativeSumPattern::new( - client.clone(), - "p2pk33_output_count".to_string(), - ), - p2pkh: AverageBlockCumulativeSumPattern::new( - client.clone(), - "p2pkh_output_count".to_string(), - ), - p2ms: AverageBlockCumulativeSumPattern::new( - client.clone(), - "p2ms_output_count".to_string(), - ), - p2sh: AverageBlockCumulativeSumPattern::new( - client.clone(), - "p2sh_output_count".to_string(), - ), - p2wpkh: AverageBlockCumulativeSumPattern::new( - client.clone(), - "p2wpkh_output_count".to_string(), - ), - p2wsh: AverageBlockCumulativeSumPattern::new( - client.clone(), - "p2wsh_output_count".to_string(), - ), - p2tr: AverageBlockCumulativeSumPattern::new( - client.clone(), - "p2tr_output_count".to_string(), - ), - p2a: AverageBlockCumulativeSumPattern::new( - client.clone(), - "p2a_output_count".to_string(), - ), - unknown: AverageBlockCumulativeSumPattern::new( - client.clone(), - "unknown_outputs_output_count".to_string(), - ), - empty: AverageBlockCumulativeSumPattern::new( - client.clone(), - "empty_outputs_output_count".to_string(), - ), - op_return: AverageBlockCumulativeSumPattern::new( - client.clone(), - "op_return_output_count".to_string(), - ), + all: AverageBlockCumulativeSumPattern::new(client.clone(), "output_count_bis".to_string()), + p2pk65: AverageBlockCumulativeSumPattern::new(client.clone(), "p2pk65_output_count".to_string()), + p2pk33: AverageBlockCumulativeSumPattern::new(client.clone(), "p2pk33_output_count".to_string()), + p2pkh: AverageBlockCumulativeSumPattern::new(client.clone(), "p2pkh_output_count".to_string()), + p2ms: AverageBlockCumulativeSumPattern::new(client.clone(), "p2ms_output_count".to_string()), + p2sh: AverageBlockCumulativeSumPattern::new(client.clone(), "p2sh_output_count".to_string()), + p2wpkh: AverageBlockCumulativeSumPattern::new(client.clone(), "p2wpkh_output_count".to_string()), + p2wsh: AverageBlockCumulativeSumPattern::new(client.clone(), "p2wsh_output_count".to_string()), + p2tr: AverageBlockCumulativeSumPattern::new(client.clone(), "p2tr_output_count".to_string()), + p2a: AverageBlockCumulativeSumPattern::new(client.clone(), "p2a_output_count".to_string()), + unknown: AverageBlockCumulativeSumPattern::new(client.clone(), "unknown_outputs_output_count".to_string()), + empty: AverageBlockCumulativeSumPattern::new(client.clone(), "empty_outputs_output_count".to_string()), + op_return: AverageBlockCumulativeSumPattern::new(client.clone(), "op_return_output_count".to_string()), } } } @@ -5982,54 +4279,18 @@ pub struct SeriesTree_Outputs_ByType_OutputShare { impl SeriesTree_Outputs_ByType_OutputShare { pub fn new(client: Arc, base_path: String) -> Self { Self { - p2pk65: _1m1w1y24hBpsPercentRatioPattern::new( - client.clone(), - "p2pk65_output_share".to_string(), - ), - p2pk33: _1m1w1y24hBpsPercentRatioPattern::new( - client.clone(), - "p2pk33_output_share".to_string(), - ), - p2pkh: _1m1w1y24hBpsPercentRatioPattern::new( - client.clone(), - "p2pkh_output_share".to_string(), - ), - p2ms: _1m1w1y24hBpsPercentRatioPattern::new( - client.clone(), - "p2ms_output_share".to_string(), - ), - p2sh: _1m1w1y24hBpsPercentRatioPattern::new( - client.clone(), - "p2sh_output_share".to_string(), - ), - p2wpkh: _1m1w1y24hBpsPercentRatioPattern::new( - client.clone(), - "p2wpkh_output_share".to_string(), - ), - p2wsh: _1m1w1y24hBpsPercentRatioPattern::new( - client.clone(), - "p2wsh_output_share".to_string(), - ), - p2tr: _1m1w1y24hBpsPercentRatioPattern::new( - client.clone(), - "p2tr_output_share".to_string(), - ), - p2a: _1m1w1y24hBpsPercentRatioPattern::new( - client.clone(), - "p2a_output_share".to_string(), - ), - unknown: _1m1w1y24hBpsPercentRatioPattern::new( - client.clone(), - "unknown_outputs_output_share".to_string(), - ), - empty: _1m1w1y24hBpsPercentRatioPattern::new( - client.clone(), - "empty_outputs_output_share".to_string(), - ), - op_return: _1m1w1y24hBpsPercentRatioPattern::new( - client.clone(), - "op_return_output_share".to_string(), - ), + p2pk65: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), "p2pk65_output_share".to_string()), + p2pk33: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), "p2pk33_output_share".to_string()), + p2pkh: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), "p2pkh_output_share".to_string()), + p2ms: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), "p2ms_output_share".to_string()), + p2sh: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), "p2sh_output_share".to_string()), + p2wpkh: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), "p2wpkh_output_share".to_string()), + p2wsh: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), "p2wsh_output_share".to_string()), + p2tr: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), "p2tr_output_share".to_string()), + p2a: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), "p2a_output_share".to_string()), + unknown: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), "unknown_outputs_output_share".to_string()), + empty: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), "empty_outputs_output_share".to_string()), + op_return: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), "op_return_output_share".to_string()), } } } @@ -6070,34 +4331,16 @@ impl SeriesTree_Addrs { raw: SeriesTree_Addrs_Raw::new(client.clone(), format!("{base_path}_raw")), indexes: SeriesTree_Addrs_Indexes::new(client.clone(), format!("{base_path}_indexes")), data: SeriesTree_Addrs_Data::new(client.clone(), format!("{base_path}_data")), - funded: AllP2aP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshPattern4::new( - client.clone(), - "addr_count".to_string(), - ), - empty: AllP2aP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshPattern4::new( - client.clone(), - "empty_addr_count".to_string(), - ), - activity: SeriesTree_Addrs_Activity::new( - client.clone(), - format!("{base_path}_activity"), - ), - total: AllP2aP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshPattern4::new( - client.clone(), - "total_addr_count".to_string(), - ), - new: AllP2aP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshPattern6::new( - client.clone(), - "new_addr_count".to_string(), - ), + funded: AllP2aP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshPattern4::new(client.clone(), "addr_count".to_string()), + empty: AllP2aP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshPattern4::new(client.clone(), "empty_addr_count".to_string()), + activity: SeriesTree_Addrs_Activity::new(client.clone(), format!("{base_path}_activity")), + total: AllP2aP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshPattern4::new(client.clone(), "total_addr_count".to_string()), + new: AllP2aP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshPattern6::new(client.clone(), "new_addr_count".to_string()), reused: SeriesTree_Addrs_Reused::new(client.clone(), format!("{base_path}_reused")), respent: SeriesTree_Addrs_Respent::new(client.clone(), format!("{base_path}_respent")), exposed: SeriesTree_Addrs_Exposed::new(client.clone(), format!("{base_path}_exposed")), delta: SeriesTree_Addrs_Delta::new(client.clone(), format!("{base_path}_delta")), - avg_amount: SeriesTree_Addrs_AvgAmount::new( - client.clone(), - format!("{base_path}_avg_amount"), - ), + avg_amount: SeriesTree_Addrs_AvgAmount::new(client.clone(), format!("{base_path}_avg_amount")), } } } @@ -6138,10 +4381,7 @@ pub struct SeriesTree_Addrs_Raw_P2pk65 { impl SeriesTree_Addrs_Raw_P2pk65 { pub fn new(client: Arc, base_path: String) -> Self { Self { - first_index: SeriesPattern18::new( - client.clone(), - "first_p2pk65_addr_index".to_string(), - ), + first_index: SeriesPattern18::new(client.clone(), "first_p2pk65_addr_index".to_string()), bytes: SeriesPattern27::new(client.clone(), "p2pk65_bytes".to_string()), } } @@ -6156,10 +4396,7 @@ pub struct SeriesTree_Addrs_Raw_P2pk33 { impl SeriesTree_Addrs_Raw_P2pk33 { pub fn new(client: Arc, base_path: String) -> Self { Self { - first_index: SeriesPattern18::new( - client.clone(), - "first_p2pk33_addr_index".to_string(), - ), + first_index: SeriesPattern18::new(client.clone(), "first_p2pk33_addr_index".to_string()), bytes: SeriesPattern26::new(client.clone(), "p2pk33_bytes".to_string()), } } @@ -6204,10 +4441,7 @@ pub struct SeriesTree_Addrs_Raw_P2wpkh { impl SeriesTree_Addrs_Raw_P2wpkh { pub fn new(client: Arc, base_path: String) -> Self { Self { - first_index: SeriesPattern18::new( - client.clone(), - "first_p2wpkh_addr_index".to_string(), - ), + first_index: SeriesPattern18::new(client.clone(), "first_p2wpkh_addr_index".to_string()), bytes: SeriesPattern31::new(client.clone(), "p2wpkh_bytes".to_string()), } } @@ -6321,38 +4555,14 @@ impl SeriesTree_Addrs_Activity { pub fn new(client: Arc, base_path: String) -> Self { Self { all: SeriesTree_Addrs_Activity_All::new(client.clone(), format!("{base_path}_all")), - p2pk65: ActiveBidirectionalReactivatedReceivingSendingPattern::new( - client.clone(), - "p2pk65".to_string(), - ), - p2pk33: ActiveBidirectionalReactivatedReceivingSendingPattern::new( - client.clone(), - "p2pk33".to_string(), - ), - p2pkh: ActiveBidirectionalReactivatedReceivingSendingPattern::new( - client.clone(), - "p2pkh".to_string(), - ), - p2sh: ActiveBidirectionalReactivatedReceivingSendingPattern::new( - client.clone(), - "p2sh".to_string(), - ), - p2wpkh: ActiveBidirectionalReactivatedReceivingSendingPattern::new( - client.clone(), - "p2wpkh".to_string(), - ), - p2wsh: ActiveBidirectionalReactivatedReceivingSendingPattern::new( - client.clone(), - "p2wsh".to_string(), - ), - p2tr: ActiveBidirectionalReactivatedReceivingSendingPattern::new( - client.clone(), - "p2tr".to_string(), - ), - p2a: ActiveBidirectionalReactivatedReceivingSendingPattern::new( - client.clone(), - "p2a".to_string(), - ), + p2pk65: ActiveBidirectionalReactivatedReceivingSendingPattern::new(client.clone(), "p2pk65".to_string()), + p2pk33: ActiveBidirectionalReactivatedReceivingSendingPattern::new(client.clone(), "p2pk33".to_string()), + p2pkh: ActiveBidirectionalReactivatedReceivingSendingPattern::new(client.clone(), "p2pkh".to_string()), + p2sh: ActiveBidirectionalReactivatedReceivingSendingPattern::new(client.clone(), "p2sh".to_string()), + p2wpkh: ActiveBidirectionalReactivatedReceivingSendingPattern::new(client.clone(), "p2wpkh".to_string()), + p2wsh: ActiveBidirectionalReactivatedReceivingSendingPattern::new(client.clone(), "p2wsh".to_string()), + p2tr: ActiveBidirectionalReactivatedReceivingSendingPattern::new(client.clone(), "p2tr".to_string()), + p2a: ActiveBidirectionalReactivatedReceivingSendingPattern::new(client.clone(), "p2a".to_string()), } } } @@ -6369,16 +4579,10 @@ pub struct SeriesTree_Addrs_Activity_All { impl SeriesTree_Addrs_Activity_All { pub fn new(client: Arc, base_path: String) -> Self { Self { - reactivated: _1m1w1y24hBlockPattern::new( - client.clone(), - "reactivated_addrs".to_string(), - ), + reactivated: _1m1w1y24hBlockPattern::new(client.clone(), "reactivated_addrs".to_string()), sending: _1m1w1y24hBlockPattern::new(client.clone(), "sending_addrs".to_string()), receiving: _1m1w1y24hBlockPattern::new(client.clone(), "receiving_addrs".to_string()), - bidirectional: _1m1w1y24hBlockPattern::new( - client.clone(), - "bidirectional_addrs".to_string(), - ), + bidirectional: _1m1w1y24hBlockPattern::new(client.clone(), "bidirectional_addrs".to_string()), active: _1m1w1y24hBlockPattern::new(client.clone(), "active_addrs".to_string()), } } @@ -6395,14 +4599,8 @@ impl SeriesTree_Addrs_Reused { pub fn new(client: Arc, base_path: String) -> Self { Self { count: FundedTotalPattern::new(client.clone(), "reused_addr_count".to_string()), - events: SeriesTree_Addrs_Reused_Events::new( - client.clone(), - format!("{base_path}_events"), - ), - supply: SeriesTree_Addrs_Reused_Supply::new( - client.clone(), - format!("{base_path}_supply"), - ), + events: SeriesTree_Addrs_Reused_Events::new(client.clone(), format!("{base_path}_events")), + supply: SeriesTree_Addrs_Reused_Supply::new(client.clone(), format!("{base_path}_supply")), } } } @@ -6421,34 +4619,13 @@ pub struct SeriesTree_Addrs_Reused_Events { impl SeriesTree_Addrs_Reused_Events { pub fn new(client: Arc, base_path: String) -> Self { Self { - output_to_reused_addr_count: AllP2aP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshPattern6::new( - client.clone(), - "output_to_reused_addr_count".to_string(), - ), - output_to_reused_addr_share: AllP2aP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshPattern7::new( - client.clone(), - "output_to_reused_addr_share".to_string(), - ), - spendable_output_to_reused_addr_share: _1m1w1y24hBpsPercentRatioPattern::new( - client.clone(), - "spendable_output_to_reused_addr_share".to_string(), - ), - input_from_reused_addr_count: AllP2aP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshPattern6::new( - client.clone(), - "input_from_reused_addr_count".to_string(), - ), - input_from_reused_addr_share: AllP2aP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshPattern7::new( - client.clone(), - "input_from_reused_addr_share".to_string(), - ), - active_reused_addr_count: _1m1w1y24hBlockPattern::new( - client.clone(), - "active_reused_addr_count".to_string(), - ), - active_reused_addr_share: _1m1w1y24hBlockPattern2::new( - client.clone(), - "active_reused_addr_share".to_string(), - ), + output_to_reused_addr_count: AllP2aP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshPattern6::new(client.clone(), "output_to_reused_addr_count".to_string()), + output_to_reused_addr_share: AllP2aP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshPattern7::new(client.clone(), "output_to_reused_addr_share".to_string()), + spendable_output_to_reused_addr_share: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), "spendable_output_to_reused_addr_share".to_string()), + input_from_reused_addr_count: AllP2aP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshPattern6::new(client.clone(), "input_from_reused_addr_count".to_string()), + input_from_reused_addr_share: AllP2aP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshPattern7::new(client.clone(), "input_from_reused_addr_share".to_string()), + active_reused_addr_count: _1m1w1y24hBlockPattern::new(client.clone(), "active_reused_addr_count".to_string()), + active_reused_addr_share: _1m1w1y24hBlockPattern2::new(client.clone(), "active_reused_addr_share".to_string()), } } } @@ -6471,39 +4648,15 @@ impl SeriesTree_Addrs_Reused_Supply { pub fn new(client: Arc, base_path: String) -> Self { Self { all: BtcCentsSatsUsdPattern::new(client.clone(), "reused_addr_supply".to_string()), - p2pk65: BtcCentsSatsUsdPattern::new( - client.clone(), - "p2pk65_reused_addr_supply".to_string(), - ), - p2pk33: BtcCentsSatsUsdPattern::new( - client.clone(), - "p2pk33_reused_addr_supply".to_string(), - ), - p2pkh: BtcCentsSatsUsdPattern::new( - client.clone(), - "p2pkh_reused_addr_supply".to_string(), - ), - p2sh: BtcCentsSatsUsdPattern::new( - client.clone(), - "p2sh_reused_addr_supply".to_string(), - ), - p2wpkh: BtcCentsSatsUsdPattern::new( - client.clone(), - "p2wpkh_reused_addr_supply".to_string(), - ), - p2wsh: BtcCentsSatsUsdPattern::new( - client.clone(), - "p2wsh_reused_addr_supply".to_string(), - ), - p2tr: BtcCentsSatsUsdPattern::new( - client.clone(), - "p2tr_reused_addr_supply".to_string(), - ), + p2pk65: BtcCentsSatsUsdPattern::new(client.clone(), "p2pk65_reused_addr_supply".to_string()), + p2pk33: BtcCentsSatsUsdPattern::new(client.clone(), "p2pk33_reused_addr_supply".to_string()), + p2pkh: BtcCentsSatsUsdPattern::new(client.clone(), "p2pkh_reused_addr_supply".to_string()), + p2sh: BtcCentsSatsUsdPattern::new(client.clone(), "p2sh_reused_addr_supply".to_string()), + p2wpkh: BtcCentsSatsUsdPattern::new(client.clone(), "p2wpkh_reused_addr_supply".to_string()), + p2wsh: BtcCentsSatsUsdPattern::new(client.clone(), "p2wsh_reused_addr_supply".to_string()), + p2tr: BtcCentsSatsUsdPattern::new(client.clone(), "p2tr_reused_addr_supply".to_string()), p2a: BtcCentsSatsUsdPattern::new(client.clone(), "p2a_reused_addr_supply".to_string()), - share: AllP2aP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshPattern5::new( - client.clone(), - "reused_addr_supply_share".to_string(), - ), + share: AllP2aP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshPattern5::new(client.clone(), "reused_addr_supply_share".to_string()), } } } @@ -6519,14 +4672,8 @@ impl SeriesTree_Addrs_Respent { pub fn new(client: Arc, base_path: String) -> Self { Self { count: FundedTotalPattern::new(client.clone(), "respent_addr_count".to_string()), - events: SeriesTree_Addrs_Respent_Events::new( - client.clone(), - format!("{base_path}_events"), - ), - supply: SeriesTree_Addrs_Respent_Supply::new( - client.clone(), - format!("{base_path}_supply"), - ), + events: SeriesTree_Addrs_Respent_Events::new(client.clone(), format!("{base_path}_events")), + supply: SeriesTree_Addrs_Respent_Supply::new(client.clone(), format!("{base_path}_supply")), } } } @@ -6545,34 +4692,13 @@ pub struct SeriesTree_Addrs_Respent_Events { impl SeriesTree_Addrs_Respent_Events { pub fn new(client: Arc, base_path: String) -> Self { Self { - output_to_reused_addr_count: AllP2aP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshPattern6::new( - client.clone(), - "output_to_respent_addr_count".to_string(), - ), - output_to_reused_addr_share: AllP2aP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshPattern7::new( - client.clone(), - "output_to_respent_addr_share".to_string(), - ), - spendable_output_to_reused_addr_share: _1m1w1y24hBpsPercentRatioPattern::new( - client.clone(), - "spendable_output_to_respent_addr_share".to_string(), - ), - input_from_reused_addr_count: AllP2aP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshPattern6::new( - client.clone(), - "input_from_respent_addr_count".to_string(), - ), - input_from_reused_addr_share: AllP2aP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshPattern7::new( - client.clone(), - "input_from_respent_addr_share".to_string(), - ), - active_reused_addr_count: _1m1w1y24hBlockPattern::new( - client.clone(), - "active_respent_addr_count".to_string(), - ), - active_reused_addr_share: _1m1w1y24hBlockPattern2::new( - client.clone(), - "active_respent_addr_share".to_string(), - ), + output_to_reused_addr_count: AllP2aP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshPattern6::new(client.clone(), "output_to_respent_addr_count".to_string()), + output_to_reused_addr_share: AllP2aP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshPattern7::new(client.clone(), "output_to_respent_addr_share".to_string()), + spendable_output_to_reused_addr_share: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), "spendable_output_to_respent_addr_share".to_string()), + input_from_reused_addr_count: AllP2aP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshPattern6::new(client.clone(), "input_from_respent_addr_count".to_string()), + input_from_reused_addr_share: AllP2aP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshPattern7::new(client.clone(), "input_from_respent_addr_share".to_string()), + active_reused_addr_count: _1m1w1y24hBlockPattern::new(client.clone(), "active_respent_addr_count".to_string()), + active_reused_addr_share: _1m1w1y24hBlockPattern2::new(client.clone(), "active_respent_addr_share".to_string()), } } } @@ -6595,39 +4721,15 @@ impl SeriesTree_Addrs_Respent_Supply { pub fn new(client: Arc, base_path: String) -> Self { Self { all: BtcCentsSatsUsdPattern::new(client.clone(), "respent_addr_supply".to_string()), - p2pk65: BtcCentsSatsUsdPattern::new( - client.clone(), - "p2pk65_respent_addr_supply".to_string(), - ), - p2pk33: BtcCentsSatsUsdPattern::new( - client.clone(), - "p2pk33_respent_addr_supply".to_string(), - ), - p2pkh: BtcCentsSatsUsdPattern::new( - client.clone(), - "p2pkh_respent_addr_supply".to_string(), - ), - p2sh: BtcCentsSatsUsdPattern::new( - client.clone(), - "p2sh_respent_addr_supply".to_string(), - ), - p2wpkh: BtcCentsSatsUsdPattern::new( - client.clone(), - "p2wpkh_respent_addr_supply".to_string(), - ), - p2wsh: BtcCentsSatsUsdPattern::new( - client.clone(), - "p2wsh_respent_addr_supply".to_string(), - ), - p2tr: BtcCentsSatsUsdPattern::new( - client.clone(), - "p2tr_respent_addr_supply".to_string(), - ), + p2pk65: BtcCentsSatsUsdPattern::new(client.clone(), "p2pk65_respent_addr_supply".to_string()), + p2pk33: BtcCentsSatsUsdPattern::new(client.clone(), "p2pk33_respent_addr_supply".to_string()), + p2pkh: BtcCentsSatsUsdPattern::new(client.clone(), "p2pkh_respent_addr_supply".to_string()), + p2sh: BtcCentsSatsUsdPattern::new(client.clone(), "p2sh_respent_addr_supply".to_string()), + p2wpkh: BtcCentsSatsUsdPattern::new(client.clone(), "p2wpkh_respent_addr_supply".to_string()), + p2wsh: BtcCentsSatsUsdPattern::new(client.clone(), "p2wsh_respent_addr_supply".to_string()), + p2tr: BtcCentsSatsUsdPattern::new(client.clone(), "p2tr_respent_addr_supply".to_string()), p2a: BtcCentsSatsUsdPattern::new(client.clone(), "p2a_respent_addr_supply".to_string()), - share: AllP2aP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshPattern5::new( - client.clone(), - "respent_addr_supply_share".to_string(), - ), + share: AllP2aP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshPattern5::new(client.clone(), "respent_addr_supply_share".to_string()), } } } @@ -6642,10 +4744,7 @@ impl SeriesTree_Addrs_Exposed { pub fn new(client: Arc, base_path: String) -> Self { Self { count: FundedTotalPattern::new(client.clone(), "exposed_addr_count".to_string()), - supply: SeriesTree_Addrs_Exposed_Supply::new( - client.clone(), - format!("{base_path}_supply"), - ), + supply: SeriesTree_Addrs_Exposed_Supply::new(client.clone(), format!("{base_path}_supply")), } } } @@ -6668,39 +4767,15 @@ impl SeriesTree_Addrs_Exposed_Supply { pub fn new(client: Arc, base_path: String) -> Self { Self { all: BtcCentsSatsUsdPattern::new(client.clone(), "exposed_addr_supply".to_string()), - p2pk65: BtcCentsSatsUsdPattern::new( - client.clone(), - "p2pk65_exposed_addr_supply".to_string(), - ), - p2pk33: BtcCentsSatsUsdPattern::new( - client.clone(), - "p2pk33_exposed_addr_supply".to_string(), - ), - p2pkh: BtcCentsSatsUsdPattern::new( - client.clone(), - "p2pkh_exposed_addr_supply".to_string(), - ), - p2sh: BtcCentsSatsUsdPattern::new( - client.clone(), - "p2sh_exposed_addr_supply".to_string(), - ), - p2wpkh: BtcCentsSatsUsdPattern::new( - client.clone(), - "p2wpkh_exposed_addr_supply".to_string(), - ), - p2wsh: BtcCentsSatsUsdPattern::new( - client.clone(), - "p2wsh_exposed_addr_supply".to_string(), - ), - p2tr: BtcCentsSatsUsdPattern::new( - client.clone(), - "p2tr_exposed_addr_supply".to_string(), - ), + p2pk65: BtcCentsSatsUsdPattern::new(client.clone(), "p2pk65_exposed_addr_supply".to_string()), + p2pk33: BtcCentsSatsUsdPattern::new(client.clone(), "p2pk33_exposed_addr_supply".to_string()), + p2pkh: BtcCentsSatsUsdPattern::new(client.clone(), "p2pkh_exposed_addr_supply".to_string()), + p2sh: BtcCentsSatsUsdPattern::new(client.clone(), "p2sh_exposed_addr_supply".to_string()), + p2wpkh: BtcCentsSatsUsdPattern::new(client.clone(), "p2wpkh_exposed_addr_supply".to_string()), + p2wsh: BtcCentsSatsUsdPattern::new(client.clone(), "p2wsh_exposed_addr_supply".to_string()), + p2tr: BtcCentsSatsUsdPattern::new(client.clone(), "p2tr_exposed_addr_supply".to_string()), p2a: BtcCentsSatsUsdPattern::new(client.clone(), "p2a_exposed_addr_supply".to_string()), - share: AllP2aP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshPattern5::new( - client.clone(), - "exposed_addr_supply_share".to_string(), - ), + share: AllP2aP2pk33P2pk65P2pkhP2shP2trP2wpkhP2wshPattern5::new(client.clone(), "exposed_addr_supply_share".to_string()), } } } @@ -6788,15 +4863,9 @@ impl SeriesTree_Scripts_Raw { pub fn new(client: Arc, base_path: String) -> Self { Self { empty: SeriesTree_Scripts_Raw_Empty::new(client.clone(), format!("{base_path}_empty")), - op_return: SeriesTree_Scripts_Raw_OpReturn::new( - client.clone(), - format!("{base_path}_op_return"), - ), + op_return: SeriesTree_Scripts_Raw_OpReturn::new(client.clone(), format!("{base_path}_op_return")), p2ms: SeriesTree_Scripts_Raw_P2ms::new(client.clone(), format!("{base_path}_p2ms")), - unknown: SeriesTree_Scripts_Raw_Unknown::new( - client.clone(), - format!("{base_path}_unknown"), - ), + unknown: SeriesTree_Scripts_Raw_Unknown::new(client.clone(), format!("{base_path}_unknown")), } } } @@ -6810,10 +4879,7 @@ pub struct SeriesTree_Scripts_Raw_Empty { impl SeriesTree_Scripts_Raw_Empty { pub fn new(client: Arc, base_path: String) -> Self { Self { - first_index: SeriesPattern18::new( - client.clone(), - "first_empty_output_index".to_string(), - ), + first_index: SeriesPattern18::new(client.clone(), "first_empty_output_index".to_string()), to_tx_index: SeriesPattern22::new(client.clone(), "tx_index".to_string()), } } @@ -6843,10 +4909,7 @@ pub struct SeriesTree_Scripts_Raw_P2ms { impl SeriesTree_Scripts_Raw_P2ms { pub fn new(client: Arc, base_path: String) -> Self { Self { - first_index: SeriesPattern18::new( - client.clone(), - "first_p2ms_output_index".to_string(), - ), + first_index: SeriesPattern18::new(client.clone(), "first_p2ms_output_index".to_string()), to_tx_index: SeriesPattern25::new(client.clone(), "tx_index".to_string()), } } @@ -6861,10 +4924,7 @@ pub struct SeriesTree_Scripts_Raw_Unknown { impl SeriesTree_Scripts_Raw_Unknown { pub fn new(client: Arc, base_path: String) -> Self { Self { - first_index: SeriesPattern18::new( - client.clone(), - "first_unknown_output_index".to_string(), - ), + first_index: SeriesPattern18::new(client.clone(), "first_unknown_output_index".to_string()), to_tx_index: SeriesPattern33::new(client.clone(), "tx_index".to_string()), } } @@ -6880,10 +4940,7 @@ impl SeriesTree_Mining { pub fn new(client: Arc, base_path: String) -> Self { Self { rewards: SeriesTree_Mining_Rewards::new(client.clone(), format!("{base_path}_rewards")), - hashrate: SeriesTree_Mining_Hashrate::new( - client.clone(), - format!("{base_path}_hashrate"), - ), + hashrate: SeriesTree_Mining_Hashrate::new(client.clone(), format!("{base_path}_hashrate")), } } } @@ -6900,14 +4957,8 @@ pub struct SeriesTree_Mining_Rewards { impl SeriesTree_Mining_Rewards { pub fn new(client: Arc, base_path: String) -> Self { Self { - coinbase: AverageBlockCumulativeSumPattern3::new( - client.clone(), - "coinbase".to_string(), - ), - subsidy: SeriesTree_Mining_Rewards_Subsidy::new( - client.clone(), - format!("{base_path}_subsidy"), - ), + coinbase: AverageBlockCumulativeSumPattern3::new(client.clone(), "coinbase".to_string()), + subsidy: SeriesTree_Mining_Rewards_Subsidy::new(client.clone(), format!("{base_path}_subsidy")), fees: SeriesTree_Mining_Rewards_Fees::new(client.clone(), format!("{base_path}_fees")), output_volume: SeriesPattern18::new(client.clone(), "output_volume".to_string()), unclaimed: BlockCumulativePattern::new(client.clone(), "unclaimed_rewards".to_string()), @@ -6928,16 +4979,10 @@ impl SeriesTree_Mining_Rewards_Subsidy { pub fn new(client: Arc, base_path: String) -> Self { Self { block: BtcCentsSatsUsdPattern3::new(client.clone(), "subsidy".to_string()), - cumulative: BtcCentsSatsUsdPattern::new( - client.clone(), - "subsidy_cumulative".to_string(), - ), + cumulative: BtcCentsSatsUsdPattern::new(client.clone(), "subsidy_cumulative".to_string()), sum: _1m1w1y24hPattern4::new(client.clone(), "subsidy_sum".to_string()), average: _1m1w1y24hPattern3::new(client.clone(), "subsidy_average".to_string()), - dominance: _1m1w1y24hBpsPercentRatioPattern::new( - client.clone(), - "subsidy_dominance".to_string(), - ), + dominance: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), "subsidy_dominance".to_string()), } } } @@ -6973,14 +5018,8 @@ impl SeriesTree_Mining_Rewards_Fees { median: _1m1w1y24hPattern4::new(client.clone(), "fees_median".to_string()), pct75: _1m1w1y24hPattern4::new(client.clone(), "fees_pct75".to_string()), pct90: _1m1w1y24hPattern4::new(client.clone(), "fees_pct90".to_string()), - dominance: _1m1w1y24hBpsPercentRatioPattern::new( - client.clone(), - "fee_dominance".to_string(), - ), - to_subsidy_ratio: SeriesTree_Mining_Rewards_Fees_ToSubsidyRatio::new( - client.clone(), - format!("{base_path}_to_subsidy_ratio"), - ), + dominance: _1m1w1y24hBpsPercentRatioPattern::new(client.clone(), "fee_dominance".to_string()), + to_subsidy_ratio: SeriesTree_Mining_Rewards_Fees_ToSubsidyRatio::new(client.clone(), format!("{base_path}_to_subsidy_ratio")), } } } @@ -7033,15 +5072,9 @@ impl SeriesTree_Mining_Hashrate_Rate { pub fn new(client: Arc, base_path: String) -> Self { Self { base: SeriesPattern1::new(client.clone(), "hash_rate".to_string()), - sma: SeriesTree_Mining_Hashrate_Rate_Sma::new( - client.clone(), - format!("{base_path}_sma"), - ), + sma: SeriesTree_Mining_Hashrate_Rate_Sma::new(client.clone(), format!("{base_path}_sma")), ath: SeriesPattern1::new(client.clone(), "hash_rate_ath".to_string()), - drawdown: BpsPercentRatioPattern5::new( - client.clone(), - "hash_rate_drawdown".to_string(), - ), + drawdown: BpsPercentRatioPattern5::new(client.clone(), "hash_rate_drawdown".to_string()), } } } @@ -7079,22 +5112,13 @@ pub struct SeriesTree_Cointime { impl SeriesTree_Cointime { pub fn new(client: Arc, base_path: String) -> Self { Self { - activity: SeriesTree_Cointime_Activity::new( - client.clone(), - format!("{base_path}_activity"), - ), + activity: SeriesTree_Cointime_Activity::new(client.clone(), format!("{base_path}_activity")), supply: SeriesTree_Cointime_Supply::new(client.clone(), format!("{base_path}_supply")), value: SeriesTree_Cointime_Value::new(client.clone(), format!("{base_path}_value")), cap: SeriesTree_Cointime_Cap::new(client.clone(), format!("{base_path}_cap")), prices: SeriesTree_Cointime_Prices::new(client.clone(), format!("{base_path}_prices")), - adjusted: SeriesTree_Cointime_Adjusted::new( - client.clone(), - format!("{base_path}_adjusted"), - ), - reserve_risk: SeriesTree_Cointime_ReserveRisk::new( - client.clone(), - format!("{base_path}_reserve_risk"), - ), + adjusted: SeriesTree_Cointime_Adjusted::new(client.clone(), format!("{base_path}_adjusted")), + reserve_risk: SeriesTree_Cointime_ReserveRisk::new(client.clone(), format!("{base_path}_reserve_risk")), } } } @@ -7112,21 +5136,12 @@ pub struct SeriesTree_Cointime_Activity { impl SeriesTree_Cointime_Activity { pub fn new(client: Arc, base_path: String) -> Self { Self { - coinblocks_created: AverageBlockCumulativeSumPattern::new( - client.clone(), - "coinblocks_created".to_string(), - ), - coinblocks_stored: AverageBlockCumulativeSumPattern::new( - client.clone(), - "coinblocks_stored".to_string(), - ), + coinblocks_created: AverageBlockCumulativeSumPattern::new(client.clone(), "coinblocks_created".to_string()), + coinblocks_stored: AverageBlockCumulativeSumPattern::new(client.clone(), "coinblocks_stored".to_string()), liveliness: SeriesPattern1::new(client.clone(), "liveliness".to_string()), vaultedness: SeriesPattern1::new(client.clone(), "vaultedness".to_string()), ratio: SeriesPattern1::new(client.clone(), "activity_to_vaultedness".to_string()), - coinblocks_destroyed: AverageBlockCumulativeSumPattern::new( - client.clone(), - "coinblocks_destroyed".to_string(), - ), + coinblocks_destroyed: AverageBlockCumulativeSumPattern::new(client.clone(), "coinblocks_destroyed".to_string()), } } } @@ -7157,18 +5172,9 @@ pub struct SeriesTree_Cointime_Value { impl SeriesTree_Cointime_Value { pub fn new(client: Arc, base_path: String) -> Self { Self { - destroyed: AverageBlockCumulativeSumPattern::new( - client.clone(), - "cointime_value_destroyed".to_string(), - ), - created: AverageBlockCumulativeSumPattern::new( - client.clone(), - "cointime_value_created".to_string(), - ), - stored: AverageBlockCumulativeSumPattern::new( - client.clone(), - "cointime_value_stored".to_string(), - ), + destroyed: AverageBlockCumulativeSumPattern::new(client.clone(), "cointime_value_destroyed".to_string()), + created: AverageBlockCumulativeSumPattern::new(client.clone(), "cointime_value_created".to_string()), + stored: AverageBlockCumulativeSumPattern::new(client.clone(), "cointime_value_stored".to_string()), vocdd: AverageBlockCumulativeSumPattern::new(client.clone(), "vocdd".to_string()), } } @@ -7208,22 +5214,10 @@ pub struct SeriesTree_Cointime_Prices { impl SeriesTree_Cointime_Prices { pub fn new(client: Arc, base_path: String) -> Self { Self { - vaulted: BpsCentsPercentilesRatioSatsUsdPattern::new( - client.clone(), - "vaulted_price".to_string(), - ), - active: BpsCentsPercentilesRatioSatsUsdPattern::new( - client.clone(), - "active_price".to_string(), - ), - true_market_mean: BpsCentsPercentilesRatioSatsUsdPattern::new( - client.clone(), - "true_market_mean".to_string(), - ), - cointime: BpsCentsPercentilesRatioSatsUsdPattern::new( - client.clone(), - "cointime_price".to_string(), - ), + vaulted: BpsCentsPercentilesRatioSatsUsdPattern::new(client.clone(), "vaulted_price".to_string()), + active: BpsCentsPercentilesRatioSatsUsdPattern::new(client.clone(), "active_price".to_string()), + true_market_mean: BpsCentsPercentilesRatioSatsUsdPattern::new(client.clone(), "true_market_mean".to_string()), + cointime: BpsCentsPercentilesRatioSatsUsdPattern::new(client.clone(), "cointime_price".to_string()), } } } @@ -7238,18 +5232,9 @@ pub struct SeriesTree_Cointime_Adjusted { impl SeriesTree_Cointime_Adjusted { pub fn new(client: Arc, base_path: String) -> Self { Self { - inflation_rate: BpsPercentRatioPattern::new( - client.clone(), - "cointime_adj_inflation_rate".to_string(), - ), - tx_velocity_native: SeriesPattern1::new( - client.clone(), - "cointime_adj_tx_velocity_btc".to_string(), - ), - tx_velocity_fiat: SeriesPattern1::new( - client.clone(), - "cointime_adj_tx_velocity_usd".to_string(), - ), + inflation_rate: BpsPercentRatioPattern::new(client.clone(), "cointime_adj_inflation_rate".to_string()), + tx_velocity_native: SeriesPattern1::new(client.clone(), "cointime_adj_tx_velocity_btc".to_string()), + tx_velocity_fiat: SeriesPattern1::new(client.clone(), "cointime_adj_tx_velocity_usd".to_string()), } } } @@ -7349,18 +5334,9 @@ impl SeriesTree_Indexes { addr: SeriesTree_Indexes_Addr::new(client.clone(), format!("{base_path}_addr")), height: SeriesTree_Indexes_Height::new(client.clone(), format!("{base_path}_height")), epoch: SeriesTree_Indexes_Epoch::new(client.clone(), format!("{base_path}_epoch")), - halving: SeriesTree_Indexes_Halving::new( - client.clone(), - format!("{base_path}_halving"), - ), - minute10: SeriesTree_Indexes_Minute10::new( - client.clone(), - format!("{base_path}_minute10"), - ), - minute30: SeriesTree_Indexes_Minute30::new( - client.clone(), - format!("{base_path}_minute30"), - ), + halving: SeriesTree_Indexes_Halving::new(client.clone(), format!("{base_path}_halving")), + minute10: SeriesTree_Indexes_Minute10::new(client.clone(), format!("{base_path}_minute10")), + minute30: SeriesTree_Indexes_Minute30::new(client.clone(), format!("{base_path}_minute30")), hour1: SeriesTree_Indexes_Hour1::new(client.clone(), format!("{base_path}_hour1")), hour4: SeriesTree_Indexes_Hour4::new(client.clone(), format!("{base_path}_hour4")), hour12: SeriesTree_Indexes_Hour12::new(client.clone(), format!("{base_path}_hour12")), @@ -7372,22 +5348,10 @@ impl SeriesTree_Indexes { month6: SeriesTree_Indexes_Month6::new(client.clone(), format!("{base_path}_month6")), year1: SeriesTree_Indexes_Year1::new(client.clone(), format!("{base_path}_year1")), year10: SeriesTree_Indexes_Year10::new(client.clone(), format!("{base_path}_year10")), - tx_index: SeriesTree_Indexes_TxIndex::new( - client.clone(), - format!("{base_path}_tx_index"), - ), - txin_index: SeriesTree_Indexes_TxinIndex::new( - client.clone(), - format!("{base_path}_txin_index"), - ), - txout_index: SeriesTree_Indexes_TxoutIndex::new( - client.clone(), - format!("{base_path}_txout_index"), - ), - timestamp: SeriesTree_Indexes_Timestamp::new( - client.clone(), - format!("{base_path}_timestamp"), - ), + tx_index: SeriesTree_Indexes_TxIndex::new(client.clone(), format!("{base_path}_tx_index")), + txin_index: SeriesTree_Indexes_TxinIndex::new(client.clone(), format!("{base_path}_txin_index")), + txout_index: SeriesTree_Indexes_TxoutIndex::new(client.clone(), format!("{base_path}_txout_index")), + timestamp: SeriesTree_Indexes_Timestamp::new(client.clone(), format!("{base_path}_timestamp")), } } } @@ -7411,33 +5375,18 @@ pub struct SeriesTree_Indexes_Addr { impl SeriesTree_Indexes_Addr { pub fn new(client: Arc, base_path: String) -> Self { Self { - p2pk33: SeriesTree_Indexes_Addr_P2pk33::new( - client.clone(), - format!("{base_path}_p2pk33"), - ), - p2pk65: SeriesTree_Indexes_Addr_P2pk65::new( - client.clone(), - format!("{base_path}_p2pk65"), - ), + p2pk33: SeriesTree_Indexes_Addr_P2pk33::new(client.clone(), format!("{base_path}_p2pk33")), + p2pk65: SeriesTree_Indexes_Addr_P2pk65::new(client.clone(), format!("{base_path}_p2pk65")), p2pkh: SeriesTree_Indexes_Addr_P2pkh::new(client.clone(), format!("{base_path}_p2pkh")), p2sh: SeriesTree_Indexes_Addr_P2sh::new(client.clone(), format!("{base_path}_p2sh")), p2tr: SeriesTree_Indexes_Addr_P2tr::new(client.clone(), format!("{base_path}_p2tr")), - p2wpkh: SeriesTree_Indexes_Addr_P2wpkh::new( - client.clone(), - format!("{base_path}_p2wpkh"), - ), + p2wpkh: SeriesTree_Indexes_Addr_P2wpkh::new(client.clone(), format!("{base_path}_p2wpkh")), p2wsh: SeriesTree_Indexes_Addr_P2wsh::new(client.clone(), format!("{base_path}_p2wsh")), p2a: SeriesTree_Indexes_Addr_P2a::new(client.clone(), format!("{base_path}_p2a")), p2ms: SeriesTree_Indexes_Addr_P2ms::new(client.clone(), format!("{base_path}_p2ms")), empty: SeriesTree_Indexes_Addr_Empty::new(client.clone(), format!("{base_path}_empty")), - unknown: SeriesTree_Indexes_Addr_Unknown::new( - client.clone(), - format!("{base_path}_unknown"), - ), - op_return: SeriesTree_Indexes_Addr_OpReturn::new( - client.clone(), - format!("{base_path}_op_return"), - ), + unknown: SeriesTree_Indexes_Addr_Unknown::new(client.clone(), format!("{base_path}_unknown")), + op_return: SeriesTree_Indexes_Addr_OpReturn::new(client.clone(), format!("{base_path}_op_return")), } } } @@ -7948,28 +5897,13 @@ impl SeriesTree_Indicators { nvt: BpsRatioPattern2::new(client.clone(), "nvt".to_string()), gini: BpsPercentRatioPattern2::new(client.clone(), "gini".to_string()), rhodl_ratio: BpsRatioPattern2::new(client.clone(), "rhodl_ratio".to_string()), - thermo_cap_multiple: BpsRatioPattern2::new( - client.clone(), - "thermo_cap_multiple".to_string(), - ), - coindays_destroyed_supply_adj: SeriesPattern1::new( - client.clone(), - "coindays_destroyed_supply_adj".to_string(), - ), - coinyears_destroyed_supply_adj: SeriesPattern1::new( - client.clone(), - "coinyears_destroyed_supply_adj".to_string(), - ), - dormancy: SeriesTree_Indicators_Dormancy::new( - client.clone(), - format!("{base_path}_dormancy"), - ), + thermo_cap_multiple: BpsRatioPattern2::new(client.clone(), "thermo_cap_multiple".to_string()), + coindays_destroyed_supply_adj: SeriesPattern1::new(client.clone(), "coindays_destroyed_supply_adj".to_string()), + coinyears_destroyed_supply_adj: SeriesPattern1::new(client.clone(), "coinyears_destroyed_supply_adj".to_string()), + dormancy: SeriesTree_Indicators_Dormancy::new(client.clone(), format!("{base_path}_dormancy")), stock_to_flow: SeriesPattern1::new(client.clone(), "stock_to_flow".to_string()), seller_exhaustion: SeriesPattern1::new(client.clone(), "seller_exhaustion".to_string()), - rarity_meter: SeriesTree_Indicators_RarityMeter::new( - client.clone(), - format!("{base_path}_rarity_meter"), - ), + rarity_meter: SeriesTree_Indicators_RarityMeter::new(client.clone(), format!("{base_path}_rarity_meter")), } } } @@ -7999,18 +5933,9 @@ pub struct SeriesTree_Indicators_RarityMeter { impl SeriesTree_Indicators_RarityMeter { pub fn new(client: Arc, base_path: String) -> Self { Self { - full: IndexPct0Pct1Pct2Pct5Pct95Pct98Pct99ScorePattern::new( - client.clone(), - "rarity_meter".to_string(), - ), - local: IndexPct0Pct1Pct2Pct5Pct95Pct98Pct99ScorePattern::new( - client.clone(), - "local_rarity_meter".to_string(), - ), - cycle: IndexPct0Pct1Pct2Pct5Pct95Pct98Pct99ScorePattern::new( - client.clone(), - "cycle_rarity_meter".to_string(), - ), + full: IndexPct0Pct1Pct2Pct5Pct95Pct98Pct99ScorePattern::new(client.clone(), "rarity_meter".to_string()), + local: IndexPct0Pct1Pct2Pct5Pct95Pct98Pct99ScorePattern::new(client.clone(), "local_rarity_meter".to_string()), + cycle: IndexPct0Pct1Pct2Pct5Pct95Pct98Pct99ScorePattern::new(client.clone(), "cycle_rarity_meter".to_string()), } } } @@ -8045,27 +5970,12 @@ pub struct SeriesTree_Investing_Period { impl SeriesTree_Investing_Period { pub fn new(client: Arc, base_path: String) -> Self { Self { - dca_stack: _10y1m1w1y2y3m3y4y5y6m6y8yPattern3::new( - client.clone(), - "dca_stack".to_string(), - ), - dca_cost_basis: SeriesTree_Investing_Period_DcaCostBasis::new( - client.clone(), - format!("{base_path}_dca_cost_basis"), - ), - dca_return: _10y1m1w1y2y3m3y4y5y6m6y8yPattern2::new( - client.clone(), - "dca_return".to_string(), - ), + dca_stack: _10y1m1w1y2y3m3y4y5y6m6y8yPattern3::new(client.clone(), "dca_stack".to_string()), + dca_cost_basis: SeriesTree_Investing_Period_DcaCostBasis::new(client.clone(), format!("{base_path}_dca_cost_basis")), + dca_return: _10y1m1w1y2y3m3y4y5y6m6y8yPattern2::new(client.clone(), "dca_return".to_string()), dca_cagr: _10y2y3y4y5y6y8yPattern::new(client.clone(), "dca_cagr".to_string()), - lump_sum_stack: _10y1m1w1y2y3m3y4y5y6m6y8yPattern3::new( - client.clone(), - "lump_sum_stack".to_string(), - ), - lump_sum_return: _10y1m1w1y2y3m3y4y5y6m6y8yPattern2::new( - client.clone(), - "lump_sum_return".to_string(), - ), + lump_sum_stack: _10y1m1w1y2y3m3y4y5y6m6y8yPattern3::new(client.clone(), "lump_sum_stack".to_string()), + lump_sum_return: _10y1m1w1y2y3m3y4y5y6m6y8yPattern2::new(client.clone(), "lump_sum_return".to_string()), } } } @@ -8115,18 +6025,9 @@ pub struct SeriesTree_Investing_Class { impl SeriesTree_Investing_Class { pub fn new(client: Arc, base_path: String) -> Self { Self { - dca_stack: SeriesTree_Investing_Class_DcaStack::new( - client.clone(), - format!("{base_path}_dca_stack"), - ), - dca_cost_basis: SeriesTree_Investing_Class_DcaCostBasis::new( - client.clone(), - format!("{base_path}_dca_cost_basis"), - ), - dca_return: SeriesTree_Investing_Class_DcaReturn::new( - client.clone(), - format!("{base_path}_dca_return"), - ), + dca_stack: SeriesTree_Investing_Class_DcaStack::new(client.clone(), format!("{base_path}_dca_stack")), + dca_cost_basis: SeriesTree_Investing_Class_DcaCostBasis::new(client.clone(), format!("{base_path}_dca_cost_basis")), + dca_return: SeriesTree_Investing_Class_DcaReturn::new(client.clone(), format!("{base_path}_dca_return")), } } } @@ -8150,54 +6051,18 @@ pub struct SeriesTree_Investing_Class_DcaStack { impl SeriesTree_Investing_Class_DcaStack { pub fn new(client: Arc, base_path: String) -> Self { Self { - from_2015: BtcCentsSatsUsdPattern::new( - client.clone(), - "dca_stack_from_2015".to_string(), - ), - from_2016: BtcCentsSatsUsdPattern::new( - client.clone(), - "dca_stack_from_2016".to_string(), - ), - from_2017: BtcCentsSatsUsdPattern::new( - client.clone(), - "dca_stack_from_2017".to_string(), - ), - from_2018: BtcCentsSatsUsdPattern::new( - client.clone(), - "dca_stack_from_2018".to_string(), - ), - from_2019: BtcCentsSatsUsdPattern::new( - client.clone(), - "dca_stack_from_2019".to_string(), - ), - from_2020: BtcCentsSatsUsdPattern::new( - client.clone(), - "dca_stack_from_2020".to_string(), - ), - from_2021: BtcCentsSatsUsdPattern::new( - client.clone(), - "dca_stack_from_2021".to_string(), - ), - from_2022: BtcCentsSatsUsdPattern::new( - client.clone(), - "dca_stack_from_2022".to_string(), - ), - from_2023: BtcCentsSatsUsdPattern::new( - client.clone(), - "dca_stack_from_2023".to_string(), - ), - from_2024: BtcCentsSatsUsdPattern::new( - client.clone(), - "dca_stack_from_2024".to_string(), - ), - from_2025: BtcCentsSatsUsdPattern::new( - client.clone(), - "dca_stack_from_2025".to_string(), - ), - from_2026: BtcCentsSatsUsdPattern::new( - client.clone(), - "dca_stack_from_2026".to_string(), - ), + from_2015: BtcCentsSatsUsdPattern::new(client.clone(), "dca_stack_from_2015".to_string()), + from_2016: BtcCentsSatsUsdPattern::new(client.clone(), "dca_stack_from_2016".to_string()), + from_2017: BtcCentsSatsUsdPattern::new(client.clone(), "dca_stack_from_2017".to_string()), + from_2018: BtcCentsSatsUsdPattern::new(client.clone(), "dca_stack_from_2018".to_string()), + from_2019: BtcCentsSatsUsdPattern::new(client.clone(), "dca_stack_from_2019".to_string()), + from_2020: BtcCentsSatsUsdPattern::new(client.clone(), "dca_stack_from_2020".to_string()), + from_2021: BtcCentsSatsUsdPattern::new(client.clone(), "dca_stack_from_2021".to_string()), + from_2022: BtcCentsSatsUsdPattern::new(client.clone(), "dca_stack_from_2022".to_string()), + from_2023: BtcCentsSatsUsdPattern::new(client.clone(), "dca_stack_from_2023".to_string()), + from_2024: BtcCentsSatsUsdPattern::new(client.clone(), "dca_stack_from_2024".to_string()), + from_2025: BtcCentsSatsUsdPattern::new(client.clone(), "dca_stack_from_2025".to_string()), + from_2026: BtcCentsSatsUsdPattern::new(client.clone(), "dca_stack_from_2026".to_string()), } } } @@ -8221,54 +6086,18 @@ pub struct SeriesTree_Investing_Class_DcaCostBasis { impl SeriesTree_Investing_Class_DcaCostBasis { pub fn new(client: Arc, base_path: String) -> Self { Self { - from_2015: CentsSatsUsdPattern::new( - client.clone(), - "dca_cost_basis_from_2015".to_string(), - ), - from_2016: CentsSatsUsdPattern::new( - client.clone(), - "dca_cost_basis_from_2016".to_string(), - ), - from_2017: CentsSatsUsdPattern::new( - client.clone(), - "dca_cost_basis_from_2017".to_string(), - ), - from_2018: CentsSatsUsdPattern::new( - client.clone(), - "dca_cost_basis_from_2018".to_string(), - ), - from_2019: CentsSatsUsdPattern::new( - client.clone(), - "dca_cost_basis_from_2019".to_string(), - ), - from_2020: CentsSatsUsdPattern::new( - client.clone(), - "dca_cost_basis_from_2020".to_string(), - ), - from_2021: CentsSatsUsdPattern::new( - client.clone(), - "dca_cost_basis_from_2021".to_string(), - ), - from_2022: CentsSatsUsdPattern::new( - client.clone(), - "dca_cost_basis_from_2022".to_string(), - ), - from_2023: CentsSatsUsdPattern::new( - client.clone(), - "dca_cost_basis_from_2023".to_string(), - ), - from_2024: CentsSatsUsdPattern::new( - client.clone(), - "dca_cost_basis_from_2024".to_string(), - ), - from_2025: CentsSatsUsdPattern::new( - client.clone(), - "dca_cost_basis_from_2025".to_string(), - ), - from_2026: CentsSatsUsdPattern::new( - client.clone(), - "dca_cost_basis_from_2026".to_string(), - ), + from_2015: CentsSatsUsdPattern::new(client.clone(), "dca_cost_basis_from_2015".to_string()), + from_2016: CentsSatsUsdPattern::new(client.clone(), "dca_cost_basis_from_2016".to_string()), + from_2017: CentsSatsUsdPattern::new(client.clone(), "dca_cost_basis_from_2017".to_string()), + from_2018: CentsSatsUsdPattern::new(client.clone(), "dca_cost_basis_from_2018".to_string()), + from_2019: CentsSatsUsdPattern::new(client.clone(), "dca_cost_basis_from_2019".to_string()), + from_2020: CentsSatsUsdPattern::new(client.clone(), "dca_cost_basis_from_2020".to_string()), + from_2021: CentsSatsUsdPattern::new(client.clone(), "dca_cost_basis_from_2021".to_string()), + from_2022: CentsSatsUsdPattern::new(client.clone(), "dca_cost_basis_from_2022".to_string()), + from_2023: CentsSatsUsdPattern::new(client.clone(), "dca_cost_basis_from_2023".to_string()), + from_2024: CentsSatsUsdPattern::new(client.clone(), "dca_cost_basis_from_2024".to_string()), + from_2025: CentsSatsUsdPattern::new(client.clone(), "dca_cost_basis_from_2025".to_string()), + from_2026: CentsSatsUsdPattern::new(client.clone(), "dca_cost_basis_from_2026".to_string()), } } } @@ -8292,54 +6121,18 @@ pub struct SeriesTree_Investing_Class_DcaReturn { impl SeriesTree_Investing_Class_DcaReturn { pub fn new(client: Arc, base_path: String) -> Self { Self { - from_2015: BpsPercentRatioPattern::new( - client.clone(), - "dca_return_from_2015".to_string(), - ), - from_2016: BpsPercentRatioPattern::new( - client.clone(), - "dca_return_from_2016".to_string(), - ), - from_2017: BpsPercentRatioPattern::new( - client.clone(), - "dca_return_from_2017".to_string(), - ), - from_2018: BpsPercentRatioPattern::new( - client.clone(), - "dca_return_from_2018".to_string(), - ), - from_2019: BpsPercentRatioPattern::new( - client.clone(), - "dca_return_from_2019".to_string(), - ), - from_2020: BpsPercentRatioPattern::new( - client.clone(), - "dca_return_from_2020".to_string(), - ), - from_2021: BpsPercentRatioPattern::new( - client.clone(), - "dca_return_from_2021".to_string(), - ), - from_2022: BpsPercentRatioPattern::new( - client.clone(), - "dca_return_from_2022".to_string(), - ), - from_2023: BpsPercentRatioPattern::new( - client.clone(), - "dca_return_from_2023".to_string(), - ), - from_2024: BpsPercentRatioPattern::new( - client.clone(), - "dca_return_from_2024".to_string(), - ), - from_2025: BpsPercentRatioPattern::new( - client.clone(), - "dca_return_from_2025".to_string(), - ), - from_2026: BpsPercentRatioPattern::new( - client.clone(), - "dca_return_from_2026".to_string(), - ), + from_2015: BpsPercentRatioPattern::new(client.clone(), "dca_return_from_2015".to_string()), + from_2016: BpsPercentRatioPattern::new(client.clone(), "dca_return_from_2016".to_string()), + from_2017: BpsPercentRatioPattern::new(client.clone(), "dca_return_from_2017".to_string()), + from_2018: BpsPercentRatioPattern::new(client.clone(), "dca_return_from_2018".to_string()), + from_2019: BpsPercentRatioPattern::new(client.clone(), "dca_return_from_2019".to_string()), + from_2020: BpsPercentRatioPattern::new(client.clone(), "dca_return_from_2020".to_string()), + from_2021: BpsPercentRatioPattern::new(client.clone(), "dca_return_from_2021".to_string()), + from_2022: BpsPercentRatioPattern::new(client.clone(), "dca_return_from_2022".to_string()), + from_2023: BpsPercentRatioPattern::new(client.clone(), "dca_return_from_2023".to_string()), + from_2024: BpsPercentRatioPattern::new(client.clone(), "dca_return_from_2024".to_string()), + from_2025: BpsPercentRatioPattern::new(client.clone(), "dca_return_from_2025".to_string()), + from_2026: BpsPercentRatioPattern::new(client.clone(), "dca_return_from_2026".to_string()), } } } @@ -8359,21 +6152,12 @@ impl SeriesTree_Market { pub fn new(client: Arc, base_path: String) -> Self { Self { ath: SeriesTree_Market_Ath::new(client.clone(), format!("{base_path}_ath")), - lookback: SeriesTree_Market_Lookback::new( - client.clone(), - format!("{base_path}_lookback"), - ), + lookback: SeriesTree_Market_Lookback::new(client.clone(), format!("{base_path}_lookback")), returns: SeriesTree_Market_Returns::new(client.clone(), format!("{base_path}_returns")), volatility: _1m1w1y24hPattern::new(client.clone(), "price_volatility".to_string()), range: SeriesTree_Market_Range::new(client.clone(), format!("{base_path}_range")), - moving_average: SeriesTree_Market_MovingAverage::new( - client.clone(), - format!("{base_path}_moving_average"), - ), - technical: SeriesTree_Market_Technical::new( - client.clone(), - format!("{base_path}_technical"), - ), + moving_average: SeriesTree_Market_MovingAverage::new(client.clone(), format!("{base_path}_moving_average")), + technical: SeriesTree_Market_Technical::new(client.clone(), format!("{base_path}_technical")), } } } @@ -8395,14 +6179,8 @@ impl SeriesTree_Market_Ath { drawdown: BpsPercentRatioPattern5::new(client.clone(), "price_drawdown".to_string()), days_since: SeriesPattern1::new(client.clone(), "days_since_price_ath".to_string()), years_since: SeriesPattern1::new(client.clone(), "years_since_price_ath".to_string()), - max_days_between: SeriesPattern1::new( - client.clone(), - "max_days_between_price_ath".to_string(), - ), - max_years_between: SeriesPattern1::new( - client.clone(), - "max_years_between_price_ath".to_string(), - ), + max_days_between: SeriesPattern1::new(client.clone(), "max_days_between_price_ath".to_string()), + max_years_between: SeriesPattern1::new(client.clone(), "max_years_between_price_ath".to_string()), } } } @@ -8454,15 +6232,9 @@ pub struct SeriesTree_Market_Returns { impl SeriesTree_Market_Returns { pub fn new(client: Arc, base_path: String) -> Self { Self { - periods: SeriesTree_Market_Returns_Periods::new( - client.clone(), - format!("{base_path}_periods"), - ), + periods: SeriesTree_Market_Returns_Periods::new(client.clone(), format!("{base_path}_periods")), cagr: _10y2y3y4y5y6y8yPattern::new(client.clone(), "price_cagr".to_string()), - sd_24h: SeriesTree_Market_Returns_Sd24h::new( - client.clone(), - format!("{base_path}_sd_24h"), - ), + sd_24h: SeriesTree_Market_Returns_Sd24h::new(client.clone(), format!("{base_path}_sd_24h")), } } } @@ -8515,10 +6287,7 @@ pub struct SeriesTree_Market_Returns_Sd24h { impl SeriesTree_Market_Returns_Sd24h { pub fn new(client: Arc, base_path: String) -> Self { Self { - _24h: SeriesTree_Market_Returns_Sd24h_24h::new( - client.clone(), - format!("{base_path}_24h"), - ), + _24h: SeriesTree_Market_Returns_Sd24h_24h::new(client.clone(), format!("{base_path}_24h")), _1w: SeriesTree_Market_Returns_Sd24h_1w::new(client.clone(), format!("{base_path}_1w")), _1m: SeriesTree_Market_Returns_Sd24h_1m::new(client.clone(), format!("{base_path}_1m")), _1y: SeriesTree_Market_Returns_Sd24h_1y::new(client.clone(), format!("{base_path}_1y")), @@ -8601,14 +6370,8 @@ impl SeriesTree_Market_Range { min: _1m1w1y2wPattern::new(client.clone(), "price_min".to_string()), max: _1m1w1y2wPattern::new(client.clone(), "price_max".to_string()), true_range: SeriesPattern1::new(client.clone(), "price_true_range".to_string()), - true_range_sum_2w: SeriesPattern1::new( - client.clone(), - "price_true_range_sum_2w".to_string(), - ), - choppiness_index_2w: BpsPercentRatioPattern2::new( - client.clone(), - "price_choppiness_index_2w".to_string(), - ), + true_range_sum_2w: SeriesPattern1::new(client.clone(), "price_true_range_sum_2w".to_string()), + choppiness_index_2w: BpsPercentRatioPattern2::new(client.clone(), "price_choppiness_index_2w".to_string()), } } } @@ -8622,14 +6385,8 @@ pub struct SeriesTree_Market_MovingAverage { impl SeriesTree_Market_MovingAverage { pub fn new(client: Arc, base_path: String) -> Self { Self { - sma: SeriesTree_Market_MovingAverage_Sma::new( - client.clone(), - format!("{base_path}_sma"), - ), - ema: SeriesTree_Market_MovingAverage_Ema::new( - client.clone(), - format!("{base_path}_ema"), - ), + sma: SeriesTree_Market_MovingAverage_Sma::new(client.clone(), format!("{base_path}_sma")), + ema: SeriesTree_Market_MovingAverage_Ema::new(client.clone(), format!("{base_path}_ema")), } } } @@ -8667,14 +6424,8 @@ impl SeriesTree_Market_MovingAverage_Sma { _89d: BpsCentsRatioSatsUsdPattern::new(client.clone(), "price_sma_89d".to_string()), _111d: BpsCentsRatioSatsUsdPattern::new(client.clone(), "price_sma_111d".to_string()), _144d: BpsCentsRatioSatsUsdPattern::new(client.clone(), "price_sma_144d".to_string()), - _200d: SeriesTree_Market_MovingAverage_Sma_200d::new( - client.clone(), - format!("{base_path}_200d"), - ), - _350d: SeriesTree_Market_MovingAverage_Sma_350d::new( - client.clone(), - format!("{base_path}_350d"), - ), + _200d: SeriesTree_Market_MovingAverage_Sma_200d::new(client.clone(), format!("{base_path}_200d")), + _350d: SeriesTree_Market_MovingAverage_Sma_350d::new(client.clone(), format!("{base_path}_350d")), _1y: BpsCentsRatioSatsUsdPattern::new(client.clone(), "price_sma_1y".to_string()), _2y: BpsCentsRatioSatsUsdPattern::new(client.clone(), "price_sma_2y".to_string()), _200w: BpsCentsRatioSatsUsdPattern::new(client.clone(), "price_sma_200w".to_string()), @@ -8786,10 +6537,7 @@ impl SeriesTree_Market_Technical { Self { rsi: SeriesTree_Market_Technical_Rsi::new(client.clone(), format!("{base_path}_rsi")), pi_cycle: BpsRatioPattern2::new(client.clone(), "pi_cycle".to_string()), - macd: SeriesTree_Market_Technical_Macd::new( - client.clone(), - format!("{base_path}_macd"), - ), + macd: SeriesTree_Market_Technical_Macd::new(client.clone(), format!("{base_path}_macd")), } } } @@ -8821,18 +6569,9 @@ pub struct SeriesTree_Market_Technical_Macd { impl SeriesTree_Market_Technical_Macd { pub fn new(client: Arc, base_path: String) -> Self { Self { - _24h: SeriesTree_Market_Technical_Macd_24h::new( - client.clone(), - format!("{base_path}_24h"), - ), - _1w: SeriesTree_Market_Technical_Macd_1w::new( - client.clone(), - format!("{base_path}_1w"), - ), - _1m: SeriesTree_Market_Technical_Macd_1m::new( - client.clone(), - format!("{base_path}_1m"), - ), + _24h: SeriesTree_Market_Technical_Macd_24h::new(client.clone(), format!("{base_path}_24h")), + _1w: SeriesTree_Market_Technical_Macd_1w::new(client.clone(), format!("{base_path}_1w")), + _1m: SeriesTree_Market_Technical_Macd_1m::new(client.clone(), format!("{base_path}_1m")), } } } @@ -8953,28 +6692,16 @@ impl SeriesTree_Pools_Major { btcguild: BlocksDominanceRewardsPattern::new(client.clone(), "btcguild".to_string()), eligius: BlocksDominanceRewardsPattern::new(client.clone(), "eligius".to_string()), f2pool: BlocksDominanceRewardsPattern::new(client.clone(), "f2pool".to_string()), - braiinspool: BlocksDominanceRewardsPattern::new( - client.clone(), - "braiinspool".to_string(), - ), + braiinspool: BlocksDominanceRewardsPattern::new(client.clone(), "braiinspool".to_string()), antpool: BlocksDominanceRewardsPattern::new(client.clone(), "antpool".to_string()), btcc: BlocksDominanceRewardsPattern::new(client.clone(), "btcc".to_string()), bwpool: BlocksDominanceRewardsPattern::new(client.clone(), "bwpool".to_string()), bitfury: BlocksDominanceRewardsPattern::new(client.clone(), "bitfury".to_string()), viabtc: BlocksDominanceRewardsPattern::new(client.clone(), "viabtc".to_string()), poolin: BlocksDominanceRewardsPattern::new(client.clone(), "poolin".to_string()), - spiderpool: BlocksDominanceRewardsPattern::new( - client.clone(), - "spiderpool".to_string(), - ), - binancepool: BlocksDominanceRewardsPattern::new( - client.clone(), - "binancepool".to_string(), - ), - foundryusa: BlocksDominanceRewardsPattern::new( - client.clone(), - "foundryusa".to_string(), - ), + spiderpool: BlocksDominanceRewardsPattern::new(client.clone(), "spiderpool".to_string()), + binancepool: BlocksDominanceRewardsPattern::new(client.clone(), "binancepool".to_string()), + foundryusa: BlocksDominanceRewardsPattern::new(client.clone(), "foundryusa".to_string()), sbicrypto: BlocksDominanceRewardsPattern::new(client.clone(), "sbicrypto".to_string()), marapool: BlocksDominanceRewardsPattern::new(client.clone(), "marapool".to_string()), secpool: BlocksDominanceRewardsPattern::new(client.clone(), "secpool".to_string()), @@ -9178,10 +6905,7 @@ impl SeriesTree_Pools_Minor { ckpool: BlocksDominancePattern::new(client.clone(), "ckpool".to_string()), nicehash: BlocksDominancePattern::new(client.clone(), "nicehash".to_string()), bitclub: BlocksDominancePattern::new(client.clone(), "bitclub".to_string()), - bitcoinaffiliatenetwork: BlocksDominancePattern::new( - client.clone(), - "bitcoinaffiliatenetwork".to_string(), - ), + bitcoinaffiliatenetwork: BlocksDominancePattern::new(client.clone(), "bitcoinaffiliatenetwork".to_string()), exxbw: BlocksDominancePattern::new(client.clone(), "exxbw".to_string()), bitsolo: BlocksDominancePattern::new(client.clone(), "bitsolo".to_string()), twentyoneinc: BlocksDominancePattern::new(client.clone(), "twentyoneinc".to_string()), @@ -9204,10 +6928,7 @@ impl SeriesTree_Pools_Minor { dcexploration: BlocksDominancePattern::new(client.clone(), "dcexploration".to_string()), dcex: BlocksDominancePattern::new(client.clone(), "dcex".to_string()), btpool: BlocksDominancePattern::new(client.clone(), "btpool".to_string()), - fiftyeightcoin: BlocksDominancePattern::new( - client.clone(), - "fiftyeightcoin".to_string(), - ), + fiftyeightcoin: BlocksDominancePattern::new(client.clone(), "fiftyeightcoin".to_string()), bitcoinindia: BlocksDominancePattern::new(client.clone(), "bitcoinindia".to_string()), shawnp0wers: BlocksDominancePattern::new(client.clone(), "shawnp0wers".to_string()), phashio: BlocksDominancePattern::new(client.clone(), "phashio".to_string()), @@ -9220,14 +6941,8 @@ impl SeriesTree_Pools_Minor { rawpool: BlocksDominancePattern::new(client.clone(), "rawpool".to_string()), haominer: BlocksDominancePattern::new(client.clone(), "haominer".to_string()), helix: BlocksDominancePattern::new(client.clone(), "helix".to_string()), - bitcoinukraine: BlocksDominancePattern::new( - client.clone(), - "bitcoinukraine".to_string(), - ), - secretsuperstar: BlocksDominancePattern::new( - client.clone(), - "secretsuperstar".to_string(), - ), + bitcoinukraine: BlocksDominancePattern::new(client.clone(), "bitcoinukraine".to_string()), + secretsuperstar: BlocksDominancePattern::new(client.clone(), "secretsuperstar".to_string()), tigerpoolnet: BlocksDominancePattern::new(client.clone(), "tigerpoolnet".to_string()), sigmapoolcom: BlocksDominancePattern::new(client.clone(), "sigmapoolcom".to_string()), okpooltop: BlocksDominancePattern::new(client.clone(), "okpooltop".to_string()), @@ -9244,40 +6959,25 @@ impl SeriesTree_Pools_Minor { arkpool: BlocksDominancePattern::new(client.clone(), "arkpool".to_string()), purebtccom: BlocksDominancePattern::new(client.clone(), "purebtccom".to_string()), kucoinpool: BlocksDominancePattern::new(client.clone(), "kucoinpool".to_string()), - entrustcharitypool: BlocksDominancePattern::new( - client.clone(), - "entrustcharitypool".to_string(), - ), + entrustcharitypool: BlocksDominancePattern::new(client.clone(), "entrustcharitypool".to_string()), okminer: BlocksDominancePattern::new(client.clone(), "okminer".to_string()), titan: BlocksDominancePattern::new(client.clone(), "titan".to_string()), pegapool: BlocksDominancePattern::new(client.clone(), "pegapool".to_string()), btcnuggets: BlocksDominancePattern::new(client.clone(), "btcnuggets".to_string()), cloudhashing: BlocksDominancePattern::new(client.clone(), "cloudhashing".to_string()), - digitalxmintsy: BlocksDominancePattern::new( - client.clone(), - "digitalxmintsy".to_string(), - ), + digitalxmintsy: BlocksDominancePattern::new(client.clone(), "digitalxmintsy".to_string()), telco214: BlocksDominancePattern::new(client.clone(), "telco214".to_string()), btcpoolparty: BlocksDominancePattern::new(client.clone(), "btcpoolparty".to_string()), multipool: BlocksDominancePattern::new(client.clone(), "multipool".to_string()), - transactioncoinmining: BlocksDominancePattern::new( - client.clone(), - "transactioncoinmining".to_string(), - ), + transactioncoinmining: BlocksDominancePattern::new(client.clone(), "transactioncoinmining".to_string()), btcdig: BlocksDominancePattern::new(client.clone(), "btcdig".to_string()), - trickysbtcpool: BlocksDominancePattern::new( - client.clone(), - "trickysbtcpool".to_string(), - ), + trickysbtcpool: BlocksDominancePattern::new(client.clone(), "trickysbtcpool".to_string()), btcmp: BlocksDominancePattern::new(client.clone(), "btcmp".to_string()), eobot: BlocksDominancePattern::new(client.clone(), "eobot".to_string()), unomp: BlocksDominancePattern::new(client.clone(), "unomp".to_string()), patels: BlocksDominancePattern::new(client.clone(), "patels".to_string()), gogreenlight: BlocksDominancePattern::new(client.clone(), "gogreenlight".to_string()), - bitcoinindiapool: BlocksDominancePattern::new( - client.clone(), - "bitcoinindiapool".to_string(), - ), + bitcoinindiapool: BlocksDominancePattern::new(client.clone(), "bitcoinindiapool".to_string()), ekanembtc: BlocksDominancePattern::new(client.clone(), "ekanembtc".to_string()), canoe: BlocksDominancePattern::new(client.clone(), "canoe".to_string()), tiger: BlocksDominancePattern::new(client.clone(), "tiger".to_string()), @@ -9285,14 +6985,8 @@ impl SeriesTree_Pools_Minor { zulupool: BlocksDominancePattern::new(client.clone(), "zulupool".to_string()), wiz: BlocksDominancePattern::new(client.clone(), "wiz".to_string()), wk057: BlocksDominancePattern::new(client.clone(), "wk057".to_string()), - futurebitapollosolo: BlocksDominancePattern::new( - client.clone(), - "futurebitapollosolo".to_string(), - ), - carbonnegative: BlocksDominancePattern::new( - client.clone(), - "carbonnegative".to_string(), - ), + futurebitapollosolo: BlocksDominancePattern::new(client.clone(), "futurebitapollosolo".to_string()), + carbonnegative: BlocksDominancePattern::new(client.clone(), "carbonnegative".to_string()), portlandhodl: BlocksDominancePattern::new(client.clone(), "portlandhodl".to_string()), phoenix: BlocksDominancePattern::new(client.clone(), "phoenix".to_string()), neopool: BlocksDominancePattern::new(client.clone(), "neopool".to_string()), @@ -9400,28 +7094,13 @@ impl SeriesTree_Supply { pub fn new(client: Arc, base_path: String) -> Self { Self { state: SeriesPattern18::new(client.clone(), "supply_state".to_string()), - circulating: BtcCentsSatsUsdPattern::new( - client.clone(), - "circulating_supply".to_string(), - ), + circulating: BtcCentsSatsUsdPattern::new(client.clone(), "circulating_supply".to_string()), burned: BlockCumulativePattern::new(client.clone(), "unspendable_supply".to_string()), - inflation_rate: BpsPercentRatioPattern::new( - client.clone(), - "inflation_rate".to_string(), - ), - velocity: SeriesTree_Supply_Velocity::new( - client.clone(), - format!("{base_path}_velocity"), - ), + inflation_rate: BpsPercentRatioPattern::new(client.clone(), "inflation_rate".to_string()), + velocity: SeriesTree_Supply_Velocity::new(client.clone(), format!("{base_path}_velocity")), market_cap: CentsDeltaUsdPattern::new(client.clone(), "market_cap".to_string()), - market_minus_realized_cap_growth_rate: _1m1w1y24hPattern::new( - client.clone(), - "market_minus_realized_cap_growth_rate".to_string(), - ), - hodled_or_lost: BtcCentsSatsUsdPattern::new( - client.clone(), - "hodled_or_lost_supply".to_string(), - ), + market_minus_realized_cap_growth_rate: _1m1w1y24hPattern::new(client.clone(), "market_minus_realized_cap_growth_rate".to_string()), + hodled_or_lost: BtcCentsSatsUsdPattern::new(client.clone(), "hodled_or_lost_supply".to_string()), } } } @@ -9480,41 +7159,17 @@ impl SeriesTree_Cohorts_Utxo { all: SeriesTree_Cohorts_Utxo_All::new(client.clone(), format!("{base_path}_all")), sth: SeriesTree_Cohorts_Utxo_Sth::new(client.clone(), format!("{base_path}_sth")), lth: SeriesTree_Cohorts_Utxo_Lth::new(client.clone(), format!("{base_path}_lth")), - age_range: SeriesTree_Cohorts_Utxo_AgeRange::new( - client.clone(), - format!("{base_path}_age_range"), - ), - under_age: SeriesTree_Cohorts_Utxo_UnderAge::new( - client.clone(), - format!("{base_path}_under_age"), - ), - over_age: SeriesTree_Cohorts_Utxo_OverAge::new( - client.clone(), - format!("{base_path}_over_age"), - ), + age_range: SeriesTree_Cohorts_Utxo_AgeRange::new(client.clone(), format!("{base_path}_age_range")), + under_age: SeriesTree_Cohorts_Utxo_UnderAge::new(client.clone(), format!("{base_path}_under_age")), + over_age: SeriesTree_Cohorts_Utxo_OverAge::new(client.clone(), format!("{base_path}_over_age")), epoch: SeriesTree_Cohorts_Utxo_Epoch::new(client.clone(), format!("{base_path}_epoch")), class: SeriesTree_Cohorts_Utxo_Class::new(client.clone(), format!("{base_path}_class")), - over_amount: SeriesTree_Cohorts_Utxo_OverAmount::new( - client.clone(), - format!("{base_path}_over_amount"), - ), - amount_range: SeriesTree_Cohorts_Utxo_AmountRange::new( - client.clone(), - format!("{base_path}_amount_range"), - ), - under_amount: SeriesTree_Cohorts_Utxo_UnderAmount::new( - client.clone(), - format!("{base_path}_under_amount"), - ), + over_amount: SeriesTree_Cohorts_Utxo_OverAmount::new(client.clone(), format!("{base_path}_over_amount")), + amount_range: SeriesTree_Cohorts_Utxo_AmountRange::new(client.clone(), format!("{base_path}_amount_range")), + under_amount: SeriesTree_Cohorts_Utxo_UnderAmount::new(client.clone(), format!("{base_path}_under_amount")), type_: SeriesTree_Cohorts_Utxo_Type::new(client.clone(), format!("{base_path}_type")), - profitability: SeriesTree_Cohorts_Utxo_Profitability::new( - client.clone(), - format!("{base_path}_profitability"), - ), - matured: SeriesTree_Cohorts_Utxo_Matured::new( - client.clone(), - format!("{base_path}_matured"), - ), + profitability: SeriesTree_Cohorts_Utxo_Profitability::new(client.clone(), format!("{base_path}_profitability")), + matured: SeriesTree_Cohorts_Utxo_Matured::new(client.clone(), format!("{base_path}_matured")), } } } @@ -9534,26 +7189,11 @@ impl SeriesTree_Cohorts_Utxo_All { pub fn new(client: Arc, base_path: String) -> Self { Self { supply: DeltaDominanceHalfInTotalPattern2::new(client.clone(), "supply".to_string()), - outputs: SeriesTree_Cohorts_Utxo_All_Outputs::new( - client.clone(), - format!("{base_path}_outputs"), - ), - activity: SeriesTree_Cohorts_Utxo_All_Activity::new( - client.clone(), - format!("{base_path}_activity"), - ), - realized: SeriesTree_Cohorts_Utxo_All_Realized::new( - client.clone(), - format!("{base_path}_realized"), - ), - cost_basis: SeriesTree_Cohorts_Utxo_All_CostBasis::new( - client.clone(), - format!("{base_path}_cost_basis"), - ), - unrealized: SeriesTree_Cohorts_Utxo_All_Unrealized::new( - client.clone(), - format!("{base_path}_unrealized"), - ), + outputs: SeriesTree_Cohorts_Utxo_All_Outputs::new(client.clone(), format!("{base_path}_outputs")), + activity: SeriesTree_Cohorts_Utxo_All_Activity::new(client.clone(), format!("{base_path}_activity")), + realized: SeriesTree_Cohorts_Utxo_All_Realized::new(client.clone(), format!("{base_path}_realized")), + cost_basis: SeriesTree_Cohorts_Utxo_All_CostBasis::new(client.clone(), format!("{base_path}_cost_basis")), + unrealized: SeriesTree_Cohorts_Utxo_All_Unrealized::new(client.clone(), format!("{base_path}_unrealized")), invested_capital: InPattern::new(client.clone(), "invested_capital_in".to_string()), } } @@ -9570,10 +7210,7 @@ impl SeriesTree_Cohorts_Utxo_All_Outputs { pub fn new(client: Arc, base_path: String) -> Self { Self { unspent_count: BaseDeltaPattern::new(client.clone(), "utxo_count".to_string()), - spent_count: AverageBlockCumulativeSumPattern2::new( - client.clone(), - "spent_utxo_count".to_string(), - ), + spent_count: AverageBlockCumulativeSumPattern2::new(client.clone(), "spent_utxo_count".to_string()), spending_rate: SeriesPattern1::new(client.clone(), "spending_rate".to_string()), } } @@ -9590,18 +7227,9 @@ pub struct SeriesTree_Cohorts_Utxo_All_Activity { impl SeriesTree_Cohorts_Utxo_All_Activity { pub fn new(client: Arc, base_path: String) -> Self { Self { - transfer_volume: AverageBlockCumulativeInSumPattern::new( - client.clone(), - "transfer_volume".to_string(), - ), - coindays_destroyed: AverageBlockCumulativeSumPattern::new( - client.clone(), - "coindays_destroyed".to_string(), - ), - coinyears_destroyed: SeriesPattern1::new( - client.clone(), - "coinyears_destroyed".to_string(), - ), + transfer_volume: AverageBlockCumulativeInSumPattern::new(client.clone(), "transfer_volume".to_string()), + coindays_destroyed: AverageBlockCumulativeSumPattern::new(client.clone(), "coindays_destroyed".to_string()), + coinyears_destroyed: SeriesPattern1::new(client.clone(), "coinyears_destroyed".to_string()), dormancy: _1m1w1y24hPattern::new(client.clone(), "dormancy".to_string()), } } @@ -9628,37 +7256,16 @@ impl SeriesTree_Cohorts_Utxo_All_Realized { Self { cap: CentsDeltaToUsdPattern::new(client.clone(), "realized_cap".to_string()), profit: BlockCumulativeSumPattern::new(client.clone(), "realized_profit".to_string()), - loss: BlockCumulativeNegativeSumPattern::new( - client.clone(), - "realized_loss".to_string(), - ), - price: SeriesTree_Cohorts_Utxo_All_Realized_Price::new( - client.clone(), - format!("{base_path}_price"), - ), + loss: BlockCumulativeNegativeSumPattern::new(client.clone(), "realized_loss".to_string()), + price: SeriesTree_Cohorts_Utxo_All_Realized_Price::new(client.clone(), format!("{base_path}_price")), mvrv: SeriesPattern1::new(client.clone(), "mvrv".to_string()), net_pnl: BlockChangeCumulativeDeltaSumPattern::new(client.clone(), "net".to_string()), - sopr: SeriesTree_Cohorts_Utxo_All_Realized_Sopr::new( - client.clone(), - format!("{base_path}_sopr"), - ), - gross_pnl: BlockCumulativeSumPattern::new( - client.clone(), - "realized_gross_pnl".to_string(), - ), - sell_side_risk_ratio: _1m1w1y24hPattern8::new( - client.clone(), - "sell_side_risk_ratio".to_string(), - ), - peak_regret: BlockCumulativeSumPattern::new( - client.clone(), - "realized_peak_regret".to_string(), - ), + sopr: SeriesTree_Cohorts_Utxo_All_Realized_Sopr::new(client.clone(), format!("{base_path}_sopr")), + gross_pnl: BlockCumulativeSumPattern::new(client.clone(), "realized_gross_pnl".to_string()), + sell_side_risk_ratio: _1m1w1y24hPattern8::new(client.clone(), "sell_side_risk_ratio".to_string()), + peak_regret: BlockCumulativeSumPattern::new(client.clone(), "realized_peak_regret".to_string()), capitalized: PricePattern::new(client.clone(), "capitalized_price".to_string()), - profit_to_loss_ratio: _1m1w1y24hPattern::new( - client.clone(), - "realized_profit_to_loss_ratio".to_string(), - ), + profit_to_loss_ratio: _1m1w1y24hPattern::new(client.clone(), "realized_profit_to_loss_ratio".to_string()), } } } @@ -9683,15 +7290,9 @@ impl SeriesTree_Cohorts_Utxo_All_Realized_Price { sats: SeriesPattern1::new(client.clone(), "realized_price_sats".to_string()), bps: SeriesPattern1::new(client.clone(), "realized_price_ratio_bps".to_string()), ratio: SeriesPattern1::new(client.clone(), "realized_price_ratio".to_string()), - percentiles: Pct0Pct1Pct2Pct5Pct95Pct98Pct99Pattern::new( - client.clone(), - "realized_price".to_string(), - ), + percentiles: Pct0Pct1Pct2Pct5Pct95Pct98Pct99Pattern::new(client.clone(), "realized_price".to_string()), sma: _1m1w1y2y4yAllPattern::new(client.clone(), "realized_price_ratio_sma".to_string()), - std_dev: SeriesTree_Cohorts_Utxo_All_Realized_Price_StdDev::new( - client.clone(), - format!("{base_path}_std_dev"), - ), + std_dev: SeriesTree_Cohorts_Utxo_All_Realized_Price_StdDev::new(client.clone(), format!("{base_path}_std_dev")), } } } @@ -9707,22 +7308,10 @@ pub struct SeriesTree_Cohorts_Utxo_All_Realized_Price_StdDev { impl SeriesTree_Cohorts_Utxo_All_Realized_Price_StdDev { pub fn new(client: Arc, base_path: String) -> Self { Self { - all: SeriesTree_Cohorts_Utxo_All_Realized_Price_StdDev_All::new( - client.clone(), - format!("{base_path}_all"), - ), - _4y: SeriesTree_Cohorts_Utxo_All_Realized_Price_StdDev_4y::new( - client.clone(), - format!("{base_path}_4y"), - ), - _2y: SeriesTree_Cohorts_Utxo_All_Realized_Price_StdDev_2y::new( - client.clone(), - format!("{base_path}_2y"), - ), - _1y: SeriesTree_Cohorts_Utxo_All_Realized_Price_StdDev_1y::new( - client.clone(), - format!("{base_path}_1y"), - ), + all: SeriesTree_Cohorts_Utxo_All_Realized_Price_StdDev_All::new(client.clone(), format!("{base_path}_all")), + _4y: SeriesTree_Cohorts_Utxo_All_Realized_Price_StdDev_4y::new(client.clone(), format!("{base_path}_4y")), + _2y: SeriesTree_Cohorts_Utxo_All_Realized_Price_StdDev_2y::new(client.clone(), format!("{base_path}_2y")), + _1y: SeriesTree_Cohorts_Utxo_All_Realized_Price_StdDev_1y::new(client.clone(), format!("{base_path}_1y")), } } } @@ -9752,66 +7341,18 @@ impl SeriesTree_Cohorts_Utxo_All_Realized_Price_StdDev_All { sd: SeriesPattern1::new(client.clone(), "realized_price_ratio_sd".to_string()), zscore: SeriesPattern1::new(client.clone(), "realized_price_ratio_zscore".to_string()), _0sd: CentsSatsUsdPattern::new(client.clone(), "realized_price_0sd".to_string()), - p0_5sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "p0_5sd".to_string(), - ), - p1sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "p1sd".to_string(), - ), - p1_5sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "p1_5sd".to_string(), - ), - p2sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "p2sd".to_string(), - ), - p2_5sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "p2_5sd".to_string(), - ), - p3sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "p3sd".to_string(), - ), - m0_5sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "m0_5sd".to_string(), - ), - m1sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "m1sd".to_string(), - ), - m1_5sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "m1_5sd".to_string(), - ), - m2sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "m2sd".to_string(), - ), - m2_5sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "m2_5sd".to_string(), - ), - m3sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "m3sd".to_string(), - ), + p0_5sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "p0_5sd".to_string()), + p1sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "p1sd".to_string()), + p1_5sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "p1_5sd".to_string()), + p2sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "p2sd".to_string()), + p2_5sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "p2_5sd".to_string()), + p3sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "p3sd".to_string()), + m0_5sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "m0_5sd".to_string()), + m1sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "m1sd".to_string()), + m1_5sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "m1_5sd".to_string()), + m2sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "m2sd".to_string()), + m2_5sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "m2_5sd".to_string()), + m3sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "m3sd".to_string()), } } } @@ -9839,71 +7380,20 @@ impl SeriesTree_Cohorts_Utxo_All_Realized_Price_StdDev_4y { pub fn new(client: Arc, base_path: String) -> Self { Self { sd: SeriesPattern1::new(client.clone(), "realized_price_ratio_sd_4y".to_string()), - zscore: SeriesPattern1::new( - client.clone(), - "realized_price_ratio_zscore_4y".to_string(), - ), + zscore: SeriesPattern1::new(client.clone(), "realized_price_ratio_zscore_4y".to_string()), _0sd: CentsSatsUsdPattern::new(client.clone(), "realized_price_0sd_4y".to_string()), - p0_5sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "p0_5sd_4y".to_string(), - ), - p1sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "p1sd_4y".to_string(), - ), - p1_5sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "p1_5sd_4y".to_string(), - ), - p2sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "p2sd_4y".to_string(), - ), - p2_5sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "p2_5sd_4y".to_string(), - ), - p3sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "p3sd_4y".to_string(), - ), - m0_5sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "m0_5sd_4y".to_string(), - ), - m1sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "m1sd_4y".to_string(), - ), - m1_5sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "m1_5sd_4y".to_string(), - ), - m2sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "m2sd_4y".to_string(), - ), - m2_5sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "m2_5sd_4y".to_string(), - ), - m3sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "m3sd_4y".to_string(), - ), + p0_5sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "p0_5sd_4y".to_string()), + p1sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "p1sd_4y".to_string()), + p1_5sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "p1_5sd_4y".to_string()), + p2sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "p2sd_4y".to_string()), + p2_5sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "p2_5sd_4y".to_string()), + p3sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "p3sd_4y".to_string()), + m0_5sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "m0_5sd_4y".to_string()), + m1sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "m1sd_4y".to_string()), + m1_5sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "m1_5sd_4y".to_string()), + m2sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "m2sd_4y".to_string()), + m2_5sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "m2_5sd_4y".to_string()), + m3sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "m3sd_4y".to_string()), } } } @@ -9931,71 +7421,20 @@ impl SeriesTree_Cohorts_Utxo_All_Realized_Price_StdDev_2y { pub fn new(client: Arc, base_path: String) -> Self { Self { sd: SeriesPattern1::new(client.clone(), "realized_price_ratio_sd_2y".to_string()), - zscore: SeriesPattern1::new( - client.clone(), - "realized_price_ratio_zscore_2y".to_string(), - ), + zscore: SeriesPattern1::new(client.clone(), "realized_price_ratio_zscore_2y".to_string()), _0sd: CentsSatsUsdPattern::new(client.clone(), "realized_price_0sd_2y".to_string()), - p0_5sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "p0_5sd_2y".to_string(), - ), - p1sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "p1sd_2y".to_string(), - ), - p1_5sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "p1_5sd_2y".to_string(), - ), - p2sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "p2sd_2y".to_string(), - ), - p2_5sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "p2_5sd_2y".to_string(), - ), - p3sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "p3sd_2y".to_string(), - ), - m0_5sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "m0_5sd_2y".to_string(), - ), - m1sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "m1sd_2y".to_string(), - ), - m1_5sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "m1_5sd_2y".to_string(), - ), - m2sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "m2sd_2y".to_string(), - ), - m2_5sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "m2_5sd_2y".to_string(), - ), - m3sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "m3sd_2y".to_string(), - ), + p0_5sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "p0_5sd_2y".to_string()), + p1sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "p1sd_2y".to_string()), + p1_5sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "p1_5sd_2y".to_string()), + p2sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "p2sd_2y".to_string()), + p2_5sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "p2_5sd_2y".to_string()), + p3sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "p3sd_2y".to_string()), + m0_5sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "m0_5sd_2y".to_string()), + m1sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "m1sd_2y".to_string()), + m1_5sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "m1_5sd_2y".to_string()), + m2sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "m2sd_2y".to_string()), + m2_5sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "m2_5sd_2y".to_string()), + m3sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "m3sd_2y".to_string()), } } } @@ -10023,71 +7462,20 @@ impl SeriesTree_Cohorts_Utxo_All_Realized_Price_StdDev_1y { pub fn new(client: Arc, base_path: String) -> Self { Self { sd: SeriesPattern1::new(client.clone(), "realized_price_ratio_sd_1y".to_string()), - zscore: SeriesPattern1::new( - client.clone(), - "realized_price_ratio_zscore_1y".to_string(), - ), + zscore: SeriesPattern1::new(client.clone(), "realized_price_ratio_zscore_1y".to_string()), _0sd: CentsSatsUsdPattern::new(client.clone(), "realized_price_0sd_1y".to_string()), - p0_5sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "p0_5sd_1y".to_string(), - ), - p1sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "p1sd_1y".to_string(), - ), - p1_5sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "p1_5sd_1y".to_string(), - ), - p2sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "p2sd_1y".to_string(), - ), - p2_5sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "p2_5sd_1y".to_string(), - ), - p3sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "p3sd_1y".to_string(), - ), - m0_5sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "m0_5sd_1y".to_string(), - ), - m1sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "m1sd_1y".to_string(), - ), - m1_5sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "m1_5sd_1y".to_string(), - ), - m2sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "m2sd_1y".to_string(), - ), - m2_5sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "m2_5sd_1y".to_string(), - ), - m3sd: PriceRatioPattern::new( - client.clone(), - "realized_price".to_string(), - "m3sd_1y".to_string(), - ), + p0_5sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "p0_5sd_1y".to_string()), + p1sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "p1sd_1y".to_string()), + p1_5sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "p1_5sd_1y".to_string()), + p2sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "p2sd_1y".to_string()), + p2_5sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "p2_5sd_1y".to_string()), + p3sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "p3sd_1y".to_string()), + m0_5sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "m0_5sd_1y".to_string()), + m1sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "m1sd_1y".to_string()), + m1_5sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "m1_5sd_1y".to_string()), + m2sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "m2sd_1y".to_string()), + m2_5sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "m2_5sd_1y".to_string()), + m3sd: PriceRatioPattern::new(client.clone(), "realized_price".to_string(), "m3sd_1y".to_string()), } } } @@ -10102,15 +7490,9 @@ pub struct SeriesTree_Cohorts_Utxo_All_Realized_Sopr { impl SeriesTree_Cohorts_Utxo_All_Realized_Sopr { pub fn new(client: Arc, base_path: String) -> Self { Self { - value_destroyed: AverageBlockCumulativeSumPattern::new( - client.clone(), - "value_destroyed".to_string(), - ), + value_destroyed: AverageBlockCumulativeSumPattern::new(client.clone(), "value_destroyed".to_string()), ratio: _1m1w1y24hPattern::new(client.clone(), "sopr".to_string()), - adjusted: SeriesTree_Cohorts_Utxo_All_Realized_Sopr_Adjusted::new( - client.clone(), - format!("{base_path}_adjusted"), - ), + adjusted: SeriesTree_Cohorts_Utxo_All_Realized_Sopr_Adjusted::new(client.clone(), format!("{base_path}_adjusted")), } } } @@ -10126,14 +7508,8 @@ impl SeriesTree_Cohorts_Utxo_All_Realized_Sopr_Adjusted { pub fn new(client: Arc, base_path: String) -> Self { Self { ratio: _1m1w1y24hPattern::new(client.clone(), "asopr".to_string()), - transfer_volume: AverageBlockCumulativeSumPattern::new( - client.clone(), - "adj_value_created".to_string(), - ), - value_destroyed: AverageBlockCumulativeSumPattern::new( - client.clone(), - "adj_value_destroyed".to_string(), - ), + transfer_volume: AverageBlockCumulativeSumPattern::new(client.clone(), "adj_value_created".to_string()), + value_destroyed: AverageBlockCumulativeSumPattern::new(client.clone(), "adj_value_destroyed".to_string()), } } } @@ -10180,32 +7556,14 @@ impl SeriesTree_Cohorts_Utxo_All_Unrealized { pub fn new(client: Arc, base_path: String) -> Self { Self { nupl: BpsRatioPattern::new(client.clone(), "nupl".to_string()), - profit: SeriesTree_Cohorts_Utxo_All_Unrealized_Profit::new( - client.clone(), - format!("{base_path}_profit"), - ), - loss: SeriesTree_Cohorts_Utxo_All_Unrealized_Loss::new( - client.clone(), - format!("{base_path}_loss"), - ), - net_pnl: SeriesTree_Cohorts_Utxo_All_Unrealized_NetPnl::new( - client.clone(), - format!("{base_path}_net_pnl"), - ), + profit: SeriesTree_Cohorts_Utxo_All_Unrealized_Profit::new(client.clone(), format!("{base_path}_profit")), + loss: SeriesTree_Cohorts_Utxo_All_Unrealized_Loss::new(client.clone(), format!("{base_path}_loss")), + net_pnl: SeriesTree_Cohorts_Utxo_All_Unrealized_NetPnl::new(client.clone(), format!("{base_path}_net_pnl")), gross_pnl: CentsUsdPattern3::new(client.clone(), "unrealized_gross_pnl".to_string()), invested_capital: InPattern2::new(client.clone(), "invested_capital_in".to_string()), - capitalized_cap_in_profit_raw: SeriesPattern18::new( - client.clone(), - "capitalized_cap_in_profit_raw".to_string(), - ), - capitalized_cap_in_loss_raw: SeriesPattern18::new( - client.clone(), - "capitalized_cap_in_loss_raw".to_string(), - ), - sentiment: SeriesTree_Cohorts_Utxo_All_Unrealized_Sentiment::new( - client.clone(), - format!("{base_path}_sentiment"), - ), + capitalized_cap_in_profit_raw: SeriesPattern18::new(client.clone(), "capitalized_cap_in_profit_raw".to_string()), + capitalized_cap_in_loss_raw: SeriesPattern18::new(client.clone(), "capitalized_cap_in_loss_raw".to_string()), + sentiment: SeriesTree_Cohorts_Utxo_All_Unrealized_Sentiment::new(client.clone(), format!("{base_path}_sentiment")), } } } @@ -10223,14 +7581,8 @@ impl SeriesTree_Cohorts_Utxo_All_Unrealized_Profit { Self { usd: SeriesPattern1::new(client.clone(), "unrealized_profit".to_string()), cents: SeriesPattern1::new(client.clone(), "unrealized_profit_cents".to_string()), - to_mcap: BpsPercentRatioPattern2::new( - client.clone(), - "unrealized_profit_to_mcap".to_string(), - ), - to_own_gross_pnl: BpsPercentRatioPattern2::new( - client.clone(), - "unrealized_profit_to_own_gross_pnl".to_string(), - ), + to_mcap: BpsPercentRatioPattern2::new(client.clone(), "unrealized_profit_to_mcap".to_string()), + to_own_gross_pnl: BpsPercentRatioPattern2::new(client.clone(), "unrealized_profit_to_own_gross_pnl".to_string()), } } } @@ -10250,14 +7602,8 @@ impl SeriesTree_Cohorts_Utxo_All_Unrealized_Loss { usd: SeriesPattern1::new(client.clone(), "unrealized_loss".to_string()), cents: SeriesPattern1::new(client.clone(), "unrealized_loss_cents".to_string()), negative: SeriesPattern1::new(client.clone(), "unrealized_loss_neg".to_string()), - to_mcap: BpsPercentRatioPattern2::new( - client.clone(), - "unrealized_loss_to_mcap".to_string(), - ), - to_own_gross_pnl: BpsPercentRatioPattern2::new( - client.clone(), - "unrealized_loss_to_own_gross_pnl".to_string(), - ), + to_mcap: BpsPercentRatioPattern2::new(client.clone(), "unrealized_loss_to_mcap".to_string()), + to_own_gross_pnl: BpsPercentRatioPattern2::new(client.clone(), "unrealized_loss_to_own_gross_pnl".to_string()), } } } @@ -10274,10 +7620,7 @@ impl SeriesTree_Cohorts_Utxo_All_Unrealized_NetPnl { Self { usd: SeriesPattern1::new(client.clone(), "net_unrealized_pnl".to_string()), cents: SeriesPattern1::new(client.clone(), "net_unrealized_pnl_cents".to_string()), - to_own_gross_pnl: BpsPercentRatioPattern::new( - client.clone(), - "net_unrealized_pnl_to_own_gross_pnl".to_string(), - ), + to_own_gross_pnl: BpsPercentRatioPattern::new(client.clone(), "net_unrealized_pnl_to_own_gross_pnl".to_string()), } } } @@ -10313,24 +7656,12 @@ pub struct SeriesTree_Cohorts_Utxo_Sth { impl SeriesTree_Cohorts_Utxo_Sth { pub fn new(client: Arc, base_path: String) -> Self { Self { - supply: DeltaDominanceHalfInTotalPattern2::new( - client.clone(), - "sth_supply".to_string(), - ), + supply: DeltaDominanceHalfInTotalPattern2::new(client.clone(), "sth_supply".to_string()), outputs: SpendingSpentUnspentPattern::new(client.clone(), "sth".to_string()), - activity: CoindaysCoinyearsDormancyTransferPattern::new( - client.clone(), - "sth".to_string(), - ), - realized: SeriesTree_Cohorts_Utxo_Sth_Realized::new( - client.clone(), - format!("{base_path}_realized"), - ), + activity: CoindaysCoinyearsDormancyTransferPattern::new(client.clone(), "sth".to_string()), + realized: SeriesTree_Cohorts_Utxo_Sth_Realized::new(client.clone(), format!("{base_path}_realized")), cost_basis: InMaxMinPerSupplyPattern::new(client.clone(), "sth".to_string()), - unrealized: CapitalizedGrossInvestedLossNetNuplProfitSentimentPattern2::new( - client.clone(), - "sth".to_string(), - ), + unrealized: CapitalizedGrossInvestedLossNetNuplProfitSentimentPattern2::new(client.clone(), "sth".to_string()), invested_capital: InPattern::new(client.clone(), "sth_invested_capital_in".to_string()), } } @@ -10356,41 +7687,17 @@ impl SeriesTree_Cohorts_Utxo_Sth_Realized { pub fn new(client: Arc, base_path: String) -> Self { Self { cap: CentsDeltaToUsdPattern::new(client.clone(), "sth_realized_cap".to_string()), - profit: BlockCumulativeSumPattern::new( - client.clone(), - "sth_realized_profit".to_string(), - ), - loss: BlockCumulativeNegativeSumPattern::new( - client.clone(), - "sth_realized_loss".to_string(), - ), - price: SeriesTree_Cohorts_Utxo_Sth_Realized_Price::new( - client.clone(), - format!("{base_path}_price"), - ), + profit: BlockCumulativeSumPattern::new(client.clone(), "sth_realized_profit".to_string()), + loss: BlockCumulativeNegativeSumPattern::new(client.clone(), "sth_realized_loss".to_string()), + price: SeriesTree_Cohorts_Utxo_Sth_Realized_Price::new(client.clone(), format!("{base_path}_price")), mvrv: SeriesPattern1::new(client.clone(), "sth_mvrv".to_string()), - net_pnl: BlockChangeCumulativeDeltaSumPattern::new( - client.clone(), - "sth_net".to_string(), - ), + net_pnl: BlockChangeCumulativeDeltaSumPattern::new(client.clone(), "sth_net".to_string()), sopr: AdjustedRatioValuePattern::new(client.clone(), "sth".to_string()), - gross_pnl: BlockCumulativeSumPattern::new( - client.clone(), - "sth_realized_gross_pnl".to_string(), - ), - sell_side_risk_ratio: _1m1w1y24hPattern8::new( - client.clone(), - "sth_sell_side_risk_ratio".to_string(), - ), - peak_regret: BlockCumulativeSumPattern::new( - client.clone(), - "sth_realized_peak_regret".to_string(), - ), + gross_pnl: BlockCumulativeSumPattern::new(client.clone(), "sth_realized_gross_pnl".to_string()), + sell_side_risk_ratio: _1m1w1y24hPattern8::new(client.clone(), "sth_sell_side_risk_ratio".to_string()), + peak_regret: BlockCumulativeSumPattern::new(client.clone(), "sth_realized_peak_regret".to_string()), capitalized: PricePattern::new(client.clone(), "sth_capitalized_price".to_string()), - profit_to_loss_ratio: _1m1w1y24hPattern::new( - client.clone(), - "sth_realized_profit_to_loss_ratio".to_string(), - ), + profit_to_loss_ratio: _1m1w1y24hPattern::new(client.clone(), "sth_realized_profit_to_loss_ratio".to_string()), } } } @@ -10415,18 +7722,9 @@ impl SeriesTree_Cohorts_Utxo_Sth_Realized_Price { sats: SeriesPattern1::new(client.clone(), "sth_realized_price_sats".to_string()), bps: SeriesPattern1::new(client.clone(), "sth_realized_price_ratio_bps".to_string()), ratio: SeriesPattern1::new(client.clone(), "sth_realized_price_ratio".to_string()), - percentiles: Pct0Pct1Pct2Pct5Pct95Pct98Pct99Pattern::new( - client.clone(), - "sth_realized_price".to_string(), - ), - sma: _1m1w1y2y4yAllPattern::new( - client.clone(), - "sth_realized_price_ratio_sma".to_string(), - ), - std_dev: SeriesTree_Cohorts_Utxo_Sth_Realized_Price_StdDev::new( - client.clone(), - format!("{base_path}_std_dev"), - ), + percentiles: Pct0Pct1Pct2Pct5Pct95Pct98Pct99Pattern::new(client.clone(), "sth_realized_price".to_string()), + sma: _1m1w1y2y4yAllPattern::new(client.clone(), "sth_realized_price_ratio_sma".to_string()), + std_dev: SeriesTree_Cohorts_Utxo_Sth_Realized_Price_StdDev::new(client.clone(), format!("{base_path}_std_dev")), } } } @@ -10442,22 +7740,10 @@ pub struct SeriesTree_Cohorts_Utxo_Sth_Realized_Price_StdDev { impl SeriesTree_Cohorts_Utxo_Sth_Realized_Price_StdDev { pub fn new(client: Arc, base_path: String) -> Self { Self { - all: SeriesTree_Cohorts_Utxo_Sth_Realized_Price_StdDev_All::new( - client.clone(), - format!("{base_path}_all"), - ), - _4y: SeriesTree_Cohorts_Utxo_Sth_Realized_Price_StdDev_4y::new( - client.clone(), - format!("{base_path}_4y"), - ), - _2y: SeriesTree_Cohorts_Utxo_Sth_Realized_Price_StdDev_2y::new( - client.clone(), - format!("{base_path}_2y"), - ), - _1y: SeriesTree_Cohorts_Utxo_Sth_Realized_Price_StdDev_1y::new( - client.clone(), - format!("{base_path}_1y"), - ), + all: SeriesTree_Cohorts_Utxo_Sth_Realized_Price_StdDev_All::new(client.clone(), format!("{base_path}_all")), + _4y: SeriesTree_Cohorts_Utxo_Sth_Realized_Price_StdDev_4y::new(client.clone(), format!("{base_path}_4y")), + _2y: SeriesTree_Cohorts_Utxo_Sth_Realized_Price_StdDev_2y::new(client.clone(), format!("{base_path}_2y")), + _1y: SeriesTree_Cohorts_Utxo_Sth_Realized_Price_StdDev_1y::new(client.clone(), format!("{base_path}_1y")), } } } @@ -10485,71 +7771,20 @@ impl SeriesTree_Cohorts_Utxo_Sth_Realized_Price_StdDev_All { pub fn new(client: Arc, base_path: String) -> Self { Self { sd: SeriesPattern1::new(client.clone(), "sth_realized_price_ratio_sd".to_string()), - zscore: SeriesPattern1::new( - client.clone(), - "sth_realized_price_ratio_zscore".to_string(), - ), + zscore: SeriesPattern1::new(client.clone(), "sth_realized_price_ratio_zscore".to_string()), _0sd: CentsSatsUsdPattern::new(client.clone(), "sth_realized_price_0sd".to_string()), - p0_5sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "p0_5sd".to_string(), - ), - p1sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "p1sd".to_string(), - ), - p1_5sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "p1_5sd".to_string(), - ), - p2sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "p2sd".to_string(), - ), - p2_5sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "p2_5sd".to_string(), - ), - p3sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "p3sd".to_string(), - ), - m0_5sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "m0_5sd".to_string(), - ), - m1sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "m1sd".to_string(), - ), - m1_5sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "m1_5sd".to_string(), - ), - m2sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "m2sd".to_string(), - ), - m2_5sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "m2_5sd".to_string(), - ), - m3sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "m3sd".to_string(), - ), + p0_5sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "p0_5sd".to_string()), + p1sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "p1sd".to_string()), + p1_5sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "p1_5sd".to_string()), + p2sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "p2sd".to_string()), + p2_5sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "p2_5sd".to_string()), + p3sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "p3sd".to_string()), + m0_5sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "m0_5sd".to_string()), + m1sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "m1sd".to_string()), + m1_5sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "m1_5sd".to_string()), + m2sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "m2sd".to_string()), + m2_5sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "m2_5sd".to_string()), + m3sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "m3sd".to_string()), } } } @@ -10577,71 +7812,20 @@ impl SeriesTree_Cohorts_Utxo_Sth_Realized_Price_StdDev_4y { pub fn new(client: Arc, base_path: String) -> Self { Self { sd: SeriesPattern1::new(client.clone(), "sth_realized_price_ratio_sd_4y".to_string()), - zscore: SeriesPattern1::new( - client.clone(), - "sth_realized_price_ratio_zscore_4y".to_string(), - ), + zscore: SeriesPattern1::new(client.clone(), "sth_realized_price_ratio_zscore_4y".to_string()), _0sd: CentsSatsUsdPattern::new(client.clone(), "sth_realized_price_0sd_4y".to_string()), - p0_5sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "p0_5sd_4y".to_string(), - ), - p1sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "p1sd_4y".to_string(), - ), - p1_5sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "p1_5sd_4y".to_string(), - ), - p2sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "p2sd_4y".to_string(), - ), - p2_5sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "p2_5sd_4y".to_string(), - ), - p3sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "p3sd_4y".to_string(), - ), - m0_5sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "m0_5sd_4y".to_string(), - ), - m1sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "m1sd_4y".to_string(), - ), - m1_5sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "m1_5sd_4y".to_string(), - ), - m2sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "m2sd_4y".to_string(), - ), - m2_5sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "m2_5sd_4y".to_string(), - ), - m3sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "m3sd_4y".to_string(), - ), + p0_5sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "p0_5sd_4y".to_string()), + p1sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "p1sd_4y".to_string()), + p1_5sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "p1_5sd_4y".to_string()), + p2sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "p2sd_4y".to_string()), + p2_5sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "p2_5sd_4y".to_string()), + p3sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "p3sd_4y".to_string()), + m0_5sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "m0_5sd_4y".to_string()), + m1sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "m1sd_4y".to_string()), + m1_5sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "m1_5sd_4y".to_string()), + m2sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "m2sd_4y".to_string()), + m2_5sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "m2_5sd_4y".to_string()), + m3sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "m3sd_4y".to_string()), } } } @@ -10669,71 +7853,20 @@ impl SeriesTree_Cohorts_Utxo_Sth_Realized_Price_StdDev_2y { pub fn new(client: Arc, base_path: String) -> Self { Self { sd: SeriesPattern1::new(client.clone(), "sth_realized_price_ratio_sd_2y".to_string()), - zscore: SeriesPattern1::new( - client.clone(), - "sth_realized_price_ratio_zscore_2y".to_string(), - ), + zscore: SeriesPattern1::new(client.clone(), "sth_realized_price_ratio_zscore_2y".to_string()), _0sd: CentsSatsUsdPattern::new(client.clone(), "sth_realized_price_0sd_2y".to_string()), - p0_5sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "p0_5sd_2y".to_string(), - ), - p1sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "p1sd_2y".to_string(), - ), - p1_5sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "p1_5sd_2y".to_string(), - ), - p2sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "p2sd_2y".to_string(), - ), - p2_5sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "p2_5sd_2y".to_string(), - ), - p3sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "p3sd_2y".to_string(), - ), - m0_5sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "m0_5sd_2y".to_string(), - ), - m1sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "m1sd_2y".to_string(), - ), - m1_5sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "m1_5sd_2y".to_string(), - ), - m2sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "m2sd_2y".to_string(), - ), - m2_5sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "m2_5sd_2y".to_string(), - ), - m3sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "m3sd_2y".to_string(), - ), + p0_5sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "p0_5sd_2y".to_string()), + p1sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "p1sd_2y".to_string()), + p1_5sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "p1_5sd_2y".to_string()), + p2sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "p2sd_2y".to_string()), + p2_5sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "p2_5sd_2y".to_string()), + p3sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "p3sd_2y".to_string()), + m0_5sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "m0_5sd_2y".to_string()), + m1sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "m1sd_2y".to_string()), + m1_5sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "m1_5sd_2y".to_string()), + m2sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "m2sd_2y".to_string()), + m2_5sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "m2_5sd_2y".to_string()), + m3sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "m3sd_2y".to_string()), } } } @@ -10761,71 +7894,20 @@ impl SeriesTree_Cohorts_Utxo_Sth_Realized_Price_StdDev_1y { pub fn new(client: Arc, base_path: String) -> Self { Self { sd: SeriesPattern1::new(client.clone(), "sth_realized_price_ratio_sd_1y".to_string()), - zscore: SeriesPattern1::new( - client.clone(), - "sth_realized_price_ratio_zscore_1y".to_string(), - ), + zscore: SeriesPattern1::new(client.clone(), "sth_realized_price_ratio_zscore_1y".to_string()), _0sd: CentsSatsUsdPattern::new(client.clone(), "sth_realized_price_0sd_1y".to_string()), - p0_5sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "p0_5sd_1y".to_string(), - ), - p1sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "p1sd_1y".to_string(), - ), - p1_5sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "p1_5sd_1y".to_string(), - ), - p2sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "p2sd_1y".to_string(), - ), - p2_5sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "p2_5sd_1y".to_string(), - ), - p3sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "p3sd_1y".to_string(), - ), - m0_5sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "m0_5sd_1y".to_string(), - ), - m1sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "m1sd_1y".to_string(), - ), - m1_5sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "m1_5sd_1y".to_string(), - ), - m2sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "m2sd_1y".to_string(), - ), - m2_5sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "m2_5sd_1y".to_string(), - ), - m3sd: PriceRatioPattern::new( - client.clone(), - "sth_realized_price".to_string(), - "m3sd_1y".to_string(), - ), + p0_5sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "p0_5sd_1y".to_string()), + p1sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "p1sd_1y".to_string()), + p1_5sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "p1_5sd_1y".to_string()), + p2sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "p2sd_1y".to_string()), + p2_5sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "p2_5sd_1y".to_string()), + p3sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "p3sd_1y".to_string()), + m0_5sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "m0_5sd_1y".to_string()), + m1sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "m1sd_1y".to_string()), + m1_5sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "m1_5sd_1y".to_string()), + m2sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "m2sd_1y".to_string()), + m2_5sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "m2_5sd_1y".to_string()), + m3sd: PriceRatioPattern::new(client.clone(), "sth_realized_price".to_string(), "m3sd_1y".to_string()), } } } @@ -10844,24 +7926,12 @@ pub struct SeriesTree_Cohorts_Utxo_Lth { impl SeriesTree_Cohorts_Utxo_Lth { pub fn new(client: Arc, base_path: String) -> Self { Self { - supply: DeltaDominanceHalfInTotalPattern2::new( - client.clone(), - "lth_supply".to_string(), - ), + supply: DeltaDominanceHalfInTotalPattern2::new(client.clone(), "lth_supply".to_string()), outputs: SpendingSpentUnspentPattern::new(client.clone(), "lth".to_string()), - activity: CoindaysCoinyearsDormancyTransferPattern::new( - client.clone(), - "lth".to_string(), - ), - realized: SeriesTree_Cohorts_Utxo_Lth_Realized::new( - client.clone(), - format!("{base_path}_realized"), - ), + activity: CoindaysCoinyearsDormancyTransferPattern::new(client.clone(), "lth".to_string()), + realized: SeriesTree_Cohorts_Utxo_Lth_Realized::new(client.clone(), format!("{base_path}_realized")), cost_basis: InMaxMinPerSupplyPattern::new(client.clone(), "lth".to_string()), - unrealized: CapitalizedGrossInvestedLossNetNuplProfitSentimentPattern2::new( - client.clone(), - "lth".to_string(), - ), + unrealized: CapitalizedGrossInvestedLossNetNuplProfitSentimentPattern2::new(client.clone(), "lth".to_string()), invested_capital: InPattern::new(client.clone(), "lth_invested_capital_in".to_string()), } } @@ -10887,44 +7957,17 @@ impl SeriesTree_Cohorts_Utxo_Lth_Realized { pub fn new(client: Arc, base_path: String) -> Self { Self { cap: CentsDeltaToUsdPattern::new(client.clone(), "lth_realized_cap".to_string()), - profit: BlockCumulativeSumPattern::new( - client.clone(), - "lth_realized_profit".to_string(), - ), - loss: BlockCumulativeNegativeSumPattern::new( - client.clone(), - "lth_realized_loss".to_string(), - ), - price: SeriesTree_Cohorts_Utxo_Lth_Realized_Price::new( - client.clone(), - format!("{base_path}_price"), - ), + profit: BlockCumulativeSumPattern::new(client.clone(), "lth_realized_profit".to_string()), + loss: BlockCumulativeNegativeSumPattern::new(client.clone(), "lth_realized_loss".to_string()), + price: SeriesTree_Cohorts_Utxo_Lth_Realized_Price::new(client.clone(), format!("{base_path}_price")), mvrv: SeriesPattern1::new(client.clone(), "lth_mvrv".to_string()), - net_pnl: BlockChangeCumulativeDeltaSumPattern::new( - client.clone(), - "lth_net".to_string(), - ), - sopr: SeriesTree_Cohorts_Utxo_Lth_Realized_Sopr::new( - client.clone(), - format!("{base_path}_sopr"), - ), - gross_pnl: BlockCumulativeSumPattern::new( - client.clone(), - "lth_realized_gross_pnl".to_string(), - ), - sell_side_risk_ratio: _1m1w1y24hPattern8::new( - client.clone(), - "lth_sell_side_risk_ratio".to_string(), - ), - peak_regret: BlockCumulativeSumPattern::new( - client.clone(), - "lth_realized_peak_regret".to_string(), - ), + net_pnl: BlockChangeCumulativeDeltaSumPattern::new(client.clone(), "lth_net".to_string()), + sopr: SeriesTree_Cohorts_Utxo_Lth_Realized_Sopr::new(client.clone(), format!("{base_path}_sopr")), + gross_pnl: BlockCumulativeSumPattern::new(client.clone(), "lth_realized_gross_pnl".to_string()), + sell_side_risk_ratio: _1m1w1y24hPattern8::new(client.clone(), "lth_sell_side_risk_ratio".to_string()), + peak_regret: BlockCumulativeSumPattern::new(client.clone(), "lth_realized_peak_regret".to_string()), capitalized: PricePattern::new(client.clone(), "lth_capitalized_price".to_string()), - profit_to_loss_ratio: _1m1w1y24hPattern::new( - client.clone(), - "lth_realized_profit_to_loss_ratio".to_string(), - ), + profit_to_loss_ratio: _1m1w1y24hPattern::new(client.clone(), "lth_realized_profit_to_loss_ratio".to_string()), } } } @@ -10949,18 +7992,9 @@ impl SeriesTree_Cohorts_Utxo_Lth_Realized_Price { sats: SeriesPattern1::new(client.clone(), "lth_realized_price_sats".to_string()), bps: SeriesPattern1::new(client.clone(), "lth_realized_price_ratio_bps".to_string()), ratio: SeriesPattern1::new(client.clone(), "lth_realized_price_ratio".to_string()), - percentiles: Pct0Pct1Pct2Pct5Pct95Pct98Pct99Pattern::new( - client.clone(), - "lth_realized_price".to_string(), - ), - sma: _1m1w1y2y4yAllPattern::new( - client.clone(), - "lth_realized_price_ratio_sma".to_string(), - ), - std_dev: SeriesTree_Cohorts_Utxo_Lth_Realized_Price_StdDev::new( - client.clone(), - format!("{base_path}_std_dev"), - ), + percentiles: Pct0Pct1Pct2Pct5Pct95Pct98Pct99Pattern::new(client.clone(), "lth_realized_price".to_string()), + sma: _1m1w1y2y4yAllPattern::new(client.clone(), "lth_realized_price_ratio_sma".to_string()), + std_dev: SeriesTree_Cohorts_Utxo_Lth_Realized_Price_StdDev::new(client.clone(), format!("{base_path}_std_dev")), } } } @@ -10976,22 +8010,10 @@ pub struct SeriesTree_Cohorts_Utxo_Lth_Realized_Price_StdDev { impl SeriesTree_Cohorts_Utxo_Lth_Realized_Price_StdDev { pub fn new(client: Arc, base_path: String) -> Self { Self { - all: SeriesTree_Cohorts_Utxo_Lth_Realized_Price_StdDev_All::new( - client.clone(), - format!("{base_path}_all"), - ), - _4y: SeriesTree_Cohorts_Utxo_Lth_Realized_Price_StdDev_4y::new( - client.clone(), - format!("{base_path}_4y"), - ), - _2y: SeriesTree_Cohorts_Utxo_Lth_Realized_Price_StdDev_2y::new( - client.clone(), - format!("{base_path}_2y"), - ), - _1y: SeriesTree_Cohorts_Utxo_Lth_Realized_Price_StdDev_1y::new( - client.clone(), - format!("{base_path}_1y"), - ), + all: SeriesTree_Cohorts_Utxo_Lth_Realized_Price_StdDev_All::new(client.clone(), format!("{base_path}_all")), + _4y: SeriesTree_Cohorts_Utxo_Lth_Realized_Price_StdDev_4y::new(client.clone(), format!("{base_path}_4y")), + _2y: SeriesTree_Cohorts_Utxo_Lth_Realized_Price_StdDev_2y::new(client.clone(), format!("{base_path}_2y")), + _1y: SeriesTree_Cohorts_Utxo_Lth_Realized_Price_StdDev_1y::new(client.clone(), format!("{base_path}_1y")), } } } @@ -11019,71 +8041,20 @@ impl SeriesTree_Cohorts_Utxo_Lth_Realized_Price_StdDev_All { pub fn new(client: Arc, base_path: String) -> Self { Self { sd: SeriesPattern1::new(client.clone(), "lth_realized_price_ratio_sd".to_string()), - zscore: SeriesPattern1::new( - client.clone(), - "lth_realized_price_ratio_zscore".to_string(), - ), + zscore: SeriesPattern1::new(client.clone(), "lth_realized_price_ratio_zscore".to_string()), _0sd: CentsSatsUsdPattern::new(client.clone(), "lth_realized_price_0sd".to_string()), - p0_5sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "p0_5sd".to_string(), - ), - p1sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "p1sd".to_string(), - ), - p1_5sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "p1_5sd".to_string(), - ), - p2sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "p2sd".to_string(), - ), - p2_5sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "p2_5sd".to_string(), - ), - p3sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "p3sd".to_string(), - ), - m0_5sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "m0_5sd".to_string(), - ), - m1sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "m1sd".to_string(), - ), - m1_5sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "m1_5sd".to_string(), - ), - m2sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "m2sd".to_string(), - ), - m2_5sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "m2_5sd".to_string(), - ), - m3sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "m3sd".to_string(), - ), + p0_5sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "p0_5sd".to_string()), + p1sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "p1sd".to_string()), + p1_5sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "p1_5sd".to_string()), + p2sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "p2sd".to_string()), + p2_5sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "p2_5sd".to_string()), + p3sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "p3sd".to_string()), + m0_5sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "m0_5sd".to_string()), + m1sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "m1sd".to_string()), + m1_5sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "m1_5sd".to_string()), + m2sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "m2sd".to_string()), + m2_5sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "m2_5sd".to_string()), + m3sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "m3sd".to_string()), } } } @@ -11111,71 +8082,20 @@ impl SeriesTree_Cohorts_Utxo_Lth_Realized_Price_StdDev_4y { pub fn new(client: Arc, base_path: String) -> Self { Self { sd: SeriesPattern1::new(client.clone(), "lth_realized_price_ratio_sd_4y".to_string()), - zscore: SeriesPattern1::new( - client.clone(), - "lth_realized_price_ratio_zscore_4y".to_string(), - ), + zscore: SeriesPattern1::new(client.clone(), "lth_realized_price_ratio_zscore_4y".to_string()), _0sd: CentsSatsUsdPattern::new(client.clone(), "lth_realized_price_0sd_4y".to_string()), - p0_5sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "p0_5sd_4y".to_string(), - ), - p1sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "p1sd_4y".to_string(), - ), - p1_5sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "p1_5sd_4y".to_string(), - ), - p2sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "p2sd_4y".to_string(), - ), - p2_5sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "p2_5sd_4y".to_string(), - ), - p3sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "p3sd_4y".to_string(), - ), - m0_5sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "m0_5sd_4y".to_string(), - ), - m1sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "m1sd_4y".to_string(), - ), - m1_5sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "m1_5sd_4y".to_string(), - ), - m2sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "m2sd_4y".to_string(), - ), - m2_5sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "m2_5sd_4y".to_string(), - ), - m3sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "m3sd_4y".to_string(), - ), + p0_5sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "p0_5sd_4y".to_string()), + p1sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "p1sd_4y".to_string()), + p1_5sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "p1_5sd_4y".to_string()), + p2sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "p2sd_4y".to_string()), + p2_5sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "p2_5sd_4y".to_string()), + p3sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "p3sd_4y".to_string()), + m0_5sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "m0_5sd_4y".to_string()), + m1sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "m1sd_4y".to_string()), + m1_5sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "m1_5sd_4y".to_string()), + m2sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "m2sd_4y".to_string()), + m2_5sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "m2_5sd_4y".to_string()), + m3sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "m3sd_4y".to_string()), } } } @@ -11203,71 +8123,20 @@ impl SeriesTree_Cohorts_Utxo_Lth_Realized_Price_StdDev_2y { pub fn new(client: Arc, base_path: String) -> Self { Self { sd: SeriesPattern1::new(client.clone(), "lth_realized_price_ratio_sd_2y".to_string()), - zscore: SeriesPattern1::new( - client.clone(), - "lth_realized_price_ratio_zscore_2y".to_string(), - ), + zscore: SeriesPattern1::new(client.clone(), "lth_realized_price_ratio_zscore_2y".to_string()), _0sd: CentsSatsUsdPattern::new(client.clone(), "lth_realized_price_0sd_2y".to_string()), - p0_5sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "p0_5sd_2y".to_string(), - ), - p1sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "p1sd_2y".to_string(), - ), - p1_5sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "p1_5sd_2y".to_string(), - ), - p2sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "p2sd_2y".to_string(), - ), - p2_5sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "p2_5sd_2y".to_string(), - ), - p3sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "p3sd_2y".to_string(), - ), - m0_5sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "m0_5sd_2y".to_string(), - ), - m1sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "m1sd_2y".to_string(), - ), - m1_5sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "m1_5sd_2y".to_string(), - ), - m2sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "m2sd_2y".to_string(), - ), - m2_5sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "m2_5sd_2y".to_string(), - ), - m3sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "m3sd_2y".to_string(), - ), + p0_5sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "p0_5sd_2y".to_string()), + p1sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "p1sd_2y".to_string()), + p1_5sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "p1_5sd_2y".to_string()), + p2sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "p2sd_2y".to_string()), + p2_5sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "p2_5sd_2y".to_string()), + p3sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "p3sd_2y".to_string()), + m0_5sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "m0_5sd_2y".to_string()), + m1sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "m1sd_2y".to_string()), + m1_5sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "m1_5sd_2y".to_string()), + m2sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "m2sd_2y".to_string()), + m2_5sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "m2_5sd_2y".to_string()), + m3sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "m3sd_2y".to_string()), } } } @@ -11295,71 +8164,20 @@ impl SeriesTree_Cohorts_Utxo_Lth_Realized_Price_StdDev_1y { pub fn new(client: Arc, base_path: String) -> Self { Self { sd: SeriesPattern1::new(client.clone(), "lth_realized_price_ratio_sd_1y".to_string()), - zscore: SeriesPattern1::new( - client.clone(), - "lth_realized_price_ratio_zscore_1y".to_string(), - ), + zscore: SeriesPattern1::new(client.clone(), "lth_realized_price_ratio_zscore_1y".to_string()), _0sd: CentsSatsUsdPattern::new(client.clone(), "lth_realized_price_0sd_1y".to_string()), - p0_5sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "p0_5sd_1y".to_string(), - ), - p1sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "p1sd_1y".to_string(), - ), - p1_5sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "p1_5sd_1y".to_string(), - ), - p2sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "p2sd_1y".to_string(), - ), - p2_5sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "p2_5sd_1y".to_string(), - ), - p3sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "p3sd_1y".to_string(), - ), - m0_5sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "m0_5sd_1y".to_string(), - ), - m1sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "m1sd_1y".to_string(), - ), - m1_5sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "m1_5sd_1y".to_string(), - ), - m2sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "m2sd_1y".to_string(), - ), - m2_5sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "m2_5sd_1y".to_string(), - ), - m3sd: PriceRatioPattern::new( - client.clone(), - "lth_realized_price".to_string(), - "m3sd_1y".to_string(), - ), + p0_5sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "p0_5sd_1y".to_string()), + p1sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "p1sd_1y".to_string()), + p1_5sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "p1_5sd_1y".to_string()), + p2sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "p2sd_1y".to_string()), + p2_5sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "p2_5sd_1y".to_string()), + p3sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "p3sd_1y".to_string()), + m0_5sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "m0_5sd_1y".to_string()), + m1sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "m1sd_1y".to_string()), + m1_5sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "m1_5sd_1y".to_string()), + m2sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "m2sd_1y".to_string()), + m2_5sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "m2_5sd_1y".to_string()), + m3sd: PriceRatioPattern::new(client.clone(), "lth_realized_price".to_string(), "m3sd_1y".to_string()), } } } @@ -11373,10 +8191,7 @@ pub struct SeriesTree_Cohorts_Utxo_Lth_Realized_Sopr { impl SeriesTree_Cohorts_Utxo_Lth_Realized_Sopr { pub fn new(client: Arc, base_path: String) -> Self { Self { - value_destroyed: AverageBlockCumulativeSumPattern::new( - client.clone(), - "lth_value_destroyed".to_string(), - ), + value_destroyed: AverageBlockCumulativeSumPattern::new(client.clone(), "lth_value_destroyed".to_string()), ratio: _1m1w1y24hPattern::new(client.clone(), "lth_sopr".to_string()), } } @@ -11410,90 +8225,27 @@ pub struct SeriesTree_Cohorts_Utxo_AgeRange { impl SeriesTree_Cohorts_Utxo_AgeRange { pub fn new(client: Arc, base_path: String) -> Self { Self { - under_1h: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_under_1h_old".to_string(), - ), - _1h_to_1d: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_1h_to_1d_old".to_string(), - ), - _1d_to_1w: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_1d_to_1w_old".to_string(), - ), - _1w_to_1m: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_1w_to_1m_old".to_string(), - ), - _1m_to_2m: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_1m_to_2m_old".to_string(), - ), - _2m_to_3m: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_2m_to_3m_old".to_string(), - ), - _3m_to_4m: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_3m_to_4m_old".to_string(), - ), - _4m_to_5m: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_4m_to_5m_old".to_string(), - ), - _5m_to_6m: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_5m_to_6m_old".to_string(), - ), - _6m_to_1y: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_6m_to_1y_old".to_string(), - ), - _1y_to_2y: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_1y_to_2y_old".to_string(), - ), - _2y_to_3y: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_2y_to_3y_old".to_string(), - ), - _3y_to_4y: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_3y_to_4y_old".to_string(), - ), - _4y_to_5y: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_4y_to_5y_old".to_string(), - ), - _5y_to_6y: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_5y_to_6y_old".to_string(), - ), - _6y_to_7y: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_6y_to_7y_old".to_string(), - ), - _7y_to_8y: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_7y_to_8y_old".to_string(), - ), - _8y_to_10y: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_8y_to_10y_old".to_string(), - ), - _10y_to_12y: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_10y_to_12y_old".to_string(), - ), - _12y_to_15y: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_12y_to_15y_old".to_string(), - ), - over_15y: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_15y_old".to_string(), - ), + under_1h: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_under_1h_old".to_string()), + _1h_to_1d: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_1h_to_1d_old".to_string()), + _1d_to_1w: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_1d_to_1w_old".to_string()), + _1w_to_1m: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_1w_to_1m_old".to_string()), + _1m_to_2m: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_1m_to_2m_old".to_string()), + _2m_to_3m: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_2m_to_3m_old".to_string()), + _3m_to_4m: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_3m_to_4m_old".to_string()), + _4m_to_5m: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_4m_to_5m_old".to_string()), + _5m_to_6m: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_5m_to_6m_old".to_string()), + _6m_to_1y: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_6m_to_1y_old".to_string()), + _1y_to_2y: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_1y_to_2y_old".to_string()), + _2y_to_3y: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_2y_to_3y_old".to_string()), + _3y_to_4y: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_3y_to_4y_old".to_string()), + _4y_to_5y: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_4y_to_5y_old".to_string()), + _5y_to_6y: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_5y_to_6y_old".to_string()), + _6y_to_7y: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_6y_to_7y_old".to_string()), + _7y_to_8y: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_7y_to_8y_old".to_string()), + _8y_to_10y: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_8y_to_10y_old".to_string()), + _10y_to_12y: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_10y_to_12y_old".to_string()), + _12y_to_15y: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_12y_to_15y_old".to_string()), + over_15y: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_15y_old".to_string()), } } } @@ -11523,78 +8275,24 @@ pub struct SeriesTree_Cohorts_Utxo_UnderAge { impl SeriesTree_Cohorts_Utxo_UnderAge { pub fn new(client: Arc, base_path: String) -> Self { Self { - _1w: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_under_1w_old".to_string(), - ), - _1m: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_under_1m_old".to_string(), - ), - _2m: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_under_2m_old".to_string(), - ), - _3m: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_under_3m_old".to_string(), - ), - _4m: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_under_4m_old".to_string(), - ), - _5m: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_under_5m_old".to_string(), - ), - _6m: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_under_6m_old".to_string(), - ), - _1y: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_under_1y_old".to_string(), - ), - _2y: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_under_2y_old".to_string(), - ), - _3y: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_under_3y_old".to_string(), - ), - _4y: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_under_4y_old".to_string(), - ), - _5y: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_under_5y_old".to_string(), - ), - _6y: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_under_6y_old".to_string(), - ), - _7y: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_under_7y_old".to_string(), - ), - _8y: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_under_8y_old".to_string(), - ), - _10y: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_under_10y_old".to_string(), - ), - _12y: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_under_12y_old".to_string(), - ), - _15y: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_under_15y_old".to_string(), - ), + _1w: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_under_1w_old".to_string()), + _1m: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_under_1m_old".to_string()), + _2m: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_under_2m_old".to_string()), + _3m: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_under_3m_old".to_string()), + _4m: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_under_4m_old".to_string()), + _5m: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_under_5m_old".to_string()), + _6m: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_under_6m_old".to_string()), + _1y: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_under_1y_old".to_string()), + _2y: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_under_2y_old".to_string()), + _3y: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_under_3y_old".to_string()), + _4y: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_under_4y_old".to_string()), + _5y: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_under_5y_old".to_string()), + _6y: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_under_6y_old".to_string()), + _7y: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_under_7y_old".to_string()), + _8y: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_under_8y_old".to_string()), + _10y: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_under_10y_old".to_string()), + _12y: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_under_12y_old".to_string()), + _15y: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_under_15y_old".to_string()), } } } @@ -11624,78 +8322,24 @@ pub struct SeriesTree_Cohorts_Utxo_OverAge { impl SeriesTree_Cohorts_Utxo_OverAge { pub fn new(client: Arc, base_path: String) -> Self { Self { - _1d: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_1d_old".to_string(), - ), - _1w: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_1w_old".to_string(), - ), - _1m: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_1m_old".to_string(), - ), - _2m: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_2m_old".to_string(), - ), - _3m: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_3m_old".to_string(), - ), - _4m: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_4m_old".to_string(), - ), - _5m: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_5m_old".to_string(), - ), - _6m: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_6m_old".to_string(), - ), - _1y: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_1y_old".to_string(), - ), - _2y: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_2y_old".to_string(), - ), - _3y: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_3y_old".to_string(), - ), - _4y: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_4y_old".to_string(), - ), - _5y: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_5y_old".to_string(), - ), - _6y: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_6y_old".to_string(), - ), - _7y: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_7y_old".to_string(), - ), - _8y: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_8y_old".to_string(), - ), - _10y: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_10y_old".to_string(), - ), - _12y: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_12y_old".to_string(), - ), + _1d: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_1d_old".to_string()), + _1w: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_1w_old".to_string()), + _1m: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_1m_old".to_string()), + _2m: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_2m_old".to_string()), + _3m: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_3m_old".to_string()), + _4m: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_4m_old".to_string()), + _5m: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_5m_old".to_string()), + _6m: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_6m_old".to_string()), + _1y: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_1y_old".to_string()), + _2y: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_2y_old".to_string()), + _3y: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_3y_old".to_string()), + _4y: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_4y_old".to_string()), + _5y: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_5y_old".to_string()), + _6y: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_6y_old".to_string()), + _7y: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_7y_old".to_string()), + _8y: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_8y_old".to_string()), + _10y: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_10y_old".to_string()), + _12y: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_12y_old".to_string()), } } } @@ -11712,26 +8356,11 @@ pub struct SeriesTree_Cohorts_Utxo_Epoch { impl SeriesTree_Cohorts_Utxo_Epoch { pub fn new(client: Arc, base_path: String) -> Self { Self { - _0: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "epoch_0".to_string(), - ), - _1: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "epoch_1".to_string(), - ), - _2: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "epoch_2".to_string(), - ), - _3: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "epoch_3".to_string(), - ), - _4: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "epoch_4".to_string(), - ), + _0: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "epoch_0".to_string()), + _1: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "epoch_1".to_string()), + _2: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "epoch_2".to_string()), + _3: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "epoch_3".to_string()), + _4: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "epoch_4".to_string()), } } } @@ -11761,78 +8390,24 @@ pub struct SeriesTree_Cohorts_Utxo_Class { impl SeriesTree_Cohorts_Utxo_Class { pub fn new(client: Arc, base_path: String) -> Self { Self { - _2009: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "class_2009".to_string(), - ), - _2010: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "class_2010".to_string(), - ), - _2011: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "class_2011".to_string(), - ), - _2012: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "class_2012".to_string(), - ), - _2013: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "class_2013".to_string(), - ), - _2014: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "class_2014".to_string(), - ), - _2015: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "class_2015".to_string(), - ), - _2016: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "class_2016".to_string(), - ), - _2017: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "class_2017".to_string(), - ), - _2018: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "class_2018".to_string(), - ), - _2019: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "class_2019".to_string(), - ), - _2020: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "class_2020".to_string(), - ), - _2021: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "class_2021".to_string(), - ), - _2022: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "class_2022".to_string(), - ), - _2023: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "class_2023".to_string(), - ), - _2024: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "class_2024".to_string(), - ), - _2025: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "class_2025".to_string(), - ), - _2026: ActivityOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "class_2026".to_string(), - ), + _2009: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "class_2009".to_string()), + _2010: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "class_2010".to_string()), + _2011: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "class_2011".to_string()), + _2012: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "class_2012".to_string()), + _2013: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "class_2013".to_string()), + _2014: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "class_2014".to_string()), + _2015: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "class_2015".to_string()), + _2016: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "class_2016".to_string()), + _2017: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "class_2017".to_string()), + _2018: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "class_2018".to_string()), + _2019: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "class_2019".to_string()), + _2020: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "class_2020".to_string()), + _2021: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "class_2021".to_string()), + _2022: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "class_2022".to_string()), + _2023: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "class_2023".to_string()), + _2024: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "class_2024".to_string()), + _2025: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "class_2025".to_string()), + _2026: ActivityOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "class_2026".to_string()), } } } @@ -11857,58 +8432,19 @@ pub struct SeriesTree_Cohorts_Utxo_OverAmount { impl SeriesTree_Cohorts_Utxo_OverAmount { pub fn new(client: Arc, base_path: String) -> Self { Self { - _1sat: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_over_1sat".to_string(), - ), - _10sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_over_10sats".to_string(), - ), - _100sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_over_100sats".to_string(), - ), - _1k_sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_over_1k_sats".to_string(), - ), - _10k_sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_over_10k_sats".to_string(), - ), - _100k_sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_over_100k_sats".to_string(), - ), - _1m_sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_over_1m_sats".to_string(), - ), - _10m_sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_over_10m_sats".to_string(), - ), - _1btc: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_over_1btc".to_string(), - ), - _10btc: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_over_10btc".to_string(), - ), - _100btc: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_over_100btc".to_string(), - ), - _1k_btc: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_over_1k_btc".to_string(), - ), - _10k_btc: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_over_10k_btc".to_string(), - ), + _1sat: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_over_1sat".to_string()), + _10sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_over_10sats".to_string()), + _100sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_over_100sats".to_string()), + _1k_sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_over_1k_sats".to_string()), + _10k_sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_over_10k_sats".to_string()), + _100k_sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_over_100k_sats".to_string()), + _1m_sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_over_1m_sats".to_string()), + _10m_sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_over_10m_sats".to_string()), + _1btc: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_over_1btc".to_string()), + _10btc: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_over_10btc".to_string()), + _100btc: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_over_100btc".to_string()), + _1k_btc: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_over_1k_btc".to_string()), + _10k_btc: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_over_10k_btc".to_string()), } } } @@ -11935,66 +8471,21 @@ pub struct SeriesTree_Cohorts_Utxo_AmountRange { impl SeriesTree_Cohorts_Utxo_AmountRange { pub fn new(client: Arc, base_path: String) -> Self { Self { - _0sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_0sats".to_string(), - ), - _1sat_to_10sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_1sat_to_10sats".to_string(), - ), - _10sats_to_100sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_10sats_to_100sats".to_string(), - ), - _100sats_to_1k_sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_100sats_to_1k_sats".to_string(), - ), - _1k_sats_to_10k_sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_1k_sats_to_10k_sats".to_string(), - ), - _10k_sats_to_100k_sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_10k_sats_to_100k_sats".to_string(), - ), - _100k_sats_to_1m_sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_100k_sats_to_1m_sats".to_string(), - ), - _1m_sats_to_10m_sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_1m_sats_to_10m_sats".to_string(), - ), - _10m_sats_to_1btc: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_10m_sats_to_1btc".to_string(), - ), - _1btc_to_10btc: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_1btc_to_10btc".to_string(), - ), - _10btc_to_100btc: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_10btc_to_100btc".to_string(), - ), - _100btc_to_1k_btc: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_100btc_to_1k_btc".to_string(), - ), - _1k_btc_to_10k_btc: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_1k_btc_to_10k_btc".to_string(), - ), - _10k_btc_to_100k_btc: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_10k_btc_to_100k_btc".to_string(), - ), - over_100k_btc: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_over_100k_btc".to_string(), - ), + _0sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_0sats".to_string()), + _1sat_to_10sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_1sat_to_10sats".to_string()), + _10sats_to_100sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_10sats_to_100sats".to_string()), + _100sats_to_1k_sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_100sats_to_1k_sats".to_string()), + _1k_sats_to_10k_sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_1k_sats_to_10k_sats".to_string()), + _10k_sats_to_100k_sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_10k_sats_to_100k_sats".to_string()), + _100k_sats_to_1m_sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_100k_sats_to_1m_sats".to_string()), + _1m_sats_to_10m_sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_1m_sats_to_10m_sats".to_string()), + _10m_sats_to_1btc: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_10m_sats_to_1btc".to_string()), + _1btc_to_10btc: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_1btc_to_10btc".to_string()), + _10btc_to_100btc: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_10btc_to_100btc".to_string()), + _100btc_to_1k_btc: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_100btc_to_1k_btc".to_string()), + _1k_btc_to_10k_btc: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_1k_btc_to_10k_btc".to_string()), + _10k_btc_to_100k_btc: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_10k_btc_to_100k_btc".to_string()), + over_100k_btc: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_over_100k_btc".to_string()), } } } @@ -12019,58 +8510,19 @@ pub struct SeriesTree_Cohorts_Utxo_UnderAmount { impl SeriesTree_Cohorts_Utxo_UnderAmount { pub fn new(client: Arc, base_path: String) -> Self { Self { - _10sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_under_10sats".to_string(), - ), - _100sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_under_100sats".to_string(), - ), - _1k_sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_under_1k_sats".to_string(), - ), - _10k_sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_under_10k_sats".to_string(), - ), - _100k_sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_under_100k_sats".to_string(), - ), - _1m_sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_under_1m_sats".to_string(), - ), - _10m_sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_under_10m_sats".to_string(), - ), - _1btc: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_under_1btc".to_string(), - ), - _10btc: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_under_10btc".to_string(), - ), - _100btc: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_under_100btc".to_string(), - ), - _1k_btc: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_under_1k_btc".to_string(), - ), - _10k_btc: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_under_10k_btc".to_string(), - ), - _100k_btc: ActivityOutputsRealizedSupplyUnrealizedPattern2::new( - client.clone(), - "utxos_under_100k_btc".to_string(), - ), + _10sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_under_10sats".to_string()), + _100sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_under_100sats".to_string()), + _1k_sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_under_1k_sats".to_string()), + _10k_sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_under_10k_sats".to_string()), + _100k_sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_under_100k_sats".to_string()), + _1m_sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_under_1m_sats".to_string()), + _10m_sats: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_under_10m_sats".to_string()), + _1btc: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_under_1btc".to_string()), + _10btc: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_under_10btc".to_string()), + _100btc: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_under_100btc".to_string()), + _1k_btc: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_under_1k_btc".to_string()), + _10k_btc: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_under_10k_btc".to_string()), + _100k_btc: ActivityOutputsRealizedSupplyUnrealizedPattern2::new(client.clone(), "utxos_under_100k_btc".to_string()), } } } @@ -12093,50 +8545,17 @@ pub struct SeriesTree_Cohorts_Utxo_Type { impl SeriesTree_Cohorts_Utxo_Type { pub fn new(client: Arc, base_path: String) -> Self { Self { - p2pk65: ActivityOutputsRealizedSupplyUnrealizedPattern3::new( - client.clone(), - "p2pk65".to_string(), - ), - p2pk33: ActivityOutputsRealizedSupplyUnrealizedPattern3::new( - client.clone(), - "p2pk33".to_string(), - ), - p2pkh: ActivityOutputsRealizedSupplyUnrealizedPattern3::new( - client.clone(), - "p2pkh".to_string(), - ), - p2ms: ActivityOutputsRealizedSupplyUnrealizedPattern3::new( - client.clone(), - "p2ms".to_string(), - ), - p2sh: ActivityOutputsRealizedSupplyUnrealizedPattern3::new( - client.clone(), - "p2sh".to_string(), - ), - p2wpkh: ActivityOutputsRealizedSupplyUnrealizedPattern3::new( - client.clone(), - "p2wpkh".to_string(), - ), - p2wsh: ActivityOutputsRealizedSupplyUnrealizedPattern3::new( - client.clone(), - "p2wsh".to_string(), - ), - p2tr: ActivityOutputsRealizedSupplyUnrealizedPattern3::new( - client.clone(), - "p2tr".to_string(), - ), - p2a: ActivityOutputsRealizedSupplyUnrealizedPattern3::new( - client.clone(), - "p2a".to_string(), - ), - unknown: ActivityOutputsRealizedSupplyUnrealizedPattern3::new( - client.clone(), - "unknown_outputs".to_string(), - ), - empty: ActivityOutputsRealizedSupplyUnrealizedPattern3::new( - client.clone(), - "empty_outputs".to_string(), - ), + p2pk65: ActivityOutputsRealizedSupplyUnrealizedPattern3::new(client.clone(), "p2pk65".to_string()), + p2pk33: ActivityOutputsRealizedSupplyUnrealizedPattern3::new(client.clone(), "p2pk33".to_string()), + p2pkh: ActivityOutputsRealizedSupplyUnrealizedPattern3::new(client.clone(), "p2pkh".to_string()), + p2ms: ActivityOutputsRealizedSupplyUnrealizedPattern3::new(client.clone(), "p2ms".to_string()), + p2sh: ActivityOutputsRealizedSupplyUnrealizedPattern3::new(client.clone(), "p2sh".to_string()), + p2wpkh: ActivityOutputsRealizedSupplyUnrealizedPattern3::new(client.clone(), "p2wpkh".to_string()), + p2wsh: ActivityOutputsRealizedSupplyUnrealizedPattern3::new(client.clone(), "p2wsh".to_string()), + p2tr: ActivityOutputsRealizedSupplyUnrealizedPattern3::new(client.clone(), "p2tr".to_string()), + p2a: ActivityOutputsRealizedSupplyUnrealizedPattern3::new(client.clone(), "p2a".to_string()), + unknown: ActivityOutputsRealizedSupplyUnrealizedPattern3::new(client.clone(), "unknown_outputs".to_string()), + empty: ActivityOutputsRealizedSupplyUnrealizedPattern3::new(client.clone(), "empty_outputs".to_string()), } } } @@ -12151,18 +8570,9 @@ pub struct SeriesTree_Cohorts_Utxo_Profitability { impl SeriesTree_Cohorts_Utxo_Profitability { pub fn new(client: Arc, base_path: String) -> Self { Self { - range: SeriesTree_Cohorts_Utxo_Profitability_Range::new( - client.clone(), - format!("{base_path}_range"), - ), - profit: SeriesTree_Cohorts_Utxo_Profitability_Profit::new( - client.clone(), - format!("{base_path}_profit"), - ), - loss: SeriesTree_Cohorts_Utxo_Profitability_Loss::new( - client.clone(), - format!("{base_path}_loss"), - ), + range: SeriesTree_Cohorts_Utxo_Profitability_Range::new(client.clone(), format!("{base_path}_range")), + profit: SeriesTree_Cohorts_Utxo_Profitability_Profit::new(client.clone(), format!("{base_path}_profit")), + loss: SeriesTree_Cohorts_Utxo_Profitability_Loss::new(client.clone(), format!("{base_path}_loss")), } } } @@ -12199,106 +8609,31 @@ pub struct SeriesTree_Cohorts_Utxo_Profitability_Range { impl SeriesTree_Cohorts_Utxo_Profitability_Range { pub fn new(client: Arc, base_path: String) -> Self { Self { - over_1000pct_in_profit: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_1000pct_in_profit".to_string(), - ), - _500pct_to_1000pct_in_profit: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_500pct_to_1000pct_in_profit".to_string(), - ), - _300pct_to_500pct_in_profit: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_300pct_to_500pct_in_profit".to_string(), - ), - _200pct_to_300pct_in_profit: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_200pct_to_300pct_in_profit".to_string(), - ), - _100pct_to_200pct_in_profit: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_100pct_to_200pct_in_profit".to_string(), - ), - _90pct_to_100pct_in_profit: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_90pct_to_100pct_in_profit".to_string(), - ), - _80pct_to_90pct_in_profit: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_80pct_to_90pct_in_profit".to_string(), - ), - _70pct_to_80pct_in_profit: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_70pct_to_80pct_in_profit".to_string(), - ), - _60pct_to_70pct_in_profit: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_60pct_to_70pct_in_profit".to_string(), - ), - _50pct_to_60pct_in_profit: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_50pct_to_60pct_in_profit".to_string(), - ), - _40pct_to_50pct_in_profit: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_40pct_to_50pct_in_profit".to_string(), - ), - _30pct_to_40pct_in_profit: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_30pct_to_40pct_in_profit".to_string(), - ), - _20pct_to_30pct_in_profit: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_20pct_to_30pct_in_profit".to_string(), - ), - _10pct_to_20pct_in_profit: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_10pct_to_20pct_in_profit".to_string(), - ), - _0pct_to_10pct_in_profit: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_0pct_to_10pct_in_profit".to_string(), - ), - _0pct_to_10pct_in_loss: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_0pct_to_10pct_in_loss".to_string(), - ), - _10pct_to_20pct_in_loss: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_10pct_to_20pct_in_loss".to_string(), - ), - _20pct_to_30pct_in_loss: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_20pct_to_30pct_in_loss".to_string(), - ), - _30pct_to_40pct_in_loss: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_30pct_to_40pct_in_loss".to_string(), - ), - _40pct_to_50pct_in_loss: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_40pct_to_50pct_in_loss".to_string(), - ), - _50pct_to_60pct_in_loss: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_50pct_to_60pct_in_loss".to_string(), - ), - _60pct_to_70pct_in_loss: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_60pct_to_70pct_in_loss".to_string(), - ), - _70pct_to_80pct_in_loss: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_70pct_to_80pct_in_loss".to_string(), - ), - _80pct_to_90pct_in_loss: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_80pct_to_90pct_in_loss".to_string(), - ), - _90pct_to_100pct_in_loss: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_90pct_to_100pct_in_loss".to_string(), - ), + over_1000pct_in_profit: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_1000pct_in_profit".to_string()), + _500pct_to_1000pct_in_profit: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_500pct_to_1000pct_in_profit".to_string()), + _300pct_to_500pct_in_profit: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_300pct_to_500pct_in_profit".to_string()), + _200pct_to_300pct_in_profit: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_200pct_to_300pct_in_profit".to_string()), + _100pct_to_200pct_in_profit: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_100pct_to_200pct_in_profit".to_string()), + _90pct_to_100pct_in_profit: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_90pct_to_100pct_in_profit".to_string()), + _80pct_to_90pct_in_profit: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_80pct_to_90pct_in_profit".to_string()), + _70pct_to_80pct_in_profit: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_70pct_to_80pct_in_profit".to_string()), + _60pct_to_70pct_in_profit: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_60pct_to_70pct_in_profit".to_string()), + _50pct_to_60pct_in_profit: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_50pct_to_60pct_in_profit".to_string()), + _40pct_to_50pct_in_profit: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_40pct_to_50pct_in_profit".to_string()), + _30pct_to_40pct_in_profit: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_30pct_to_40pct_in_profit".to_string()), + _20pct_to_30pct_in_profit: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_20pct_to_30pct_in_profit".to_string()), + _10pct_to_20pct_in_profit: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_10pct_to_20pct_in_profit".to_string()), + _0pct_to_10pct_in_profit: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_0pct_to_10pct_in_profit".to_string()), + _0pct_to_10pct_in_loss: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_0pct_to_10pct_in_loss".to_string()), + _10pct_to_20pct_in_loss: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_10pct_to_20pct_in_loss".to_string()), + _20pct_to_30pct_in_loss: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_20pct_to_30pct_in_loss".to_string()), + _30pct_to_40pct_in_loss: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_30pct_to_40pct_in_loss".to_string()), + _40pct_to_50pct_in_loss: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_40pct_to_50pct_in_loss".to_string()), + _50pct_to_60pct_in_loss: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_50pct_to_60pct_in_loss".to_string()), + _60pct_to_70pct_in_loss: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_60pct_to_70pct_in_loss".to_string()), + _70pct_to_80pct_in_loss: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_70pct_to_80pct_in_loss".to_string()), + _80pct_to_90pct_in_loss: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_80pct_to_90pct_in_loss".to_string()), + _90pct_to_100pct_in_loss: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_90pct_to_100pct_in_loss".to_string()), } } } @@ -12324,62 +8659,20 @@ pub struct SeriesTree_Cohorts_Utxo_Profitability_Profit { impl SeriesTree_Cohorts_Utxo_Profitability_Profit { pub fn new(client: Arc, base_path: String) -> Self { Self { - all: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_in_profit".to_string(), - ), - _10pct: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_10pct_in_profit".to_string(), - ), - _20pct: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_20pct_in_profit".to_string(), - ), - _30pct: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_30pct_in_profit".to_string(), - ), - _40pct: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_40pct_in_profit".to_string(), - ), - _50pct: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_50pct_in_profit".to_string(), - ), - _60pct: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_60pct_in_profit".to_string(), - ), - _70pct: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_70pct_in_profit".to_string(), - ), - _80pct: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_80pct_in_profit".to_string(), - ), - _90pct: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_90pct_in_profit".to_string(), - ), - _100pct: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_100pct_in_profit".to_string(), - ), - _200pct: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_200pct_in_profit".to_string(), - ), - _300pct: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_300pct_in_profit".to_string(), - ), - _500pct: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_500pct_in_profit".to_string(), - ), + all: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_in_profit".to_string()), + _10pct: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_10pct_in_profit".to_string()), + _20pct: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_20pct_in_profit".to_string()), + _30pct: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_30pct_in_profit".to_string()), + _40pct: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_40pct_in_profit".to_string()), + _50pct: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_50pct_in_profit".to_string()), + _60pct: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_60pct_in_profit".to_string()), + _70pct: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_70pct_in_profit".to_string()), + _80pct: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_80pct_in_profit".to_string()), + _90pct: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_90pct_in_profit".to_string()), + _100pct: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_100pct_in_profit".to_string()), + _200pct: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_200pct_in_profit".to_string()), + _300pct: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_300pct_in_profit".to_string()), + _500pct: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_500pct_in_profit".to_string()), } } } @@ -12400,42 +8693,15 @@ pub struct SeriesTree_Cohorts_Utxo_Profitability_Loss { impl SeriesTree_Cohorts_Utxo_Profitability_Loss { pub fn new(client: Arc, base_path: String) -> Self { Self { - all: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_in_loss".to_string(), - ), - _10pct: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_10pct_in_loss".to_string(), - ), - _20pct: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_20pct_in_loss".to_string(), - ), - _30pct: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_30pct_in_loss".to_string(), - ), - _40pct: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_40pct_in_loss".to_string(), - ), - _50pct: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_50pct_in_loss".to_string(), - ), - _60pct: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_60pct_in_loss".to_string(), - ), - _70pct: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_70pct_in_loss".to_string(), - ), - _80pct: NuplRealizedSupplyUnrealizedPattern::new( - client.clone(), - "utxos_over_80pct_in_loss".to_string(), - ), + all: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_in_loss".to_string()), + _10pct: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_10pct_in_loss".to_string()), + _20pct: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_20pct_in_loss".to_string()), + _30pct: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_30pct_in_loss".to_string()), + _40pct: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_40pct_in_loss".to_string()), + _50pct: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_50pct_in_loss".to_string()), + _60pct: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_60pct_in_loss".to_string()), + _70pct: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_70pct_in_loss".to_string()), + _80pct: NuplRealizedSupplyUnrealizedPattern::new(client.clone(), "utxos_over_80pct_in_loss".to_string()), } } } @@ -12468,90 +8734,27 @@ pub struct SeriesTree_Cohorts_Utxo_Matured { impl SeriesTree_Cohorts_Utxo_Matured { pub fn new(client: Arc, base_path: String) -> Self { Self { - under_1h: AverageBlockCumulativeSumPattern3::new( - client.clone(), - "utxos_under_1h_old_matured_supply".to_string(), - ), - _1h_to_1d: AverageBlockCumulativeSumPattern3::new( - client.clone(), - "utxos_1h_to_1d_old_matured_supply".to_string(), - ), - _1d_to_1w: AverageBlockCumulativeSumPattern3::new( - client.clone(), - "utxos_1d_to_1w_old_matured_supply".to_string(), - ), - _1w_to_1m: AverageBlockCumulativeSumPattern3::new( - client.clone(), - "utxos_1w_to_1m_old_matured_supply".to_string(), - ), - _1m_to_2m: AverageBlockCumulativeSumPattern3::new( - client.clone(), - "utxos_1m_to_2m_old_matured_supply".to_string(), - ), - _2m_to_3m: AverageBlockCumulativeSumPattern3::new( - client.clone(), - "utxos_2m_to_3m_old_matured_supply".to_string(), - ), - _3m_to_4m: AverageBlockCumulativeSumPattern3::new( - client.clone(), - "utxos_3m_to_4m_old_matured_supply".to_string(), - ), - _4m_to_5m: AverageBlockCumulativeSumPattern3::new( - client.clone(), - "utxos_4m_to_5m_old_matured_supply".to_string(), - ), - _5m_to_6m: AverageBlockCumulativeSumPattern3::new( - client.clone(), - "utxos_5m_to_6m_old_matured_supply".to_string(), - ), - _6m_to_1y: AverageBlockCumulativeSumPattern3::new( - client.clone(), - "utxos_6m_to_1y_old_matured_supply".to_string(), - ), - _1y_to_2y: AverageBlockCumulativeSumPattern3::new( - client.clone(), - "utxos_1y_to_2y_old_matured_supply".to_string(), - ), - _2y_to_3y: AverageBlockCumulativeSumPattern3::new( - client.clone(), - "utxos_2y_to_3y_old_matured_supply".to_string(), - ), - _3y_to_4y: AverageBlockCumulativeSumPattern3::new( - client.clone(), - "utxos_3y_to_4y_old_matured_supply".to_string(), - ), - _4y_to_5y: AverageBlockCumulativeSumPattern3::new( - client.clone(), - "utxos_4y_to_5y_old_matured_supply".to_string(), - ), - _5y_to_6y: AverageBlockCumulativeSumPattern3::new( - client.clone(), - "utxos_5y_to_6y_old_matured_supply".to_string(), - ), - _6y_to_7y: AverageBlockCumulativeSumPattern3::new( - client.clone(), - "utxos_6y_to_7y_old_matured_supply".to_string(), - ), - _7y_to_8y: AverageBlockCumulativeSumPattern3::new( - client.clone(), - "utxos_7y_to_8y_old_matured_supply".to_string(), - ), - _8y_to_10y: AverageBlockCumulativeSumPattern3::new( - client.clone(), - "utxos_8y_to_10y_old_matured_supply".to_string(), - ), - _10y_to_12y: AverageBlockCumulativeSumPattern3::new( - client.clone(), - "utxos_10y_to_12y_old_matured_supply".to_string(), - ), - _12y_to_15y: AverageBlockCumulativeSumPattern3::new( - client.clone(), - "utxos_12y_to_15y_old_matured_supply".to_string(), - ), - over_15y: AverageBlockCumulativeSumPattern3::new( - client.clone(), - "utxos_over_15y_old_matured_supply".to_string(), - ), + under_1h: AverageBlockCumulativeSumPattern3::new(client.clone(), "utxos_under_1h_old_matured_supply".to_string()), + _1h_to_1d: AverageBlockCumulativeSumPattern3::new(client.clone(), "utxos_1h_to_1d_old_matured_supply".to_string()), + _1d_to_1w: AverageBlockCumulativeSumPattern3::new(client.clone(), "utxos_1d_to_1w_old_matured_supply".to_string()), + _1w_to_1m: AverageBlockCumulativeSumPattern3::new(client.clone(), "utxos_1w_to_1m_old_matured_supply".to_string()), + _1m_to_2m: AverageBlockCumulativeSumPattern3::new(client.clone(), "utxos_1m_to_2m_old_matured_supply".to_string()), + _2m_to_3m: AverageBlockCumulativeSumPattern3::new(client.clone(), "utxos_2m_to_3m_old_matured_supply".to_string()), + _3m_to_4m: AverageBlockCumulativeSumPattern3::new(client.clone(), "utxos_3m_to_4m_old_matured_supply".to_string()), + _4m_to_5m: AverageBlockCumulativeSumPattern3::new(client.clone(), "utxos_4m_to_5m_old_matured_supply".to_string()), + _5m_to_6m: AverageBlockCumulativeSumPattern3::new(client.clone(), "utxos_5m_to_6m_old_matured_supply".to_string()), + _6m_to_1y: AverageBlockCumulativeSumPattern3::new(client.clone(), "utxos_6m_to_1y_old_matured_supply".to_string()), + _1y_to_2y: AverageBlockCumulativeSumPattern3::new(client.clone(), "utxos_1y_to_2y_old_matured_supply".to_string()), + _2y_to_3y: AverageBlockCumulativeSumPattern3::new(client.clone(), "utxos_2y_to_3y_old_matured_supply".to_string()), + _3y_to_4y: AverageBlockCumulativeSumPattern3::new(client.clone(), "utxos_3y_to_4y_old_matured_supply".to_string()), + _4y_to_5y: AverageBlockCumulativeSumPattern3::new(client.clone(), "utxos_4y_to_5y_old_matured_supply".to_string()), + _5y_to_6y: AverageBlockCumulativeSumPattern3::new(client.clone(), "utxos_5y_to_6y_old_matured_supply".to_string()), + _6y_to_7y: AverageBlockCumulativeSumPattern3::new(client.clone(), "utxos_6y_to_7y_old_matured_supply".to_string()), + _7y_to_8y: AverageBlockCumulativeSumPattern3::new(client.clone(), "utxos_7y_to_8y_old_matured_supply".to_string()), + _8y_to_10y: AverageBlockCumulativeSumPattern3::new(client.clone(), "utxos_8y_to_10y_old_matured_supply".to_string()), + _10y_to_12y: AverageBlockCumulativeSumPattern3::new(client.clone(), "utxos_10y_to_12y_old_matured_supply".to_string()), + _12y_to_15y: AverageBlockCumulativeSumPattern3::new(client.clone(), "utxos_12y_to_15y_old_matured_supply".to_string()), + over_15y: AverageBlockCumulativeSumPattern3::new(client.clone(), "utxos_over_15y_old_matured_supply".to_string()), } } } @@ -12566,18 +8769,9 @@ pub struct SeriesTree_Cohorts_Addr { impl SeriesTree_Cohorts_Addr { pub fn new(client: Arc, base_path: String) -> Self { Self { - over_amount: SeriesTree_Cohorts_Addr_OverAmount::new( - client.clone(), - format!("{base_path}_over_amount"), - ), - amount_range: SeriesTree_Cohorts_Addr_AmountRange::new( - client.clone(), - format!("{base_path}_amount_range"), - ), - under_amount: SeriesTree_Cohorts_Addr_UnderAmount::new( - client.clone(), - format!("{base_path}_under_amount"), - ), + over_amount: SeriesTree_Cohorts_Addr_OverAmount::new(client.clone(), format!("{base_path}_over_amount")), + amount_range: SeriesTree_Cohorts_Addr_AmountRange::new(client.clone(), format!("{base_path}_amount_range")), + under_amount: SeriesTree_Cohorts_Addr_UnderAmount::new(client.clone(), format!("{base_path}_under_amount")), } } } @@ -12602,58 +8796,19 @@ pub struct SeriesTree_Cohorts_Addr_OverAmount { impl SeriesTree_Cohorts_Addr_OverAmount { pub fn new(client: Arc, base_path: String) -> Self { Self { - _1sat: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_over_1sat".to_string(), - ), - _10sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_over_10sats".to_string(), - ), - _100sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_over_100sats".to_string(), - ), - _1k_sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_over_1k_sats".to_string(), - ), - _10k_sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_over_10k_sats".to_string(), - ), - _100k_sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_over_100k_sats".to_string(), - ), - _1m_sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_over_1m_sats".to_string(), - ), - _10m_sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_over_10m_sats".to_string(), - ), - _1btc: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_over_1btc".to_string(), - ), - _10btc: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_over_10btc".to_string(), - ), - _100btc: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_over_100btc".to_string(), - ), - _1k_btc: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_over_1k_btc".to_string(), - ), - _10k_btc: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_over_10k_btc".to_string(), - ), + _1sat: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_over_1sat".to_string()), + _10sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_over_10sats".to_string()), + _100sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_over_100sats".to_string()), + _1k_sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_over_1k_sats".to_string()), + _10k_sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_over_10k_sats".to_string()), + _100k_sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_over_100k_sats".to_string()), + _1m_sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_over_1m_sats".to_string()), + _10m_sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_over_10m_sats".to_string()), + _1btc: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_over_1btc".to_string()), + _10btc: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_over_10btc".to_string()), + _100btc: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_over_100btc".to_string()), + _1k_btc: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_over_1k_btc".to_string()), + _10k_btc: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_over_10k_btc".to_string()), } } } @@ -12680,66 +8835,21 @@ pub struct SeriesTree_Cohorts_Addr_AmountRange { impl SeriesTree_Cohorts_Addr_AmountRange { pub fn new(client: Arc, base_path: String) -> Self { Self { - _0sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_0sats".to_string(), - ), - _1sat_to_10sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_1sat_to_10sats".to_string(), - ), - _10sats_to_100sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_10sats_to_100sats".to_string(), - ), - _100sats_to_1k_sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_100sats_to_1k_sats".to_string(), - ), - _1k_sats_to_10k_sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_1k_sats_to_10k_sats".to_string(), - ), - _10k_sats_to_100k_sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_10k_sats_to_100k_sats".to_string(), - ), - _100k_sats_to_1m_sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_100k_sats_to_1m_sats".to_string(), - ), - _1m_sats_to_10m_sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_1m_sats_to_10m_sats".to_string(), - ), - _10m_sats_to_1btc: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_10m_sats_to_1btc".to_string(), - ), - _1btc_to_10btc: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_1btc_to_10btc".to_string(), - ), - _10btc_to_100btc: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_10btc_to_100btc".to_string(), - ), - _100btc_to_1k_btc: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_100btc_to_1k_btc".to_string(), - ), - _1k_btc_to_10k_btc: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_1k_btc_to_10k_btc".to_string(), - ), - _10k_btc_to_100k_btc: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_10k_btc_to_100k_btc".to_string(), - ), - over_100k_btc: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_over_100k_btc".to_string(), - ), + _0sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_0sats".to_string()), + _1sat_to_10sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_1sat_to_10sats".to_string()), + _10sats_to_100sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_10sats_to_100sats".to_string()), + _100sats_to_1k_sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_100sats_to_1k_sats".to_string()), + _1k_sats_to_10k_sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_1k_sats_to_10k_sats".to_string()), + _10k_sats_to_100k_sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_10k_sats_to_100k_sats".to_string()), + _100k_sats_to_1m_sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_100k_sats_to_1m_sats".to_string()), + _1m_sats_to_10m_sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_1m_sats_to_10m_sats".to_string()), + _10m_sats_to_1btc: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_10m_sats_to_1btc".to_string()), + _1btc_to_10btc: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_1btc_to_10btc".to_string()), + _10btc_to_100btc: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_10btc_to_100btc".to_string()), + _100btc_to_1k_btc: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_100btc_to_1k_btc".to_string()), + _1k_btc_to_10k_btc: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_1k_btc_to_10k_btc".to_string()), + _10k_btc_to_100k_btc: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_10k_btc_to_100k_btc".to_string()), + over_100k_btc: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_over_100k_btc".to_string()), } } } @@ -12764,58 +8874,19 @@ pub struct SeriesTree_Cohorts_Addr_UnderAmount { impl SeriesTree_Cohorts_Addr_UnderAmount { pub fn new(client: Arc, base_path: String) -> Self { Self { - _10sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_under_10sats".to_string(), - ), - _100sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_under_100sats".to_string(), - ), - _1k_sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_under_1k_sats".to_string(), - ), - _10k_sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_under_10k_sats".to_string(), - ), - _100k_sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_under_100k_sats".to_string(), - ), - _1m_sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_under_1m_sats".to_string(), - ), - _10m_sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_under_10m_sats".to_string(), - ), - _1btc: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_under_1btc".to_string(), - ), - _10btc: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_under_10btc".to_string(), - ), - _100btc: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_under_100btc".to_string(), - ), - _1k_btc: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_under_1k_btc".to_string(), - ), - _10k_btc: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_under_10k_btc".to_string(), - ), - _100k_btc: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new( - client.clone(), - "addrs_under_100k_btc".to_string(), - ), + _10sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_under_10sats".to_string()), + _100sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_under_100sats".to_string()), + _1k_sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_under_1k_sats".to_string()), + _10k_sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_under_10k_sats".to_string()), + _100k_sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_under_100k_sats".to_string()), + _1m_sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_under_1m_sats".to_string()), + _10m_sats: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_under_10m_sats".to_string()), + _1btc: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_under_1btc".to_string()), + _10btc: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_under_10btc".to_string()), + _100btc: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_under_100btc".to_string()), + _1k_btc: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_under_1k_btc".to_string()), + _10k_btc: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_under_10k_btc".to_string()), + _100k_btc: ActivityAddrOutputsRealizedSupplyUnrealizedPattern::new(client.clone(), "addrs_under_100k_btc".to_string()), } } } @@ -12828,7 +8899,7 @@ pub struct BrkClient { impl BrkClient { /// Client version. - pub const VERSION: &'static str = "v0.3.0-beta.6"; + pub const VERSION: &'static str = "v0.3.0-beta.7"; /// Create a new client with the given base URL. pub fn new(base_url: impl Into) -> Self { @@ -12860,26 +8931,20 @@ impl BrkClient { /// .last(10) /// .json::()?; /// ``` - pub fn series_endpoint( - &self, - series: impl Into, - index: Index, - ) -> SeriesEndpoint { - SeriesEndpoint::new(self.base.clone(), Arc::from(series.into().as_str()), index) + pub fn series_endpoint(&self, series: impl Into, index: Index) -> SeriesEndpoint { + SeriesEndpoint::new( + self.base.clone(), + Arc::from(series.into().as_str()), + index, + ) } /// Create a dynamic date-based series endpoint builder. /// /// Returns `Err` if the index is not date-based. - pub fn date_series_endpoint( - &self, - series: impl Into, - index: Index, - ) -> Result> { + pub fn date_series_endpoint(&self, series: impl Into, index: Index) -> Result> { if !index.is_date_based() { - return Err(BrkError { - message: format!("{} is not a date-based index", index.name()), - }); + return Err(BrkError { message: format!("{} is not a date-based index", index.name()) }); } Ok(DateSeriesEndpoint::new( self.base.clone(), @@ -12915,20 +8980,10 @@ impl BrkClient { /// *[Mempool.space docs](https://mempool.space/docs/api/rest#get-address-transactions)* /// /// Endpoint: `GET /api/address/{address}/txs` - pub fn get_address_txs( - &self, - address: Addr, - after_txid: Option, - ) -> Result> { + pub fn get_address_txs(&self, address: Addr, after_txid: Option) -> Result> { let mut query = Vec::new(); - if let Some(v) = after_txid { - query.push(format!("after_txid={}", v)); - } - let query_str = if query.is_empty() { - String::new() - } else { - format!("?{}", query.join("&")) - }; + if let Some(v) = after_txid { query.push(format!("after_txid={}", v)); } + let query_str = if query.is_empty() { String::new() } else { format!("?{}", query.join("&")) }; let path = format!("/api/address/{address}/txs{}", query_str); self.base.get_json(&path) } @@ -12940,20 +8995,10 @@ impl BrkClient { /// *[Mempool.space docs](https://mempool.space/docs/api/rest#get-address-transactions-chain)* /// /// Endpoint: `GET /api/address/{address}/txs/chain` - pub fn get_address_confirmed_txs( - &self, - address: Addr, - after_txid: Option, - ) -> Result> { + pub fn get_address_confirmed_txs(&self, address: Addr, after_txid: Option) -> Result> { let mut query = Vec::new(); - if let Some(v) = after_txid { - query.push(format!("after_txid={}", v)); - } - let query_str = if query.is_empty() { - String::new() - } else { - format!("?{}", query.join("&")) - }; + if let Some(v) = after_txid { query.push(format!("after_txid={}", v)); } + let query_str = if query.is_empty() { String::new() } else { format!("?{}", query.join("&")) }; let path = format!("/api/address/{address}/txs/chain{}", query_str); self.base.get_json(&path) } @@ -12966,8 +9011,7 @@ impl BrkClient { /// /// Endpoint: `GET /api/address/{address}/txs/mempool` pub fn get_address_mempool_txs(&self, address: Addr) -> Result> { - self.base - .get_json(&format!("/api/address/{address}/txs/mempool")) + self.base.get_json(&format!("/api/address/{address}/txs/mempool")) } /// Address UTXOs @@ -13044,8 +9088,7 @@ impl BrkClient { /// /// Endpoint: `GET /api/block/{hash}/txid/{index}` pub fn get_block_txid(&self, hash: BlockHash, index: TxIndex) -> Result { - self.base - .get_text(&format!("/api/block/{hash}/txid/{index}")) + self.base.get_text(&format!("/api/block/{hash}/txid/{index}")) } /// Block transaction IDs @@ -13077,13 +9120,8 @@ impl BrkClient { /// *[Mempool.space docs](https://mempool.space/docs/api/rest#get-block-transactions)* /// /// Endpoint: `GET /api/block/{hash}/txs/{start_index}` - pub fn get_block_txs_from_index( - &self, - hash: BlockHash, - start_index: TxIndex, - ) -> Result> { - self.base - .get_json(&format!("/api/block/{hash}/txs/{start_index}")) + pub fn get_block_txs_from_index(&self, hash: BlockHash, start_index: TxIndex) -> Result> { + self.base.get_json(&format!("/api/block/{hash}/txs/{start_index}")) } /// Recent blocks @@ -13186,35 +9224,15 @@ impl BrkClient { /// Fetch multiple series in a single request. Supports filtering by index and date range. Returns an array of SeriesData objects. For a single series, use `get_series` instead. /// /// Endpoint: `GET /api/series/bulk` - pub fn get_series_bulk( - &self, - series: SeriesList, - index: Index, - start: Option, - end: Option, - limit: Option, - format: Option, - ) -> Result>> { + pub fn get_series_bulk(&self, series: SeriesList, index: Index, start: Option, end: Option, limit: Option, format: Option) -> Result>> { let mut query = Vec::new(); query.push(format!("series={}", series)); query.push(format!("index={}", index)); - if let Some(v) = start { - query.push(format!("start={}", v)); - } - if let Some(v) = end { - query.push(format!("end={}", v)); - } - if let Some(v) = limit { - query.push(format!("limit={}", v)); - } - if let Some(v) = format { - query.push(format!("format={}", v)); - } - let query_str = if query.is_empty() { - String::new() - } else { - format!("?{}", query.join("&")) - }; + if let Some(v) = start { query.push(format!("start={}", v)); } + if let Some(v) = end { query.push(format!("end={}", v)); } + if let Some(v) = limit { query.push(format!("limit={}", v)); } + if let Some(v) = format { query.push(format!("format={}", v)); } + let query_str = if query.is_empty() { String::new() } else { format!("?{}", query.join("&")) }; let path = format!("/api/series/bulk{}", query_str); if format == Some(Format::CSV) { self.base.get_text(&path).map(FormatResponse::Csv) @@ -13248,17 +9266,9 @@ impl BrkClient { /// Endpoint: `GET /api/series/list` pub fn list_series(&self, page: Option, per_page: Option) -> Result { let mut query = Vec::new(); - if let Some(v) = page { - query.push(format!("page={}", v)); - } - if let Some(v) = per_page { - query.push(format!("per_page={}", v)); - } - let query_str = if query.is_empty() { - String::new() - } else { - format!("?{}", query.join("&")) - }; + if let Some(v) = page { query.push(format!("page={}", v)); } + if let Some(v) = per_page { query.push(format!("per_page={}", v)); } + let query_str = if query.is_empty() { String::new() } else { format!("?{}", query.join("&")) }; let path = format!("/api/series/list{}", query_str); self.base.get_json(&path) } @@ -13271,14 +9281,8 @@ impl BrkClient { pub fn search_series(&self, q: SeriesName, limit: Option) -> Result> { let mut query = Vec::new(); query.push(format!("q={}", q)); - if let Some(v) = limit { - query.push(format!("limit={}", v)); - } - let query_str = if query.is_empty() { - String::new() - } else { - format!("?{}", query.join("&")) - }; + if let Some(v) = limit { query.push(format!("limit={}", v)); } + let query_str = if query.is_empty() { String::new() } else { format!("?{}", query.join("&")) }; let path = format!("/api/series/search{}", query_str); self.base.get_json(&path) } @@ -13297,33 +9301,13 @@ impl BrkClient { /// Fetch data for a specific series at the given index. Use query parameters to filter by date range and format (json/csv). /// /// Endpoint: `GET /api/series/{series}/{index}` - pub fn get_series( - &self, - series: SeriesName, - index: Index, - start: Option, - end: Option, - limit: Option, - format: Option, - ) -> Result> { + pub fn get_series(&self, series: SeriesName, index: Index, start: Option, end: Option, limit: Option, format: Option) -> Result> { let mut query = Vec::new(); - if let Some(v) = start { - query.push(format!("start={}", v)); - } - if let Some(v) = end { - query.push(format!("end={}", v)); - } - if let Some(v) = limit { - query.push(format!("limit={}", v)); - } - if let Some(v) = format { - query.push(format!("format={}", v)); - } - let query_str = if query.is_empty() { - String::new() - } else { - format!("?{}", query.join("&")) - }; + if let Some(v) = start { query.push(format!("start={}", v)); } + if let Some(v) = end { query.push(format!("end={}", v)); } + if let Some(v) = limit { query.push(format!("limit={}", v)); } + if let Some(v) = format { query.push(format!("format={}", v)); } + let query_str = if query.is_empty() { String::new() } else { format!("?{}", query.join("&")) }; let path = format!("/api/series/{series}/{}{}", index.name(), query_str); if format == Some(Format::CSV) { self.base.get_text(&path).map(FormatResponse::Csv) @@ -13337,33 +9321,13 @@ impl BrkClient { /// Returns just the data array without the SeriesData wrapper. Supports the same range and format parameters as the standard endpoint. /// /// Endpoint: `GET /api/series/{series}/{index}/data` - pub fn get_series_data( - &self, - series: SeriesName, - index: Index, - start: Option, - end: Option, - limit: Option, - format: Option, - ) -> Result>> { + pub fn get_series_data(&self, series: SeriesName, index: Index, start: Option, end: Option, limit: Option, format: Option) -> Result>> { let mut query = Vec::new(); - if let Some(v) = start { - query.push(format!("start={}", v)); - } - if let Some(v) = end { - query.push(format!("end={}", v)); - } - if let Some(v) = limit { - query.push(format!("limit={}", v)); - } - if let Some(v) = format { - query.push(format!("format={}", v)); - } - let query_str = if query.is_empty() { - String::new() - } else { - format!("?{}", query.join("&")) - }; + if let Some(v) = start { query.push(format!("start={}", v)); } + if let Some(v) = end { query.push(format!("end={}", v)); } + if let Some(v) = limit { query.push(format!("limit={}", v)); } + if let Some(v) = format { query.push(format!("format={}", v)); } + let query_str = if query.is_empty() { String::new() } else { format!("?{}", query.join("&")) }; let path = format!("/api/series/{series}/{}/data{}", index.name(), query_str); if format == Some(Format::CSV) { self.base.get_text(&path).map(FormatResponse::Csv) @@ -13378,8 +9342,7 @@ impl BrkClient { /// /// Endpoint: `GET /api/series/{series}/{index}/latest` pub fn get_series_latest(&self, series: SeriesName, index: Index) -> Result { - self.base - .get_text(&format!("/api/series/{series}/{}/latest", index.name())) + self.base.get_text(&format!("/api/series/{series}/{}/latest", index.name())) } /// Get series data length @@ -13388,8 +9351,7 @@ impl BrkClient { /// /// Endpoint: `GET /api/series/{series}/{index}/len` pub fn get_series_len(&self, series: SeriesName, index: Index) -> Result { - self.base - .get_json(&format!("/api/series/{series}/{}/len", index.name())) + self.base.get_json(&format!("/api/series/{series}/{}/len", index.name())) } /// Get series version @@ -13398,8 +9360,7 @@ impl BrkClient { /// /// Endpoint: `GET /api/series/{series}/{index}/version` pub fn get_series_version(&self, series: SeriesName, index: Index) -> Result { - self.base - .get_json(&format!("/api/series/{series}/{}/version", index.name())) + self.base.get_json(&format!("/api/series/{series}/{}/version", index.name())) } /// Disk usage @@ -13470,8 +9431,7 @@ impl BrkClient { /// /// Endpoint: `GET /api/tx/{txid}/merkleblock-proof` pub fn get_tx_merkleblock_proof(&self, txid: Txid) -> Result { - self.base - .get_text(&format!("/api/tx/{txid}/merkleblock-proof")) + self.base.get_text(&format!("/api/tx/{txid}/merkleblock-proof")) } /// Output spend status @@ -13482,8 +9442,7 @@ impl BrkClient { /// /// Endpoint: `GET /api/tx/{txid}/outspend/{vout}` pub fn get_tx_outspend(&self, txid: Txid, vout: Vout) -> Result { - self.base - .get_json(&format!("/api/tx/{txid}/outspend/{vout}")) + self.base.get_json(&format!("/api/tx/{txid}/outspend/{vout}")) } /// All output spend statuses @@ -13537,14 +9496,8 @@ impl BrkClient { /// Endpoint: `GET /api/urpd/{cohort}` pub fn get_urpd(&self, cohort: Cohort, agg: Option) -> Result { let mut query = Vec::new(); - if let Some(v) = agg { - query.push(format!("agg={}", v)); - } - let query_str = if query.is_empty() { - String::new() - } else { - format!("?{}", query.join("&")) - }; + if let Some(v) = agg { query.push(format!("agg={}", v)); } + let query_str = if query.is_empty() { String::new() } else { format!("?{}", query.join("&")) }; let path = format!("/api/urpd/{cohort}{}", query_str); self.base.get_json(&path) } @@ -13565,21 +9518,10 @@ impl BrkClient { /// See the URPD tag description for unit conventions and `agg` options. /// /// Endpoint: `GET /api/urpd/{cohort}/{date}` - pub fn get_urpd_at( - &self, - cohort: Cohort, - date: &str, - agg: Option, - ) -> Result { + pub fn get_urpd_at(&self, cohort: Cohort, date: &str, agg: Option) -> Result { let mut query = Vec::new(); - if let Some(v) = agg { - query.push(format!("agg={}", v)); - } - let query_str = if query.is_empty() { - String::new() - } else { - format!("?{}", query.join("&")) - }; + if let Some(v) = agg { query.push(format!("agg={}", v)); } + let query_str = if query.is_empty() { String::new() } else { format!("?{}", query.join("&")) }; let path = format!("/api/urpd/{cohort}/{date}{}", query_str); self.base.get_json(&path) } @@ -13636,8 +9578,7 @@ impl BrkClient { /// /// Endpoint: `GET /api/v1/difficulty-adjustment` pub fn get_difficulty_adjustment(&self) -> Result { - self.base - .get_json(&format!("/api/v1/difficulty-adjustment")) + self.base.get_json(&format!("/api/v1/difficulty-adjustment")) } /// Projected mempool blocks @@ -13682,14 +9623,8 @@ impl BrkClient { /// Endpoint: `GET /api/v1/historical-price` pub fn get_historical_price(&self, timestamp: Option) -> Result { let mut query = Vec::new(); - if let Some(v) = timestamp { - query.push(format!("timestamp={}", v)); - } - let query_str = if query.is_empty() { - String::new() - } else { - format!("?{}", query.join("&")) - }; + if let Some(v) = timestamp { query.push(format!("timestamp={}", v)); } + let query_str = if query.is_empty() { String::new() } else { format!("?{}", query.join("&")) }; let path = format!("/api/v1/historical-price{}", query_str); self.base.get_json(&path) } @@ -13702,8 +9637,7 @@ impl BrkClient { /// /// Endpoint: `GET /api/v1/mining/blocks/fee-rates/{time_period}` pub fn get_block_fee_rates(&self, time_period: TimePeriod) -> Result> { - self.base - .get_json(&format!("/api/v1/mining/blocks/fee-rates/{time_period}")) + self.base.get_json(&format!("/api/v1/mining/blocks/fee-rates/{time_period}")) } /// Block fees @@ -13714,8 +9648,7 @@ impl BrkClient { /// /// Endpoint: `GET /api/v1/mining/blocks/fees/{time_period}` pub fn get_block_fees(&self, time_period: TimePeriod) -> Result> { - self.base - .get_json(&format!("/api/v1/mining/blocks/fees/{time_period}")) + self.base.get_json(&format!("/api/v1/mining/blocks/fees/{time_period}")) } /// Block rewards @@ -13726,8 +9659,7 @@ impl BrkClient { /// /// Endpoint: `GET /api/v1/mining/blocks/rewards/{time_period}` pub fn get_block_rewards(&self, time_period: TimePeriod) -> Result> { - self.base - .get_json(&format!("/api/v1/mining/blocks/rewards/{time_period}")) + self.base.get_json(&format!("/api/v1/mining/blocks/rewards/{time_period}")) } /// Block sizes and weights @@ -13738,9 +9670,7 @@ impl BrkClient { /// /// Endpoint: `GET /api/v1/mining/blocks/sizes-weights/{time_period}` pub fn get_block_sizes_weights(&self, time_period: TimePeriod) -> Result { - self.base.get_json(&format!( - "/api/v1/mining/blocks/sizes-weights/{time_period}" - )) + self.base.get_json(&format!("/api/v1/mining/blocks/sizes-weights/{time_period}")) } /// Block by timestamp @@ -13751,8 +9681,7 @@ impl BrkClient { /// /// Endpoint: `GET /api/v1/mining/blocks/timestamp/{timestamp}` pub fn get_block_by_timestamp(&self, timestamp: Timestamp) -> Result { - self.base - .get_json(&format!("/api/v1/mining/blocks/timestamp/{timestamp}")) + self.base.get_json(&format!("/api/v1/mining/blocks/timestamp/{timestamp}")) } /// Difficulty adjustments (all time) @@ -13763,8 +9692,7 @@ impl BrkClient { /// /// Endpoint: `GET /api/v1/mining/difficulty-adjustments` pub fn get_difficulty_adjustments(&self) -> Result> { - self.base - .get_json(&format!("/api/v1/mining/difficulty-adjustments")) + self.base.get_json(&format!("/api/v1/mining/difficulty-adjustments")) } /// Difficulty adjustments @@ -13774,13 +9702,8 @@ impl BrkClient { /// *[Mempool.space docs](https://mempool.space/docs/api/rest#get-difficulty-adjustments)* /// /// Endpoint: `GET /api/v1/mining/difficulty-adjustments/{time_period}` - pub fn get_difficulty_adjustments_by_period( - &self, - time_period: TimePeriod, - ) -> Result> { - self.base.get_json(&format!( - "/api/v1/mining/difficulty-adjustments/{time_period}" - )) + pub fn get_difficulty_adjustments_by_period(&self, time_period: TimePeriod) -> Result> { + self.base.get_json(&format!("/api/v1/mining/difficulty-adjustments/{time_period}")) } /// Network hashrate (all time) @@ -13802,8 +9725,7 @@ impl BrkClient { /// /// Endpoint: `GET /api/v1/mining/hashrate/pools` pub fn get_pools_hashrate(&self) -> Result> { - self.base - .get_json(&format!("/api/v1/mining/hashrate/pools")) + self.base.get_json(&format!("/api/v1/mining/hashrate/pools")) } /// All pools hashrate @@ -13813,12 +9735,8 @@ impl BrkClient { /// *[Mempool.space docs](https://mempool.space/docs/api/rest#get-mining-pool-hashrates)* /// /// Endpoint: `GET /api/v1/mining/hashrate/pools/{time_period}` - pub fn get_pools_hashrate_by_period( - &self, - time_period: TimePeriod, - ) -> Result> { - self.base - .get_json(&format!("/api/v1/mining/hashrate/pools/{time_period}")) + pub fn get_pools_hashrate_by_period(&self, time_period: TimePeriod) -> Result> { + self.base.get_json(&format!("/api/v1/mining/hashrate/pools/{time_period}")) } /// Network hashrate @@ -13829,8 +9747,7 @@ impl BrkClient { /// /// Endpoint: `GET /api/v1/mining/hashrate/{time_period}` pub fn get_hashrate_by_period(&self, time_period: TimePeriod) -> Result { - self.base - .get_json(&format!("/api/v1/mining/hashrate/{time_period}")) + self.base.get_json(&format!("/api/v1/mining/hashrate/{time_period}")) } /// Mining pool details @@ -13852,8 +9769,7 @@ impl BrkClient { /// /// Endpoint: `GET /api/v1/mining/pool/{slug}/blocks` pub fn get_pool_blocks(&self, slug: PoolSlug) -> Result> { - self.base - .get_json(&format!("/api/v1/mining/pool/{slug}/blocks")) + self.base.get_json(&format!("/api/v1/mining/pool/{slug}/blocks")) } /// Mining pool blocks from height @@ -13864,8 +9780,7 @@ impl BrkClient { /// /// Endpoint: `GET /api/v1/mining/pool/{slug}/blocks/{height}` pub fn get_pool_blocks_from(&self, slug: PoolSlug, height: Height) -> Result> { - self.base - .get_json(&format!("/api/v1/mining/pool/{slug}/blocks/{height}")) + self.base.get_json(&format!("/api/v1/mining/pool/{slug}/blocks/{height}")) } /// Mining pool hashrate @@ -13876,8 +9791,7 @@ impl BrkClient { /// /// Endpoint: `GET /api/v1/mining/pool/{slug}/hashrate` pub fn get_pool_hashrate(&self, slug: PoolSlug) -> Result> { - self.base - .get_json(&format!("/api/v1/mining/pool/{slug}/hashrate")) + self.base.get_json(&format!("/api/v1/mining/pool/{slug}/hashrate")) } /// List all mining pools @@ -13899,8 +9813,7 @@ impl BrkClient { /// /// Endpoint: `GET /api/v1/mining/pools/{time_period}` pub fn get_pool_stats(&self, time_period: TimePeriod) -> Result { - self.base - .get_json(&format!("/api/v1/mining/pools/{time_period}")) + self.base.get_json(&format!("/api/v1/mining/pools/{time_period}")) } /// Mining reward statistics @@ -13911,8 +9824,7 @@ impl BrkClient { /// /// Endpoint: `GET /api/v1/mining/reward-stats/{block_count}` pub fn get_reward_stats(&self, block_count: i64) -> Result { - self.base - .get_json(&format!("/api/v1/mining/reward-stats/{block_count}")) + self.base.get_json(&format!("/api/v1/mining/reward-stats/{block_count}")) } /// Current BTC price @@ -13956,8 +9868,7 @@ impl BrkClient { /// /// Endpoint: `GET /api/v1/validate-address/{address}` pub fn validate_address(&self, address: &str) -> Result { - self.base - .get_json(&format!("/api/v1/validate-address/{address}")) + self.base.get_json(&format!("/api/v1/validate-address/{address}")) } /// Health check @@ -13986,4 +9897,5 @@ impl BrkClient { pub fn get_version(&self) -> Result { self.base.get_json(&format!("/version")) } + } diff --git a/crates/brk_computer/src/distribution/vecs.rs b/crates/brk_computer/src/distribution/vecs.rs index 97c7f2225..139104550 100644 --- a/crates/brk_computer/src/distribution/vecs.rs +++ b/crates/brk_computer/src/distribution/vecs.rs @@ -41,7 +41,7 @@ use super::{ metrics::AvgAmountMetrics, }; -const VERSION: Version = Version::new(23); +const VERSION: Version = Version::new(24); #[derive(Traversable)] pub struct AddrMetricsVecs { diff --git a/crates/brk_mempool/src/steps/rebuilder/mod.rs b/crates/brk_mempool/src/steps/rebuilder/mod.rs index dd13e585d..9954dea41 100644 --- a/crates/brk_mempool/src/steps/rebuilder/mod.rs +++ b/crates/brk_mempool/src/steps/rebuilder/mod.rs @@ -10,7 +10,9 @@ use std::{ }; use brk_rpc::Client; +use brk_types::FeeRate; use parking_lot::RwLock; +use tracing::warn; #[cfg(debug_assertions)] use self::projected_blocks::verify::Verifier; @@ -72,6 +74,11 @@ impl Rebuilder { self.dirty.store(false, Ordering::Release); + let min_fee = client.get_mempool_min_fee().unwrap_or_else(|e| { + warn!("getmempoolinfo failed, falling back to FeeRate::MIN: {e}"); + FeeRate::MIN + }); + let built = { let entries = entries.read(); let entries_slice = entries.entries(); @@ -82,7 +89,7 @@ impl Rebuilder { #[cfg(not(debug_assertions))] let _ = client; - Snapshot::build(blocks, entries_slice) + Snapshot::build(blocks, entries_slice, min_fee) }; *self.snapshot.write() = Arc::new(built); diff --git a/crates/brk_mempool/src/steps/rebuilder/projected_blocks/fees.rs b/crates/brk_mempool/src/steps/rebuilder/projected_blocks/fees.rs index 1ea722002..06b3f6f74 100644 --- a/crates/brk_mempool/src/steps/rebuilder/projected_blocks/fees.rs +++ b/crates/brk_mempool/src/steps/rebuilder/projected_blocks/fees.rs @@ -2,21 +2,74 @@ use brk_types::{FeeRate, RecommendedFees}; use super::stats::BlockStats; -/// Compute recommended fees from block stats (mempool.space style). -pub fn compute_recommended_fees(stats: &[BlockStats]) -> RecommendedFees { +/// Output rounding granularity in sat/vB. mempool.space's +/// `/api/v1/fees/recommended` uses `1.0`; their `/precise` +/// variant uses `0.001`. bitview always emits precise. +const MIN_INCREMENT: FeeRate = FeeRate::new(0.001); +/// `getPreciseRecommendedFee` adds this to `fastestFee` and +/// half of it to `halfHourFee`, then floors them. Compensates +/// for sub-1-sat/vB fees mined by hashrate that ignores the +/// relay floor. +const PRIORITY_FACTOR: FeeRate = FeeRate::new(0.5); +const MIN_FASTEST_FEE: FeeRate = FeeRate::new(1.0); +const MIN_HALF_HOUR_FEE: FeeRate = FeeRate::new(0.5); + +/// Literal port of mempool.space's `getPreciseRecommendedFee` +/// (backend/src/api/fee-api.ts). `min_fee` is bitcoind's live +/// `mempoolminfee` in sat/vB and acts as a floor for every tier +/// while the mempool is purging by fee. +pub fn compute_recommended_fees(stats: &[BlockStats], min_fee: FeeRate) -> RecommendedFees { + let purge_rate = min_fee.ceil_to(MIN_INCREMENT); + let minimum_fee = purge_rate.max(MIN_INCREMENT); + + let first = stats.first().map_or(minimum_fee, |b| { + optimize_median_fee(b, stats.get(1), None, minimum_fee) + }); + let second = stats.get(1).map_or(minimum_fee, |b| { + optimize_median_fee(b, stats.get(2), Some(first), minimum_fee) + }); + let third = stats.get(2).map_or(minimum_fee, |b| { + optimize_median_fee(b, stats.get(3), Some(second), minimum_fee) + }); + + let mut fastest = minimum_fee.max(first); + let mut half_hour = minimum_fee.max(second); + let mut hour = minimum_fee.max(third); + let economy = third.clamp(minimum_fee, minimum_fee * 2.0); + + fastest = fastest.max(half_hour).max(hour).max(economy); + half_hour = half_hour.max(hour).max(economy); + hour = hour.max(economy); + + let fastest = (fastest + PRIORITY_FACTOR).max(MIN_FASTEST_FEE); + let half_hour = (half_hour + PRIORITY_FACTOR / 2.0).max(MIN_HALF_HOUR_FEE); + RecommendedFees { - fastest_fee: median_fee_for_block(stats, 0), - half_hour_fee: median_fee_for_block(stats, 2), - hour_fee: median_fee_for_block(stats, 5), - economy_fee: median_fee_for_block(stats, 7), - minimum_fee: FeeRate::MIN, + fastest_fee: fastest.round_milli(), + half_hour_fee: half_hour.round_milli(), + hour_fee: hour.round_milli(), + economy_fee: economy.round_milli(), + minimum_fee: minimum_fee.round_milli(), } } -/// Get the median fee rate for block N. -fn median_fee_for_block(stats: &[BlockStats], block_index: usize) -> FeeRate { - stats - .get(block_index) - .map(|s| s.median_fee_rate()) - .unwrap_or_else(|| FeeRate::MIN) +/// Pick the fee for one projected block, smoothing toward the +/// previous tier and discounting partially-full final blocks. +fn optimize_median_fee( + block: &BlockStats, + next_block: Option<&BlockStats>, + previous_fee: Option, + min_fee: FeeRate, +) -> FeeRate { + let median = block.median_fee_rate(); + let use_fee = previous_fee.map_or(median, |prev| FeeRate::mean(median, prev)); + let vsize = u64::from(block.total_vsize); + if vsize <= 500_000 || median < min_fee { + return min_fee; + } + if vsize <= 950_000 && next_block.is_none() { + let multiplier = (vsize - 500_000) as f64 / 500_000.0; + return (use_fee * multiplier).round_to(MIN_INCREMENT).max(min_fee); + } + use_fee.ceil_to(MIN_INCREMENT).max(min_fee) } diff --git a/crates/brk_mempool/src/steps/rebuilder/projected_blocks/snapshot.rs b/crates/brk_mempool/src/steps/rebuilder/projected_blocks/snapshot.rs index 6b2774172..53be9e4bc 100644 --- a/crates/brk_mempool/src/steps/rebuilder/projected_blocks/snapshot.rs +++ b/crates/brk_mempool/src/steps/rebuilder/projected_blocks/snapshot.rs @@ -1,6 +1,6 @@ use std::hash::{DefaultHasher, Hash, Hasher}; -use brk_types::RecommendedFees; +use brk_types::{FeeRate, RecommendedFees}; use super::{ super::block_builder::Package, @@ -27,13 +27,15 @@ pub struct Snapshot { impl Snapshot { /// Build a snapshot from packages grouped by projected block. - pub fn build(blocks: Vec>, entries: &[Option]) -> Self { + /// `min_fee` is bitcoind's live `mempoolminfee`, used as the floor + /// for every recommended-fee tier. + pub fn build(blocks: Vec>, entries: &[Option], min_fee: FeeRate) -> Self { let block_stats: Vec = blocks .iter() .map(|block| stats::compute_block_stats(block, entries)) .collect(); - let fees = fees::compute_recommended_fees(&block_stats); + let fees = fees::compute_recommended_fees(&block_stats, min_fee); let blocks: Vec> = blocks .into_iter() diff --git a/crates/brk_mempool/src/stores/addr_tracker.rs b/crates/brk_mempool/src/stores/addr_tracker.rs index a9890d9e4..ed56877e9 100644 --- a/crates/brk_mempool/src/stores/addr_tracker.rs +++ b/crates/brk_mempool/src/stores/addr_tracker.rs @@ -1,4 +1,7 @@ -use std::hash::{DefaultHasher, Hash, Hasher}; +use std::{ + collections::hash_map::Entry as MapEntry, + hash::{DefaultHasher, Hash, Hasher}, +}; use brk_types::{AddrBytes, AddrMempoolStats, Transaction, TxOut, Txid}; use derive_more::Deref; @@ -51,7 +54,6 @@ impl AddrTracker { } fn update(&mut self, tx: &Transaction, txid: &Txid, is_addition: bool) { - // Inputs: track sending for txin in &tx.input { let Some(prevout) = txin.prevout.as_ref() else { continue; @@ -59,33 +61,57 @@ impl AddrTracker { let Some(bytes) = prevout.addr_bytes() else { continue; }; - - let (stats, txids) = self.0.entry(bytes).or_default(); - if is_addition { - txids.insert(txid.clone()); - stats.sending(prevout); - } else { - txids.remove(txid); - stats.sent(prevout); - } - stats.update_tx_count(txids.len() as u32); + self.apply(bytes, txid, is_addition, |stats| { + if is_addition { + stats.sending(prevout); + } else { + stats.sent(prevout); + } + }); } - // Outputs: track receiving for txout in &tx.output { let Some(bytes) = txout.addr_bytes() else { continue; }; + self.apply(bytes, txid, is_addition, |stats| { + if is_addition { + stats.receiving(txout); + } else { + stats.received(txout); + } + }); + } + } - let (stats, txids) = self.0.entry(bytes).or_default(); - if is_addition { - txids.insert(txid.clone()); - stats.receiving(txout); - } else { - txids.remove(txid); - stats.received(txout); + fn apply( + &mut self, + bytes: AddrBytes, + txid: &Txid, + is_addition: bool, + update_stats: impl FnOnce(&mut AddrMempoolStats), + ) { + let mut entry = match self.0.entry(bytes) { + MapEntry::Occupied(e) => e, + MapEntry::Vacant(v) => { + if !is_addition { + return; + } + v.insert_entry(Default::default()) } - stats.update_tx_count(txids.len() as u32); + }; + let (stats, txids) = entry.get_mut(); + if is_addition { + txids.insert(txid.clone()); + } else { + txids.remove(txid); + } + update_stats(stats); + let len = txids.len(); + if len == 0 { + entry.remove(); + } else { + stats.update_tx_count(len as u32); } } } diff --git a/crates/brk_rpc/src/methods.rs b/crates/brk_rpc/src/methods.rs index f55168d45..d44e9aa88 100644 --- a/crates/brk_rpc/src/methods.rs +++ b/crates/brk_rpc/src/methods.rs @@ -2,10 +2,11 @@ use std::{thread::sleep, time::Duration}; use bitcoin::{consensus::encode, hex::FromHex}; use brk_error::{Error, Result}; -use brk_types::{Bitcoin, BlockHash, Height, MempoolEntryInfo, Sats, Txid, Vout}; +use brk_types::{Bitcoin, BlockHash, FeeRate, Height, MempoolEntryInfo, Sats, Txid, Vout}; use corepc_types::v30::{ GetBlockCount, GetBlockHash, GetBlockHeader, GetBlockHeaderVerbose, GetBlockVerboseOne, - GetBlockVerboseZero, GetBlockchainInfo, GetRawMempool, GetRawMempoolVerbose, GetTxOut, + GetBlockVerboseZero, GetBlockchainInfo, GetMempoolInfo, GetRawMempool, GetRawMempoolVerbose, + GetTxOut, }; use rustc_hash::FxHashMap; use serde::Deserialize; @@ -172,6 +173,15 @@ impl Client { } } + /// Live `mempoolminfee` in sat/vB, already maxed against `minrelaytxfee` + /// per Core's contract. Wallets must pay at least this rate or bitcoind + /// will reject the broadcast; rises above the relay floor when the + /// mempool is purging by fee. + pub fn get_mempool_min_fee(&self) -> Result { + let r: GetMempoolInfo = self.0.call_with_retry("getmempoolinfo", &[])?; + Ok(FeeRate::from(r.mempool_min_fee * 100_000.0)) + } + /// Get txids of all transactions in a memory pool pub fn get_raw_mempool(&self) -> Result> { let r: GetRawMempool = self.0.call_with_retry("getrawmempool", &[])?; diff --git a/crates/brk_server/src/api/series_legacy.rs b/crates/brk_server/src/api/series_legacy.rs index 1ed848e93..3858bbb44 100644 --- a/crates/brk_server/src/api/series_legacy.rs +++ b/crates/brk_server/src/api/series_legacy.rs @@ -119,10 +119,7 @@ fn cost_basis_formatted( FxHashMap::with_capacity_and_hasher(raw.map.len(), Default::default()); for (&price_cents, &sats) in &raw.map { let price = Cents::from(price_cents); - let key = match agg { - UrpdAggregation::Raw => price, - _ => agg.bucket_floor(price).unwrap_or(price), - }; + let key = agg.bucket_floor(price); let entry = bucketed.entry(key).or_insert((Sats::ZERO, Dollars::ZERO)); entry.0 += sats; if needs_realized { diff --git a/crates/brk_types/src/feerate.rs b/crates/brk_types/src/feerate.rs index b78c62915..e5ce89df0 100644 --- a/crates/brk_types/src/feerate.rs +++ b/crates/brk_types/src/feerate.rs @@ -1,6 +1,6 @@ use std::{ cmp::Ordering, - ops::{Add, AddAssign, Div}, + ops::{Add, AddAssign, Div, Mul}, }; use schemars::JsonSchema; @@ -24,9 +24,35 @@ pub struct FeeRate(f64); impl FeeRate { pub const MIN: Self = Self(0.1); - pub fn new(fr: f64) -> Self { + pub const fn new(fr: f64) -> Self { Self(fr) } + + /// Round up to the nearest multiple of `nearest`. + #[inline] + pub fn ceil_to(self, nearest: Self) -> Self { + Self((self.0 / nearest.0).ceil() * nearest.0) + } + + /// Round to the nearest multiple of `nearest`. + #[inline] + pub fn round_to(self, nearest: Self) -> Self { + Self((self.0 / nearest.0).round() * nearest.0) + } + + /// Round to 3 decimal places via `(x * 1000).round() / 1000`. + /// Divide-by-integer at the end is more numerically stable + /// than `round_to(0.001)`'s closing `* 0.001`. + #[inline] + pub fn round_milli(self) -> Self { + Self((self.0 * 1000.0).round() / 1000.0) + } + + /// Arithmetic mean of two rates. + #[inline] + pub fn mean(a: Self, b: Self) -> Self { + Self((a.0 + b.0) / 2.0) + } } impl From<(Sats, VSize)> for FeeRate { @@ -88,6 +114,20 @@ impl Div for FeeRate { } } +impl Div for FeeRate { + type Output = Self; + fn div(self, rhs: f64) -> Self::Output { + Self(self.0 / rhs) + } +} + +impl Mul for FeeRate { + type Output = Self; + fn mul(self, rhs: f64) -> Self::Output { + Self(self.0 * rhs) + } +} + impl From for FeeRate { #[inline] fn from(value: usize) -> Self { diff --git a/crates/brk_types/src/urpd.rs b/crates/brk_types/src/urpd.rs index d0d5aa334..bec04a3b6 100644 --- a/crates/brk_types/src/urpd.rs +++ b/crates/brk_types/src/urpd.rs @@ -1,18 +1,18 @@ -use std::collections::BTreeMap; - use rustc_hash::FxHashMap; use schemars::JsonSchema; use serde::{Deserialize, Serialize}; -use crate::{Bitcoin, Cents, Cohort, Date, Dollars, Sats, UrpdAggregation, UrpdBucket, UrpdRaw}; +use crate::{ + Bitcoin, Cents, CentsSats, CentsSigned, Cohort, Date, Dollars, Sats, UrpdAggregation, + UrpdBucket, UrpdRaw, +}; /// UTXO Realized Price Distribution for a cohort on a specific date. /// /// Supply is grouped by the close price at which each UTXO was last moved. -/// Each bucket exposes three values derived from the same `(price_floor, supply)` -/// pairs: supply in BTC, realized cap contribution in USD (`price_floor * supply`), -/// and unrealized P&L against that date's close in USD -/// (`(close - price_floor) * supply`, can be negative). +/// Each bucket exposes three values: supply in BTC, realized cap contribution +/// in USD (sum of `realized_price * supply` over the coins in the bucket), and +/// unrealized P&L in USD (`close * supply - realized_cap`, can be negative). #[derive(Debug, Clone, Deserialize, Serialize, JsonSchema)] pub struct Urpd { pub cohort: Cohort, @@ -26,6 +26,12 @@ pub struct Urpd { pub buckets: Vec, } +#[derive(Default, Clone, Copy)] +struct BucketAccum { + supply: Sats, + realized_cap: CentsSats, +} + impl Urpd { /// Build from the raw on-disk distribution plus context. pub fn build( @@ -35,39 +41,44 @@ impl Urpd { raw: &UrpdRaw, aggregation: UrpdAggregation, ) -> Self { - let mut agg: FxHashMap = + let mut agg: FxHashMap = FxHashMap::with_capacity_and_hasher(raw.map.len(), Default::default()); for (&price_cents, &sats) in &raw.map { let price = Cents::from(price_cents); - let key = match aggregation { - UrpdAggregation::Raw => price, - _ => aggregation.bucket_floor(price).unwrap_or(price), - }; - *agg.entry(key).or_insert(Sats::ZERO) += sats; + let key = aggregation.bucket_floor(price); + let slot = agg.entry(key).or_default(); + slot.supply += sats; + slot.realized_cap += CentsSats::from_price_sats(price, sats); } - let sorted: BTreeMap = agg.into_iter().collect(); + let mut sorted: Vec<_> = agg.into_iter().collect(); + sorted.sort_unstable_by_key(|&(price, _)| price); + let close = Dollars::from(close_cents); + let total_supply: Sats = raw.map.values().copied().sum(); - let mut total_sats = Sats::ZERO; - let mut buckets = Vec::with_capacity(sorted.len()); - for (price_floor_cents, supply) in sorted { - total_sats += supply; - let price_floor = Dollars::from(price_floor_cents); - buckets.push(UrpdBucket { - price_floor, - supply: Bitcoin::from(supply), - realized_cap: price_floor * supply, - unrealized_pnl: (close - price_floor) * supply, - }); - } + let buckets = sorted + .into_iter() + .map(|(price_floor_cents, slot)| { + let realized_cap_cents = slot.realized_cap.to_cents(); + let close_mc_cents = CentsSats::from_price_sats(close_cents, slot.supply).to_cents(); + let pnl = CentsSigned::from(close_mc_cents.inner()) + - CentsSigned::from(realized_cap_cents.inner()); + UrpdBucket { + price_floor: Dollars::from(price_floor_cents), + supply: Bitcoin::from(slot.supply), + realized_cap: Dollars::from(realized_cap_cents), + unrealized_pnl: Dollars::from(pnl), + } + }) + .collect(); Self { cohort, date, aggregation, close, - total_supply: Bitcoin::from(total_sats), + total_supply: Bitcoin::from(total_supply), buckets, } } diff --git a/crates/brk_types/src/urpd_aggregation.rs b/crates/brk_types/src/urpd_aggregation.rs index eff98f56d..167faca2c 100644 --- a/crates/brk_types/src/urpd_aggregation.rs +++ b/crates/brk_types/src/urpd_aggregation.rs @@ -46,26 +46,24 @@ impl UrpdAggregation { } } - /// Compute bucket floor for a given price in cents. - /// Returns None for Raw (no bucketing). - pub fn bucket_floor(&self, price_cents: Cents) -> Option { + /// Compute the bucket floor for a price in cents. + /// `Raw` is the identity (no bucketing). + pub fn bucket_floor(&self, price_cents: Cents) -> Cents { match self { - Self::Raw => None, + Self::Raw => price_cents, Self::Lin200 | Self::Lin500 | Self::Lin1000 => { let size = self.linear_size_cents().unwrap(); - Some((price_cents / size) * size) + (price_cents / size) * size } Self::Log10 | Self::Log50 | Self::Log100 | Self::Log200 => { if price_cents == Cents::ZERO { - return Some(Cents::ZERO); + return Cents::ZERO; } let n = self.log_buckets_per_decade().unwrap(); - // Bucket index = floor(n * log10(price)) - // Floor = 10^(bucket_index / n) let log_price = f64::from(price_cents).log10(); let bucket_idx = (n as f64 * log_price).floor() as i32; let floor = 10_f64.powf(bucket_idx as f64 / n as f64); - Some(Cents::from(floor.round() as u64)) + Cents::from(floor.round() as u64) } } } diff --git a/crates/brk_types/src/urpd_bucket.rs b/crates/brk_types/src/urpd_bucket.rs index 35f07fdfd..e24507a61 100644 --- a/crates/brk_types/src/urpd_bucket.rs +++ b/crates/brk_types/src/urpd_bucket.rs @@ -6,12 +6,12 @@ use crate::{Bitcoin, Dollars}; /// A single bucket in a URPD snapshot. #[derive(Debug, Clone, Deserialize, Serialize, JsonSchema)] pub struct UrpdBucket { - /// Inclusive lower bound of the bucket, in USD. + /// Lower bound of the bucket, in USD. Equals the exact realized price for `Raw`. pub price_floor: Dollars, /// Supply held with a last-move price inside this bucket, in BTC. pub supply: Bitcoin, - /// Realized cap contribution in USD: `price_floor * supply`. + /// Realized cap contribution in USD: sum of `realized_price * supply` over the coins in this bucket. pub realized_cap: Dollars, - /// Unrealized P&L in USD against the close on the snapshot date: `(close - price_floor) * supply`. Can be negative. + /// Unrealized P&L in USD against the close on the snapshot date: `close * supply - realized_cap`. Can be negative. pub unrealized_pnl: Dollars, } diff --git a/modules/brk-client/index.js b/modules/brk-client/index.js index 7869c7b98..5322bdc2c 100644 --- a/modules/brk-client/index.js +++ b/modules/brk-client/index.js @@ -1187,10 +1187,9 @@ replaced it. Omitted on the root of an RBF response. * UTXO Realized Price Distribution for a cohort on a specific date. * * Supply is grouped by the close price at which each UTXO was last moved. - * Each bucket exposes three values derived from the same `(price_floor, supply)` - * pairs: supply in BTC, realized cap contribution in USD (`price_floor * supply`), - * and unrealized P&L against that date's close in USD - * (`(close - price_floor) * supply`, can be negative). + * Each bucket exposes three values: supply in BTC, realized cap contribution + * in USD (sum of `realized_price * supply` over the coins in the bucket), and + * unrealized P&L in USD (`close * supply - realized_cap`, can be negative). * * @typedef {Object} Urpd * @property {Cohort} cohort @@ -1211,10 +1210,10 @@ replaced it. Omitted on the root of an RBF response. * A single bucket in a URPD snapshot. * * @typedef {Object} UrpdBucket - * @property {Dollars} priceFloor - Inclusive lower bound of the bucket, in USD. + * @property {Dollars} priceFloor - Lower bound of the bucket, in USD. Equals the exact realized price for `Raw`. * @property {Bitcoin} supply - Supply held with a last-move price inside this bucket, in BTC. - * @property {Dollars} realizedCap - Realized cap contribution in USD: `price_floor * supply`. - * @property {Dollars} unrealizedPnl - Unrealized P&L in USD against the close on the snapshot date: `(close - price_floor) * supply`. Can be negative. + * @property {Dollars} realizedCap - Realized cap contribution in USD: sum of `realized_price * supply` over the coins in this bucket. + * @property {Dollars} unrealizedPnl - Unrealized P&L in USD against the close on the snapshot date: `close * supply - realized_cap`. Can be negative. */ /** * Path parameters for per-cohort URPD endpoints. @@ -7272,7 +7271,7 @@ function createTransferPattern(client, acc) { * @extends BrkClientBase */ class BrkClient extends BrkClientBase { - VERSION = "v0.3.0-beta.6"; + VERSION = "v0.3.0-beta.7"; INDEXES = /** @type {const} */ ([ "minute10", diff --git a/modules/brk-client/package.json b/modules/brk-client/package.json index b3e3c3899..ac0dfafe6 100644 --- a/modules/brk-client/package.json +++ b/modules/brk-client/package.json @@ -40,5 +40,5 @@ "url": "git+https://github.com/bitcoinresearchkit/brk.git" }, "type": "module", - "version": "0.3.0-beta.6" + "version": "0.3.0-beta.7" } diff --git a/packages/brk_client/brk_client/__init__.py b/packages/brk_client/brk_client/__init__.py index 3bc368f3e..0f536bea6 100644 --- a/packages/brk_client/brk_client/__init__.py +++ b/packages/brk_client/brk_client/__init__.py @@ -1573,10 +1573,10 @@ class UrpdBucket(TypedDict): A single bucket in a URPD snapshot. Attributes: - price_floor: Inclusive lower bound of the bucket, in USD. + price_floor: Lower bound of the bucket, in USD. Equals the exact realized price for `Raw`. supply: Supply held with a last-move price inside this bucket, in BTC. - realized_cap: Realized cap contribution in USD: `price_floor * supply`. - unrealized_pnl: Unrealized P&L in USD against the close on the snapshot date: `(close - price_floor) * supply`. Can be negative. + realized_cap: Realized cap contribution in USD: sum of `realized_price * supply` over the coins in this bucket. + unrealized_pnl: Unrealized P&L in USD against the close on the snapshot date: `close * supply - realized_cap`. Can be negative. """ price_floor: Dollars supply: Bitcoin @@ -1588,10 +1588,9 @@ class Urpd(TypedDict): UTXO Realized Price Distribution for a cohort on a specific date. Supply is grouped by the close price at which each UTXO was last moved. - Each bucket exposes three values derived from the same `(price_floor, supply)` - pairs: supply in BTC, realized cap contribution in USD (`price_floor * supply`), - and unrealized P&L against that date's close in USD - (`(close - price_floor) * supply`, can be negative). + Each bucket exposes three values: supply in BTC, realized cap contribution + in USD (sum of `realized_price * supply` over the coins in the bucket), and + unrealized P&L in USD (`close * supply - realized_cap`, can be negative). Attributes: aggregation: Aggregation strategy applied to the buckets. @@ -6523,7 +6522,7 @@ class SeriesTree: class BrkClient(BrkClientBase): """Main BRK client with series tree and API methods.""" - VERSION = "v0.3.0-beta.6" + VERSION = "v0.3.0-beta.7" INDEXES = [ "minute10", diff --git a/packages/brk_client/pyproject.toml b/packages/brk_client/pyproject.toml index a7566d209..c88bd321c 100644 --- a/packages/brk_client/pyproject.toml +++ b/packages/brk_client/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "brk-client" -version = "0.3.0-beta.6" +version = "0.3.0-beta.7" description = "Bitcoin on-chain analytics client — thousands of metrics, block explorer, and address index" readme = "README.md" requires-python = ">=3.9"