release: v0.3.0-beta.2

v0.3.0-alpha.0

.dockerignore

@@ -0,0 +1,3 @@
+.git
+target
+docker

.gitignore

@@ -24,6 +24,7 @@ _*
 /oracle*
 /playground
 /*.txt
+/*.csv
 
 # Logs
 *.log*
@@ -38,6 +39,7 @@ flamegraph.svg
 
 # AI
 .claude/settings*
+!CLAUDE.md
 
 # Expand
 expand.rs

CLAUDE.md

@@ -0,0 +1 @@
+Codex will review your output once you are done.

Cargo.toml

@@ -4,7 +4,7 @@ members = ["crates/*"]
 package.description = "The Bitcoin Research Kit is a suite of tools designed to extract, compute and display data stored on a Bitcoin Core node"
 package.license = "MIT"
 package.edition = "2024"
-package.version = "0.1.4"
+package.version = "0.3.0-beta.2"
 package.homepage = "https://bitcoinresearchkit.org"
 package.repository = "https://github.com/bitcoinresearchkit/brk"
 package.readme = "README.md"
@@ -36,54 +36,60 @@ inherits = "release"
 debug = true
 
 [workspace.dependencies]
-aide = { version = "0.16.0-alpha.2", features = ["axum-json", "axum-query"] }
-axum = { version = "0.8.8", default-features = false, features = ["http1", "json", "query", "tokio", "tracing"] }
+aide = { version = "0.16.0-alpha.4", features = ["axum-json", "axum-query"] }
+axum = { version = "0.8.9", default-features = false, features = ["http1", "json", "query", "tokio", "tracing"] }
 bitcoin = { version = "0.32.8", features = ["serde"] }
 bitcoincore-rpc = "0.19.0"
-brk_alloc = { version = "0.1.4", path = "crates/brk_alloc" }
-brk_bencher = { version = "0.1.4", path = "crates/brk_bencher" }
-brk_bindgen = { version = "0.1.4", path = "crates/brk_bindgen" }
-brk_cli = { version = "0.1.4", path = "crates/brk_cli" }
-brk_client = { version = "0.1.4", path = "crates/brk_client" }
-brk_cohort = { version = "0.1.4", path = "crates/brk_cohort" }
-brk_computer = { version = "0.1.4", path = "crates/brk_computer" }
-brk_error = { version = "0.1.4", path = "crates/brk_error" }
-brk_fetcher = { version = "0.1.4", path = "crates/brk_fetcher" }
-brk_indexer = { version = "0.1.4", path = "crates/brk_indexer" }
-brk_iterator = { version = "0.1.4", path = "crates/brk_iterator" }
-brk_logger = { version = "0.1.4", path = "crates/brk_logger" }
-brk_mempool = { version = "0.1.4", path = "crates/brk_mempool" }
-brk_query = { version = "0.1.4", path = "crates/brk_query", features = ["tokio"] }
-brk_reader = { version = "0.1.4", path = "crates/brk_reader" }
-brk_rpc = { version = "0.1.4", path = "crates/brk_rpc" }
-brk_server = { version = "0.1.4", path = "crates/brk_server" }
-brk_store = { version = "0.1.4", path = "crates/brk_store" }
-brk_traversable = { version = "0.1.4", path = "crates/brk_traversable", features = ["pco", "derive"] }
-brk_traversable_derive = { version = "0.1.4", path = "crates/brk_traversable_derive" }
-brk_types = { version = "0.1.4", path = "crates/brk_types" }
-brk_website = { version = "0.1.4", path = "crates/brk_website" }
-byteview = "0.10.0"
+brk_alloc = { version = "0.3.0-beta.2", path = "crates/brk_alloc" }
+brk_bencher = { version = "0.3.0-beta.2", path = "crates/brk_bencher" }
+brk_bindgen = { version = "0.3.0-beta.2", path = "crates/brk_bindgen" }
+brk_cli = { version = "0.3.0-beta.2", path = "crates/brk_cli" }
+brk_client = { version = "0.3.0-beta.2", path = "crates/brk_client" }
+brk_cohort = { version = "0.3.0-beta.2", path = "crates/brk_cohort" }
+brk_computer = { version = "0.3.0-beta.2", path = "crates/brk_computer" }
+brk_error = { version = "0.3.0-beta.2", path = "crates/brk_error" }
+brk_fetcher = { version = "0.3.0-beta.2", path = "crates/brk_fetcher" }
+brk_indexer = { version = "0.3.0-beta.2", path = "crates/brk_indexer" }
+brk_iterator = { version = "0.3.0-beta.2", path = "crates/brk_iterator" }
+brk_logger = { version = "0.3.0-beta.2", path = "crates/brk_logger" }
+brk_mempool = { version = "0.3.0-beta.2", path = "crates/brk_mempool" }
+brk_oracle = { version = "0.3.0-beta.2", path = "crates/brk_oracle" }
+brk_query = { version = "0.3.0-beta.2", path = "crates/brk_query", features = ["tokio"] }
+brk_reader = { version = "0.3.0-beta.2", path = "crates/brk_reader" }
+brk_rpc = { version = "0.3.0-beta.2", path = "crates/brk_rpc" }
+brk_server = { version = "0.3.0-beta.2", path = "crates/brk_server" }
+brk_store = { version = "0.3.0-beta.2", path = "crates/brk_store" }
+brk_traversable = { version = "0.3.0-beta.2", path = "crates/brk_traversable", features = ["pco", "derive"] }
+brk_traversable_derive = { version = "0.3.0-beta.2", path = "crates/brk_traversable_derive" }
+brk_types = { version = "0.3.0-beta.2", path = "crates/brk_types" }
+brk_website = { version = "0.3.0-beta.2", path = "crates/brk_website" }
+byteview = "0.10.1"
 color-eyre = "0.6.5"
+corepc-client = { package = "brk-corepc-client", version = "0.11.1", features = ["client-sync"] }
+# corepc-client = { package = "brk-corepc-client", path = "../corepc/client", features = ["client-sync"] }
+corepc-jsonrpc = { package = "brk-corepc-jsonrpc", version = "0.19.1", features = ["simple_http"], default-features = false }
+# corepc-jsonrpc = { package = "brk-corepc-jsonrpc", path = "../corepc/jsonrpc", features = ["simple_http"], default-features = false }
 derive_more = { version = "2.1.1", features = ["deref", "deref_mut"] }
-fjall = "3.0.1"
-indexmap = { version = "2.13.0", features = ["serde"] }
-jiff = { version = "0.2.18", features = ["perf-inline", "tz-system"], default-features = false }
-minreq = { version = "2.14.1", features = ["https", "json-using-serde"] }
-owo-colors = "4.2.3"
+fjall = "=3.0.4"
+indexmap = { version = "2.14.0", features = ["serde"] }
+jiff = { version = "0.2.23", features = ["perf-inline", "tz-system"], default-features = false }
+owo-colors = "4.3.0"
 parking_lot = "0.12.5"
-rayon = "1.11.0"
-rustc-hash = "2.1.1"
+pco = "1.0.1"
+rayon = "1.12.0"
+rustc-hash = "2.1.2"
 schemars = { version = "1.2.1", features = ["indexmap2"] }
 serde = "1.0.228"
 serde_bytes = "0.11.19"
 serde_derive = "1.0.228"
 serde_json = { version = "1.0.149", features = ["float_roundtrip", "preserve_order"] }
 smallvec = "1.15.1"
-tokio = { version = "1.49.0", features = ["rt-multi-thread"] }
-tracing = { version = "0.1", default-features = false, features = ["std"] }
+tokio = { version = "1.52.0", features = ["rt-multi-thread"] }
 tower-http = { version = "0.6.8", features = ["catch-panic", "compression-br", "compression-gzip", "compression-zstd", "cors", "normalize-path", "timeout", "trace"] }
 tower-layer = "0.3"
-vecdb = { version = "0.6.8", features = ["derive", "serde_json", "pco", "schemars"] }
+tracing = { version = "0.1", default-features = false, features = ["std"] }
+ureq = { version = "3.3.0", features = ["json"] }
+vecdb = { version = "0.10.1", features = ["derive", "serde_json", "pco", "schemars"] }
 # vecdb = { path = "../anydb/crates/vecdb", features = ["derive", "serde_json", "pco", "schemars"] }
 
 [workspace.metadata.release]
@@ -91,6 +97,7 @@ shared-version = true
 tag-name = "v{{version}}"
 pre-release-commit-message = "release: v{{version}}"
 tag-message = "release: v{{version}}"
+allow-branch = ["main", "next"]
 
 [workspace.metadata.dist]
 cargo-dist-version = "0.30.2"

crates/brk/Cargo.toml

@@ -20,6 +20,7 @@ full = [
     "iterator",
     "logger",
     "mempool",
+    "oracle",
     "query",
     "reader",
     "rpc",
@@ -39,6 +40,7 @@ indexer = ["brk_indexer"]
 iterator = ["brk_iterator"]
 logger = ["brk_logger"]
 mempool = ["brk_mempool"]
+oracle = ["brk_oracle"]
 query = ["brk_query"]
 reader = ["brk_reader"]
 rpc = ["brk_rpc"]
@@ -59,9 +61,10 @@ brk_indexer = { workspace = true, optional = true }
 brk_iterator = { workspace = true, optional = true }
 brk_logger = { workspace = true, optional = true }
 brk_mempool = { workspace = true, optional = true }
+brk_oracle = { workspace = true, optional = true }
 brk_query = { workspace = true, optional = true }
 brk_reader = { workspace = true, optional = true }
-brk_rpc = { workspace = true, optional = true }
+brk_rpc = { workspace = true, optional = true, features = ["corepc"] }
 brk_server = { workspace = true, optional = true }
 brk_store = { workspace = true, optional = true }
 brk_traversable = { workspace = true, optional = true }

crates/brk/README.md

@@ -18,7 +18,12 @@ use brk::query::Query;
 use brk::types::Height;
 ```
 
-Feature flags match crate names without the `brk_` prefix. Use `full` to enable all.
+Feature flags match crate names without the `brk_` prefix. Use `full` to enable all:
+
+```toml
+[dependencies]
+brk = { version = "0.1", features = ["full"] }
+```
 
 ## Crates
 
@@ -30,6 +35,7 @@ Feature flags match crate names without the `brk_` prefix. Use `full` to enable
 | [brk_indexer](https://docs.rs/brk_indexer) | Index transactions, addresses, and UTXOs |
 | [brk_computer](https://docs.rs/brk_computer) | Compute derived metrics (realized cap, MVRV, SOPR, cohorts, etc.) |
 | [brk_mempool](https://docs.rs/brk_mempool) | Monitor mempool, estimate fees, project upcoming blocks |
+| [brk_oracle](https://docs.rs/brk_oracle) | Pure on-chain BTC/USD price oracle |
 | [brk_query](https://docs.rs/brk_query) | Query interface for indexed and computed data |
 | [brk_server](https://docs.rs/brk_server) | REST API with OpenAPI docs |
 

crates/brk/src/lib.rs

@@ -44,6 +44,10 @@ pub use brk_logger as logger;
 #[doc(inline)]
 pub use brk_mempool as mempool;
 
+#[cfg(feature = "oracle")]
+#[doc(inline)]
+pub use brk_oracle as oracle;
+
 #[cfg(feature = "query")]
 #[doc(inline)]
 pub use brk_query as query;

crates/brk_bencher/src/io.rs

@@ -8,7 +8,7 @@ use std::{
 use std::fs;
 
 #[cfg(target_os = "macos")]
-use libproc::pid_rusage::{pidrusage, RUsageInfoV2};
+use libproc::pid_rusage::{RUsageInfoV2, pidrusage};
 
 pub struct IoMonitor {
     pid: u32,

crates/brk_bencher/src/lib.rs

@@ -113,7 +113,9 @@ impl Bencher {
         self.0.stop_flag.store(true, Ordering::Relaxed);
 
         if let Some(handle) = self.0.monitor_thread.lock().take() {
-            handle.join().map_err(|_| Error::Internal("Monitor thread panicked"))??;
+            handle
+                .join()
+                .map_err(|_| Error::Internal("Monitor thread panicked"))??;
         }
 
         self.0.progression.flush()?;

crates/brk_bencher_visualizer/src/chart.rs

@@ -43,14 +43,18 @@ pub fn generate(config: ChartConfig, runs: &[Run]) -> Result<()> {
     let max_value = runs.iter().map(|r| r.max_value()).fold(0.0, f64::max);
 
     let (time_scaled, time_divisor, time_label) = format::time(max_time_s);
-    let (value_scaled, scale_factor, y_label) = scale_y_axis(max_value, &config.y_label, &config.y_format);
+    let (value_scaled, scale_factor, y_label) =
+        scale_y_axis(max_value, &config.y_label, &config.y_format);
     let x_labels = label_count(time_scaled);
 
     let root = SVGBackend::new(config.output_path, SIZE).into_drawing_area();
     root.fill(&BG_COLOR)?;
 
     let mut chart = ChartBuilder::on(&root)
-        .caption(&config.title, (FONT, FONT_SIZE_BIG).into_font().color(&TEXT_COLOR))
+        .caption(
+            &config.title,
+            (FONT, FONT_SIZE_BIG).into_font().color(&TEXT_COLOR),
+        )
         .margin(20)
         .margin_right(40)
         .x_label_area_size(50)
@@ -62,7 +66,14 @@ pub fn generate(config: ChartConfig, runs: &[Run]) -> Result<()> {
 
     for (idx, run) in runs.iter().enumerate() {
         let color = COLORS[idx % COLORS.len()];
-        draw_series(&mut chart, &run.data, &run.id, color, time_divisor, scale_factor)?;
+        draw_series(
+            &mut chart,
+            &run.data,
+            &run.id,
+            color,
+            time_divisor,
+            scale_factor,
+        )?;
     }
 
     configure_legend(&mut chart)?;
@@ -93,14 +104,18 @@ pub fn generate_dual(
     let max_value = runs.iter().map(|r| r.max_value()).fold(0.0, f64::max);
 
     let (time_scaled, time_divisor, time_label) = format::time(max_time_s);
-    let (value_scaled, scale_factor, y_label) = scale_y_axis(max_value, &config.y_label, &config.y_format);
+    let (value_scaled, scale_factor, y_label) =
+        scale_y_axis(max_value, &config.y_label, &config.y_format);
     let x_labels = label_count(time_scaled);
 
     let root = SVGBackend::new(config.output_path, SIZE).into_drawing_area();
     root.fill(&BG_COLOR)?;
 
     let mut chart = ChartBuilder::on(&root)
-        .caption(&config.title, (FONT, FONT_SIZE_BIG).into_font().color(&TEXT_COLOR))
+        .caption(
+            &config.title,
+            (FONT, FONT_SIZE_BIG).into_font().color(&TEXT_COLOR),
+        )
         .margin(20)
         .margin_right(40)
         .x_label_area_size(50)
@@ -164,7 +179,13 @@ type Chart<'a, 'b> = ChartContext<
     Cartesian2d<plotters::coord::types::RangedCoordf64, plotters::coord::types::RangedCoordf64>,
 >;
 
-fn configure_mesh(chart: &mut Chart, x_label: &str, y_label: &str, y_format: &YAxisFormat, x_labels: usize) -> Result<()> {
+fn configure_mesh(
+    chart: &mut Chart,
+    x_label: &str,
+    y_label: &str,
+    y_format: &YAxisFormat,
+    x_labels: usize,
+) -> Result<()> {
     let y_formatter: Box<dyn Fn(&f64) -> String> = match y_format {
         YAxisFormat::Bytes => Box::new(|y: &f64| {
             if y.fract() == 0.0 {
@@ -200,9 +221,12 @@ fn draw_series(
     time_divisor: f64,
     scale_factor: f64,
 ) -> Result<()> {
-    let points = data
-        .iter()
-        .map(|d| (d.timestamp_ms as f64 / 1000.0 / time_divisor, d.value / scale_factor));
+    let points = data.iter().map(|d| {
+        (
+            d.timestamp_ms as f64 / 1000.0 / time_divisor,
+            d.value / scale_factor,
+        )
+    });
 
     chart
         .draw_series(LineSeries::new(points, color.stroke_width(1)))?
@@ -221,7 +245,12 @@ fn draw_dashed_series(
 ) -> Result<()> {
     let points: Vec<_> = data
         .iter()
-        .map(|d| (d.timestamp_ms as f64 / 1000.0 / time_divisor, d.value / scale_factor))
+        .map(|d| {
+            (
+                d.timestamp_ms as f64 / 1000.0 / time_divisor,
+                d.value / scale_factor,
+            )
+        })
         .collect();
 
     // Draw dashed line by skipping every other segment
@@ -234,7 +263,12 @@ fn draw_dashed_series(
                 .map(|(_, w)| PathElement::new(vec![w[0], w[1]], color.stroke_width(2))),
         )?
         .label(label)
-        .legend(move |(x, y)| PathElement::new(vec![(x, y), (x + 10, y), (x + 20, y)], color.stroke_width(2)));
+        .legend(move |(x, y)| {
+            PathElement::new(
+                vec![(x, y), (x + 10, y), (x + 20, y)],
+                color.stroke_width(2),
+            )
+        });
     Ok(())
 }
 

crates/brk_bencher_visualizer/src/lib.rs

@@ -2,7 +2,7 @@ mod chart;
 mod data;
 mod format;
 
-use data::{read_dual_runs, read_runs, Cutoffs, DualRun, Result, Run};
+use data::{Cutoffs, DualRun, Result, Run, read_dual_runs, read_runs};
 use std::{
     fs,
     path::{Path, PathBuf},
@@ -57,10 +57,24 @@ impl Visualizer {
         let io_runs = read_dual_runs(crate_path, "io.csv")?;
 
         // Combined charts (all runs)
-        self.generate_combined_charts(crate_path, crate_name, &disk_runs, &memory_runs, &progress_runs, &io_runs)?;
+        self.generate_combined_charts(
+            crate_path,
+            crate_name,
+            &disk_runs,
+            &memory_runs,
+            &progress_runs,
+            &io_runs,
+        )?;
 
         // Individual charts (one per run)
-        self.generate_individual_charts(crate_path, crate_name, &disk_runs, &memory_runs, &progress_runs, &io_runs)?;
+        self.generate_individual_charts(
+            crate_path,
+            crate_name,
+            &disk_runs,
+            &memory_runs,
+            &progress_runs,
+            &io_runs,
+        )?;
 
         Ok(())
     }
@@ -246,4 +260,3 @@ impl Visualizer {
         Ok(())
     }
 }
-

crates/brk_bindgen/Cargo.toml

@@ -12,6 +12,6 @@ brk_cohort = { workspace = true }
 brk_query = { workspace = true }
 brk_types = { workspace = true }
 indexmap = { workspace = true }
-oas3 = "0.20"
+oas3 = "0.21"
 serde = { workspace = true }
 serde_json = { workspace = true }

crates/brk_bindgen/src/analysis/names.rs

@@ -1,7 +1,7 @@
-//! Common prefix/suffix detection for metric names.
+//! Common prefix/suffix detection for series names.
 //!
 //! This module provides utilities to find common prefixes and suffixes
-//! among metric names, which is used to detect pattern mode (suffix vs prefix).
+//! among series names, which is used to detect pattern mode (suffix vs prefix).
 
 /// Find the longest common prefix among all strings.
 /// Returns the prefix WITH trailing underscore if found at word boundary.
@@ -151,7 +151,10 @@ mod tests {
     #[test]
     fn test_common_prefix_lth() {
         let names = vec!["lth_cost_basis_max", "lth_cost_basis_min", "lth_cost_basis"];
-        assert_eq!(find_common_prefix(&names), Some("lth_cost_basis_".to_string()));
+        assert_eq!(
+            find_common_prefix(&names),
+            Some("lth_cost_basis_".to_string())
+        );
     }
 
     #[test]

crates/brk_bindgen/src/analysis/patterns.rs

@@ -329,11 +329,21 @@ fn resolve_branch_patterns(
 }
 
 /// Normalize fields for naming (same structure = same name).
+/// Only erases leaf types when all leaves share the same type — this ensures
+/// mixed-type signatures (e.g., StoredU32 raw + StoredU64 cumulative) get a
+/// different name than same-type signatures that can be genericized.
 fn normalize_fields_for_naming(fields: &[PatternField]) -> Vec<PatternField> {
+    let leaf_types: Vec<&str> = fields
+        .iter()
+        .filter(|f| !f.is_branch())
+        .map(|f| f.rust_type.as_str())
+        .collect();
+    let all_same = !leaf_types.is_empty() && leaf_types.iter().all(|t| *t == leaf_types[0]);
+
     fields
         .iter()
         .map(|f| {
-            if f.is_branch() {
+            if f.is_branch() || !all_same {
                 f.clone()
             } else {
                 PatternField {

crates/brk_bindgen/src/analysis/tree.rs

@@ -16,7 +16,7 @@ use super::{find_common_prefix, find_common_suffix, normalize_prefix};
 ///
 /// This is useful for pattern base analysis where we want the "base" case
 /// (e.g., the leaf without suffix like `_btc` or `_usd`).
-fn get_shortest_leaf_name(node: &TreeNode) -> Option<String> {
+pub(super) fn get_shortest_leaf_name(node: &TreeNode) -> Option<String> {
     match node {
         TreeNode::Leaf(leaf) => Some(leaf.name().to_string()),
         TreeNode::Branch(children) => children
@@ -64,7 +64,7 @@ pub fn get_node_fields(
     fields
 }
 
-/// Detect index patterns (sets of indexes that appear together on metrics).
+/// Detect index patterns (sets of indexes that appear together on series).
 pub fn detect_index_patterns(tree: &TreeNode) -> Vec<IndexSetPattern> {
     let mut unique_index_sets: BTreeSet<BTreeSet<Index>> = BTreeSet::new();
     collect_index_sets_from_tree(tree, &mut unique_index_sets);
@@ -85,7 +85,7 @@ pub fn detect_index_patterns(tree: &TreeNode) -> Vec<IndexSetPattern> {
         .into_iter()
         .enumerate()
         .map(|(i, indexes)| IndexSetPattern {
-            name: format!("MetricPattern{}", i + 1),
+            name: format!("SeriesPattern{}", i + 1),
             indexes,
         })
         .collect()
@@ -147,7 +147,7 @@ impl PatternBaseResult {
     }
 }
 
-/// Get the metric base for a pattern instance by analyzing direct children.
+/// Get the series base for a pattern instance by analyzing direct children.
 ///
 /// Uses the shortest leaf names from direct children to find common prefix/suffix.
 ///
@@ -194,7 +194,7 @@ pub fn get_pattern_instance_base(node: &TreeNode) -> PatternBaseResult {
     }
 
     // Fallback: no common prefix/suffix found - this is a root-level pattern
-    // Return empty base so metric names are used directly
+    // Return empty base so series names are used directly
     PatternBaseResult::empty()
 }
 
@@ -346,15 +346,15 @@ pub fn get_fields_with_child_info(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use brk_types::{MetricLeaf, MetricLeafWithSchema, TreeNode};
+    use brk_types::{SeriesLeaf, SeriesLeafWithSchema, TreeNode};
 
     fn make_leaf(name: &str) -> TreeNode {
-        let leaf = MetricLeaf {
+        let leaf = SeriesLeaf {
             name: name.to_string(),
             kind: "TestType".to_string(),
             indexes: BTreeSet::new(),
         };
-        TreeNode::Leaf(MetricLeafWithSchema::new(leaf, serde_json::json!({})))
+        TreeNode::Leaf(SeriesLeafWithSchema::new(leaf, serde_json::json!({})))
     }
 
     fn make_branch(children: Vec<(&str, TreeNode)>) -> TreeNode {
@@ -371,15 +371,15 @@ mod tests {
         let tree = make_branch(vec![
             (
                 "base",
-                make_branch(vec![("dateindex", make_leaf("block_vbytes"))]),
+                make_branch(vec![("day1", make_leaf("block_vbytes"))]),
             ),
             (
                 "average",
-                make_branch(vec![("dateindex", make_leaf("block_vbytes_average"))]),
+                make_branch(vec![("day1", make_leaf("block_vbytes_average"))]),
             ),
             (
                 "sum",
-                make_branch(vec![("dateindex", make_leaf("block_vbytes_sum"))]),
+                make_branch(vec![("day1", make_leaf("block_vbytes_sum"))]),
             ),
         ]);
 
@@ -390,27 +390,27 @@ mod tests {
 
     #[test]
     fn test_get_pattern_instance_base_without_base_field() {
-        // Simulates weight tree: NO base field, only suffixed metrics
+        // Simulates weight tree: NO base field, only suffixed series
         let tree = make_branch(vec![
             (
                 "average",
-                make_branch(vec![("dateindex", make_leaf("block_weight_average"))]),
+                make_branch(vec![("day1", make_leaf("block_weight_average"))]),
             ),
             (
                 "sum",
-                make_branch(vec![("dateindex", make_leaf("block_weight_sum"))]),
+                make_branch(vec![("day1", make_leaf("block_weight_sum"))]),
             ),
             (
                 "cumulative",
-                make_branch(vec![("dateindex", make_leaf("block_weight_cumulative"))]),
+                make_branch(vec![("day1", make_leaf("block_weight_cumulative"))]),
             ),
             (
                 "max",
-                make_branch(vec![("dateindex", make_leaf("block_weight_max"))]),
+                make_branch(vec![("day1", make_leaf("block_weight_max"))]),
             ),
             (
                 "min",
-                make_branch(vec![("dateindex", make_leaf("block_weight_min"))]),
+                make_branch(vec![("day1", make_leaf("block_weight_min"))]),
             ),
         ]);
 
@@ -426,15 +426,15 @@ mod tests {
         let tree = make_branch(vec![
             (
                 "base",
-                make_branch(vec![("dateindex", make_leaf("block_weight_average"))]),
+                make_branch(vec![("day1", make_leaf("block_weight_average"))]),
             ),
             (
                 "average",
-                make_branch(vec![("dateindex", make_leaf("block_weight_average"))]),
+                make_branch(vec![("day1", make_leaf("block_weight_average"))]),
             ),
             (
                 "sum",
-                make_branch(vec![("dateindex", make_leaf("block_weight_sum"))]),
+                make_branch(vec![("day1", make_leaf("block_weight_sum"))]),
             ),
         ]);
 
@@ -447,7 +447,7 @@ mod tests {
     #[test]
     fn test_get_pattern_instance_base_with_mismatched_base_name() {
         // Simulates the actual bug: indexed tree's "base" field has name "weight"
-        // but computed tree's derived metrics use "block_weight_*" prefix.
+        // but computed tree's derived series use "block_weight_*" prefix.
         // After tree merge, we get a base field with mismatched naming.
         let tree = make_branch(vec![
             ("base", make_leaf("weight")), // Outlier - doesn't match pattern
@@ -466,11 +466,11 @@ mod tests {
 
     #[test]
     fn test_get_pattern_instance_base_root_level_no_common_pattern() {
-        // Simulates root-level pattern with metrics that have no common prefix/suffix.
+        // Simulates root-level pattern with series that have no common prefix/suffix.
         // These names have no shared prefix or suffix, even when excluding any one.
-        // In this case, we should return empty base so metric names are used directly.
+        // In this case, we should return empty base so series names are used directly.
         let tree = make_branch(vec![
-            ("alpha", make_leaf("foo_metric")),
+            ("alpha", make_leaf("foo_series")),
             ("beta", make_leaf("bar_value")),
             ("gamma", make_leaf("baz_count")),
         ]);
@@ -513,10 +513,10 @@ mod tests {
 
     #[test]
     fn test_get_pattern_instance_base_suffix_mode_price_ago() {
-        // Simulates price_ago pattern: price_1d_ago, price_1w_ago, price_10y_ago
+        // Simulates price_ago pattern: price_24h_ago, price_1w_ago, price_10y_ago
         // Common prefix is "price_", so this is suffix mode
         let tree = make_branch(vec![
-            ("_1d", make_leaf("price_1d_ago")),
+            ("_24h", make_leaf("price_24h_ago")),
             ("_1w", make_leaf("price_1w_ago")),
             ("_1m", make_leaf("price_1m_ago")),
             ("_10y", make_leaf("price_10y_ago")),
@@ -524,16 +524,16 @@ mod tests {
 
         let result = get_pattern_instance_base(&tree);
         assert_eq!(result.base, "price");
-        assert!(result.is_suffix_mode); // Suffix mode: _m(base, "1d_ago")
+        assert!(result.is_suffix_mode); // Suffix mode: _m(base, "24h_ago")
         assert!(!result.has_outlier);
     }
 
     #[test]
     fn test_get_pattern_instance_base_prefix_mode_price_returns() {
-        // Simulates price_returns pattern: 1d_price_returns, 1w_price_returns, 10y_price_returns
+        // Simulates price_returns pattern: 24h_price_returns, 1w_price_returns, 10y_price_returns
         // Common suffix is "_price_returns", so this is prefix mode
         let tree = make_branch(vec![
-            ("_1d", make_leaf("1d_price_returns")),
+            ("_24h", make_leaf("24h_price_returns")),
             ("_1w", make_leaf("1w_price_returns")),
             ("_1m", make_leaf("1m_price_returns")),
             ("_10y", make_leaf("10y_price_returns")),
@@ -541,7 +541,7 @@ mod tests {
 
         let result = get_pattern_instance_base(&tree);
         assert_eq!(result.base, "price_returns");
-        assert!(!result.is_suffix_mode); // Prefix mode: _p("1d_", base)
+        assert!(!result.is_suffix_mode); // Prefix mode: _p("24h_", base)
         assert!(!result.has_outlier);
     }
 

crates/brk_bindgen/src/backends/javascript.rs

@@ -59,4 +59,51 @@ impl LanguageSyntax for JavaScriptSyntax {
     fn constructor_name(&self, type_name: &str) -> String {
         format!("create{}", type_name)
     }
+
+    fn disc_arg_expr(&self, template: &str) -> String {
+        if template == "{disc}" {
+            "disc".to_string()
+        } else if template.is_empty() {
+            "''".to_string()
+        } else if !template.contains("{disc}") {
+            format!("'{}'", template)
+        } else if template.ends_with("{disc}") {
+            let static_part = template.trim_end_matches("{disc}").trim_end_matches('_');
+            format!("_m('{}', disc)", static_part)
+        } else {
+            let js_template = template.replace("{disc}", "${disc}");
+            format!("`{}`", js_template)
+        }
+    }
+
+    fn template_expr(&self, acc_var: &str, template: &str) -> String {
+        let var_name = to_camel_case(acc_var);
+        if template.is_empty() {
+            // Identity — just pass disc
+            format!("_m({}, disc)", var_name)
+        } else if template == "{disc}" {
+            // Template IS the discriminator
+            format!("_m({}, disc)", var_name)
+        } else if !template.contains("{disc}") {
+            // Static suffix — no disc involved
+            format!("_m({}, '{}')", var_name, template)
+        } else {
+            // Template with {disc}: use nested _m for proper separator handling
+            // "ratio_{disc}_bps" → split on {disc} → _m(_m(acc, 'ratio'), disc) then _bps
+            // But this is complex. For embedded disc, use string interpolation.
+            // For suffix disc (ends with {disc}), use _m composition.
+            if let Some(static_part) = template.strip_suffix("{disc}") {
+                if static_part.is_empty() {
+                    format!("_m({}, disc)", var_name)
+                } else {
+                    let static_part = static_part.trim_end_matches('_');
+                    format!("_m(_m({}, '{}'), disc)", var_name, static_part)
+                }
+            } else {
+                // Embedded disc — use template literal
+                let js_template = template.replace("{disc}", "${disc}");
+                format!("_m({}, `{}`)", var_name, js_template)
+            }
+        }
+    }
 }

crates/brk_bindgen/src/backends/python.rs

@@ -54,4 +54,29 @@ impl LanguageSyntax for PythonSyntax {
     fn constructor_name(&self, type_name: &str) -> String {
         type_name.to_string()
     }
+
+    fn disc_arg_expr(&self, template: &str) -> String {
+        if template == "{disc}" {
+            "disc".to_string()
+        } else if template.is_empty() {
+            "''".to_string()
+        } else if !template.contains("{disc}") {
+            format!("'{}'", template)
+        } else if template.ends_with("{disc}") {
+            let static_part = template.trim_end_matches("{disc}").trim_end_matches('_');
+            format!("_m('{}', disc)", static_part)
+        } else {
+            format!("f'{}'", template)
+        }
+    }
+
+    fn template_expr(&self, acc_var: &str, template: &str) -> String {
+        if template == "{disc}" {
+            format!("_m({}, disc)", acc_var)
+        } else if !template.contains("{disc}") {
+            format!("_m({}, '{}')", acc_var, template)
+        } else {
+            format!("_m({}, f'{}')", acc_var, template)
+        }
+    }
 }

crates/brk_bindgen/src/backends/rust.rs

@@ -1,13 +1,21 @@
 //! Rust language syntax implementation.
 
-use crate::{GenericSyntax, LanguageSyntax, to_snake_case};
+use crate::{GenericSyntax, LanguageSyntax, escape_rust_keyword, to_snake_case};
 
 /// Rust-specific code generation syntax.
 pub struct RustSyntax;
 
+/// Escape braces in a template string for use in `format!()`, preserving `{disc}`.
+fn escape_rust_format(template: &str) -> String {
+    template
+        .replace('{', "{{")
+        .replace('}', "}}")
+        .replace("{{disc}}", "{disc}")
+}
+
 impl LanguageSyntax for RustSyntax {
     fn field_name(&self, name: &str) -> String {
-        to_snake_case(name)
+        escape_rust_keyword(&to_snake_case(name))
     }
 
     fn path_expr(&self, base_var: &str, suffix: &str) -> String {
@@ -16,20 +24,20 @@ impl LanguageSyntax for RustSyntax {
 
     fn suffix_expr(&self, acc_var: &str, relative: &str) -> String {
         if relative.is_empty() {
-            // Identity: just return acc
-            format!("{}.clone()", acc_var)
+            self.owned_expr(acc_var)
         } else {
-            // _m(&acc, relative) -> if acc.is_empty() { relative } else { format!("{acc}_{relative}") }
             format!("_m(&{}, \"{}\")", acc_var, relative)
         }
     }
 
+    fn owned_expr(&self, var: &str) -> String {
+        format!("{}.clone()", var)
+    }
+
     fn prefix_expr(&self, prefix: &str, acc_var: &str) -> String {
         if prefix.is_empty() {
-            // Identity: just return acc
-            format!("{}.clone()", acc_var)
+            self.owned_expr(acc_var)
         } else {
-            // _p(prefix, &acc) -> if acc.is_empty() { prefix_base } else { format!("{prefix}{acc}") }
             let prefix_base = prefix.trim_end_matches('_');
             format!("_p(\"{}\", &{})", prefix_base, acc_var)
         }
@@ -55,4 +63,35 @@ impl LanguageSyntax for RustSyntax {
     fn constructor_name(&self, type_name: &str) -> String {
         format!("{}::new", type_name)
     }
+
+    fn disc_arg_expr(&self, template: &str) -> String {
+        if template == "{disc}" {
+            "disc.clone()".to_string()
+        } else if template.is_empty() {
+            "String::new()".to_string()
+        } else if !template.contains("{disc}") {
+            format!("\"{}\".to_string()", template)
+        } else if template.ends_with("{disc}") {
+            let static_part = template.trim_end_matches("{disc}").trim_end_matches('_');
+            format!("_m(\"{}\", &disc)", static_part)
+        } else {
+            format!("format!(\"{}\")", escape_rust_format(template))
+        }
+    }
+
+    fn template_expr(&self, acc_var: &str, template: &str) -> String {
+        if template == "{disc}" {
+            format!("_m(&{}, &disc)", acc_var)
+        } else if template.is_empty() {
+            acc_var.to_string()
+        } else if !template.contains("{disc}") {
+            format!("_m(&{}, \"{}\")", acc_var, template)
+        } else {
+            format!(
+                "_m(&{}, &format!(\"{}\", disc=disc))",
+                acc_var,
+                escape_rust_format(template)
+            )
+        }
+    }
 }

crates/brk_bindgen/src/generate/constants.rs

@@ -6,14 +6,15 @@
 use std::collections::BTreeMap;
 
 use brk_cohort::{
-    AGE_RANGE_NAMES, AMOUNT_RANGE_NAMES, EPOCH_NAMES, GE_AMOUNT_NAMES, LT_AMOUNT_NAMES,
-    MAX_AGE_NAMES, MIN_AGE_NAMES, SPENDABLE_TYPE_NAMES, TERM_NAMES, YEAR_NAMES,
+    AGE_RANGE_NAMES, AMOUNT_RANGE_NAMES, CLASS_NAMES, EPOCH_NAMES, LOSS_NAMES, OVER_AGE_NAMES,
+    OVER_AMOUNT_NAMES, PROFIT_NAMES, PROFITABILITY_RANGE_NAMES, SPENDABLE_TYPE_NAMES, TERM_NAMES,
+    UNDER_AGE_NAMES, UNDER_AMOUNT_NAMES,
 };
-use brk_types::{pools, Index, PoolSlug};
+use brk_types::{Index, PoolSlug, pools};
 use serde::Serialize;
 use serde_json::Value;
 
-use crate::{to_camel_case, VERSION};
+use crate::{VERSION, to_camel_case};
 
 /// Collected constant data for client generation.
 pub struct ClientConstants {
@@ -26,7 +27,7 @@ impl ClientConstants {
     /// Collect all constant data.
     pub fn collect() -> Self {
         let indexes = Index::all();
-        let indexes: Vec<&'static str> = indexes.iter().map(|i| i.serialize_long()).collect();
+        let indexes: Vec<&'static str> = indexes.iter().map(|i| i.name()).collect();
 
         let pools = pools();
         let mut sorted_pools: Vec<_> = pools.iter().collect();
@@ -55,14 +56,20 @@ impl CohortConstants {
         vec![
             ("TERM_NAMES", to_value(&TERM_NAMES)),
             ("EPOCH_NAMES", to_value(&EPOCH_NAMES)),
-            ("YEAR_NAMES", to_value(&YEAR_NAMES)),
+            ("CLASS_NAMES", to_value(&CLASS_NAMES)),
             ("SPENDABLE_TYPE_NAMES", to_value(&SPENDABLE_TYPE_NAMES)),
             ("AGE_RANGE_NAMES", to_value(&AGE_RANGE_NAMES)),
-            ("MAX_AGE_NAMES", to_value(&MAX_AGE_NAMES)),
-            ("MIN_AGE_NAMES", to_value(&MIN_AGE_NAMES)),
+            ("UNDER_AGE_NAMES", to_value(&UNDER_AGE_NAMES)),
+            ("OVER_AGE_NAMES", to_value(&OVER_AGE_NAMES)),
             ("AMOUNT_RANGE_NAMES", to_value(&AMOUNT_RANGE_NAMES)),
-            ("GE_AMOUNT_NAMES", to_value(&GE_AMOUNT_NAMES)),
-            ("LT_AMOUNT_NAMES", to_value(&LT_AMOUNT_NAMES)),
+            ("OVER_AMOUNT_NAMES", to_value(&OVER_AMOUNT_NAMES)),
+            ("UNDER_AMOUNT_NAMES", to_value(&UNDER_AMOUNT_NAMES)),
+            (
+                "PROFITABILITY_RANGE_NAMES",
+                to_value(&PROFITABILITY_RANGE_NAMES),
+            ),
+            ("PROFIT_NAMES", to_value(&PROFIT_NAMES)),
+            ("LOSS_NAMES", to_value(&LOSS_NAMES)),
         ]
     }
 }

crates/brk_bindgen/src/generate/fields.rs

@@ -6,12 +6,13 @@
 
 use std::fmt::Write;
 
-use brk_types::MetricLeafWithSchema;
+use brk_types::SeriesLeafWithSchema;
 
-use crate::{ClientMetadata, LanguageSyntax, PatternField, StructuralPattern};
+use crate::{
+    ClientMetadata, LanguageSyntax, PatternBaseResult, PatternField, PatternMode, StructuralPattern,
+};
 
 /// Create a path suffix from a name.
-/// Adds `_` prefix only if the name doesn't already start with `_`.
 fn path_suffix(name: &str) -> String {
     if name.starts_with('_') {
         name.to_string()
@@ -20,50 +21,52 @@ fn path_suffix(name: &str) -> String {
     }
 }
 
-/// Compute path expression from pattern mode and field part.
-fn compute_path_expr<S: LanguageSyntax>(
+/// Compute the constructor value for a parameterized field (factory context).
+///
+/// Handles all three pattern modes (Suffix/Prefix/Templated) and the special
+/// case of templated child patterns that need (acc, disc) instead of a path.
+fn compute_parameterized_value<S: LanguageSyntax>(
     syntax: &S,
+    field: &PatternField,
     pattern: &StructuralPattern,
-    field: &PatternField,
-    base_var: &str,
-) -> String {
-    match pattern.get_field_part(&field.name) {
-        Some(part) => {
-            if pattern.is_suffix_mode() {
-                syntax.suffix_expr(base_var, part)
-            } else {
-                syntax.prefix_expr(part, base_var)
-            }
-        }
-        None => syntax.path_expr(base_var, &path_suffix(&field.name)),
-    }
-}
-
-/// Compute field value from path expression.
-fn compute_field_value<S: LanguageSyntax>(
-    syntax: &S,
-    field: &PatternField,
     metadata: &ClientMetadata,
-    path_expr: &str,
 ) -> String {
-    if metadata.is_pattern_type(&field.rust_type) {
-        syntax.constructor(&field.rust_type, path_expr)
-    } else if let Some(accessor) = metadata.find_index_set_pattern(&field.indexes) {
-        syntax.constructor(&accessor.name, path_expr)
-    } else if field.is_branch() {
-        syntax.constructor(&field.rust_type, path_expr)
-    } else {
+    // Templated child patterns receive acc and disc as separate arguments
+    if let Some(child_pattern) = metadata.find_pattern(&field.rust_type)
+        && child_pattern.is_templated()
+    {
+        let disc_template = pattern.get_field_part(&field.name).unwrap_or(&field.name);
+        let disc_arg = syntax.disc_arg_expr(disc_template);
+        let acc_arg = syntax.owned_expr("acc");
+        return syntax.constructor(&field.rust_type, &format!("{acc_arg}, {disc_arg}"));
+    }
+
+    // Compute path expression from pattern mode
+    let path_expr = match pattern.get_field_part(&field.name) {
+        Some(part) => match &pattern.mode {
+            Some(PatternMode::Templated { .. }) => syntax.template_expr("acc", part),
+            Some(PatternMode::Prefix { .. }) => syntax.prefix_expr(part, "acc"),
+            _ => syntax.suffix_expr("acc", part),
+        },
+        None => syntax.path_expr("acc", &path_suffix(&field.name)),
+    };
+
+    // Wrap in constructor — leaves use their index accessor, everything else uses the type name
+    if let Some(accessor) = metadata.find_index_set_pattern(&field.indexes) {
+        syntax.constructor(&accessor.name, &path_expr)
+    } else if field.is_leaf() {
         panic!(
-            "Field '{}' has no matching pattern or index accessor. All metrics must be indexed.",
+            "Field '{}' has no matching index accessor. All series must be indexed.",
             field.name
         )
+    } else {
+        syntax.constructor(&field.rust_type, &path_expr)
     }
 }
 
-/// Generate a parameterized field using the language syntax.
+/// Generate a parameterized field for a pattern factory.
 ///
-/// This is used for pattern instances where fields use an accumulated
-/// metric name that's built up through the tree traversal.
+/// Used for pattern instances where fields build series names from an accumulated base.
 pub fn generate_parameterized_field<S: LanguageSyntax>(
     output: &mut String,
     syntax: &S,
@@ -73,67 +76,69 @@ pub fn generate_parameterized_field<S: LanguageSyntax>(
     indent: &str,
 ) {
     let field_name = syntax.field_name(&field.name);
-    let type_ann = metadata.field_type_annotation(field, pattern.is_generic, None, syntax.generic_syntax());
-    let path_expr = compute_path_expr(syntax, pattern, field, "acc");
-    let value = compute_field_value(syntax, field, metadata, &path_expr);
+    let type_ann =
+        metadata.field_type_annotation(field, pattern.is_generic, None, syntax.generic_syntax());
+    let value = compute_parameterized_value(syntax, field, pattern, metadata);
 
-    writeln!(output, "{}", syntax.field_init(indent, &field_name, &type_ann, &value)).unwrap();
+    writeln!(
+        output,
+        "{}",
+        syntax.field_init(indent, &field_name, &type_ann, &value)
+    )
+    .unwrap();
 }
 
-/// Generate a tree node field with a specific child node for pattern instance base detection.
+/// Generate a tree node field for a pattern-type child.
 ///
-/// This is used when generating tree nodes where we need to detect the pattern instance
-/// base from descendant leaf names.
+/// Called for non-inline branch children that match a parameterizable pattern.
+/// For templated patterns, extracts the discriminator from the base result.
 pub fn generate_tree_node_field<S: LanguageSyntax>(
     output: &mut String,
     syntax: &S,
     field: &PatternField,
     metadata: &ClientMetadata,
     indent: &str,
-    child_name: &str,
-    pattern_base: Option<&str>,
+    client_expr: &str,
+    base_result: &PatternBaseResult,
 ) {
     let field_name = syntax.field_name(&field.name);
     let type_ann = metadata.field_type_annotation(field, false, None, syntax.generic_syntax());
+    let base_arg = syntax.string_literal(&base_result.base);
 
-    let value = if metadata.is_pattern_type(&field.rust_type) {
-        // Use metric base only for parameterizable patterns
-        let use_base = metadata
-            .find_pattern(&field.rust_type)
-            .is_some_and(|p| p.is_parameterizable())
-            && pattern_base.is_some();
-
-        let path_arg = if use_base {
-            syntax.string_literal(pattern_base.unwrap())
-        } else {
-            syntax.path_expr("base_path", &path_suffix(child_name))
-        };
-        syntax.constructor(&field.rust_type, &path_arg)
-    } else if let Some(accessor) = metadata.find_index_set_pattern(&field.indexes) {
-        // Leaf field - use metric name if provided, else tree path
-        let path_arg = pattern_base
-            .map(|name| syntax.string_literal(name))
-            .unwrap_or_else(|| syntax.path_expr("base_path", &path_suffix(child_name)));
-        syntax.constructor(&accessor.name, &path_arg)
-    } else if field.is_branch() {
-        // Non-pattern branch - instantiate the nested struct
-        let path_expr = syntax.path_expr("base_path", &path_suffix(child_name));
-        syntax.constructor(&field.rust_type, &path_expr)
+    let value = if let Some(pattern) = metadata.find_pattern(&field.rust_type)
+        && pattern.is_templated()
+    {
+        let disc = pattern
+            .extract_disc_from_instance(&base_result.field_parts)
+            .unwrap_or_default();
+        format!(
+            "{}({}, {}, {})",
+            syntax.constructor_name(&field.rust_type),
+            client_expr,
+            base_arg,
+            syntax.string_literal(&disc)
+        )
     } else {
-        // All metrics must be indexed
-        panic!(
-            "Field '{}' is a leaf with no index accessor. All metrics must be indexed.",
-            field.name
+        format!(
+            "{}({}, {})",
+            syntax.constructor_name(&field.rust_type),
+            client_expr,
+            base_arg
         )
     };
 
-    writeln!(output, "{}", syntax.field_init(indent, &field_name, &type_ann, &value)).unwrap();
+    writeln!(
+        output,
+        "{}",
+        syntax.field_init(indent, &field_name, &type_ann, &value)
+    )
+    .unwrap();
 }
 
-/// Generate a leaf field using the actual metric name from the TreeNode::Leaf.
+/// Generate a leaf field using the actual series name from the TreeNode::Leaf.
 ///
 /// This is the shared implementation for all language backends. It uses
-/// `leaf.name()` directly to get the correct metric name, avoiding any
+/// `leaf.name()` directly to get the correct series name, avoiding any
 /// path concatenation that could produce incorrect names.
 ///
 /// # Arguments
@@ -141,7 +146,7 @@ pub fn generate_tree_node_field<S: LanguageSyntax>(
 /// * `syntax` - The language syntax implementation
 /// * `client_expr` - The client expression (e.g., "client.clone()", "this", "client")
 /// * `tree_field_name` - The field name from the tree structure
-/// * `leaf` - The Leaf node containing the actual metric name and indexes
+/// * `leaf` - The Leaf node containing the actual series name and indexes
 /// * `metadata` - Client metadata for looking up index patterns
 /// * `indent` - Indentation string
 pub fn generate_leaf_field<S: LanguageSyntax>(
@@ -149,7 +154,7 @@ pub fn generate_leaf_field<S: LanguageSyntax>(
     syntax: &S,
     client_expr: &str,
     tree_field_name: &str,
-    leaf: &MetricLeafWithSchema,
+    leaf: &SeriesLeafWithSchema,
     metadata: &ClientMetadata,
     indent: &str,
 ) {
@@ -158,18 +163,18 @@ pub fn generate_leaf_field<S: LanguageSyntax>(
         .find_index_set_pattern(leaf.indexes())
         .unwrap_or_else(|| {
             panic!(
-                "Metric '{}' has no matching index pattern. All metrics must be indexed.",
+                "Series '{}' has no matching index pattern. All series must be indexed.",
                 leaf.name()
             )
         });
 
     let type_ann = metadata.field_type_annotation_from_leaf(leaf, syntax.generic_syntax());
-    let metric_name = syntax.string_literal(leaf.name());
+    let series_name = syntax.string_literal(leaf.name());
     let value = format!(
         "{}({}, {})",
         syntax.constructor_name(&accessor.name),
         client_expr,
-        metric_name
+        series_name
     );
 
     writeln!(

crates/brk_bindgen/src/generate/tree.rs

@@ -25,10 +25,8 @@ pub struct ChildContext<'a> {
     pub name: &'a str,
     /// The child node.
     pub node: &'a TreeNode,
-    /// The field info for this child.
+    /// The field info for this child (with type_param set for generic patterns).
     pub field: PatternField,
-    /// Child fields if this is a branch (for pattern lookup).
-    pub child_fields: Option<Vec<PatternField>>,
     /// Pattern analysis result.
     pub base_result: PatternBaseResult,
     /// Whether this is a leaf node.
@@ -102,9 +100,14 @@ pub fn prepare_tree_node<'a>(
     let children: Vec<ChildContext<'a>> = branch_children
         .iter()
         .zip(fields_with_child_info)
-        .map(|((child_name, child_node), (field, child_fields))| {
+        .map(|((child_name, child_node), (mut field, child_fields))| {
             let is_leaf = matches!(child_node, TreeNode::Leaf(_));
 
+            // Set type_param for generic patterns so field_type_annotation works directly
+            if let Some(cf) = &child_fields {
+                field.type_param = metadata.get_type_param(cf).cloned();
+            }
+
             // Build child path and look up its pre-computed base result
             let child_path = build_child_path(path, child_name);
             let base_result = metadata
@@ -112,27 +115,26 @@ pub fn prepare_tree_node<'a>(
                 .cloned()
                 .unwrap_or_else(PatternBaseResult::force_inline);
 
-            // For type annotations: use pattern type if ANY pattern matches
-            let matches_any_pattern = child_fields
+            // Single lookup for the child's matching pattern (avoids repeated scans)
+            let matching_pattern = child_fields
                 .as_ref()
-                .is_some_and(|cf| metadata.matches_pattern(cf));
+                .and_then(|cf| metadata.find_pattern_by_fields(cf));
 
-            // Check if the pattern mode AND field parts match the instance
-            // Uses is_none_or so that "no pattern" doesn't trigger inlining
-            let pattern_compatible = child_fields
-                .as_ref()
-                .and_then(|cf| metadata.find_pattern_by_fields(cf))
-                .is_none_or(|p| {
-                    p.is_suffix_mode() == base_result.is_suffix_mode
-                        && p.field_parts_match(&base_result.field_parts)
-                });
+            let matches_any_pattern = matching_pattern.is_some();
+            let pattern_compatible = matching_pattern.is_none_or(|p| {
+                p.is_suffix_mode() == base_result.is_suffix_mode
+                    && p.field_parts_match(&base_result.field_parts)
+            });
+            let is_parameterizable =
+                matching_pattern.is_none_or(|p| metadata.is_parameterizable(&p.name));
 
             // should_inline determines if we generate an inline struct type
-            // We inline if: it's a branch AND (doesn't match any pattern OR pattern incompatible OR has outlier)
             let should_inline = !is_leaf
-                && (!matches_any_pattern || !pattern_compatible || base_result.has_outlier);
+                && (!matches_any_pattern
+                    || !pattern_compatible
+                    || !is_parameterizable
+                    || base_result.has_outlier);
 
-            // Inline type name (only used when should_inline is true)
             let inline_type_name = if should_inline {
                 child_type_name(name, child_name)
             } else {
@@ -143,7 +145,6 @@ pub fn prepare_tree_node<'a>(
                 name: child_name,
                 node: child_node,
                 field,
-                child_fields,
                 base_result,
                 is_leaf,
                 should_inline,

crates/brk_bindgen/src/generators/javascript/api.rs

@@ -2,7 +2,11 @@
 
 use std::fmt::Write;
 
-use crate::{Endpoint, Parameter, generators::{normalize_return_type, write_description}, to_camel_case};
+use crate::{
+    Endpoint, Parameter,
+    generators::{normalize_return_type, write_description},
+    to_camel_case,
+};
 
 /// Generate API methods for the BrkClient class.
 pub fn generate_api_methods(output: &mut String, endpoints: &[Endpoint]) {
@@ -33,7 +37,13 @@ pub fn generate_api_methods(output: &mut String, endpoints: &[Endpoint]) {
 
         // Add endpoint path
         writeln!(output, "   *").unwrap();
-        writeln!(output, "   * Endpoint: `{} {}`", endpoint.method.to_uppercase(), endpoint.path).unwrap();
+        writeln!(
+            output,
+            "   * Endpoint: `{} {}`",
+            endpoint.method.to_uppercase(),
+            endpoint.path
+        )
+        .unwrap();
 
         if !endpoint.path_params.is_empty() || !endpoint.query_params.is_empty() {
             writeln!(output, "   *").unwrap();
@@ -59,48 +69,67 @@ pub fn generate_api_methods(output: &mut String, endpoints: &[Endpoint]) {
             .unwrap();
         }
 
+        writeln!(
+            output,
+            "   * @param {{{{ signal?: AbortSignal, onUpdate?: (value: {}) => void }}}} [options]",
+            return_type
+        )
+        .unwrap();
         writeln!(output, "   * @returns {{Promise<{}>}}", return_type).unwrap();
         writeln!(output, "   */").unwrap();
 
         let params = build_method_params(endpoint);
-        writeln!(output, "  async {}({}) {{", method_name, params).unwrap();
+        let params_with_opts = if params.is_empty() {
+            "{ signal, onUpdate } = {}".to_string()
+        } else {
+            format!("{}, {{ signal, onUpdate }} = {{}}", params)
+        };
+        writeln!(output, "  async {}({}) {{", method_name, params_with_opts).unwrap();
 
         let path = build_path_template(&endpoint.path, &endpoint.path_params);
 
+        let fetch_call = if endpoint.returns_json() {
+            "this.getJson(path, { signal, onUpdate })"
+        } else {
+            "this.getText(path, { signal, onUpdate })"
+        };
+
         if endpoint.query_params.is_empty() {
-            writeln!(output, "    return this.getJson(`{}`);", path).unwrap();
+            writeln!(output, "    const path = `{}`;", path).unwrap();
         } else {
             writeln!(output, "    const params = new URLSearchParams();").unwrap();
             for param in &endpoint.query_params {
+                let ident = sanitize_ident(&param.name);
                 if param.required {
                     writeln!(
                         output,
                         "    params.set('{}', String({}));",
-                        param.name, param.name
+                        param.name, ident
                     )
                     .unwrap();
                 } else {
                     writeln!(
                         output,
                         "    if ({} !== undefined) params.set('{}', String({}));",
-                        param.name, param.name, param.name
+                        ident, param.name, ident
                     )
                     .unwrap();
                 }
             }
             writeln!(output, "    const query = params.toString();").unwrap();
-            writeln!(output, "    const path = `{}${{query ? '?' + query : ''}}`;", path).unwrap();
-
-            if endpoint.supports_csv {
-                writeln!(output, "    if (format === 'csv') {{").unwrap();
-                writeln!(output, "      return this.getText(path);").unwrap();
-                writeln!(output, "    }}").unwrap();
-                writeln!(output, "    return this.getJson(path);").unwrap();
-            } else {
-                writeln!(output, "    return this.getJson(path);").unwrap();
-            }
+            writeln!(
+                output,
+                "    const path = `{}${{query ? '?' + query : ''}}`;",
+                path
+            )
+            .unwrap();
         }
 
+        if endpoint.supports_csv {
+            writeln!(output, "    if (format === 'csv') return this.getText(path, {{ signal, onUpdate }});").unwrap();
+        }
+        writeln!(output, "    return {};", fetch_call).unwrap();
+
         writeln!(output, "  }}\n").unwrap();
     }
 }
@@ -112,14 +141,19 @@ fn endpoint_to_method_name(endpoint: &Endpoint) -> String {
 fn build_method_params(endpoint: &Endpoint) -> String {
     let mut params = Vec::new();
     for param in &endpoint.path_params {
-        params.push(param.name.clone());
+        params.push(sanitize_ident(&param.name));
     }
     for param in &endpoint.query_params {
-        params.push(param.name.clone());
+        params.push(sanitize_ident(&param.name));
     }
     params.join(", ")
 }
 
+/// Strip characters invalid in JS identifiers (e.g. `[]` from `txId[]`).
+fn sanitize_ident(name: &str) -> String {
+    name.replace(['[', ']'], "")
+}
+
 fn build_path_template(path: &str, path_params: &[Parameter]) -> String {
     let mut result = path.to_string();
     for param in path_params {

crates/brk_bindgen/src/generators/javascript/client.rs

@@ -22,6 +22,20 @@ pub fn generate_base_client(output: &mut String) {
 const _isBrowser = typeof window !== 'undefined' && 'caches' in window;
 const _runIdle = (/** @type {{VoidFunction}} */ fn) => (globalThis.requestIdleCallback ?? setTimeout)(fn);
 const _defaultCacheName = '__BRK_CLIENT__';
+/** @param {{*}} v */
+const _addCamelGetters = (v) => {{
+  if (Array.isArray(v)) {{ v.forEach(_addCamelGetters); return v; }}
+  if (v && typeof v === 'object' && v.constructor === Object) {{
+    for (const k in v) {{
+      if (k.includes('_')) {{
+        const c = k.replace(/_([a-z])/g, (_, l) => l.toUpperCase());
+        if (!(c in v)) Object.defineProperty(v, c, {{ get() {{ return this[k]; }} }});
+      }}
+      _addCamelGetters(v[k]);
+    }}
+  }}
+  return v;
+}};
 
 /**
  * @param {{string|boolean|undefined}} cache
@@ -49,11 +63,18 @@ class BrkError extends Error {{
 }}
 
 // Date conversion constants and helpers
-const _GENESIS = new Date(2009, 0, 3);  // dateindex 0, weekindex 0
-const _DAY_ONE = new Date(2009, 0, 9);  // dateindex 1 (6 day gap after genesis)
-const _MS_PER_DAY = 24 * 60 * 60 * 1000;
+const _GENESIS = new Date(2009, 0, 3);  // day1 0, week1 0
+const _DAY_ONE = new Date(2009, 0, 9);  // day1 1 (6 day gap after genesis)
+const _MS_PER_DAY = 86400000;
 const _MS_PER_WEEK = 7 * _MS_PER_DAY;
-const _DATE_INDEXES = new Set(['dateindex', 'weekindex', 'monthindex', 'yearindex', 'quarterindex', 'semesterindex', 'decadeindex']);
+const _EPOCH_MS = 1230768000000;
+const _DATE_INDEXES = new Set([
+  'minute10', 'minute30',
+  'hour1', 'hour4', 'hour12',
+  'day1', 'day3', 'week1',
+  'month1', 'month3', 'month6',
+  'year1', 'year10',
+]);
 
 /** @param {{number}} months @returns {{globalThis.Date}} */
 const _addMonths = (months) => new Date(2009, months, 1);
@@ -66,46 +87,100 @@ const _addMonths = (months) => new Date(2009, months, 1);
  */
 function indexToDate(index, i) {{
   switch (index) {{
-    case 'dateindex': return i === 0 ? _GENESIS : new Date(_DAY_ONE.getTime() + (i - 1) * _MS_PER_DAY);
-    case 'weekindex': return new Date(_GENESIS.getTime() + i * _MS_PER_WEEK);
-    case 'monthindex': return _addMonths(i);
-    case 'yearindex': return new Date(2009 + i, 0, 1);
-    case 'quarterindex': return _addMonths(i * 3);
-    case 'semesterindex': return _addMonths(i * 6);
-    case 'decadeindex': return new Date(2009 + i * 10, 0, 1);
+    case 'minute10': return new Date(_EPOCH_MS + i * 600000);
+    case 'minute30': return new Date(_EPOCH_MS + i * 1800000);
+    case 'hour1': return new Date(_EPOCH_MS + i * 3600000);
+    case 'hour4': return new Date(_EPOCH_MS + i * 14400000);
+    case 'hour12': return new Date(_EPOCH_MS + i * 43200000);
+    case 'day1': return i === 0 ? _GENESIS : new Date(_DAY_ONE.getTime() + (i - 1) * _MS_PER_DAY);
+    case 'day3': return new Date(_EPOCH_MS - 86400000 + i * 259200000);
+    case 'week1': return new Date(_GENESIS.getTime() + i * _MS_PER_WEEK);
+    case 'month1': return _addMonths(i);
+    case 'month3': return _addMonths(i * 3);
+    case 'month6': return _addMonths(i * 6);
+    case 'year1': return new Date(2009 + i, 0, 1);
+    case 'year10': return new Date(2009 + i * 10, 0, 1);
     default: throw new Error(`${{index}} is not a date-based index`);
   }}
 }}
 
 /**
- * Check if an index type is date-based.
- * @param {{Index}} index
- * @returns {{boolean}}
+ * Convert a Date to an index value for date-based indexes.
+ * Returns the floor index (latest index whose date is <= the given date).
+ * @param {{Index}} index - The index type
+ * @param {{globalThis.Date}} d - The date to convert
+ * @returns {{number}}
  */
-function isDateIndex(index) {{
-  return _DATE_INDEXES.has(index);
+function dateToIndex(index, d) {{
+  const ms = d.getTime();
+  switch (index) {{
+    case 'minute10': return Math.floor((ms - _EPOCH_MS) / 600000);
+    case 'minute30': return Math.floor((ms - _EPOCH_MS) / 1800000);
+    case 'hour1': return Math.floor((ms - _EPOCH_MS) / 3600000);
+    case 'hour4': return Math.floor((ms - _EPOCH_MS) / 14400000);
+    case 'hour12': return Math.floor((ms - _EPOCH_MS) / 43200000);
+    case 'day1': {{
+      if (ms < _DAY_ONE.getTime()) return 0;
+      return 1 + Math.floor((ms - _DAY_ONE.getTime()) / _MS_PER_DAY);
+    }}
+    case 'day3': return Math.floor((ms - _EPOCH_MS + 86400000) / 259200000);
+    case 'week1': return Math.floor((ms - _GENESIS.getTime()) / _MS_PER_WEEK);
+    case 'month1': return (d.getFullYear() - 2009) * 12 + d.getMonth();
+    case 'month3': return (d.getFullYear() - 2009) * 4 + Math.floor(d.getMonth() / 3);
+    case 'month6': return (d.getFullYear() - 2009) * 2 + Math.floor(d.getMonth() / 6);
+    case 'year1': return d.getFullYear() - 2009;
+    case 'year10': return Math.floor((d.getFullYear() - 2009) / 10);
+    default: throw new Error(`${{index}} is not a date-based index`);
+  }}
 }}
 
 /**
- * Wrap raw metric data with helper methods.
+ * Wrap raw series data with helper methods.
  * @template T
- * @param {{MetricData<T>}} raw - Raw JSON response
- * @returns {{MetricData<T>}}
+ * @param {{SeriesData<T>}} raw - Raw JSON response
+ * @returns {{DateSeriesData<T>}}
  */
-function _wrapMetricData(raw) {{
+function _wrapSeriesData(raw) {{
   const {{ index, start, end, data }} = raw;
-  return /** @type {{MetricData<T>}} */ ({{
+  const _dateBased = _DATE_INDEXES.has(index);
+  return /** @type {{DateSeriesData<T>}} */ ({{
     ...raw,
+    isDateBased: _dateBased,
+    indexes() {{
+      /** @type {{number[]}} */
+      const result = [];
+      for (let i = start; i < end; i++) result.push(i);
+      return result;
+    }},
+    keys() {{
+      return this.indexes();
+    }},
+    entries() {{
+      /** @type {{Array<[number, T]>}} */
+      const result = [];
+      for (let i = 0; i < data.length; i++) result.push([start + i, data[i]]);
+      return result;
+    }},
+    toMap() {{
+      /** @type {{Map<number, T>}} */
+      const map = new Map();
+      for (let i = 0; i < data.length; i++) map.set(start + i, data[i]);
+      return map;
+    }},
+    *[Symbol.iterator]() {{
+      for (let i = 0; i < data.length; i++) yield /** @type {{[number, T]}} */ ([start + i, data[i]]);
+    }},
+    // DateSeriesData methods (only meaningful for date-based indexes)
     dates() {{
       /** @type {{globalThis.Date[]}} */
       const result = [];
       for (let i = start; i < end; i++) result.push(indexToDate(index, i));
       return result;
     }},
-    indexes() {{
-      /** @type {{number[]}} */
+    dateEntries() {{
+      /** @type {{Array<[globalThis.Date, T]>}} */
       const result = [];
-      for (let i = start; i < end; i++) result.push(i);
+      for (let i = 0; i < data.length; i++) result.push([indexToDate(index, start + i), data[i]]);
       return result;
     }},
     toDateMap() {{
@@ -114,125 +189,132 @@ function _wrapMetricData(raw) {{
       for (let i = 0; i < data.length; i++) map.set(indexToDate(index, start + i), data[i]);
       return map;
     }},
-    toIndexMap() {{
-      /** @type {{Map<number, T>}} */
-      const map = new Map();
-      for (let i = 0; i < data.length; i++) map.set(start + i, data[i]);
-      return map;
-    }},
-    dateEntries() {{
-      /** @type {{Array<[globalThis.Date, T]>}} */
-      const result = [];
-      for (let i = 0; i < data.length; i++) result.push([indexToDate(index, start + i), data[i]]);
-      return result;
-    }},
-    indexEntries() {{
-      /** @type {{Array<[number, T]>}} */
-      const result = [];
-      for (let i = 0; i < data.length; i++) result.push([start + i, data[i]]);
-      return result;
-    }},
-    *iter() {{
-      for (let i = 0; i < data.length; i++) yield [start + i, data[i]];
-    }},
-    *iterDates() {{
-      for (let i = 0; i < data.length; i++) yield [indexToDate(index, start + i), data[i]];
-    }},
-    [Symbol.iterator]() {{
-      return this.iter();
-    }},
   }});
 }}
 
 /**
  * @template T
- * @typedef {{Object}} MetricData
- * @property {{number}} version - Version of the metric data
+ * @typedef {{Object}} SeriesDataBase
+ * @property {{number}} version - Version of the series data
  * @property {{Index}} index - The index type used for this query
+ * @property {{string}} type - Value type (e.g. "f32", "u64", "Sats")
  * @property {{number}} total - Total number of data points
  * @property {{number}} start - Start index (inclusive)
  * @property {{number}} end - End index (exclusive)
  * @property {{string}} stamp - ISO 8601 timestamp of when the response was generated
- * @property {{T[]}} data - The metric data
- * @property {{() => globalThis.Date[]}} dates - Convert index range to dates (date-based indexes only)
- * @property {{() => number[]}} indexes - Get index range as array
- * @property {{() => Map<globalThis.Date, T>}} toDateMap - Return data as Map keyed by date (date-based only)
- * @property {{() => Map<number, T>}} toIndexMap - Return data as Map keyed by index
- * @property {{() => Array<[globalThis.Date, T]>}} dateEntries - Return data as [date, value] pairs (date-based only)
- * @property {{() => Array<[number, T]>}} indexEntries - Return data as [index, value] pairs
- * @property {{() => IterableIterator<[number, T]>}} iter - Iterate over [index, value] pairs
- * @property {{() => IterableIterator<[globalThis.Date, T]>}} iterDates - Iterate over [date, value] pairs (date-based only)
- */
-/** @typedef {{MetricData<any>}} AnyMetricData */
-
-/**
- * Thenable interface for await support.
- * @template T
- * @typedef {{(onfulfilled?: (value: MetricData<T>) => MetricData<T>, onrejected?: (reason: Error) => never) => Promise<MetricData<T>>}} Thenable
+ * @property {{T[]}} data - The series data
+ * @property {{boolean}} isDateBased - Whether this series uses a date-based index
+ * @property {{() => number[]}} indexes - Get index numbers
+ * @property {{() => number[]}} keys - Get keys as index numbers (alias for indexes)
+ * @property {{() => Array<[number, T]>}} entries - Get [index, value] pairs
+ * @property {{() => Map<number, T>}} toMap - Convert to Map<index, value>
  */
 
+/** @template T @typedef {{SeriesDataBase<T> & Iterable<[number, T]>}} SeriesData */
+
 /**
- * Metric endpoint builder. Callable (returns itself) so both .by.dateindex and .by.dateindex() work.
  * @template T
- * @typedef {{Object}} MetricEndpointBuilder
+ * @typedef {{Object}} DateSeriesDataExtras
+ * @property {{() => globalThis.Date[]}} dates - Get dates for each data point
+ * @property {{() => Array<[globalThis.Date, T]>}} dateEntries - Get [date, value] pairs
+ * @property {{() => Map<globalThis.Date, T>}} toDateMap - Convert to Map<date, value>
+ */
+
+/** @template T @typedef {{SeriesData<T> & DateSeriesDataExtras<T>}} DateSeriesData */
+/** @typedef {{SeriesData<any>}} AnySeriesData */
+
+/** @template T @typedef {{(onfulfilled?: (value: SeriesData<T>) => any, onrejected?: (reason: Error) => never) => Promise<SeriesData<T>>}} Thenable */
+/** @template T @typedef {{(onfulfilled?: (value: DateSeriesData<T>) => any, onrejected?: (reason: Error) => never) => Promise<DateSeriesData<T>>}} DateThenable */
+
+/**
+ * @template T
+ * @typedef {{Object}} SeriesEndpoint
  * @property {{(index: number) => SingleItemBuilder<T>}} get - Get single item at index
- * @property {{(start?: number, end?: number) => RangeBuilder<T>}} slice - Slice like Array.slice
+ * @property {{(start?: number, end?: number) => RangeBuilder<T>}} slice - Slice by index
  * @property {{(n: number) => RangeBuilder<T>}} first - Get first n items
  * @property {{(n: number) => RangeBuilder<T>}} last - Get last n items
  * @property {{(n: number) => SkippedBuilder<T>}} skip - Skip first n items, chain with take()
- * @property {{(onUpdate?: (value: MetricData<T>) => void) => Promise<MetricData<T>>}} fetch - Fetch all data
+ * @property {{(onUpdate?: (value: SeriesData<T>) => void) => Promise<SeriesData<T>>}} fetch - Fetch all data
  * @property {{() => Promise<string>}} fetchCsv - Fetch all data as CSV
  * @property {{Thenable<T>}} then - Thenable (await endpoint)
  * @property {{string}} path - The endpoint path
  */
-/** @typedef {{MetricEndpointBuilder<any>}} AnyMetricEndpointBuilder */
 
 /**
  * @template T
- * @typedef {{Object}} SingleItemBuilder
- * @property {{(onUpdate?: (value: MetricData<T>) => void) => Promise<MetricData<T>>}} fetch - Fetch the item
+ * @typedef {{Object}} DateSeriesEndpoint
+ * @property {{(index: number | globalThis.Date) => DateSingleItemBuilder<T>}} get - Get single item at index or Date
+ * @property {{(start?: number | globalThis.Date, end?: number | globalThis.Date) => DateRangeBuilder<T>}} slice - Slice by index or Date
+ * @property {{(n: number) => DateRangeBuilder<T>}} first - Get first n items
+ * @property {{(n: number) => DateRangeBuilder<T>}} last - Get last n items
+ * @property {{(n: number) => DateSkippedBuilder<T>}} skip - Skip first n items, chain with take()
+ * @property {{(onUpdate?: (value: DateSeriesData<T>) => void) => Promise<DateSeriesData<T>>}} fetch - Fetch all data
+ * @property {{() => Promise<string>}} fetchCsv - Fetch all data as CSV
+ * @property {{DateThenable<T>}} then - Thenable (await endpoint)
+ * @property {{string}} path - The endpoint path
+ */
+
+/** @typedef {{SeriesEndpoint<any>}} AnySeriesEndpoint */
+
+/** @template T @typedef {{Object}} SingleItemBuilder
+ * @property {{(onUpdate?: (value: SeriesData<T>) => void) => Promise<SeriesData<T>>}} fetch - Fetch the item
  * @property {{() => Promise<string>}} fetchCsv - Fetch as CSV
  * @property {{Thenable<T>}} then - Thenable
  */
 
-/**
- * @template T
- * @typedef {{Object}} SkippedBuilder
+/** @template T @typedef {{Object}} DateSingleItemBuilder
+ * @property {{(onUpdate?: (value: DateSeriesData<T>) => void) => Promise<DateSeriesData<T>>}} fetch - Fetch the item
+ * @property {{() => Promise<string>}} fetchCsv - Fetch as CSV
+ * @property {{DateThenable<T>}} then - Thenable
+ */
+
+/** @template T @typedef {{Object}} SkippedBuilder
  * @property {{(n: number) => RangeBuilder<T>}} take - Take n items after skipped position
- * @property {{(onUpdate?: (value: MetricData<T>) => void) => Promise<MetricData<T>>}} fetch - Fetch from skipped position to end
+ * @property {{(onUpdate?: (value: SeriesData<T>) => void) => Promise<SeriesData<T>>}} fetch - Fetch from skipped position to end
  * @property {{() => Promise<string>}} fetchCsv - Fetch as CSV
  * @property {{Thenable<T>}} then - Thenable
  */
 
-/**
- * @template T
- * @typedef {{Object}} RangeBuilder
- * @property {{(onUpdate?: (value: MetricData<T>) => void) => Promise<MetricData<T>>}} fetch - Fetch the range
+/** @template T @typedef {{Object}} DateSkippedBuilder
+ * @property {{(n: number) => DateRangeBuilder<T>}} take - Take n items after skipped position
+ * @property {{(onUpdate?: (value: DateSeriesData<T>) => void) => Promise<DateSeriesData<T>>}} fetch - Fetch from skipped position to end
+ * @property {{() => Promise<string>}} fetchCsv - Fetch as CSV
+ * @property {{DateThenable<T>}} then - Thenable
+ */
+
+/** @template T @typedef {{Object}} RangeBuilder
+ * @property {{(onUpdate?: (value: SeriesData<T>) => void) => Promise<SeriesData<T>>}} fetch - Fetch the range
  * @property {{() => Promise<string>}} fetchCsv - Fetch as CSV
  * @property {{Thenable<T>}} then - Thenable
  */
 
+/** @template T @typedef {{Object}} DateRangeBuilder
+ * @property {{(onUpdate?: (value: DateSeriesData<T>) => void) => Promise<DateSeriesData<T>>}} fetch - Fetch the range
+ * @property {{() => Promise<string>}} fetchCsv - Fetch as CSV
+ * @property {{DateThenable<T>}} then - Thenable
+ */
+
 /**
  * @template T
- * @typedef {{Object}} MetricPattern
- * @property {{string}} name - The metric name
- * @property {{Readonly<Partial<Record<Index, MetricEndpointBuilder<T>>>>}} by - Index endpoints as lazy getters. Access via .by.dateindex or .by['dateindex']
+ * @typedef {{Object}} SeriesPattern
+ * @property {{string}} name - The series name
+ * @property {{Readonly<Partial<Record<Index, SeriesEndpoint<T>>>>}} by - Index endpoints as lazy getters
  * @property {{() => readonly Index[]}} indexes - Get the list of available indexes
- * @property {{(index: Index) => MetricEndpointBuilder<T>|undefined}} get - Get an endpoint for a specific index
+ * @property {{(index: Index) => SeriesEndpoint<T>|undefined}} get - Get an endpoint for a specific index
  */
 
-/** @typedef {{MetricPattern<any>}} AnyMetricPattern */
+/** @typedef {{SeriesPattern<any>}} AnySeriesPattern */
 
 /**
- * Create a metric endpoint builder with typestate pattern.
+ * Create a series endpoint builder with typestate pattern.
  * @template T
  * @param {{BrkClientBase}} client
- * @param {{string}} name - The metric vec name
+ * @param {{string}} name - The series vec name
  * @param {{Index}} index - The index name
- * @returns {{MetricEndpointBuilder<T>}}
+ * @returns {{DateSeriesEndpoint<T>}}
  */
 function _endpoint(client, name, index) {{
-  const p = `/api/metric/${{name}}/${{index}}`;
+  const p = `/api/series/${{name}}/${{index}}`;
 
   /**
    * @param {{number}} [start]
@@ -252,43 +334,47 @@ function _endpoint(client, name, index) {{
   /**
    * @param {{number}} [start]
    * @param {{number}} [end]
-   * @returns {{RangeBuilder<T>}}
+   * @returns {{DateRangeBuilder<T>}}
    */
   const rangeBuilder = (start, end) => ({{
-    fetch(onUpdate) {{ return client._fetchMetricData(buildPath(start, end), onUpdate); }},
+    fetch(onUpdate) {{ return client._fetchSeriesData(buildPath(start, end), onUpdate); }},
     fetchCsv() {{ return client.getText(buildPath(start, end, 'csv')); }},
     then(resolve, reject) {{ return this.fetch().then(resolve, reject); }},
   }});
 
   /**
    * @param {{number}} idx
-   * @returns {{SingleItemBuilder<T>}}
+   * @returns {{DateSingleItemBuilder<T>}}
    */
   const singleItemBuilder = (idx) => ({{
-    fetch(onUpdate) {{ return client._fetchMetricData(buildPath(idx, idx + 1), onUpdate); }},
+    fetch(onUpdate) {{ return client._fetchSeriesData(buildPath(idx, idx + 1), onUpdate); }},
     fetchCsv() {{ return client.getText(buildPath(idx, idx + 1, 'csv')); }},
     then(resolve, reject) {{ return this.fetch().then(resolve, reject); }},
   }});
 
   /**
    * @param {{number}} start
-   * @returns {{SkippedBuilder<T>}}
+   * @returns {{DateSkippedBuilder<T>}}
    */
   const skippedBuilder = (start) => ({{
     take(n) {{ return rangeBuilder(start, start + n); }},
-    fetch(onUpdate) {{ return client._fetchMetricData(buildPath(start, undefined), onUpdate); }},
+    fetch(onUpdate) {{ return client._fetchSeriesData(buildPath(start, undefined), onUpdate); }},
     fetchCsv() {{ return client.getText(buildPath(start, undefined, 'csv')); }},
     then(resolve, reject) {{ return this.fetch().then(resolve, reject); }},
   }});
 
-  /** @type {{MetricEndpointBuilder<T>}} */
+  /** @type {{DateSeriesEndpoint<T>}} */
   const endpoint = {{
-    get(idx) {{ return singleItemBuilder(idx); }},
-    slice(start, end) {{ return rangeBuilder(start, end); }},
+    get(idx) {{ if (idx instanceof Date) idx = dateToIndex(index, idx); return singleItemBuilder(idx); }},
+    slice(start, end) {{
+      if (start instanceof Date) start = dateToIndex(index, start);
+      if (end instanceof Date) end = dateToIndex(index, end);
+      return rangeBuilder(start, end);
+    }},
     first(n) {{ return rangeBuilder(undefined, n); }},
     last(n) {{ return n === 0 ? rangeBuilder(undefined, 0) : rangeBuilder(-n, undefined); }},
     skip(n) {{ return skippedBuilder(n); }},
-    fetch(onUpdate) {{ return client._fetchMetricData(buildPath(), onUpdate); }},
+    fetch(onUpdate) {{ return client._fetchSeriesData(buildPath(), onUpdate); }},
     fetchCsv() {{ return client.getText(buildPath(undefined, undefined, 'csv')); }},
     then(resolve, reject) {{ return this.fetch().then(resolve, reject); }},
     get path() {{ return p; }},
@@ -306,7 +392,8 @@ class BrkClientBase {{
    */
   constructor(options) {{
     const isString = typeof options === 'string';
-    this.baseUrl = isString ? options : options.baseUrl;
+    const rawUrl = isString ? options : options.baseUrl;
+    this.baseUrl = rawUrl.endsWith('/') ? rawUrl.slice(0, -1) : rawUrl;
     this.timeout = isString ? 5000 : (options.timeout ?? 5000);
     /** @type {{Promise<Cache | null>}} */
     this._cachePromise = _openCache(isString ? undefined : options.cache);
@@ -317,26 +404,29 @@ class BrkClientBase {{
 
   /**
    * @param {{string}} path
+   * @param {{{{ signal?: AbortSignal }}}} [options]
    * @returns {{Promise<Response>}}
    */
-  async get(path) {{
-    const base = this.baseUrl.endsWith('/') ? this.baseUrl.slice(0, -1) : this.baseUrl;
-    const url = `${{base}}${{path}}`;
-    const res = await fetch(url, {{ signal: AbortSignal.timeout(this.timeout) }});
+  async get(path, {{ signal }} = {{}}) {{
+    const url = `${{this.baseUrl}}${{path}}`;
+    const signals = [AbortSignal.timeout(this.timeout)];
+    if (signal) signals.push(signal);
+    const res = await fetch(url, {{ signal: AbortSignal.any(signals) }});
     if (!res.ok) throw new BrkError(`HTTP ${{res.status}}: ${{url}}`, res.status);
     return res;
   }}
 
   /**
-   * Make a GET request - races cache vs network, first to resolve calls onUpdate
+   * Make a GET request - races cache vs network, first to resolve calls onUpdate.
+   * Shared implementation backing `getJson` and `getText`.
    * @template T
    * @param {{string}} path
-   * @param {{(value: T) => void}} [onUpdate] - Called when data is available (may be called twice: cache then network)
+   * @param {{(res: Response) => Promise<T>}} parse - Response body reader
+   * @param {{{{ onUpdate?: (value: T) => void, signal?: AbortSignal }}}} [options]
    * @returns {{Promise<T>}}
    */
-  async getJson(path, onUpdate) {{
-    const base = this.baseUrl.endsWith('/') ? this.baseUrl.slice(0, -1) : this.baseUrl;
-    const url = `${{base}}${{path}}`;
+  async _getCached(path, parse, {{ onUpdate, signal }} = {{}}) {{
+    const url = `${{this.baseUrl}}${{path}}`;
     const cache = this._cache ?? await this._cachePromise;
 
     let resolved = false;
@@ -347,77 +437,87 @@ class BrkClientBase {{
     const cachePromise = cache?.match(url).then(async (res) => {{
       cachedRes = res ?? null;
       if (!res) return null;
-      const json = await res.json();
+      const value = await parse(res);
       if (!resolved && onUpdate) {{
         resolved = true;
-        onUpdate(json);
+        onUpdate(value);
       }}
-      return json;
+      return value;
     }});
 
-    const networkPromise = this.get(path).then(async (res) => {{
+    const networkPromise = this.get(path, {{ signal }}).then(async (res) => {{
       const cloned = res.clone();
-      const json = await res.json();
+      const value = await parse(res);
       // Skip update if ETag matches and cache already delivered
       if (cachedRes?.headers.get('ETag') === res.headers.get('ETag')) {{
         if (!resolved && onUpdate) {{
           resolved = true;
-          onUpdate(json);
+          onUpdate(value);
         }}
-        return json;
+        return value;
       }}
       resolved = true;
-      if (onUpdate) {{
-        onUpdate(json);
-      }}
+      if (onUpdate) onUpdate(value);
       if (cache) _runIdle(() => cache.put(url, cloned));
-      return json;
+      return value;
     }});
 
     try {{
       return await networkPromise;
     }} catch (e) {{
       // Network failed - wait for cache
-      const cachedJson = await cachePromise?.catch(() => null);
-      if (cachedJson) return cachedJson;
+      const cachedValue = await cachePromise?.catch(() => null);
+      if (cachedValue != null) return cachedValue;
       throw e;
     }}
   }}
 
   /**
-   * Make a GET request and return raw text (for CSV responses)
+   * Make a GET request expecting a JSON response. Cached and supports `onUpdate`.
+   * @template T
    * @param {{string}} path
-   * @returns {{Promise<string>}}
+   * @param {{{{ onUpdate?: (value: T) => void, signal?: AbortSignal }}}} [options]
+   * @returns {{Promise<T>}}
    */
-  async getText(path) {{
-    const res = await this.get(path);
-    return res.text();
+  getJson(path, options) {{
+    return this._getCached(path, async (res) => _addCamelGetters(await res.json()), options);
   }}
 
   /**
-   * Fetch metric data and wrap with helper methods (internal)
+   * Make a GET request expecting a text response (text/plain, text/csv, ...).
+   * Cached and supports `onUpdate`, same as `getJson`.
+   * @param {{string}} path
+   * @param {{{{ onUpdate?: (value: string) => void, signal?: AbortSignal }}}} [options]
+   * @returns {{Promise<string>}}
+   */
+  getText(path, options) {{
+    return this._getCached(path, (res) => res.text(), options);
+  }}
+
+  /**
+   * Fetch series data and wrap with helper methods (internal)
    * @template T
    * @param {{string}} path
-   * @param {{(value: MetricData<T>) => void}} [onUpdate]
-   * @returns {{Promise<MetricData<T>>}}
+   * @param {{(value: DateSeriesData<T>) => void}} [onUpdate]
+   * @returns {{Promise<DateSeriesData<T>>}}
    */
-  async _fetchMetricData(path, onUpdate) {{
-    const wrappedOnUpdate = onUpdate ? (/** @type {{MetricData<T>}} */ raw) => onUpdate(_wrapMetricData(raw)) : undefined;
-    const raw = await this.getJson(path, wrappedOnUpdate);
-    return _wrapMetricData(raw);
+  async _fetchSeriesData(path, onUpdate) {{
+    const wrappedOnUpdate = onUpdate ? (/** @type {{SeriesData<T>}} */ raw) => onUpdate(_wrapSeriesData(raw)) : undefined;
+    const raw = await this.getJson(path, {{ onUpdate: wrappedOnUpdate }});
+    return _wrapSeriesData(raw);
   }}
 }}
 
 /**
- * Build metric name with suffix.
+ * Build series name with suffix.
  * @param {{string}} acc - Accumulated prefix
- * @param {{string}} s - Metric suffix
+ * @param {{string}} s - Series suffix
  * @returns {{string}}
  */
 const _m = (acc, s) => s ? (acc ? `${{acc}}_${{s}}` : s) : acc;
 
 /**
- * Build metric name with prefix.
+ * Build series name with prefix.
  * @param {{string}} prefix - Prefix to prepend
  * @param {{string}} acc - Accumulated name
  * @returns {{string}}
@@ -436,7 +536,11 @@ pub fn generate_static_constants(output: &mut String) {
     // VERSION, INDEXES, POOL_ID_TO_POOL_NAME
     writeln!(output, "  VERSION = \"{}\";\n", constants.version).unwrap();
     write_static_const(output, "INDEXES", &format_json(&constants.indexes));
-    write_static_const(output, "POOL_ID_TO_POOL_NAME", &format_json(&constants.pool_map));
+    write_static_const(
+        output,
+        "POOL_ID_TO_POOL_NAME",
+        &format_json(&constants.pool_map),
+    );
 
     // Cohort constants with camelCase keys
     for (name, value) in CohortConstants::all() {
@@ -457,13 +561,15 @@ pub fn generate_static_constants(output: &mut String) {
   }}
 
   /**
-   * Check if an index type is date-based.
-   * @param {{Index}} index
-   * @returns {{boolean}}
+   * Convert a Date to an index value for date-based indexes.
+   * @param {{Index}} index - The index type
+   * @param {{globalThis.Date}} d - The date to convert
+   * @returns {{number}}
    */
-  isDateIndex(index) {{
-    return isDateIndex(index);
+  dateToIndex(index, d) {{
+    return dateToIndex(index, d);
   }}
+
 "#
     )
     .unwrap();
@@ -501,31 +607,31 @@ pub fn generate_index_accessors(output: &mut String, patterns: &[IndexSetPattern
 
     writeln!(output, "// Index group constants and factory\n").unwrap();
 
-    // Generate index array constants (e.g., _i1 = ["dateindex", "height"])
+    // Generate index array constants (e.g., _i1 = ["day1", "height"])
     for (i, pattern) in patterns.iter().enumerate() {
         write!(output, "const _i{} = /** @type {{const}} */ ([", i + 1).unwrap();
         for (j, index) in pattern.indexes.iter().enumerate() {
             if j > 0 {
                 write!(output, ", ").unwrap();
             }
-            write!(output, "\"{}\"", index.serialize_long()).unwrap();
+            write!(output, "\"{}\"", index.name()).unwrap();
         }
         writeln!(output, "]);").unwrap();
     }
     writeln!(output).unwrap();
 
-    // Generate ONE generic metric pattern factory
+    // Generate ONE generic series pattern factory
     writeln!(
         output,
         r#"/**
- * Generic metric pattern factory.
+ * Generic series pattern factory.
  * @template T
  * @param {{BrkClientBase}} client
- * @param {{string}} name - The metric vec name
+ * @param {{string}} name - The series vec name
  * @param {{readonly Index[]}} indexes - The supported indexes
  */
 function _mp(client, name, indexes) {{
-  const by = /** @type {{any}} */ ({{}});
+  const by = {{}};
   for (const idx of indexes) {{
     Object.defineProperty(by, idx, {{
       get() {{ return _endpoint(client, name, idx); }},
@@ -536,8 +642,9 @@ function _mp(client, name, indexes) {{
   return {{
     name,
     by,
+    /** @returns {{readonly Index[]}} */
     indexes() {{ return indexes; }},
-    /** @param {{Index}} index */
+    /** @param {{Index}} index @returns {{SeriesEndpoint<T>|undefined}} */
     get(index) {{ return indexes.includes(index) ? _endpoint(client, name, index) : undefined; }}
   }};
 }}
@@ -552,17 +659,19 @@ function _mp(client, name, indexes) {{
             .indexes
             .iter()
             .map(|idx| {
-                format!(
-                    "readonly {}: MetricEndpointBuilder<T>",
-                    idx.serialize_long()
-                )
+                let builder = if idx.is_date_based() {
+                    "DateSeriesEndpoint"
+                } else {
+                    "SeriesEndpoint"
+                };
+                format!("readonly {}: {}<T>", idx.name(), builder)
             })
             .collect();
         let by_type = format!("{{ {} }}", by_fields.join(", "));
 
         writeln!(
             output,
-            "/** @template T @typedef {{{{ name: string, by: {}, indexes: () => readonly Index[], get: (index: Index) => MetricEndpointBuilder<T>|undefined }}}} {} */",
+            "/** @template T @typedef {{{{ name: string, by: {}, indexes: () => readonly Index[], get: (index: Index) => SeriesEndpoint<T>|undefined }}}} {} */",
             by_type, pattern.name
         )
         .unwrap();
@@ -576,7 +685,8 @@ function _mp(client, name, indexes) {{
         .unwrap();
         writeln!(
             output,
-            "function create{}(client, name) {{ return _mp(client, name, _i{}); }}",
+            "function create{}(client, name) {{ return /** @type {{{}<T>}} */ (_mp(client, name, _i{})); }}",
+            pattern.name,
             pattern.name,
             i + 1
         )
@@ -621,14 +731,21 @@ pub fn generate_structural_patterns(
         }
         writeln!(output, " */\n").unwrap();
 
-        // Generate factory function for ALL patterns
+        // Skip factory for non-parameterizable patterns (inlined at tree level)
+        if !metadata.is_parameterizable(&pattern.name) {
+            continue;
+        }
+
         writeln!(output, "/**").unwrap();
         writeln!(output, " * Create a {} pattern node", pattern.name).unwrap();
         if pattern.is_generic {
             writeln!(output, " * @template T").unwrap();
         }
         writeln!(output, " * @param {{BrkClientBase}} client").unwrap();
-        writeln!(output, " * @param {{string}} acc - Accumulated metric name").unwrap();
+        writeln!(output, " * @param {{string}} acc - Accumulated series name").unwrap();
+        if pattern.is_templated() {
+            writeln!(output, " * @param {{string}} disc - Discriminator suffix").unwrap();
+        }
         let return_type = if pattern.is_generic {
             format!("{}<T>", pattern.name)
         } else {
@@ -637,7 +754,16 @@ pub fn generate_structural_patterns(
         writeln!(output, " * @returns {{{}}}", return_type).unwrap();
         writeln!(output, " */").unwrap();
 
-        writeln!(output, "function create{}(client, acc) {{", pattern.name).unwrap();
+        if pattern.is_templated() {
+            writeln!(
+                output,
+                "function create{}(client, acc, disc) {{",
+                pattern.name
+            )
+            .unwrap();
+        } else {
+            writeln!(output, "function create{}(client, acc) {{", pattern.name).unwrap();
+        }
         writeln!(output, "  return {{").unwrap();
 
         let syntax = JavaScriptSyntax;

crates/brk_bindgen/src/generators/javascript/tree.rs

@@ -7,13 +7,13 @@ use brk_types::TreeNode;
 
 use crate::{
     ClientMetadata, Endpoint, GenericSyntax, JavaScriptSyntax, PatternField, build_child_path,
-    generate_leaf_field, prepare_tree_node, to_camel_case,
+    generate_leaf_field, generate_tree_node_field, prepare_tree_node, to_camel_case,
 };
 
 use super::api::generate_api_methods;
 use super::client::generate_static_constants;
 
-/// Generate JSDoc typedefs for the metrics tree.
+/// Generate JSDoc typedefs for the series tree.
 pub fn generate_tree_typedefs(output: &mut String, catalog: &TreeNode, metadata: &ClientMetadata) {
     writeln!(output, "// Catalog tree typedefs\n").unwrap();
 
@@ -21,10 +21,10 @@ pub fn generate_tree_typedefs(output: &mut String, catalog: &TreeNode, metadata:
     let mut generated = BTreeSet::new();
     generate_tree_typedef(
         output,
-        "MetricsTree",
+        "SeriesTree",
         "",
         catalog,
-        &pattern_lookup,
+        pattern_lookup,
         metadata,
         &mut generated,
     );
@@ -50,13 +50,7 @@ fn generate_tree_typedef(
         let js_type = if child.should_inline {
             child.inline_type_name.clone()
         } else {
-            metadata.resolve_tree_field_type(
-                &child.field,
-                child.child_fields.as_deref(),
-                name,
-                child.name,
-                GenericSyntax::JAVASCRIPT,
-            )
+            metadata.field_type_annotation(&child.field, false, None, GenericSyntax::JAVASCRIPT)
         };
 
         writeln!(
@@ -99,7 +93,7 @@ pub fn generate_main_client(
     writeln!(output, "/**").unwrap();
     writeln!(
         output,
-        " * Main BRK client with metrics tree and API methods"
+        " * Main BRK client with series tree and API methods"
     )
     .unwrap();
     writeln!(output, " * @extends BrkClientBase").unwrap();
@@ -113,14 +107,14 @@ pub fn generate_main_client(
     writeln!(output, "   */").unwrap();
     writeln!(output, "  constructor(options) {{").unwrap();
     writeln!(output, "    super(options);").unwrap();
-    writeln!(output, "    /** @type {{MetricsTree}} */").unwrap();
-    writeln!(output, "    this.metrics = this._buildTree('');").unwrap();
+    writeln!(output, "    /** @type {{SeriesTree}} */").unwrap();
+    writeln!(output, "    this.series = this._buildTree('');").unwrap();
     writeln!(output, "  }}\n").unwrap();
 
     writeln!(output, "  /**").unwrap();
     writeln!(output, "   * @private").unwrap();
     writeln!(output, "   * @param {{string}} basePath").unwrap();
-    writeln!(output, "   * @returns {{MetricsTree}}").unwrap();
+    writeln!(output, "   * @returns {{SeriesTree}}").unwrap();
     writeln!(output, "   */").unwrap();
     writeln!(output, "  _buildTree(basePath) {{").unwrap();
     writeln!(output, "    return {{").unwrap();
@@ -128,10 +122,10 @@ pub fn generate_main_client(
     generate_tree_initializer(
         output,
         catalog,
-        "MetricsTree",
+        "SeriesTree",
         "",
         3,
-        &pattern_lookup,
+        pattern_lookup,
         metadata,
         &mut generated,
     );
@@ -141,27 +135,27 @@ pub fn generate_main_client(
     writeln!(output, "  /**").unwrap();
     writeln!(
         output,
-        "   * Create a dynamic metric endpoint builder for any metric/index combination."
+        "   * Create a dynamic series endpoint builder for any series/index combination."
     )
     .unwrap();
     writeln!(output, "   *").unwrap();
     writeln!(
         output,
-        "   * Use this for programmatic access when the metric name is determined at runtime."
+        "   * Use this for programmatic access when the series name is determined at runtime."
     )
     .unwrap();
     writeln!(
         output,
-        "   * For type-safe access, use the `metrics` tree instead."
+        "   * For type-safe access, use the `series` tree instead."
     )
     .unwrap();
     writeln!(output, "   *").unwrap();
-    writeln!(output, "   * @param {{string}} metric - The metric name").unwrap();
+    writeln!(output, "   * @param {{string}} series - The series name").unwrap();
     writeln!(output, "   * @param {{Index}} index - The index name").unwrap();
-    writeln!(output, "   * @returns {{MetricEndpointBuilder<unknown>}}").unwrap();
+    writeln!(output, "   * @returns {{SeriesEndpoint<unknown>}}").unwrap();
     writeln!(output, "   */").unwrap();
-    writeln!(output, "  metric(metric, index) {{").unwrap();
-    writeln!(output, "    return _endpoint(this, metric, index);").unwrap();
+    writeln!(output, "  seriesEndpoint(series, index) {{").unwrap();
+    writeln!(output, "    return _endpoint(this, series, index);").unwrap();
     writeln!(output, "  }}\n").unwrap();
 
     generate_api_methods(output, endpoints);
@@ -220,13 +214,15 @@ fn generate_tree_initializer(
             );
             writeln!(output, "{}}},", indent_str).unwrap();
         } else {
-            // Use pattern factory
-            writeln!(
+            generate_tree_node_field(
                 output,
-                "{}{}: create{}(this, '{}'),",
-                indent_str, field_name, child.field.rust_type, child.base_result.base
-            )
-            .unwrap();
+                &syntax,
+                &child.field,
+                metadata,
+                &indent_str,
+                "this",
+                &child.base_result,
+            );
         }
     }
 }

crates/brk_bindgen/src/generators/javascript/types.rs

@@ -4,7 +4,11 @@ use std::fmt::Write;
 
 use serde_json::Value;
 
-use crate::{TypeSchemas, generators::{MANUAL_GENERIC_TYPES, write_description}, get_union_variants, ref_to_type_name, to_camel_case};
+use crate::{
+    TypeSchemas,
+    generators::{MANUAL_GENERIC_TYPES, write_description},
+    get_union_variants, ref_to_type_name, to_camel_case,
+};
 
 /// Generate JSDoc type definitions from OpenAPI schemas.
 pub fn generate_type_definitions(output: &mut String, schemas: &TypeSchemas) {

crates/brk_bindgen/src/generators/mod.rs

@@ -18,7 +18,7 @@ pub use python::generate_python_client;
 pub use rust::generate_rust_client;
 
 /// Types that are manually defined as generics in client code, not from schema.
-pub const MANUAL_GENERIC_TYPES: &[&str] = &["MetricData", "MetricEndpoint"];
+pub const MANUAL_GENERIC_TYPES: &[&str] = &["SeriesData", "SeriesEndpoint"];
 
 /// Write a multi-line description with the given prefix for each line.
 /// `empty_prefix` is used for blank lines (e.g., "   *" without trailing space).

crates/brk_bindgen/src/generators/python/api.rs

@@ -2,7 +2,11 @@
 
 use std::fmt::Write;
 
-use crate::{Endpoint, Parameter, escape_python_keyword, generators::{normalize_return_type, write_description}, to_snake_case};
+use crate::{
+    Endpoint, Parameter, escape_python_keyword,
+    generators::{normalize_return_type, write_description},
+    to_snake_case,
+};
 
 use super::client::generate_class_constants;
 use super::types::js_type_to_python;
@@ -12,7 +16,7 @@ pub fn generate_main_client(output: &mut String, endpoints: &[Endpoint]) {
     writeln!(output, "class BrkClient(BrkClientBase):").unwrap();
     writeln!(
         output,
-        "    \"\"\"Main BRK client with metrics tree and API methods.\"\"\""
+        "    \"\"\"Main BRK client with series tree and API methods.\"\"\""
     )
     .unwrap();
     writeln!(output).unwrap();
@@ -26,29 +30,60 @@ pub fn generate_main_client(output: &mut String, endpoints: &[Endpoint]) {
     )
     .unwrap();
     writeln!(output, "        super().__init__(base_url, timeout)").unwrap();
-    writeln!(output, "        self.metrics = MetricsTree(self)").unwrap();
+    writeln!(output, "        self.series = SeriesTree(self)").unwrap();
     writeln!(output).unwrap();
 
-    // Generate metric() method for dynamic metric access
-    writeln!(output, "    def metric(self, metric: str, index: Index) -> MetricEndpointBuilder[Any]:").unwrap();
-    writeln!(output, "        \"\"\"Create a dynamic metric endpoint builder for any metric/index combination.").unwrap();
+    // Generate series_endpoint() method for dynamic series access
+    writeln!(
+        output,
+        "    def series_endpoint(self, series: str, index: Index) -> SeriesEndpoint[Any]:"
+    )
+    .unwrap();
+    writeln!(
+        output,
+        "        \"\"\"Create a dynamic series endpoint builder for any series/index combination."
+    )
+    .unwrap();
     writeln!(output).unwrap();
-    writeln!(output, "        Use this for programmatic access when the metric name is determined at runtime.").unwrap();
-    writeln!(output, "        For type-safe access, use the `metrics` tree instead.").unwrap();
+    writeln!(
+        output,
+        "        Use this for programmatic access when the series name is determined at runtime."
+    )
+    .unwrap();
+    writeln!(
+        output,
+        "        For type-safe access, use the `series` tree instead."
+    )
+    .unwrap();
     writeln!(output, "        \"\"\"").unwrap();
-    writeln!(output, "        return MetricEndpointBuilder(self, metric, index)").unwrap();
+    writeln!(output, "        return SeriesEndpoint(self, series, index)").unwrap();
     writeln!(output).unwrap();
 
     // Generate helper methods
-    writeln!(output, "    def index_to_date(self, index: Index, i: int) -> date:").unwrap();
-    writeln!(output, "        \"\"\"Convert an index value to a date for date-based indexes.\"\"\"").unwrap();
-    writeln!(output, "        return index_to_date(index, i)").unwrap();
+    writeln!(
+        output,
+        "    def index_to_date(self, index: Index, i: int) -> Union[date, datetime]:"
+    )
+    .unwrap();
+    writeln!(
+        output,
+        "        \"\"\"Convert an index value to a date/datetime for date-based indexes.\"\"\""
+    )
+    .unwrap();
+    writeln!(output, "        return _index_to_date(index, i)").unwrap();
     writeln!(output).unwrap();
-    writeln!(output, "    def is_date_index(self, index: Index) -> bool:").unwrap();
-    writeln!(output, "        \"\"\"Check if an index type is date-based.\"\"\"").unwrap();
-    writeln!(output, "        return is_date_index(index)").unwrap();
+    writeln!(
+        output,
+        "    def date_to_index(self, index: Index, d: Union[date, datetime]) -> int:"
+    )
+    .unwrap();
+    writeln!(
+        output,
+        "        \"\"\"Convert a date/datetime to an index value for date-based indexes.\"\"\""
+    )
+    .unwrap();
+    writeln!(output, "        return _date_to_index(index, d)").unwrap();
     writeln!(output).unwrap();
-
     // Generate API methods
     generate_api_methods(output, endpoints);
 }
@@ -66,7 +101,7 @@ pub fn generate_api_methods(output: &mut String, endpoints: &[Endpoint]) {
                 .response_type
                 .as_deref()
                 .map(js_type_to_python)
-                .unwrap_or_else(|| "Any".to_string()),
+                .unwrap_or_else(|| "str".to_string()),
         );
 
         let return_type = if endpoint.supports_csv {
@@ -113,16 +148,28 @@ pub fn generate_api_methods(output: &mut String, endpoints: &[Endpoint]) {
             }
         }
         writeln!(output).unwrap();
-        writeln!(output, "        Endpoint: `{} {}`\"\"\"", endpoint.method.to_uppercase(), endpoint.path).unwrap();
+        writeln!(
+            output,
+            "        Endpoint: `{} {}`\"\"\"",
+            endpoint.method.to_uppercase(),
+            endpoint.path
+        )
+        .unwrap();
 
         // Build path
         let path = build_path_template(&endpoint.path, &endpoint.path_params);
 
+        let fetch_method = if endpoint.returns_json() {
+            "get_json"
+        } else {
+            "get_text"
+        };
+
         if endpoint.query_params.is_empty() {
             if endpoint.path_params.is_empty() {
-                writeln!(output, "        return self.get_json('{}')", path).unwrap();
+                writeln!(output, "        return self.{}('{}')", fetch_method, path).unwrap();
             } else {
-                writeln!(output, "        return self.get_json(f'{}')", path).unwrap();
+                writeln!(output, "        return self.{}(f'{}')", fetch_method, path).unwrap();
             }
         } else {
             writeln!(output, "        params = []").unwrap();
@@ -156,9 +203,9 @@ pub fn generate_api_methods(output: &mut String, endpoints: &[Endpoint]) {
             if endpoint.supports_csv {
                 writeln!(output, "        if format == 'csv':").unwrap();
                 writeln!(output, "            return self.get_text(path)").unwrap();
-                writeln!(output, "        return self.get_json(path)").unwrap();
+                writeln!(output, "        return self.{}(path)", fetch_method).unwrap();
             } else {
-                writeln!(output, "        return self.get_json(path)").unwrap();
+                writeln!(output, "        return self.{}(path)", fetch_method).unwrap();
             }
         }
 

crates/brk_bindgen/src/generators/python/client.rs

@@ -99,27 +99,27 @@ class BrkClientBase:
         """Make a GET request and return text."""
         return self.get(path).decode()
 
-    def close(self):
+    def close(self) -> None:
         """Close the HTTP client."""
         if self._conn:
             self._conn.close()
             self._conn = None
 
-    def __enter__(self):
+    def __enter__(self) -> BrkClientBase:
         return self
 
-    def __exit__(self, exc_type, exc_val, exc_tb):
+    def __exit__(self, exc_type: Optional[type], exc_val: Optional[BaseException], exc_tb: Optional[Any]) -> None:
         self.close()
 
 
 def _m(acc: str, s: str) -> str:
-    """Build metric name with suffix."""
+    """Build series name with suffix."""
     if not s: return acc
     return f"{{acc}}_{{s}}" if acc else s
 
 
 def _p(prefix: str, acc: str) -> str:
-    """Build metric name with prefix."""
+    """Build series name with prefix."""
     return f"{{prefix}}_{{acc}}" if acc else prefix
 
 "#
@@ -127,121 +127,201 @@ def _p(prefix: str, acc: str) -> str:
     .unwrap();
 }
 
-/// Generate the MetricData and MetricEndpointBuilder classes
+/// Generate the SeriesData and SeriesEndpoint classes
 pub fn generate_endpoint_class(output: &mut String) {
     writeln!(
         output,
         r#"# Date conversion constants
-_GENESIS = date(2009, 1, 3)  # dateindex 0, weekindex 0
-_DAY_ONE = date(2009, 1, 9)  # dateindex 1 (6 day gap after genesis)
-_DATE_INDEXES = frozenset(['dateindex', 'weekindex', 'monthindex', 'yearindex', 'quarterindex', 'semesterindex', 'decadeindex'])
+_GENESIS = date(2009, 1, 3)  # day1 0, week1 0
+_DAY_ONE = date(2009, 1, 9)  # day1 1 (6 day gap after genesis)
+_EPOCH = datetime(2009, 1, 1, tzinfo=timezone.utc)
+_DATE_INDEXES = frozenset([
+    'minute10', 'minute30',
+    'hour1', 'hour4', 'hour12',
+    'day1', 'day3', 'week1',
+    'month1', 'month3', 'month6',
+    'year1', 'year10',
+])
 
-def is_date_index(index: str) -> bool:
-    """Check if an index type is date-based."""
-    return index in _DATE_INDEXES
-
-def index_to_date(index: str, i: int) -> date:
-    """Convert an index value to a date for date-based indexes."""
-    if index == 'dateindex':
+def _index_to_date(index: str, i: int) -> Union[date, datetime]:
+    """Convert an index value to a date/datetime for date-based indexes."""
+    if index == 'minute10':
+        return _EPOCH + timedelta(minutes=i * 10)
+    elif index == 'minute30':
+        return _EPOCH + timedelta(minutes=i * 30)
+    elif index == 'hour1':
+        return _EPOCH + timedelta(hours=i)
+    elif index == 'hour4':
+        return _EPOCH + timedelta(hours=i * 4)
+    elif index == 'hour12':
+        return _EPOCH + timedelta(hours=i * 12)
+    elif index == 'day1':
         return _GENESIS if i == 0 else _DAY_ONE + timedelta(days=i - 1)
-    elif index == 'weekindex':
+    elif index == 'day3':
+        return _EPOCH.date() - timedelta(days=1) + timedelta(days=i * 3)
+    elif index == 'week1':
         return _GENESIS + timedelta(weeks=i)
-    elif index == 'monthindex':
+    elif index == 'month1':
         return date(2009 + i // 12, i % 12 + 1, 1)
-    elif index == 'yearindex':
-        return date(2009 + i, 1, 1)
-    elif index == 'quarterindex':
+    elif index == 'month3':
         m = i * 3
         return date(2009 + m // 12, m % 12 + 1, 1)
-    elif index == 'semesterindex':
+    elif index == 'month6':
         m = i * 6
         return date(2009 + m // 12, m % 12 + 1, 1)
-    elif index == 'decadeindex':
+    elif index == 'year1':
+        return date(2009 + i, 1, 1)
+    elif index == 'year10':
         return date(2009 + i * 10, 1, 1)
     else:
         raise ValueError(f"{{index}} is not a date-based index")
 
 
+def _date_to_index(index: str, d: Union[date, datetime]) -> int:
+    """Convert a date/datetime to an index value for date-based indexes.
+
+    Returns the floor index (latest index whose date is <= the given date).
+    For sub-day indexes (minute*, hour*), a plain date is treated as midnight UTC.
+    """
+    if index in ('minute10', 'minute30', 'hour1', 'hour4', 'hour12'):
+        if isinstance(d, datetime):
+            dt = d if d.tzinfo else d.replace(tzinfo=timezone.utc)
+        else:
+            dt = datetime(d.year, d.month, d.day, tzinfo=timezone.utc)
+        secs = int((dt - _EPOCH).total_seconds())
+        div = {{'minute10': 600, 'minute30': 1800,
+               'hour1': 3600, 'hour4': 14400, 'hour12': 43200}}
+        return secs // div[index]
+    dd = d.date() if isinstance(d, datetime) else d
+    if index == 'day1':
+        if dd < _DAY_ONE:
+            return 0
+        return 1 + (dd - _DAY_ONE).days
+    elif index == 'day3':
+        return (dd - date(2008, 12, 31)).days // 3
+    elif index == 'week1':
+        return (dd - _GENESIS).days // 7
+    elif index == 'month1':
+        return (dd.year - 2009) * 12 + (dd.month - 1)
+    elif index == 'month3':
+        return (dd.year - 2009) * 4 + (dd.month - 1) // 3
+    elif index == 'month6':
+        return (dd.year - 2009) * 2 + (dd.month - 1) // 6
+    elif index == 'year1':
+        return dd.year - 2009
+    elif index == 'year10':
+        return (dd.year - 2009) // 10
+    else:
+        raise ValueError(f"{{index}} is not a date-based index")
+
+
 @dataclass
-class MetricData(Generic[T]):
-    """Metric data with range information."""
+class SeriesData(Generic[T]):
+    """Series data with range information. Always int-indexed."""
     version: int
     index: Index
+    type: str
     total: int
     start: int
     end: int
     stamp: str
     data: List[T]
 
-    def dates(self) -> List[date]:
-        """Convert index range to dates. Only works for date-based indexes."""
-        return [index_to_date(self.index, i) for i in range(self.start, self.end)]
+    @property
+    def is_date_based(self) -> bool:
+        """Whether this series uses a date-based index."""
+        return self.index in _DATE_INDEXES
 
     def indexes(self) -> List[int]:
-        """Get index range as list."""
+        """Get raw index numbers."""
         return list(range(self.start, self.end))
 
-    def to_date_dict(self) -> dict[date, T]:
-        """Return data as {{date: value}} dict. Only works for date-based indexes."""
-        return dict(zip(self.dates(), self.data))
+    def keys(self) -> List[int]:
+        """Get keys as index numbers."""
+        return self.indexes()
 
-    def to_index_dict(self) -> dict[int, T]:
-        """Return data as {{index: value}} dict."""
-        return dict(zip(range(self.start, self.end), self.data))
+    def items(self) -> List[Tuple[int, T]]:
+        """Get (index, value) pairs."""
+        return list(zip(self.indexes(), self.data))
 
-    def date_items(self) -> List[Tuple[date, T]]:
-        """Return data as [(date, value), ...] pairs. Only works for date-based indexes."""
-        return list(zip(self.dates(), self.data))
-
-    def index_items(self) -> List[Tuple[int, T]]:
-        """Return data as [(index, value), ...] pairs."""
-        return list(zip(range(self.start, self.end), self.data))
-
-    def iter(self) -> Iterator[Tuple[int, T]]:
-        """Iterate over (index, value) pairs."""
-        return iter(zip(range(self.start, self.end), self.data))
-
-    def iter_dates(self) -> Iterator[Tuple[date, T]]:
-        """Iterate over (date, value) pairs. Date-based indexes only."""
-        return iter(zip(self.dates(), self.data))
+    def to_dict(self) -> Dict[int, T]:
+        """Return {{index: value}} dict."""
+        return dict(zip(self.indexes(), self.data))
 
     def __iter__(self) -> Iterator[Tuple[int, T]]:
-        """Default iteration over (index, value) pairs."""
-        return self.iter()
+        """Iterate over (index, value) pairs."""
+        return iter(zip(self.indexes(), self.data))
+
+    def __len__(self) -> int:
+        return len(self.data)
+
+    def to_polars(self) -> pl.DataFrame:
+        """Convert to Polars DataFrame with 'index' and 'value' columns."""
+        try:
+            import polars as pl  # type: ignore[import-not-found]
+        except ImportError:
+            raise ImportError("polars is required: pip install polars")
+        return pl.DataFrame({{"index": self.indexes(), "value": self.data}})
+
+    def to_pandas(self) -> pd.DataFrame:
+        """Convert to Pandas DataFrame with 'index' and 'value' columns."""
+        try:
+            import pandas as pd  # type: ignore[import-not-found]
+        except ImportError:
+            raise ImportError("pandas is required: pip install pandas")
+        return pd.DataFrame({{"index": self.indexes(), "value": self.data}})
+
+
+@dataclass
+class DateSeriesData(SeriesData[T]):
+    """Series data with date-based index. Extends SeriesData with date methods."""
+
+    def dates(self) -> List[Union[date, datetime]]:
+        """Get dates for the index range. Returns datetime for sub-daily indexes, date for daily+."""
+        return [_index_to_date(self.index, i) for i in range(self.start, self.end)]
+
+    def date_items(self) -> List[Tuple[Union[date, datetime], T]]:
+        """Get (date, value) pairs."""
+        return list(zip(self.dates(), self.data))
+
+    def to_date_dict(self) -> Dict[Union[date, datetime], T]:
+        """Return {{date: value}} dict."""
+        return dict(zip(self.dates(), self.data))
 
     def to_polars(self, with_dates: bool = True) -> pl.DataFrame:
-        """Convert to Polars DataFrame. Requires polars to be installed.
+        """Convert to Polars DataFrame.
 
         Returns a DataFrame with columns:
-        - 'date' (date) and 'value' (T) if with_dates=True and index is date-based
-        - 'index' (int) and 'value' (T) otherwise
+        - 'date' and 'value' if with_dates=True (default)
+        - 'index' and 'value' otherwise
         """
         try:
             import polars as pl  # type: ignore[import-not-found]
         except ImportError:
             raise ImportError("polars is required: pip install polars")
-        if with_dates and self.index in _DATE_INDEXES:
+        if with_dates:
             return pl.DataFrame({{"date": self.dates(), "value": self.data}})
-        return pl.DataFrame({{"index": list(range(self.start, self.end)), "value": self.data}})
+        return pl.DataFrame({{"index": self.indexes(), "value": self.data}})
 
     def to_pandas(self, with_dates: bool = True) -> pd.DataFrame:
-        """Convert to Pandas DataFrame. Requires pandas to be installed.
+        """Convert to Pandas DataFrame.
 
         Returns a DataFrame with columns:
-        - 'date' (date) and 'value' (T) if with_dates=True and index is date-based
-        - 'index' (int) and 'value' (T) otherwise
+        - 'date' and 'value' if with_dates=True (default)
+        - 'index' and 'value' otherwise
         """
         try:
             import pandas as pd  # type: ignore[import-not-found]
         except ImportError:
             raise ImportError("pandas is required: pip install pandas")
-        if with_dates and self.index in _DATE_INDEXES:
+        if with_dates:
             return pd.DataFrame({{"date": self.dates(), "value": self.data}})
-        return pd.DataFrame({{"index": list(range(self.start, self.end)), "value": self.data}})
+        return pd.DataFrame({{"index": self.indexes(), "value": self.data}})
 
 
-# Type alias for non-generic usage
-AnyMetricData = MetricData[Any]
+# Type aliases for non-generic usage
+AnySeriesData = SeriesData[Any]
+AnyDateSeriesData = DateSeriesData[Any]
 
 
 class _EndpointConfig:
@@ -261,7 +341,7 @@ class _EndpointConfig:
         self.end = end
 
     def path(self) -> str:
-        return f"/api/metric/{{self.name}}/{{self.index}}"
+        return f"/api/series/{{self.name}}/{{self.index}}"
 
     def _build_path(self, format: Optional[str] = None) -> str:
         params = []
@@ -275,8 +355,14 @@ class _EndpointConfig:
         p = self.path()
         return f"{{p}}?{{query}}" if query else p
 
-    def get_metric(self) -> MetricData:
-        return MetricData(**self.client.get_json(self._build_path()))
+    def _new(self, start: Optional[int] = None, end: Optional[int] = None) -> _EndpointConfig:
+        return _EndpointConfig(self.client, self.name, self.index, start, end)
+
+    def get_series(self) -> SeriesData[Any]:
+        return SeriesData(**self.client.get_json(self._build_path()))
+
+    def get_date_series(self) -> DateSeriesData[Any]:
+        return DateSeriesData(**self.client.get_json(self._build_path()))
 
     def get_csv(self) -> str:
         return self.client.get_text(self._build_path(format='csv'))
@@ -288,9 +374,9 @@ class RangeBuilder(Generic[T]):
     def __init__(self, config: _EndpointConfig):
         self._config = config
 
-    def fetch(self) -> MetricData[T]:
+    def fetch(self) -> SeriesData[T]:
         """Fetch the range as parsed JSON."""
-        return self._config.get_metric()
+        return self._config.get_series()
 
     def fetch_csv(self) -> str:
         """Fetch the range as CSV string."""
@@ -303,9 +389,9 @@ class SingleItemBuilder(Generic[T]):
     def __init__(self, config: _EndpointConfig):
         self._config = config
 
-    def fetch(self) -> MetricData[T]:
+    def fetch(self) -> SeriesData[T]:
         """Fetch the single item."""
-        return self._config.get_metric()
+        return self._config.get_series()
 
     def fetch_csv(self) -> str:
         """Fetch as CSV."""
@@ -321,43 +407,46 @@ class SkippedBuilder(Generic[T]):
     def take(self, n: int) -> RangeBuilder[T]:
         """Take n items after the skipped position."""
         start = self._config.start or 0
-        return RangeBuilder(_EndpointConfig(
-            self._config.client, self._config.name, self._config.index,
-            start, start + n
-        ))
+        return RangeBuilder(self._config._new(start, start + n))
 
-    def fetch(self) -> MetricData[T]:
+    def fetch(self) -> SeriesData[T]:
         """Fetch from skipped position to end."""
-        return self._config.get_metric()
+        return self._config.get_series()
 
     def fetch_csv(self) -> str:
         """Fetch as CSV."""
         return self._config.get_csv()
 
 
-class MetricEndpointBuilder(Generic[T]):
-    """Builder for metric endpoint queries.
+class DateRangeBuilder(RangeBuilder[T]):
+    """Range builder that returns DateSeriesData."""
+    def fetch(self) -> DateSeriesData[T]:
+        return self._config.get_date_series()
 
-    Use method chaining to specify the data range, then call fetch() or fetch_csv() to execute.
+
+class DateSingleItemBuilder(SingleItemBuilder[T]):
+    """Single item builder that returns DateSeriesData."""
+    def fetch(self) -> DateSeriesData[T]:
+        return self._config.get_date_series()
+
+
+class DateSkippedBuilder(SkippedBuilder[T]):
+    """Skipped builder that returns DateSeriesData."""
+    def take(self, n: int) -> DateRangeBuilder[T]:
+        start = self._config.start or 0
+        return DateRangeBuilder(self._config._new(start, start + n))
+    def fetch(self) -> DateSeriesData[T]:
+        return self._config.get_date_series()
+
+
+class SeriesEndpoint(Generic[T]):
+    """Builder for series endpoint queries with int-based indexing.
 
     Examples:
-        # Fetch all data
         data = endpoint.fetch()
-
-        # Single item access
         data = endpoint[5].fetch()
-
-        # Slice syntax (Python-native)
-        data = endpoint[:10].fetch()      # First 10
-        data = endpoint[-5:].fetch()      # Last 5
-        data = endpoint[100:110].fetch()  # Range
-
-        # Convenience methods (pandas-style)
-        data = endpoint.head().fetch()    # First 10 (default)
-        data = endpoint.head(20).fetch()  # First 20
-        data = endpoint.tail(5).fetch()   # Last 5
-
-        # Iterator-style chaining
+        data = endpoint[:10].fetch()
+        data = endpoint.head(20).fetch()
         data = endpoint.skip(100).take(10).fetch()
     """
 
@@ -370,52 +459,29 @@ class MetricEndpointBuilder(Generic[T]):
     def __getitem__(self, key: slice) -> RangeBuilder[T]: ...
 
     def __getitem__(self, key: Union[int, slice]) -> Union[SingleItemBuilder[T], RangeBuilder[T]]:
-        """Access single item or slice.
-
-        Examples:
-            endpoint[5]        # Single item at index 5
-            endpoint[:10]      # First 10
-            endpoint[-5:]      # Last 5
-            endpoint[100:110]  # Range 100-109
-        """
+        """Access single item or slice by integer index."""
         if isinstance(key, int):
-            return SingleItemBuilder(_EndpointConfig(
-                self._config.client, self._config.name, self._config.index,
-                key, key + 1
-            ))
-        return RangeBuilder(_EndpointConfig(
-            self._config.client, self._config.name, self._config.index,
-            key.start, key.stop
-        ))
+            return SingleItemBuilder(self._config._new(key, key + 1))
+        return RangeBuilder(self._config._new(key.start, key.stop))
 
     def head(self, n: int = 10) -> RangeBuilder[T]:
-        """Get the first n items (pandas-style)."""
-        return RangeBuilder(_EndpointConfig(
-            self._config.client, self._config.name, self._config.index,
-            None, n
-        ))
+        """Get the first n items."""
+        return RangeBuilder(self._config._new(end=n))
 
     def tail(self, n: int = 10) -> RangeBuilder[T]:
-        """Get the last n items (pandas-style)."""
-        start, end = (None, 0) if n == 0 else (-n, None)
-        return RangeBuilder(_EndpointConfig(
-            self._config.client, self._config.name, self._config.index,
-            start, end
-        ))
+        """Get the last n items."""
+        return RangeBuilder(self._config._new(end=0) if n == 0 else self._config._new(start=-n))
 
     def skip(self, n: int) -> SkippedBuilder[T]:
-        """Skip the first n items. Chain with take() to get a range."""
-        return SkippedBuilder(_EndpointConfig(
-            self._config.client, self._config.name, self._config.index,
-            n, None
-        ))
+        """Skip the first n items."""
+        return SkippedBuilder(self._config._new(start=n))
 
-    def fetch(self) -> MetricData[T]:
-        """Fetch all data as parsed JSON."""
-        return self._config.get_metric()
+    def fetch(self) -> SeriesData[T]:
+        """Fetch all data."""
+        return self._config.get_series()
 
     def fetch_csv(self) -> str:
-        """Fetch all data as CSV string."""
+        """Fetch all data as CSV."""
         return self._config.get_csv()
 
     def path(self) -> str:
@@ -423,23 +489,87 @@ class MetricEndpointBuilder(Generic[T]):
         return self._config.path()
 
 
-# Type alias for non-generic usage
-AnyMetricEndpointBuilder = MetricEndpointBuilder[Any]
+class DateSeriesEndpoint(Generic[T]):
+    """Builder for series endpoint queries with date-based indexing.
+
+    Accepts dates in __getitem__ and returns DateSeriesData from fetch().
+
+    Examples:
+        data = endpoint.fetch()
+        data = endpoint[date(2020, 1, 1)].fetch()
+        data = endpoint[date(2020, 1, 1):date(2023, 1, 1)].fetch()
+        data = endpoint[:10].fetch()
+    """
+
+    def __init__(self, client: BrkClientBase, name: str, index: Index):
+        self._config = _EndpointConfig(client, name, index)
+
+    @overload
+    def __getitem__(self, key: int) -> DateSingleItemBuilder[T]: ...
+    @overload
+    def __getitem__(self, key: datetime) -> DateSingleItemBuilder[T]: ...
+    @overload
+    def __getitem__(self, key: date) -> DateSingleItemBuilder[T]: ...
+    @overload
+    def __getitem__(self, key: slice) -> DateRangeBuilder[T]: ...
+
+    def __getitem__(self, key: Union[int, slice, date, datetime]) -> Union[DateSingleItemBuilder[T], DateRangeBuilder[T]]:
+        """Access single item or slice. Accepts int, date, or datetime."""
+        if isinstance(key, (date, datetime)):
+            idx = _date_to_index(self._config.index, key)
+            return DateSingleItemBuilder(self._config._new(idx, idx + 1))
+        if isinstance(key, int):
+            return DateSingleItemBuilder(self._config._new(key, key + 1))
+        start, stop = key.start, key.stop
+        if isinstance(start, (date, datetime)):
+            start = _date_to_index(self._config.index, start)
+        if isinstance(stop, (date, datetime)):
+            stop = _date_to_index(self._config.index, stop)
+        return DateRangeBuilder(self._config._new(start, stop))
+
+    def head(self, n: int = 10) -> DateRangeBuilder[T]:
+        """Get the first n items."""
+        return DateRangeBuilder(self._config._new(end=n))
+
+    def tail(self, n: int = 10) -> DateRangeBuilder[T]:
+        """Get the last n items."""
+        return DateRangeBuilder(self._config._new(end=0) if n == 0 else self._config._new(start=-n))
+
+    def skip(self, n: int) -> DateSkippedBuilder[T]:
+        """Skip the first n items."""
+        return DateSkippedBuilder(self._config._new(start=n))
+
+    def fetch(self) -> DateSeriesData[T]:
+        """Fetch all data."""
+        return self._config.get_date_series()
+
+    def fetch_csv(self) -> str:
+        """Fetch all data as CSV."""
+        return self._config.get_csv()
+
+    def path(self) -> str:
+        """Get the base endpoint path."""
+        return self._config.path()
 
 
-class MetricPattern(Protocol[T]):
-    """Protocol for metric patterns with different index sets."""
+# Type aliases for non-generic usage
+AnySeriesEndpoint = SeriesEndpoint[Any]
+AnyDateSeriesEndpoint = DateSeriesEndpoint[Any]
+
+
+class SeriesPattern(Protocol[T]):
+    """Protocol for series patterns with different index sets."""
 
     @property
     def name(self) -> str:
-        """Get the metric name."""
+        """Get the series name."""
         ...
 
     def indexes(self) -> List[str]:
-        """Get the list of available indexes for this metric."""
+        """Get the list of available indexes for this series."""
         ...
 
-    def get(self, index: Index) -> Optional[MetricEndpointBuilder[T]]:
+    def get(self, index: Index) -> Optional[SeriesEndpoint[T]]:
         """Get an endpoint builder for a specific index, if supported."""
         ...
 
@@ -462,7 +592,7 @@ pub fn generate_index_accessors(output: &mut String, patterns: &[IndexSetPattern
             if j > 0 {
                 write!(output, ", ").unwrap();
             }
-            write!(output, "'{}'", index.serialize_long()).unwrap();
+            write!(output, "'{}'", index.name()).unwrap();
         }
         // Single-element tuple needs trailing comma
         if pattern.indexes.len() == 1 {
@@ -472,11 +602,14 @@ pub fn generate_index_accessors(output: &mut String, patterns: &[IndexSetPattern
     }
     writeln!(output).unwrap();
 
-    // Generate helper function
+    // Generate helper functions
     writeln!(
         output,
-        r#"def _ep(c: BrkClientBase, n: str, i: Index) -> MetricEndpointBuilder[Any]:
-    return MetricEndpointBuilder(c, n, i)
+        r#"def _ep(c: BrkClientBase, n: str, i: Index) -> SeriesEndpoint[Any]:
+    return SeriesEndpoint(c, n, i)
+
+def _dep(c: BrkClientBase, n: str, i: Index) -> DateSeriesEndpoint[Any]:
+    return DateSeriesEndpoint(c, n, i)
 "#
     )
     .unwrap();
@@ -496,11 +629,16 @@ pub fn generate_index_accessors(output: &mut String, patterns: &[IndexSetPattern
         .unwrap();
         for index in &pattern.indexes {
             let method_name = index_to_field_name(index);
-            let index_name = index.serialize_long();
+            let index_name = index.name();
+            let (builder_type, helper) = if index.is_date_based() {
+                ("DateSeriesEndpoint", "_dep")
+            } else {
+                ("SeriesEndpoint", "_ep")
+            };
             writeln!(
                 output,
-                "    def {}(self) -> MetricEndpointBuilder[T]: return _ep(self._c, self._n, '{}')",
-                method_name, index_name
+                "    def {}(self) -> {}[T]: return {}(self._c, self._n, '{}')",
+                method_name, builder_type, helper, index_name
             )
             .unwrap();
         }
@@ -517,10 +655,15 @@ pub fn generate_index_accessors(output: &mut String, patterns: &[IndexSetPattern
         .unwrap();
         writeln!(output, "    @property").unwrap();
         writeln!(output, "    def name(self) -> str: return self._n").unwrap();
-        writeln!(output, "    def indexes(self) -> List[str]: return list({})", idx_var).unwrap();
         writeln!(
             output,
-            "    def get(self, index: Index) -> Optional[MetricEndpointBuilder[T]]: return _ep(self.by._c, self._n, index) if index in {} else None",
+            "    def indexes(self) -> List[str]: return list({})",
+            idx_var
+        )
+        .unwrap();
+        writeln!(
+            output,
+            "    def get(self, index: Index) -> Optional[SeriesEndpoint[T]]: return _ep(self.by._c, self._n, index) if index in {} else None",
             idx_var
         )
         .unwrap();
@@ -552,15 +695,30 @@ pub fn generate_structural_patterns(
             "    \"\"\"Pattern struct for repeated tree structure.\"\"\""
         )
         .unwrap();
+
+        // Skip constructor for non-parameterizable patterns (inlined at tree level)
+        if !metadata.is_parameterizable(&pattern.name) {
+            writeln!(output, "    pass\n").unwrap();
+            continue;
+        }
+
         writeln!(output, "    ").unwrap();
+        if pattern.is_templated() {
+            writeln!(
+                output,
+                "    def __init__(self, client: BrkClientBase, acc: str, disc: str):"
+            )
+            .unwrap();
+        } else {
+            writeln!(
+                output,
+                "    def __init__(self, client: BrkClientBase, acc: str):"
+            )
+            .unwrap();
+        }
         writeln!(
             output,
-            "    def __init__(self, client: BrkClientBase, acc: str):"
-        )
-        .unwrap();
-        writeln!(
-            output,
-            "        \"\"\"Create pattern node with accumulated metric name.\"\"\""
+            "        \"\"\"Create pattern node with accumulated series name.\"\"\""
         )
         .unwrap();
 

crates/brk_bindgen/src/generators/python/mod.rs

@@ -29,7 +29,7 @@ pub fn generate_python_client(
     writeln!(output, "from dataclasses import dataclass").unwrap();
     writeln!(
         output,
-        "from typing import TypeVar, Generic, Any, Optional, List, Literal, TypedDict, Union, Protocol, overload, Iterator, Tuple, TYPE_CHECKING"
+        "from typing import TypeVar, Generic, Any, Dict, Optional, List, Iterator, Literal, TypedDict, Union, Protocol, overload, Tuple, TYPE_CHECKING"
     )
     .unwrap();
     writeln!(
@@ -38,11 +38,23 @@ pub fn generate_python_client(
     )
     .unwrap();
     writeln!(output, "from urllib.parse import urlparse").unwrap();
-    writeln!(output, "from datetime import date, timedelta").unwrap();
+    writeln!(
+        output,
+        "from datetime import date, datetime, timedelta, timezone"
+    )
+    .unwrap();
     writeln!(output, "import json\n").unwrap();
     writeln!(output, "if TYPE_CHECKING:").unwrap();
-    writeln!(output, "    import pandas as pd  # type: ignore[import-not-found]").unwrap();
-    writeln!(output, "    import polars as pl  # type: ignore[import-not-found]\n").unwrap();
+    writeln!(
+        output,
+        "    import pandas as pd  # type: ignore[import-not-found]"
+    )
+    .unwrap();
+    writeln!(
+        output,
+        "    import polars as pl  # type: ignore[import-not-found]\n"
+    )
+    .unwrap();
     writeln!(output, "T = TypeVar('T')\n").unwrap();
 
     types::generate_type_definitions(&mut output, schemas);

crates/brk_bindgen/src/generators/python/tree.rs

@@ -6,22 +6,22 @@ use std::fmt::Write;
 use brk_types::TreeNode;
 
 use crate::{
-    ClientMetadata, GenericSyntax, PatternField, PythonSyntax, build_child_path,
-    generate_leaf_field, prepare_tree_node, to_snake_case,
+    ClientMetadata, LanguageSyntax, PatternField, PythonSyntax, build_child_path,
+    generate_leaf_field, generate_tree_node_field, prepare_tree_node,
 };
 
 /// Generate tree classes
 pub fn generate_tree_classes(output: &mut String, catalog: &TreeNode, metadata: &ClientMetadata) {
-    writeln!(output, "# Metrics tree classes\n").unwrap();
+    writeln!(output, "# Series tree classes\n").unwrap();
 
     let pattern_lookup = metadata.pattern_lookup();
     let mut generated = BTreeSet::new();
     generate_tree_class(
         output,
-        "MetricsTree",
+        "SeriesTree",
         "",
         catalog,
-        &pattern_lookup,
+        pattern_lookup,
         metadata,
         &mut generated,
     );
@@ -60,7 +60,7 @@ fn generate_tree_class(
 
     // THEN generate the current class (after all children are defined)
     writeln!(output, "class {}:", name).unwrap();
-    writeln!(output, "    \"\"\"Metrics tree node.\"\"\"").unwrap();
+    writeln!(output, "    \"\"\"Series tree node.\"\"\"").unwrap();
     writeln!(output, "    ").unwrap();
     writeln!(
         output,
@@ -68,10 +68,12 @@ fn generate_tree_class(
     )
     .unwrap();
 
+    if ctx.children.is_empty() {
+        writeln!(output, "        pass").unwrap();
+    }
+
     let syntax = PythonSyntax;
     for child in &ctx.children {
-        let field_name_py = to_snake_case(child.name);
-
         if child.is_leaf {
             if let TreeNode::Leaf(leaf) = child.node {
                 generate_leaf_field(
@@ -79,28 +81,23 @@ fn generate_tree_class(
                 );
             }
         } else if child.should_inline {
-            // Inline class
+            let field_name = syntax.field_name(child.name);
             writeln!(
                 output,
                 "        self.{}: {} = {}(client)",
-                field_name_py, child.inline_type_name, child.inline_type_name
+                field_name, child.inline_type_name, child.inline_type_name
             )
             .unwrap();
         } else {
-            // Use pattern class with metric base
-            let py_type = metadata.resolve_tree_field_type(
-                &child.field,
-                child.child_fields.as_deref(),
-                name,
-                child.name,
-                GenericSyntax::PYTHON,
-            );
-            writeln!(
+            generate_tree_node_field(
                 output,
-                "        self.{}: {} = {}(client, '{}')",
-                field_name_py, py_type, child.field.rust_type, child.base_result.base
-            )
-            .unwrap();
+                &syntax,
+                &child.field,
+                metadata,
+                "        ",
+                "client",
+                &child.base_result,
+            );
         }
     }
 

crates/brk_bindgen/src/generators/rust/api.rs

@@ -10,10 +10,10 @@ use super::types::js_type_to_rust;
 pub fn generate_main_client(output: &mut String, endpoints: &[Endpoint]) {
     writeln!(
         output,
-        r#"/// Main BRK client with metrics tree and API methods.
+        r#"/// Main BRK client with series tree and API methods.
 pub struct BrkClient {{
     base: Arc<BrkClientBase>,
-    metrics: MetricsTree,
+    series: SeriesTree,
 }}
 
 impl BrkClient {{
@@ -23,40 +23,54 @@ impl BrkClient {{
     /// Create a new client with the given base URL.
     pub fn new(base_url: impl Into<String>) -> Self {{
         let base = Arc::new(BrkClientBase::new(base_url));
-        let metrics = MetricsTree::new(base.clone(), String::new());
-        Self {{ base, metrics }}
+        let series = SeriesTree::new(base.clone(), String::new());
+        Self {{ base, series }}
     }}
 
     /// Create a new client with options.
     pub fn with_options(options: BrkClientOptions) -> Self {{
         let base = Arc::new(BrkClientBase::with_options(options));
-        let metrics = MetricsTree::new(base.clone(), String::new());
-        Self {{ base, metrics }}
+        let series = SeriesTree::new(base.clone(), String::new());
+        Self {{ base, series }}
     }}
 
-    /// Get the metrics tree for navigating metrics.
-    pub fn metrics(&self) -> &MetricsTree {{
-        &self.metrics
+    /// Get the series tree for navigating series.
+    pub fn series(&self) -> &SeriesTree {{
+        &self.series
     }}
 
-    /// Create a dynamic metric endpoint builder for any metric/index combination.
+    /// Create a dynamic series endpoint builder for any series/index combination.
     ///
-    /// Use this for programmatic access when the metric name is determined at runtime.
-    /// For type-safe access, use the `metrics()` tree instead.
+    /// Use this for programmatic access when the series name is determined at runtime.
+    /// For type-safe access, use the `series()` tree instead.
     ///
     /// # Example
     /// ```ignore
-    /// let data = client.metric("realized_price", Index::Height)
+    /// let data = client.series("realized_price", Index::Height)
     ///     .last(10)
     ///     .json::<f64>()?;
     /// ```
-    pub fn metric(&self, metric: impl Into<Metric>, index: Index) -> MetricEndpointBuilder<serde_json::Value> {{
-        MetricEndpointBuilder::new(
+    pub fn series_endpoint(&self, series: impl Into<SeriesName>, index: Index) -> SeriesEndpoint<serde_json::Value> {{
+        SeriesEndpoint::new(
             self.base.clone(),
-            Arc::from(metric.into().as_str()),
+            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<SeriesName>, index: Index) -> Result<DateSeriesEndpoint<serde_json::Value>> {{
+        if !index.is_date_based() {{
+            return Err(BrkError {{ message: format!("{{}} is not a date-based index", index.name()) }});
+        }}
+        Ok(DateSeriesEndpoint::new(
+            self.base.clone(),
+            Arc::from(series.into().as_str()),
+            index,
+        ))
+    }}
 "#,
         VERSION = VERSION
     )
@@ -79,7 +93,7 @@ pub fn generate_api_methods(output: &mut String, endpoints: &[Endpoint]) {
             .response_type
             .as_deref()
             .map(js_type_to_rust)
-            .unwrap_or_else(|| "serde_json::Value".to_string());
+            .unwrap_or_else(|| "String".to_string());
 
         let return_type = if endpoint.supports_csv {
             format!("FormatResponse<{}>", base_return_type)
@@ -101,7 +115,13 @@ pub fn generate_api_methods(output: &mut String, endpoints: &[Endpoint]) {
         }
         // Add endpoint path
         writeln!(output, "    ///").unwrap();
-        writeln!(output, "    /// Endpoint: `{} {}`", endpoint.method.to_uppercase(), endpoint.path).unwrap();
+        writeln!(
+            output,
+            "    /// Endpoint: `{} {}`",
+            endpoint.method.to_uppercase(),
+            endpoint.path
+        )
+        .unwrap();
 
         let params = build_method_params(endpoint);
         writeln!(
@@ -112,39 +132,72 @@ pub fn generate_api_methods(output: &mut String, endpoints: &[Endpoint]) {
         .unwrap();
 
         let (path, index_arg) = build_path_template(endpoint);
+        let fetch_method = if endpoint.returns_json() {
+            "get_json"
+        } else {
+            "get_text"
+        };
 
         if endpoint.query_params.is_empty() {
-            writeln!(output, "        self.base.get_json(&format!(\"{}\"{}))", path, index_arg).unwrap();
+            writeln!(
+                output,
+                "        self.base.{}(&format!(\"{}\"{}))",
+                fetch_method, path, index_arg
+            )
+            .unwrap();
         } else {
             writeln!(output, "        let mut query = Vec::new();").unwrap();
             for param in &endpoint.query_params {
-                if param.required {
+                let ident = sanitize_ident(&param.name);
+                let is_array = param.param_type.ends_with("[]");
+                if is_array {
+                    writeln!(
+                        output,
+                        "        for v in {} {{ query.push(format!(\"{}={{}}\", v)); }}",
+                        ident, param.name
+                    )
+                    .unwrap();
+                } else if param.required {
                     writeln!(
                         output,
                         "        query.push(format!(\"{}={{}}\", {}));",
-                        param.name, param.name
+                        param.name, ident
                     )
                     .unwrap();
                 } else {
                     writeln!(
                         output,
                         "        if let Some(v) = {} {{ query.push(format!(\"{}={{}}\", v)); }}",
-                        param.name, param.name
+                        ident, param.name
                     )
                     .unwrap();
                 }
             }
             writeln!(output, "        let query_str = if query.is_empty() {{ String::new() }} else {{ format!(\"?{{}}\", query.join(\"&\")) }};").unwrap();
-            writeln!(output, "        let path = format!(\"{}{{}}\"{}, query_str);", path, index_arg).unwrap();
+            writeln!(
+                output,
+                "        let path = format!(\"{}{{}}\"{}, query_str);",
+                path, index_arg
+            )
+            .unwrap();
 
             if endpoint.supports_csv {
                 writeln!(output, "        if format == Some(Format::CSV) {{").unwrap();
-                writeln!(output, "            self.base.get_text(&path).map(FormatResponse::Csv)").unwrap();
+                writeln!(
+                    output,
+                    "            self.base.get_text(&path).map(FormatResponse::Csv)"
+                )
+                .unwrap();
                 writeln!(output, "        }} else {{").unwrap();
-                writeln!(output, "            self.base.get_json(&path).map(FormatResponse::Json)").unwrap();
+                writeln!(
+                    output,
+                    "            self.base.{}(&path).map(FormatResponse::Json)",
+                    fetch_method
+                )
+                .unwrap();
                 writeln!(output, "        }}").unwrap();
             } else {
-                writeln!(output, "        self.base.get_json(&path)").unwrap();
+                writeln!(output, "        self.base.{}(&path)", fetch_method).unwrap();
             }
         }
 
@@ -160,34 +213,46 @@ fn build_method_params(endpoint: &Endpoint) -> String {
     let mut params = Vec::new();
     for param in &endpoint.path_params {
         let rust_type = param_type_to_rust(&param.param_type);
-        params.push(format!(", {}: {}", param.name, rust_type));
+        params.push(format!(", {}: {}", sanitize_ident(&param.name), rust_type));
     }
     for param in &endpoint.query_params {
         let rust_type = param_type_to_rust(&param.param_type);
+        let name = sanitize_ident(&param.name);
         if param.required {
-            params.push(format!(", {}: {}", param.name, rust_type));
+            params.push(format!(", {}: {}", name, rust_type));
         } else {
-            params.push(format!(", {}: Option<{}>", param.name, rust_type));
+            params.push(format!(", {}: Option<{}>", name, rust_type));
         }
     }
     params.join("")
 }
 
+/// Strip characters invalid in Rust identifiers (e.g. `[]` from `txId[]`).
+fn sanitize_ident(name: &str) -> String {
+    name.replace(['[', ']'], "")
+}
+
 /// Convert parameter type to Rust type for function signatures.
 fn param_type_to_rust(param_type: &str) -> String {
+    if let Some(inner) = param_type.strip_suffix("[]") {
+        return format!("&[{}]", param_type_to_rust(inner));
+    }
     match param_type {
         "string" | "*" => "&str".to_string(),
         "integer" | "number" => "i64".to_string(),
         "boolean" => "bool".to_string(),
-        other => other.to_string(), // Domain types like Index, Metric, Format
+        other => other.to_string(),
     }
 }
 
 /// Build path template and extra format args for Index params.
 fn build_path_template(endpoint: &Endpoint) -> (String, &'static str) {
-    let has_index_param = endpoint.path_params.iter().any(|p| p.name == "index" && p.param_type == "Index");
+    let has_index_param = endpoint
+        .path_params
+        .iter()
+        .any(|p| p.name == "index" && p.param_type == "Index");
     if has_index_param {
-        (endpoint.path.replace("{index}", "{}"), ", index.serialize_long()")
+        (endpoint.path.replace("{index}", "{}"), ", index.name()")
     } else {
         (endpoint.path.clone(), "")
     }

crates/brk_bindgen/src/generators/rust/client.rs

@@ -4,7 +4,7 @@ use std::fmt::Write;
 
 use crate::{
     ClientMetadata, GenericSyntax, IndexSetPattern, RustSyntax, StructuralPattern,
-    generate_parameterized_field, index_to_field_name, to_snake_case,
+    escape_rust_keyword, generate_parameterized_field, index_to_field_name, to_snake_case,
 };
 
 /// Generate import statements.
@@ -59,64 +59,53 @@ impl Default for BrkClientOptions {{
     }}
 }}
 
-/// Base HTTP client for making requests.
+/// Base HTTP client for making requests. Reuses connections via ureq::Agent.
 #[derive(Debug, Clone)]
 pub struct BrkClientBase {{
+    agent: ureq::Agent,
     base_url: String,
-    timeout_secs: u64,
 }}
 
 impl BrkClientBase {{
     /// Create a new client with the given base URL.
     pub fn new(base_url: impl Into<String>) -> Self {{
-        Self {{
-            base_url: base_url.into(),
-            timeout_secs: 30,
-        }}
+        Self::with_options(BrkClientOptions {{ base_url: base_url.into(), ..Default::default() }})
     }}
 
     /// Create a new client with options.
     pub fn with_options(options: BrkClientOptions) -> Self {{
+        let agent = ureq::Agent::config_builder()
+            .timeout_global(Some(std::time::Duration::from_secs(options.timeout_secs)))
+            .build()
+            .into();
         Self {{
-            base_url: options.base_url,
-            timeout_secs: options.timeout_secs,
+            agent,
+            base_url: options.base_url.trim_end_matches('/').to_string(),
         }}
     }}
 
-    fn get(&self, path: &str) -> Result<minreq::Response> {{
-        let base = self.base_url.trim_end_matches('/');
-        let url = format!("{{}}{{}}", base, path);
-        let response = minreq::get(&url)
-            .with_timeout(self.timeout_secs)
-            .send()
-            .map_err(|e| BrkError {{ message: e.to_string() }})?;
-
-        if response.status_code >= 400 {{
-            return Err(BrkError {{
-                message: format!("HTTP {{}}", response.status_code),
-            }});
-        }}
-
-        Ok(response)
+    fn url(&self, path: &str) -> String {{
+        format!("{{}}{{}}", self.base_url, path)
     }}
 
     /// Make a GET request and deserialize JSON response.
     pub fn get_json<T: DeserializeOwned>(&self, path: &str) -> Result<T> {{
-        self.get(path)?
-            .json()
+        self.agent.get(&self.url(path))
+            .call()
+            .and_then(|mut r| r.body_mut().read_json())
             .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<String> {{
-        self.get(path)?
-            .as_str()
-            .map(|s| s.to_string())
+        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() }})
     }}
 }}
 
-/// Build metric name with suffix.
+/// Build series name with suffix.
 #[inline]
 fn _m(acc: &str, s: &str) -> String {{
     if s.is_empty() {{ acc.to_string() }}
@@ -124,7 +113,7 @@ fn _m(acc: &str, s: &str) -> String {{
     else {{ format!("{{acc}}_{{s}}") }}
 }}
 
-/// Build metric name with prefix.
+/// Build series name with prefix.
 #[inline]
 fn _p(prefix: &str, acc: &str) -> String {{
     if acc.is_empty() {{ prefix.to_string() }} else {{ format!("{{prefix}}_{{acc}}") }}
@@ -135,23 +124,23 @@ fn _p(prefix: &str, acc: &str) -> String {{
     .unwrap();
 }
 
-/// Generate the MetricPattern trait.
-pub fn generate_metric_pattern_trait(output: &mut String) {
+/// Generate the SeriesPattern trait.
+pub fn generate_series_pattern_trait(output: &mut String) {
     writeln!(
         output,
-        r#"/// Non-generic trait for metric patterns (usable in collections).
-pub trait AnyMetricPattern {{
-    /// Get the metric name.
+        r#"/// Non-generic trait for series patterns (usable in collections).
+pub trait AnySeriesPattern {{
+    /// Get the series name.
     fn name(&self) -> &str;
 
-    /// Get the list of available indexes for this metric.
+    /// Get the list of available indexes for this series.
     fn indexes(&self) -> &'static [Index];
 }}
 
-/// Generic trait for metric patterns with endpoint access.
-pub trait MetricPattern<T>: AnyMetricPattern {{
+/// Generic trait for series patterns with endpoint access.
+pub trait SeriesPattern<T>: AnySeriesPattern {{
     /// Get an endpoint builder for a specific index, if supported.
-    fn get(&self, index: Index) -> Option<MetricEndpointBuilder<T>>;
+    fn get(&self, index: Index) -> Option<SeriesEndpoint<T>>;
 }}
 
 "#
@@ -159,7 +148,7 @@ pub trait MetricPattern<T>: AnyMetricPattern {{
     .unwrap();
 }
 
-/// Generate the MetricEndpointBuilder structs with typestate pattern.
+/// Generate the SeriesEndpoint structs with typestate pattern.
 pub fn generate_endpoint(output: &mut String) {
     writeln!(
         output,
@@ -179,7 +168,7 @@ impl EndpointConfig {{
     }}
 
     fn path(&self) -> String {{
-        format!("/api/metric/{{}}/{{}}", self.name, self.index.serialize_long())
+        format!("/api/series/{{}}/{{}}", self.name, self.index.name())
     }}
 
     fn build_path(&self, format: Option<&str>) -> String {{
@@ -200,45 +189,39 @@ impl EndpointConfig {{
     }}
 }}
 
-/// Initial builder for metric endpoint queries.
+/// Builder for series endpoint queries.
 ///
-/// Use method chaining to specify the data range, then call `fetch()` or `fetch_csv()` to execute.
+/// Parameterized by element type `T` and response type `D` (defaults to `SeriesData<T>`).
+/// For date-based indexes, use `DateSeriesEndpoint<T>` which sets `D = DateSeriesData<T>`.
 ///
 /// # Examples
 /// ```ignore
-/// // Fetch all data
-/// let data = endpoint.fetch()?;
-///
-/// // Get single item at index 5
-/// let data = endpoint.get(5).fetch()?;
-///
-/// // Get first 10 using range
-/// let data = endpoint.range(..10).fetch()?;
-///
-/// // Get range [100, 200)
-/// let data = endpoint.range(100..200).fetch()?;
-///
-/// // Get first 10 (convenience)
-/// let data = endpoint.take(10).fetch()?;
-///
-/// // Get last 10
-/// let data = endpoint.last(10).fetch()?;
-///
-/// // Iterator-style chaining
-/// let data = endpoint.skip(100).take(10).fetch()?;
+/// let data = endpoint.fetch()?;                   // all data
+/// let data = endpoint.get(5).fetch()?;             // single item
+/// let data = endpoint.range(..10).fetch()?;        // first 10
+/// let data = endpoint.range(100..200).fetch()?;    // range [100, 200)
+/// let data = endpoint.take(10).fetch()?;           // first 10 (convenience)
+/// let data = endpoint.last(10).fetch()?;           // last 10
+/// let data = endpoint.skip(100).take(10).fetch()?; // iterator-style
 /// ```
-pub struct MetricEndpointBuilder<T> {{
+pub struct SeriesEndpoint<T, D = SeriesData<T>> {{
     config: EndpointConfig,
-    _marker: std::marker::PhantomData<T>,
+    _marker: std::marker::PhantomData<fn() -> (T, D)>,
 }}
 
-impl<T: DeserializeOwned> MetricEndpointBuilder<T> {{
+/// Builder for date-based series endpoint queries.
+///
+/// Like `SeriesEndpoint` but returns `DateSeriesData` and provides
+/// date-based access methods (`get_date`, `date_range`).
+pub type DateSeriesEndpoint<T> = SeriesEndpoint<T, DateSeriesData<T>>;
+
+impl<T: DeserializeOwned, D: DeserializeOwned> SeriesEndpoint<T, D> {{
     pub fn new(client: Arc<BrkClientBase>, name: Arc<str>, index: Index) -> Self {{
         Self {{ config: EndpointConfig::new(client, name, index), _marker: std::marker::PhantomData }}
     }}
 
     /// Select a specific index position.
-    pub fn get(mut self, index: usize) -> SingleItemBuilder<T> {{
+    pub fn get(mut self, index: usize) -> SingleItemBuilder<T, D> {{
         self.config.start = Some(index as i64);
         self.config.end = Some(index as i64 + 1);
         SingleItemBuilder {{ config: self.config, _marker: std::marker::PhantomData }}
@@ -252,7 +235,7 @@ impl<T: DeserializeOwned> MetricEndpointBuilder<T> {{
     /// endpoint.range(100..110)  // indices 100-109
     /// endpoint.range(100..)     // from 100 to end
     /// ```
-    pub fn range<R: RangeBounds<usize>>(mut self, range: R) -> RangeBuilder<T> {{
+    pub fn range<R: RangeBounds<usize>>(mut self, range: R) -> RangeBuilder<T, D> {{
         self.config.start = match range.start_bound() {{
             Bound::Included(&n) => Some(n as i64),
             Bound::Excluded(&n) => Some(n as i64 + 1),
@@ -267,12 +250,12 @@ impl<T: DeserializeOwned> MetricEndpointBuilder<T> {{
     }}
 
     /// Take the first n items.
-    pub fn take(self, n: usize) -> RangeBuilder<T> {{
+    pub fn take(self, n: usize) -> RangeBuilder<T, D> {{
         self.range(..n)
     }}
 
     /// Take the last n items.
-    pub fn last(mut self, n: usize) -> RangeBuilder<T> {{
+    pub fn last(mut self, n: usize) -> RangeBuilder<T, D> {{
         if n == 0 {{
             self.config.end = Some(0);
         }} else {{
@@ -282,13 +265,13 @@ impl<T: DeserializeOwned> MetricEndpointBuilder<T> {{
     }}
 
     /// Skip the first n items. Chain with `take(n)` to get a range.
-    pub fn skip(mut self, n: usize) -> SkippedBuilder<T> {{
+    pub fn skip(mut self, n: usize) -> SkippedBuilder<T, D> {{
         self.config.start = Some(n as i64);
         SkippedBuilder {{ config: self.config, _marker: std::marker::PhantomData }}
     }}
 
     /// Fetch all data as parsed JSON.
-    pub fn fetch(self) -> Result<MetricData<T>> {{
+    pub fn fetch(self) -> Result<D> {{
         self.config.get_json(None)
     }}
 
@@ -303,15 +286,47 @@ impl<T: DeserializeOwned> MetricEndpointBuilder<T> {{
     }}
 }}
 
-/// Builder for single item access.
-pub struct SingleItemBuilder<T> {{
-    config: EndpointConfig,
-    _marker: std::marker::PhantomData<T>,
+/// Date-specific methods available only on `DateSeriesEndpoint`.
+impl<T: DeserializeOwned> SeriesEndpoint<T, DateSeriesData<T>> {{
+    /// Select a specific date position (for day-precision or coarser indexes).
+    pub fn get_date(self, date: Date) -> SingleItemBuilder<T, DateSeriesData<T>> {{
+        let index = self.config.index.date_to_index(date).unwrap_or(0);
+        self.get(index)
+    }}
+
+    /// Select a date range (for day-precision or coarser indexes).
+    pub fn date_range(self, start: Date, end: Date) -> RangeBuilder<T, DateSeriesData<T>> {{
+        let s = self.config.index.date_to_index(start).unwrap_or(0);
+        let e = self.config.index.date_to_index(end).unwrap_or(0);
+        self.range(s..e)
+    }}
+
+    /// Select a specific timestamp position (works for all date-based indexes including sub-daily).
+    pub fn get_timestamp(self, ts: Timestamp) -> SingleItemBuilder<T, DateSeriesData<T>> {{
+        let index = self.config.index.timestamp_to_index(ts).unwrap_or(0);
+        self.get(index)
+    }}
+
+    /// Select a timestamp range (works for all date-based indexes including sub-daily).
+    pub fn timestamp_range(self, start: Timestamp, end: Timestamp) -> RangeBuilder<T, DateSeriesData<T>> {{
+        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)
+    }}
 }}
 
-impl<T: DeserializeOwned> SingleItemBuilder<T> {{
+/// Builder for single item access.
+pub struct SingleItemBuilder<T, D = SeriesData<T>> {{
+    config: EndpointConfig,
+    _marker: std::marker::PhantomData<fn() -> (T, D)>,
+}}
+
+/// Date-aware single item builder.
+pub type DateSingleItemBuilder<T> = SingleItemBuilder<T, DateSeriesData<T>>;
+
+impl<T: DeserializeOwned, D: DeserializeOwned> SingleItemBuilder<T, D> {{
     /// Fetch the single item.
-    pub fn fetch(self) -> Result<MetricData<T>> {{
+    pub fn fetch(self) -> Result<D> {{
         self.config.get_json(None)
     }}
 
@@ -322,21 +337,24 @@ impl<T: DeserializeOwned> SingleItemBuilder<T> {{
 }}
 
 /// Builder after calling `skip(n)`. Chain with `take(n)` to specify count.
-pub struct SkippedBuilder<T> {{
+pub struct SkippedBuilder<T, D = SeriesData<T>> {{
     config: EndpointConfig,
-    _marker: std::marker::PhantomData<T>,
+    _marker: std::marker::PhantomData<fn() -> (T, D)>,
 }}
 
-impl<T: DeserializeOwned> SkippedBuilder<T> {{
+/// Date-aware skipped builder.
+pub type DateSkippedBuilder<T> = SkippedBuilder<T, DateSeriesData<T>>;
+
+impl<T: DeserializeOwned, D: DeserializeOwned> SkippedBuilder<T, D> {{
     /// Take n items after the skipped position.
-    pub fn take(mut self, n: usize) -> RangeBuilder<T> {{
+    pub fn take(mut self, n: usize) -> RangeBuilder<T, D> {{
         let start = self.config.start.unwrap_or(0);
         self.config.end = Some(start + n as i64);
         RangeBuilder {{ config: self.config, _marker: std::marker::PhantomData }}
     }}
 
     /// Fetch from the skipped position to the end.
-    pub fn fetch(self) -> Result<MetricData<T>> {{
+    pub fn fetch(self) -> Result<D> {{
         self.config.get_json(None)
     }}
 
@@ -347,14 +365,17 @@ impl<T: DeserializeOwned> SkippedBuilder<T> {{
 }}
 
 /// Builder with range fully specified.
-pub struct RangeBuilder<T> {{
+pub struct RangeBuilder<T, D = SeriesData<T>> {{
     config: EndpointConfig,
-    _marker: std::marker::PhantomData<T>,
+    _marker: std::marker::PhantomData<fn() -> (T, D)>,
 }}
 
-impl<T: DeserializeOwned> RangeBuilder<T> {{
+/// Date-aware range builder.
+pub type DateRangeBuilder<T> = RangeBuilder<T, DateSeriesData<T>>;
+
+impl<T: DeserializeOwned, D: DeserializeOwned> RangeBuilder<T, D> {{
     /// Fetch the range as parsed JSON.
-    pub fn fetch(self) -> Result<MetricData<T>> {{
+    pub fn fetch(self) -> Result<D> {{
         self.config.get_json(None)
     }}
 
@@ -389,12 +410,17 @@ pub fn generate_index_accessors(output: &mut String, patterns: &[IndexSetPattern
     }
     writeln!(output).unwrap();
 
-    // Generate helper function
+    // Generate helper functions
     writeln!(
         output,
         r#"#[inline]
-fn _ep<T: DeserializeOwned>(c: &Arc<BrkClientBase>, n: &Arc<str>, i: Index) -> MetricEndpointBuilder<T> {{
-    MetricEndpointBuilder::new(c.clone(), n.clone(), i)
+fn _ep<T: DeserializeOwned>(c: &Arc<BrkClientBase>, n: &Arc<str>, i: Index) -> SeriesEndpoint<T> {{
+    SeriesEndpoint::new(c.clone(), n.clone(), i)
+}}
+
+#[inline]
+fn _dep<T: DeserializeOwned>(c: &Arc<BrkClientBase>, n: &Arc<str>, i: Index) -> DateSeriesEndpoint<T> {{
+    DateSeriesEndpoint::new(c.clone(), n.clone(), i)
 }}
 "#
     )
@@ -412,12 +438,21 @@ fn _ep<T: DeserializeOwned>(c: &Arc<BrkClientBase>, n: &Arc<str>, i: Index) -> M
         writeln!(output, "impl<T: DeserializeOwned> {}<T> {{", by_name).unwrap();
         for index in &pattern.indexes {
             let method_name = index_to_field_name(index);
-            writeln!(
-                output,
-                "    pub fn {}(&self) -> MetricEndpointBuilder<T> {{ _ep(&self.client, &self.name, Index::{}) }}",
-                method_name, index
-            )
-            .unwrap();
+            if index.is_date_based() {
+                writeln!(
+                    output,
+                    "    pub fn {}(&self) -> DateSeriesEndpoint<T> {{ _dep(&self.client, &self.name, Index::{}) }}",
+                    method_name, index
+                )
+                .unwrap();
+            } else {
+                writeln!(
+                    output,
+                    "    pub fn {}(&self) -> SeriesEndpoint<T> {{ _ep(&self.client, &self.name, Index::{}) }}",
+                    method_name, index
+                )
+                .unwrap();
+            }
         }
         writeln!(output, "}}\n").unwrap();
 
@@ -438,18 +473,18 @@ fn _ep<T: DeserializeOwned>(c: &Arc<BrkClientBase>, n: &Arc<str>, i: Index) -> M
         writeln!(output, "    pub fn name(&self) -> &str {{ &self.name }}").unwrap();
         writeln!(output, "}}\n").unwrap();
 
-        // Implement AnyMetricPattern trait
+        // Implement AnySeriesPattern trait
         writeln!(
             output,
-            "impl<T> AnyMetricPattern for {}<T> {{ fn name(&self) -> &str {{ &self.name }} fn indexes(&self) -> &'static [Index] {{ {} }} }}",
+            "impl<T> AnySeriesPattern for {}<T> {{ fn name(&self) -> &str {{ &self.name }} fn indexes(&self) -> &'static [Index] {{ {} }} }}",
             pattern.name, idx_const
         )
         .unwrap();
 
-        // Implement MetricPattern<T> trait
+        // Implement SeriesPattern<T> trait
         writeln!(
             output,
-            "impl<T: DeserializeOwned> MetricPattern<T> for {}<T> {{ fn get(&self, index: Index) -> Option<MetricEndpointBuilder<T>> {{ {}.contains(&index).then(|| _ep(&self.by.client, &self.by.name, index)) }} }}\n",
+            "impl<T: DeserializeOwned> SeriesPattern<T> for {}<T> {{ fn get(&self, index: Index) -> Option<SeriesEndpoint<T>> {{ {}.contains(&index).then(|| _ep(&self.by.client, &self.by.name, index)) }} }}\n",
             pattern.name, idx_const
         )
         .unwrap();
@@ -476,7 +511,7 @@ pub fn generate_pattern_structs(
         writeln!(output, "pub struct {}{} {{", pattern.name, generic_params).unwrap();
 
         for field in &pattern.fields {
-            let field_name = to_snake_case(&field.name);
+            let field_name = escape_rust_keyword(&to_snake_case(&field.name));
             let type_annotation = metadata.field_type_annotation(
                 field,
                 pattern.is_generic,
@@ -488,7 +523,11 @@ pub fn generate_pattern_structs(
 
         writeln!(output, "}}\n").unwrap();
 
-        // Generate impl block with constructor for ALL patterns
+        // Skip constructor for non-parameterizable patterns (inlined at tree level)
+        if !metadata.is_parameterizable(&pattern.name) {
+            continue;
+        }
+
         let impl_generic = if pattern.is_generic {
             "<T: DeserializeOwned>"
         } else {
@@ -503,14 +542,22 @@ pub fn generate_pattern_structs(
 
         writeln!(
             output,
-            "    /// Create a new pattern node with accumulated metric name."
-        )
-        .unwrap();
-        writeln!(
-            output,
-            "    pub fn new(client: Arc<BrkClientBase>, acc: String) -> Self {{"
+            "    /// Create a new pattern node with accumulated series name."
         )
         .unwrap();
+        if pattern.is_templated() {
+            writeln!(
+                output,
+                "    pub fn new(client: Arc<BrkClientBase>, acc: String, disc: String) -> Self {{"
+            )
+            .unwrap();
+        } else {
+            writeln!(
+                output,
+                "    pub fn new(client: Arc<BrkClientBase>, acc: String) -> Self {{"
+            )
+            .unwrap();
+        }
         writeln!(output, "        Self {{").unwrap();
 
         let syntax = RustSyntax;

crates/brk_bindgen/src/generators/rust/mod.rs

@@ -32,7 +32,7 @@ pub fn generate_rust_client(
 
     client::generate_imports(&mut output);
     client::generate_base_client(&mut output);
-    client::generate_metric_pattern_trait(&mut output);
+    client::generate_series_pattern_trait(&mut output);
     client::generate_endpoint(&mut output);
     client::generate_index_accessors(&mut output, &metadata.index_set_patterns);
     client::generate_pattern_structs(&mut output, &metadata.structural_patterns, metadata);

crates/brk_bindgen/src/generators/rust/tree.rs

@@ -7,21 +7,22 @@ use brk_types::TreeNode;
 
 use crate::{
     ClientMetadata, GenericSyntax, LanguageSyntax, PatternField, RustSyntax, build_child_path,
-    generate_leaf_field, generate_tree_node_field, prepare_tree_node, to_snake_case,
+    escape_rust_keyword, generate_leaf_field, generate_tree_node_field, prepare_tree_node,
+    to_snake_case,
 };
 
 /// Generate tree structs.
 pub fn generate_tree(output: &mut String, catalog: &TreeNode, metadata: &ClientMetadata) {
-    writeln!(output, "// Metrics tree\n").unwrap();
+    writeln!(output, "// Series tree\n").unwrap();
 
     let pattern_lookup = metadata.pattern_lookup();
     let mut generated = BTreeSet::new();
     generate_tree_node(
         output,
-        "MetricsTree",
+        "SeriesTree",
         "",
         catalog,
-        &pattern_lookup,
+        pattern_lookup,
         metadata,
         &mut generated,
     );
@@ -41,21 +42,15 @@ fn generate_tree_node(
     };
 
     // Generate struct definition
-    writeln!(output, "/// Metrics tree node.").unwrap();
+    writeln!(output, "/// Series tree node.").unwrap();
     writeln!(output, "pub struct {} {{", name).unwrap();
 
     for child in &ctx.children {
-        let field_name = to_snake_case(child.name);
+        let field_name = escape_rust_keyword(&to_snake_case(child.name));
         let type_annotation = if child.should_inline {
             child.inline_type_name.clone()
         } else {
-            metadata.resolve_tree_field_type(
-                &child.field,
-                child.child_fields.as_deref(),
-                name,
-                child.name,
-                GenericSyntax::RUST,
-            )
+            metadata.field_type_annotation(&child.field, false, None, GenericSyntax::RUST)
         };
         writeln!(output, "    pub {}: {},", field_name, type_annotation).unwrap();
     }
@@ -73,7 +68,7 @@ fn generate_tree_node(
 
     let syntax = RustSyntax;
     for child in &ctx.children {
-        let field_name = to_snake_case(child.name);
+        let field_name = escape_rust_keyword(&to_snake_case(child.name));
 
         if child.is_leaf {
             if let TreeNode::Leaf(leaf) = child.node {
@@ -97,17 +92,14 @@ fn generate_tree_node(
             )
             .unwrap();
         } else {
-            // Pattern type - use ::new() constructor
-            // All patterns have ::new(), parameterizable ones use detected mode,
-            // non-parameterizable ones use field name fallback
             generate_tree_node_field(
                 output,
                 &syntax,
                 &child.field,
                 metadata,
                 "            ",
-                child.name,
-                Some(&child.base_result.base),
+                "client.clone()",
+                &child.base_result,
             );
         }
     }

crates/brk_bindgen/src/generators/rust/types.rs

@@ -10,7 +10,7 @@ pub fn js_type_to_rust(js_type: &str) -> String {
             "integer" => "i64".to_string(),
             "number" => "f64".to_string(),
             "boolean" => "bool".to_string(),
-            "*" => "serde_json::Value".to_string(),
+            "*" | "Object" => "serde_json::Value".to_string(),
             other => other.to_string(),
         }
     }

crates/brk_bindgen/src/openapi.rs

@@ -43,6 +43,11 @@ impl Endpoint {
         self.method == "GET" && !self.deprecated
     }
 
+    /// Returns true if this endpoint returns JSON (has a response_type extracted from application/json).
+    pub fn returns_json(&self) -> bool {
+        self.response_type.is_some()
+    }
+
     /// Returns the operation ID or generates one from the path.
     /// The returned string uses the raw case from the spec (typically camelCase).
     pub fn operation_name(&self) -> String {
@@ -218,7 +223,7 @@ fn check_csv_support(operation: &Operation) -> bool {
 
 /// Extract path parameters in the order they appear in the path URL.
 fn extract_path_parameters(path: &str, operation: &Operation) -> Vec<Parameter> {
-    // Extract parameter names from the path in order (e.g., "/api/metric/{metric}/{index}" -> ["metric", "index"])
+    // Extract parameter names from the path in order (e.g., "/api/series/{series}/{index}" -> ["series", "index"])
     let path_order: Vec<&str> = path
         .split('/')
         .filter_map(|segment| segment.strip_prefix('{').and_then(|s| s.strip_suffix('}')))
@@ -306,18 +311,52 @@ fn schema_type_from_schema(schema: &Schema) -> Option<String> {
 }
 
 fn schema_to_type_name(schema: &ObjectSchema) -> Option<String> {
-    let schema_type = schema.schema_type.as_ref()?;
+    if let Some(schema_type) = schema.schema_type.as_ref() {
+        return match schema_type {
+            SchemaTypeSet::Single(t) => single_type_to_name(t, schema),
+            SchemaTypeSet::Multiple(types) => {
+                // For nullable types like ["integer", "null"], return the non-null type
+                types
+                    .iter()
+                    .find(|t| !matches!(t, SchemaType::Null))
+                    .and_then(|t| single_type_to_name(t, schema))
+                    .or(Some("*".to_string()))
+            }
+        };
+    }
 
-    match schema_type {
-        SchemaTypeSet::Single(t) => single_type_to_name(t, schema),
-        SchemaTypeSet::Multiple(types) => {
-            // For nullable types like ["integer", "null"], return the non-null type
-            types
-                .iter()
-                .find(|t| !matches!(t, SchemaType::Null))
-                .and_then(|t| single_type_to_name(t, schema))
-                .or(Some("*".to_string()))
-        }
+    // Handle anyOf/oneOf unions (e.g., Option<RangeIndex> → anyOf: [$ref, null])
+    let variants = if !schema.any_of.is_empty() {
+        &schema.any_of
+    } else if !schema.one_of.is_empty() {
+        &schema.one_of
+    } else {
+        return None;
+    };
+
+    let types: Vec<String> = variants
+        .iter()
+        .filter_map(|v| match v {
+            ObjectOrReference::Ref { ref_path, .. } => {
+                ref_to_type_name(ref_path).map(|s| s.to_string())
+            }
+            ObjectOrReference::Object(obj) => {
+                // Skip null variants
+                if matches!(
+                    obj.schema_type.as_ref(),
+                    Some(SchemaTypeSet::Single(SchemaType::Null))
+                ) {
+                    return None;
+                }
+                schema_to_type_name(obj)
+            }
+        })
+        .collect();
+
+    match types.len() {
+        0 => None,
+        1 => Some(types.into_iter().next().unwrap()),
+        _ => Some(types.join(" | ")),
     }
 }
 

crates/brk_bindgen/src/syntax.rs

@@ -92,4 +92,31 @@ pub trait LanguageSyntax {
     /// - JavaScript: `createTypeName`
     /// - Rust: `TypeName::new`
     fn constructor_name(&self, type_name: &str) -> String;
+
+    /// Return a variable as an owned value expression.
+    ///
+    /// - Rust: `var.clone()` (String needs explicit cloning)
+    /// - JavaScript/Python: `var` (no ownership)
+    fn owned_expr(&self, var: &str) -> String {
+        var.to_string()
+    }
+
+    /// Format a discriminator argument for passing to a templated child.
+    ///
+    /// Returns an expression computing the disc value from a template.
+    /// - `"pct99"` (static) → `'pct99'` (JS) / `"pct99".to_string()` (Rust)
+    /// - `""` (empty) → `disc` (pass parent's disc through)
+    /// - `"p1sd{disc}"` (suffix) → `_m('p1sd', disc)` (composed)
+    /// - `"ratio_{disc}_bps"` (embedded) → `` `ratio_${disc}_bps` `` (template literal)
+    fn disc_arg_expr(&self, template: &str) -> String;
+
+    /// Format a templated mode expression: substitute `{disc}` at runtime.
+    ///
+    /// The template contains `{disc}` placeholder. The generated code should
+    /// construct `_m(acc, template_with_disc_substituted)` at runtime.
+    ///
+    /// # Arguments
+    /// * `acc_var` - The accumulator variable (e.g., "acc")
+    /// * `template` - Template like `"ratio_{disc}_bps"` or `"{disc}"`
+    fn template_expr(&self, acc_var: &str, template: &str) -> String;
 }

crates/brk_bindgen/src/types/case.rs

@@ -14,25 +14,25 @@ pub fn to_pascal_case(s: &str) -> String {
         .collect()
 }
 
-/// Convert a string to snake_case, handling Rust keywords.
+/// Convert a string to snake_case (no keyword escaping — backends handle that).
 pub fn to_snake_case(s: &str) -> String {
-    // Convert to lowercase and replace dashes with underscores
     let sanitized = s.to_lowercase().replace('-', "_");
 
-    // Prefix with _ if starts with digit
-    let sanitized = if sanitized.chars().next().is_some_and(|c| c.is_ascii_digit()) {
+    if sanitized.chars().next().is_some_and(|c| c.is_ascii_digit()) {
         format!("_{}", sanitized)
     } else {
         sanitized
-    };
+    }
+}
 
-    // Handle Rust keywords
-    match sanitized.as_str() {
+/// Escape Rust reserved keywords with `_` suffix (consistent with Python).
+pub fn escape_rust_keyword(name: &str) -> String {
+    match name {
         "type" | "const" | "static" | "match" | "if" | "else" | "loop" | "while" | "for"
         | "break" | "continue" | "return" | "fn" | "let" | "mut" | "ref" | "self" | "super"
         | "mod" | "use" | "pub" | "crate" | "extern" | "impl" | "trait" | "struct" | "enum"
-        | "where" | "async" | "await" | "dyn" | "move" => format!("r#{}", sanitized),
-        _ => sanitized,
+        | "where" | "async" | "await" | "dyn" | "move" => format!("{}_", name),
+        _ => name.to_string(),
     }
 }
 
@@ -54,9 +54,9 @@ pub fn to_camel_case(s: &str) -> String {
     }
 }
 
-/// Convert an Index to a snake_case field name (e.g., DateIndex -> dateindex).
+/// Convert an Index to a snake_case field name (e.g., Day1 -> day1).
 pub fn index_to_field_name(index: &Index) -> String {
-    to_snake_case(index.serialize_long())
+    to_snake_case(index.name())
 }
 
 /// Generate a child type/struct/class name (e.g., ParentName + child_name -> ParentName_ChildName).
@@ -74,6 +74,9 @@ pub fn escape_python_keyword(name: &str) -> String {
         "try", "while", "with", "yield",
     ];
 
+    // Strip characters invalid in identifiers (e.g. `[]` from `txId[]`)
+    let name = name.replace(['[', ']'], "");
+
     // Prefix with underscore if starts with digit
     let name = if name.starts_with(|c: char| c.is_ascii_digit()) {
         format!("_{}", name)

crates/brk_bindgen/src/types/metadata.rs

@@ -3,7 +3,7 @@
 use std::collections::{BTreeMap, BTreeSet};
 
 use brk_query::Vecs;
-use brk_types::{Index, MetricLeafWithSchema};
+use brk_types::{Index, SeriesLeafWithSchema};
 
 use super::{GenericSyntax, IndexSetPattern, PatternField, StructuralPattern, extract_inner_type};
 use crate::{PatternBaseResult, analysis};
@@ -15,10 +15,10 @@ pub struct ClientMetadata {
     pub catalog: brk_types::TreeNode,
     /// Structural patterns - tree node shapes that repeat
     pub structural_patterns: Vec<StructuralPattern>,
-    /// Index set patterns - sets of indexes that appear together on metrics
+    /// Index set patterns - sets of indexes that appear together on series
     pub index_set_patterns: Vec<IndexSetPattern>,
-    /// Maps concrete field signatures to pattern names
-    concrete_to_pattern: BTreeMap<Vec<PatternField>, String>,
+    /// Maps field signatures to pattern names (merged from concrete instances + pattern definitions)
+    pattern_lookup: BTreeMap<Vec<PatternField>, String>,
     /// Maps concrete field signatures to their type parameter (for generic patterns)
     concrete_to_type_param: BTreeMap<Vec<PatternField>, String>,
     /// Maps tree paths to their computed PatternBaseResult
@@ -37,11 +37,17 @@ impl ClientMetadata {
             analysis::detect_structural_patterns(&catalog);
         let index_set_patterns = analysis::detect_index_patterns(&catalog);
 
+        // Build merged pattern lookup: concrete instances + pattern definitions
+        let mut pattern_lookup = concrete_to_pattern;
+        for p in &structural_patterns {
+            pattern_lookup.insert(p.fields.clone(), p.name.clone());
+        }
+
         ClientMetadata {
             catalog,
             structural_patterns,
             index_set_patterns,
-            concrete_to_pattern,
+            pattern_lookup,
             concrete_to_type_param,
             node_bases,
         }
@@ -54,78 +60,29 @@ impl ClientMetadata {
             .find(|p| &p.indexes == indexes)
     }
 
-    /// Check if a type is a structural pattern name.
-    pub fn is_pattern_type(&self, type_name: &str) -> bool {
-        self.structural_patterns.iter().any(|p| p.name == type_name)
-    }
-
     /// Find a pattern by name.
     pub fn find_pattern(&self, name: &str) -> Option<&StructuralPattern> {
         self.structural_patterns.iter().find(|p| p.name == name)
     }
 
-    /// Check if a pattern is generic.
-    pub fn is_pattern_generic(&self, name: &str) -> bool {
-        self.find_pattern(name).is_some_and(|p| p.is_generic)
-    }
-
-    /// Check if a pattern by name is fully parameterizable.
-    /// A pattern is parameterizable if it has a mode AND all its branch fields
-    /// are also parameterizable (or not patterns at all).
+    /// Check if a pattern is fully parameterizable (recursively).
+    /// Returns false if the pattern or any nested branch pattern has no mode.
     pub fn is_parameterizable(&self, name: &str) -> bool {
         self.find_pattern(name).is_some_and(|p| {
-            if !p.is_parameterizable() {
-                return false;
-            }
-            // Check all branch fields have parameterizable types (or are not patterns)
-            p.fields.iter().all(|f| {
-                if f.is_branch() {
-                    self.structural_patterns
-                        .iter()
-                        .find(|pat| pat.name == f.rust_type)
-                        .is_none_or(|pat| pat.is_parameterizable())
-                } else {
-                    true
-                }
-            })
+            p.is_parameterizable()
+                && p.fields.iter().all(|f| {
+                    !f.is_branch()
+                        || self.find_pattern(&f.rust_type).is_none()
+                        || self.is_parameterizable(&f.rust_type)
+                })
         })
     }
 
-    /// Check if child fields match ANY pattern (parameterizable or not).
-    /// Used for type annotations - we want to reuse pattern types for all patterns.
-    pub fn matches_pattern(&self, fields: &[PatternField]) -> bool {
-        self.concrete_to_pattern.contains_key(fields)
-            || self.structural_patterns.iter().any(|p| p.fields == fields)
-    }
-
-    /// Find a pattern by its fields.
+    /// Find a pattern by its concrete fields.
     pub fn find_pattern_by_fields(&self, fields: &[PatternField]) -> Option<&StructuralPattern> {
-        self.concrete_to_pattern
+        self.pattern_lookup
             .get(fields)
             .and_then(|name| self.find_pattern(name))
-            .or_else(|| self.structural_patterns.iter().find(|p| p.fields == fields))
-    }
-
-    /// Resolve the type name for a tree field.
-    /// If the field matches ANY pattern (parameterizable or not), returns pattern type.
-    /// Otherwise returns the inline type name (parent_child format).
-    pub fn resolve_tree_field_type(
-        &self,
-        field: &PatternField,
-        child_fields: Option<&[PatternField]>,
-        parent_name: &str,
-        child_name: &str,
-        syntax: GenericSyntax,
-    ) -> String {
-        match child_fields {
-            // Use pattern type for ANY matching pattern (parameterizable or not)
-            Some(cf) if self.matches_pattern(cf) => {
-                let generic_value_type = self.get_type_param(cf).map(String::as_str);
-                self.field_type_annotation(field, false, generic_value_type, syntax)
-            }
-            Some(_) => crate::child_type_name(parent_name, child_name),
-            None => self.field_type_annotation(field, false, None, syntax),
-        }
     }
 
     /// Get the type parameter for a generic pattern given its concrete fields.
@@ -133,13 +90,9 @@ impl ClientMetadata {
         self.concrete_to_type_param.get(fields)
     }
 
-    /// Build a lookup map from field signatures to pattern names.
-    pub fn pattern_lookup(&self) -> BTreeMap<Vec<PatternField>, String> {
-        let mut lookup = self.concrete_to_pattern.clone();
-        for p in &self.structural_patterns {
-            lookup.insert(p.fields.clone(), p.name.clone());
-        }
-        lookup
+    /// Get the pre-computed pattern lookup map.
+    pub fn pattern_lookup(&self) -> &BTreeMap<Vec<PatternField>, String> {
+        &self.pattern_lookup
     }
 
     /// Get the pre-computed PatternBaseResult for a tree path.
@@ -155,14 +108,9 @@ impl ClientMetadata {
         generic_value_type: Option<&str>,
         syntax: GenericSyntax,
     ) -> String {
-        let value_type = if is_generic && field.rust_type == "T" {
-            "T".to_string()
-        } else {
-            extract_inner_type(&field.rust_type)
-        };
-
-        if self.is_pattern_type(&field.rust_type) {
-            if self.is_pattern_generic(&field.rust_type) {
+        // Pattern type — single lookup instead of is_pattern_type + is_pattern_generic
+        if let Some(pattern) = self.find_pattern(&field.rust_type) {
+            if pattern.is_generic {
                 let type_param = field
                     .type_param
                     .as_deref()
@@ -170,30 +118,41 @@ impl ClientMetadata {
                     .unwrap_or(if is_generic { "T" } else { syntax.default_type });
                 return syntax.wrap(&field.rust_type, type_param);
             }
-            field.rust_type.clone()
-        } else if field.is_branch() {
-            field.rust_type.clone()
-        } else if let Some(accessor) = self.find_index_set_pattern(&field.indexes) {
+            return field.rust_type.clone();
+        }
+
+        // Branch type (non-pattern)
+        if field.is_branch() {
+            return field.rust_type.clone();
+        }
+
+        // Leaf type
+        let value_type = if is_generic && field.rust_type == "T" {
+            "T".to_string()
+        } else {
+            extract_inner_type(&field.rust_type)
+        };
+        if let Some(accessor) = self.find_index_set_pattern(&field.indexes) {
             syntax.wrap(&accessor.name, &value_type)
         } else {
-            syntax.wrap("MetricNode", &value_type)
+            syntax.wrap("SeriesNode", &value_type)
         }
     }
 
     /// Generate type annotation for a leaf node with language-specific syntax.
     ///
     /// This is a simpler version of `field_type_annotation` that works directly
-    /// with a `MetricLeafWithSchema` node instead of a `PatternField`.
+    /// with a `SeriesLeafWithSchema` node instead of a `PatternField`.
     pub fn field_type_annotation_from_leaf(
         &self,
-        leaf: &MetricLeafWithSchema,
+        leaf: &SeriesLeafWithSchema,
         syntax: GenericSyntax,
     ) -> String {
         let value_type = leaf.kind().to_string();
         if let Some(accessor) = self.find_index_set_pattern(leaf.indexes()) {
             syntax.wrap(&accessor.name, &value_type)
         } else {
-            syntax.wrap("MetricNode", &value_type)
+            syntax.wrap("SeriesNode", &value_type)
         }
     }
 }

crates/brk_bindgen/src/types/positions.rs

@@ -1,4 +1,4 @@
-//! Pattern mode and field parts for metric name reconstruction.
+//! Pattern mode and field parts for series name reconstruction.
 //!
 //! Patterns are either suffix mode or prefix mode:
 //! - Suffix mode: `_m(acc, relative)` → `acc_relative` or just `relative` if acc empty
@@ -6,14 +6,14 @@
 
 use std::collections::BTreeMap;
 
-/// How a pattern constructs metric names from the accumulator.
+/// How a pattern constructs series names from the accumulator.
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum PatternMode {
     /// Fields append their relative name to acc.
     /// Formula: `_m(acc, relative)` → `{acc}_{relative}` or `{relative}` if acc empty
     /// Example: `_m("lth", "max_cost_basis")` → `"lth_max_cost_basis"`
     Suffix {
-        /// Maps field name to its relative name (full metric name when acc = "")
+        /// Maps field name to its relative name (full series name when acc = "")
         relatives: BTreeMap<String, String>,
     },
     /// Fields prepend their prefix to acc.
@@ -23,4 +23,12 @@ pub enum PatternMode {
         /// Maps field name to its prefix (empty string for identity)
         prefixes: BTreeMap<String, String>,
     },
+    /// Fields construct series names using a template with a discriminator placeholder.
+    /// Factory takes two params: `acc` (base) and `disc` (discriminator).
+    /// Formula: `_m(acc, template.replace("{disc}", disc))`
+    /// Example: template `"ratio_{disc}_bps"` with disc `"pct99"` → `_m(acc, "ratio_pct99_bps")`
+    Templated {
+        /// Maps field name to its template string containing `{disc}` placeholder
+        templates: BTreeMap<String, String>,
+    },
 }

crates/brk_bindgen/src/types/structs.rs

@@ -6,7 +6,7 @@ use brk_types::Index;
 
 use super::PatternMode;
 
-/// A pattern of indexes that appear together on multiple metrics.
+/// A pattern of indexes that appear together on multiple series.
 #[derive(Debug, Clone)]
 pub struct IndexSetPattern {
     /// Pattern name (e.g., "DateHeightIndexes")
@@ -22,7 +22,7 @@ pub struct StructuralPattern {
     pub name: String,
     /// Ordered list of child fields
     pub fields: Vec<PatternField>,
-    /// How fields construct metric names from acc (None = not parameterizable)
+    /// How fields construct series names from acc (None = not parameterizable)
     pub mode: Option<PatternMode>,
     /// If true, all leaf fields use a type parameter T
     pub is_generic: bool,
@@ -41,21 +41,53 @@ impl StructuralPattern {
                 relatives.get(field_name).map(|s| s.as_str())
             }
             Some(PatternMode::Prefix { prefixes }) => prefixes.get(field_name).map(|s| s.as_str()),
+            Some(PatternMode::Templated { templates }) => {
+                templates.get(field_name).map(|s| s.as_str())
+            }
             None => None,
         }
     }
 
     /// Returns true if this pattern is in suffix mode.
     pub fn is_suffix_mode(&self) -> bool {
-        matches!(&self.mode, Some(PatternMode::Suffix { .. }))
+        matches!(
+            &self.mode,
+            Some(PatternMode::Suffix { .. } | PatternMode::Templated { .. })
+        )
+    }
+
+    /// Returns true if this pattern uses templated mode with a discriminator.
+    pub fn is_templated(&self) -> bool {
+        matches!(&self.mode, Some(PatternMode::Templated { .. }))
+    }
+
+    /// Extract the discriminator value from a concrete instance's field_parts.
+    /// Uses the pattern's templates to reverse-match and find the disc.
+    pub fn extract_disc_from_instance(
+        &self,
+        instance_field_parts: &BTreeMap<String, String>,
+    ) -> Option<String> {
+        let templates = match &self.mode {
+            Some(PatternMode::Templated { templates }) => templates,
+            _ => return None,
+        };
+        // Find a template with {disc} and extract the disc from the instance value.
+        // Strip leading underscore since _m() handles separators.
+        for (field_name, template) in templates {
+            if let Some(value) = instance_field_parts.get(field_name)
+                && let Some(disc) = extract_disc(template, value)
+            {
+                return Some(disc.trim_start_matches('_').to_string());
+            }
+        }
+        // If no template matched (all empty templates), disc is empty
+        Some(String::new())
     }
 
     /// Check if the given instance field parts match this pattern's field parts.
-    /// Returns true if all field parts in the pattern match the instance's field parts.
     pub fn field_parts_match(&self, instance_field_parts: &BTreeMap<String, String>) -> bool {
         match &self.mode {
             Some(PatternMode::Suffix { relatives }) => {
-                // For each field in the pattern, check if the instance has the same suffix
                 relatives.iter().all(|(field_name, pattern_suffix)| {
                     instance_field_parts
                         .get(field_name)
@@ -63,18 +95,51 @@ impl StructuralPattern {
                 })
             }
             Some(PatternMode::Prefix { prefixes }) => {
-                // For each field in the pattern, check if the instance has the same prefix
                 prefixes.iter().all(|(field_name, pattern_prefix)| {
                     instance_field_parts
                         .get(field_name)
                         .is_some_and(|instance_prefix| instance_prefix == pattern_prefix)
                 })
             }
-            None => false, // Non-parameterizable patterns don't use field parts
+            Some(PatternMode::Templated { templates }) => {
+                // For templated patterns, check if the instance's field_parts
+                // can be produced by substituting some discriminator into the templates
+                let first_template_field = templates.iter().next();
+                let Some((ref_field, ref_template)) = first_template_field else {
+                    return false;
+                };
+                let Some(ref_value) = instance_field_parts.get(ref_field) else {
+                    return false;
+                };
+                // Extract discriminator from the reference field
+                let Some(disc) = extract_disc(ref_template, ref_value) else {
+                    return false;
+                };
+                // Verify all fields match with this discriminator
+                templates.iter().all(|(field_name, template)| {
+                    instance_field_parts
+                        .get(field_name)
+                        .is_some_and(|value| *value == template.replace("{disc}", &disc))
+                })
+            }
+            None => false,
         }
     }
 }
 
+/// Extract the discriminator value by matching a template against a concrete string.
+/// E.g., template `"ratio_{disc}_bps"` matched against `"ratio_pct99_bps"` yields `"pct99"`.
+fn extract_disc(template: &str, value: &str) -> Option<String> {
+    let (prefix, suffix) = template.split_once("{disc}")?;
+    if value.starts_with(prefix) && value.ends_with(suffix) {
+        let disc = &value[prefix.len()..value.len() - suffix.len()];
+        if !disc.is_empty() {
+            return Some(disc.to_string());
+        }
+    }
+    None
+}
+
 /// A field in a structural pattern.
 #[derive(Debug, Clone, PartialOrd, Ord)]
 pub struct PatternField {

crates/brk_cli/Cargo.toml

@@ -12,14 +12,12 @@ anyhow = "1.0"
 brk_alloc = { workspace = true }
 brk_computer = { workspace = true }
 brk_error = { workspace = true, features = ["tokio", "vecdb"] }
-brk_fetcher = { workspace = true }
 brk_indexer = { workspace = true }
-brk_iterator = { workspace = true }
 brk_logger = { workspace = true }
 brk_mempool = { workspace = true }
 brk_query = { workspace = true }
 brk_reader = { workspace = true }
-brk_rpc = { workspace = true }
+brk_rpc = { workspace = true, features = ["corepc"] }
 brk_server = { workspace = true }
 brk_types = { workspace = true }
 lexopt = "0.3"
@@ -27,7 +25,7 @@ owo-colors = { workspace = true }
 tracing = { workspace = true }
 serde = { workspace = true }
 tokio = { workspace = true }
-toml = "0.9.11"
+toml = "1.1.2"
 vecdb = { workspace = true }
 
 [[bin]]

crates/brk_cli/README.md

@@ -1,19 +1,21 @@
-# brk_cli
+# BRK CLI
 
-Command-line interface for running a Bitcoin Research Kit instance.
+Run your own Bitcoin Research Kit instance. One binary, one command. Full sync in ~4-7h depending on hardware. ~44% disk overhead vs 250% for mempool/electrs.
 
-## Preview
-
-- https://bitview.space - web interface
-- https://bitview.space/api - API docs
+[bitview.space](https://bitview.space) is the official free hosted instance.
 
 ## Requirements
 
-- Bitcoin Core running with RPC enabled
+- Linux or macOS
+- Bitcoin Core with `server=1` in `bitcoin.conf`
 - Access to `blk*.dat` files
-- [~400 GB disk space](https://bitview.space/api/server/disk)
+- [~400 GB disk space](https://bitview.space/api/server/disk) (see [Disk usage](#disk-usage))
 - [12+ GB RAM](https://github.com/bitcoinresearchkit/benches#benchmarks)
 
+## Disk usage
+
+BRK uses [sparse files](https://en.wikipedia.org/wiki/Sparse_file). Tools like `ls -l` or Finder report the logical file size (>1 TB), not actual disk usage (~350 GB). Use `du -sh` to see real usage.
+
 ## Install
 
 ```bash
@@ -35,7 +37,9 @@ brk
 
 Indexes the blockchain, computes datasets, starts the server on `localhost:3110`, and waits for new blocks.
 
-**Note:** When more than 10,000 blocks behind, indexing completes before the server starts to free up memory from fragmentation that occurs during large syncs. The web interface at `localhost:3110` won't be available until sync finishes.
+## First sync
+
+The initial sync processes the entire blockchain and can take several hours. During this time (more than 10,000 blocks behind), indexing completes before the server starts to free up memory. The web interface at `localhost:3110` won't be available until sync finishes.
 
 ## Options
 

crates/brk_cli/src/config.rs

@@ -4,7 +4,6 @@ use std::{
 };
 
 use brk_error::{Error, Result};
-use brk_fetcher::Fetcher;
 use brk_rpc::{Auth, Client};
 use brk_server::Website;
 use brk_types::Port;
@@ -24,9 +23,6 @@ pub struct Config {
     #[serde(default, deserialize_with = "default_on_error")]
     website: Option<Website>,
 
-    #[serde(default, deserialize_with = "default_on_error")]
-    fetch: Option<bool>,
-
     #[serde(default, deserialize_with = "default_on_error")]
     bitcoindir: Option<String>,
 
@@ -70,9 +66,6 @@ impl Config {
         if let Some(v) = config_args.website {
             config.website = Some(v);
         }
-        if let Some(v) = config_args.fetch {
-            config.fetch = Some(v);
-        }
         if let Some(v) = config_args.bitcoindir {
             config.bitcoindir = Some(v);
         }
@@ -119,7 +112,6 @@ impl Config {
                 Long("brkdir") => config.brkdir = Some(parser.value().unwrap().parse().unwrap()),
                 Long("brkport") => config.brkport = Some(parser.value().unwrap().parse().unwrap()),
                 Long("website") => config.website = Some(parser.value().unwrap().parse().unwrap()),
-                Long("fetch") => config.fetch = Some(parser.value().unwrap().parse().unwrap()),
                 Long("bitcoindir") => {
                     config.bitcoindir = Some(parser.value().unwrap().parse().unwrap())
                 }
@@ -179,11 +171,6 @@ impl Config {
             "<BOOL|PATH>".bright_black(),
             "[true]".bright_black()
         );
-        println!(
-            "    --fetch {}            Fetch prices {}",
-            "<BOOL>".bright_black(),
-            "[true]".bright_black()
-        );
         println!();
         println!(
             "    --bitcoindir {}       Bitcoin directory {}",
@@ -236,10 +223,7 @@ impl Config {
             "    Edit {} to persist settings:",
             "~/.brk/config.toml".bright_black()
         );
-        println!(
-            "    {}",
-            "brkdir = \"/path/to/data\"".bright_black()
-        );
+        println!("    {}", "brkdir = \"/path/to/data\"".bright_black());
         println!(
             "    {}",
             "bitcoindir = \"/path/to/.bitcoin\"".bright_black()
@@ -338,10 +322,6 @@ Finally, you can run the program with '-h' for help."
             .map_or_else(default_brk_path, |s| fix_user_path(s.as_ref()))
     }
 
-    pub fn harsdir(&self) -> PathBuf {
-        self.brkdir().join("hars")
-    }
-
     fn path_cookiefile(&self) -> PathBuf {
         self.rpccookiefile.as_ref().map_or_else(
             || self.bitcoindir().join(".cookie"),
@@ -356,15 +336,6 @@ Finally, you can run the program with '-h' for help."
     pub fn brkport(&self) -> Option<Port> {
         self.brkport
     }
-
-    pub fn fetch(&self) -> bool {
-        self.fetch.is_none_or(|b| b)
-    }
-
-    pub fn fetcher(&self) -> Option<Fetcher> {
-        self.fetch()
-            .then(|| Fetcher::import(Some(self.harsdir().as_path())).unwrap())
-    }
 }
 
 fn default_on_error<'de, D, T>(deserializer: D) -> Result<T, D::Error>

crates/brk_cli/src/main.rs

@@ -3,14 +3,13 @@
 use std::{
     fs,
     thread::{self, sleep},
-    time::Duration,
+    time::{Duration, Instant},
 };
 
 use brk_alloc::Mimalloc;
 use brk_computer::Computer;
 use brk_error::Result;
 use brk_indexer::Indexer;
-use brk_iterator::Blocks;
 use brk_mempool::Mempool;
 use brk_query::AsyncQuery;
 use brk_reader::Reader;
@@ -24,15 +23,6 @@ mod paths;
 use crate::{config::Config, paths::*};
 
 pub fn main() -> anyhow::Result<()> {
-    // Can't increase main thread's stack size, thus we need to use another thread
-    thread::Builder::new()
-        .stack_size(512 * 1024 * 1024)
-        .spawn(run)?
-        .join()
-        .unwrap()
-}
-
-pub fn run() -> anyhow::Result<()> {
     fs::create_dir_all(dot_brk_path())?;
 
     brk_logger::init(Some(&dot_brk_log_path()))?;
@@ -46,8 +36,6 @@ pub fn run() -> anyhow::Result<()> {
 
     let reader = Reader::new(config.blocksdir(), &client);
 
-    let blocks = Blocks::new(&client, &reader);
-
     let mut indexer = Indexer::forced_import(&config.brkdir())?;
 
     #[cfg(not(debug_assertions))]
@@ -61,14 +49,14 @@ pub fn run() -> anyhow::Result<()> {
             info!("Indexing {blocks_behind} blocks before starting server...");
             info!("---");
             sleep(Duration::from_secs(10));
-            indexer.index(&blocks, &client, &exit)?;
+            indexer.index(&reader, &client, &exit)?;
             drop(indexer);
             Mimalloc::collect();
             indexer = Indexer::forced_import(&config.brkdir())?;
         }
     }
 
-    let mut computer = Computer::forced_import(&config.brkdir(), &indexer, config.fetcher())?;
+    let mut computer = Computer::forced_import(&config.brkdir(), &indexer)?;
 
     let mempool = Mempool::new(&client);
 
@@ -108,16 +96,19 @@ pub fn run() -> anyhow::Result<()> {
 
         info!("{} blocks found.", u32::from(last_height) + 1);
 
+        let total_start = Instant::now();
+
         let starting_indexes = if cfg!(debug_assertions) {
-            indexer.checked_index(&blocks, &client, &exit)?
+            indexer.checked_index(&reader, &client, &exit)?
         } else {
-            indexer.index(&blocks, &client, &exit)?
+            indexer.index(&reader, &client, &exit)?
         };
 
         Mimalloc::collect();
 
-        computer.compute(&indexer, starting_indexes, &reader, &exit)?;
+        computer.compute(&indexer, starting_indexes, &exit)?;
 
+        info!("Total time: {:?}", total_start.elapsed());
         info!("Waiting for new blocks...");
 
         while last_height == client.get_last_height()? {

crates/brk_client/Cargo.toml

@@ -8,10 +8,11 @@ homepage.workspace = true
 repository.workspace = true
 keywords = ["bitcoin", "blockchain", "analytics", "on-chain"]
 categories = ["api-bindings", "cryptography::cryptocurrencies"]
+exclude = ["examples/"]
 
 [dependencies]
 brk_cohort = { workspace = true }
 brk_types = { workspace = true }
-minreq = { workspace = true }
+ureq = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }

crates/brk_client/README.md

@@ -21,7 +21,7 @@ fn main() -> brk_client::Result<()> {
 
     // Blockchain data (mempool.space compatible)
     let block = client.get_block_by_height(800000)?;
-    let tx = client.get_tx("abc123...")?;
+    let tx = client.get_tx("a1075db55d416d3ca199f55b6084e2115b9345e16c5cf302fc80e9d5fbf5d48d")?;
     let address = client.get_address("bc1q...")?;
 
     // Metrics API - typed, chainable

crates/brk_client/examples/basic.rs

@@ -1,7 +1,7 @@
 //! Basic example of using the BRK client.
 
 use brk_client::{BrkClient, BrkClientOptions};
-use brk_types::{FormatResponse, Index, Metric};
+use brk_types::{FormatResponse, Index, RangeIndex};
 
 fn main() -> brk_client::Result<()> {
     // Create client with default options
@@ -14,59 +14,72 @@ fn main() -> brk_client::Result<()> {
     });
 
     // Fetch price data using the typed metrics API
-    // Using new idiomatic API: last(3).fetch()
+    // day1() returns DateMetricEndpointBuilder, so fetch() returns DateMetricData
     let price_close = client
-        .metrics()
-        .price
-        .usd
+        .series()
+        .prices
         .split
         .close
+        .usd
         .by
-        .dateindex()
+        .day1()
         .last(3)
         .fetch()?;
-    println!("Last 3 price close values: {:?}", price_close);
+    println!("Last 3 price close values:");
+    // iter_dates() returns Option (None for sub-daily indexes)
+    for (date, value) in price_close.iter_dates().unwrap() {
+        println!("  {}: {}", date, value);
+    }
+    // iter_timestamps() works for all date-based indexes including sub-daily
+    for (ts, value) in price_close.iter_timestamps() {
+        println!("  {}: {}", ts, value);
+    }
 
-    // Fetch block data
+    // Fetch block data with height index (non-date, returns MetricData)
     let block_count = client
-        .metrics()
+        .series()
         .blocks
         .count
-        .block_count
+        .total
         .sum
+        ._24h
         .by
-        .dateindex()
+        .day1()
         .last(3)
         .fetch()?;
-    println!("Last 3 block count values: {:?}", block_count);
+    println!("Last 3 block count values:");
+    for (date, value) in block_count.iter_dates().unwrap() {
+        println!("  {}: {}", date, value);
+    }
 
-    // Fetch supply data
-    dbg!(
-        client
-            .metrics()
-            .supply
-            .circulating
-            .bitcoin
-            .by
-            .dateindex()
-            .path()
-    );
+    // Fetch supply data as CSV
+    dbg!(client.series().supply.circulating.btc.by.day1().path());
     let circulating = client
-        .metrics()
+        .series()
         .supply
         .circulating
-        .bitcoin
+        .btc
         .by
-        .dateindex()
+        .day1()
         .last(3)
         .fetch_csv()?;
-    println!("Last 3 circulating supply values: {:?}", circulating);
+    println!("Last 3 circulating supply (CSV): {:?}", circulating);
 
-    // Using generic metric fetching
-    let metricdata = client.get_metric(
-        Metric::from("price_close"),
-        Index::DateIndex,
-        Some(-3),
+    // Using dynamic metric fetching with date_metric() for date-based indexes
+    let date_metric = client
+        .date_series_endpoint("price_close", Index::Day1)?
+        .last(3)
+        .fetch()?;
+    println!("Dynamic date metric fetch:");
+    for (date, value) in date_metric.iter_dates().unwrap() {
+        println!("  {}: {}", date, value);
+    }
+
+    // Using generic metric fetching (returns FormatResponse)
+    let metricdata = client.get_series(
+        "price_close".into(),
+        Index::Day1,
+        Some(RangeIndex::Int(-3)),
         None,
         None,
         None,

crates/brk_client/examples/fetch_prices.rs

@@ -1,51 +0,0 @@
-use std::fs::File;
-use std::io::{BufWriter, Write};
-
-use brk_client::{BrkClient, BrkClientOptions, Result};
-use brk_types::Dollars;
-
-const CHUNK_SIZE: usize = 10_000;
-const END_HEIGHT: usize = 630_000;
-const OUTPUT_FILE: &str = "prices_avg.txt";
-
-fn main() -> Result<()> {
-    let client = BrkClient::with_options(BrkClientOptions {
-        base_url: "https://next.bitview.space".to_string(),
-        timeout_secs: 60,
-    });
-
-    let file = File::create(OUTPUT_FILE).map_err(|e| brk_client::BrkError {
-        message: e.to_string(),
-    })?;
-    let mut writer = BufWriter::new(file);
-
-    for start in (0..END_HEIGHT).step_by(CHUNK_SIZE) {
-        let end = (start + CHUNK_SIZE).min(END_HEIGHT);
-        eprintln!("Fetching {start} to {end}...");
-
-        let ohlcs = client
-            .metrics()
-            .price
-            .cents
-            .ohlc
-            .by
-            .height()
-            .range(start..end)
-            .fetch()?;
-
-        for ohlc in ohlcs.data {
-            let avg = (u64::from(*ohlc.open) + u64::from(*ohlc.close)) / 2;
-            let avg = Dollars::from(avg);
-            writeln!(writer, "{avg}").map_err(|e| brk_client::BrkError {
-                message: e.to_string(),
-            })?;
-        }
-    }
-
-    writer.flush().map_err(|e| brk_client::BrkError {
-        message: e.to_string(),
-    })?;
-    eprintln!("Done. Output in {OUTPUT_FILE}");
-
-    Ok(())
-}

crates/brk_client/examples/tree.rs

@@ -4,7 +4,7 @@
 //! and fetch data from each endpoint. Run with: cargo run --example tree
 
 use brk_client::BrkClient;
-use brk_types::{Index, TreeNode};
+use brk_types::{Index, RangeIndex, TreeNode};
 use std::collections::BTreeSet;
 
 /// A collected metric with its path and available indexes.
@@ -45,7 +45,7 @@ fn main() -> brk_client::Result<()> {
     let client = BrkClient::new("http://localhost:3110");
 
     // Get the metrics catalog tree
-    let tree = client.get_metrics_tree()?;
+    let tree = client.get_series_tree()?;
 
     // Recursively collect all metrics
     let metrics = collect_metrics(&tree, "");
@@ -55,14 +55,14 @@ fn main() -> brk_client::Result<()> {
 
     for metric in &metrics {
         for index in &metric.indexes {
-            let index_str = index.serialize_long();
+            let index_str = index.name();
             let full_path = format!("{}.by.{}", metric.path, index_str);
 
-            match client.get_metric(
+            match client.get_series(
                 metric.name.as_str().into(),
                 *index,
                 None,
-                Some(0),
+                Some(RangeIndex::Int(0)),
                 None,
                 None,
             ) {

crates/brk_cohort/Cargo.toml

@@ -14,3 +14,6 @@ brk_traversable = { workspace = true }
 vecdb = { workspace = true }
 rayon = { workspace = true }
 serde = { workspace = true }
+
+[package.metadata.cargo-machete]
+ignored = ["vecdb"]

crates/brk_cohort/README.md

@@ -24,7 +24,7 @@ pub enum Filter {
     Term(Term),           // STH/LTH
     Time(TimeFilter),     // Age-based
     Amount(AmountFilter), // Value-based
-    Epoch(HalvingEpoch),  // Halving epoch
+    Epoch(Halving),  // Halving epoch
     Year(Year),           // Calendar year
     Type(OutputType),     // P2PKH, P2TR, etc.
 }
@@ -48,5 +48,5 @@ ctx.full_name(&filter, "min_age_150d");  // "utxos_min_age_150d"
 ## Built On
 
 - `brk_error` for error handling
-- `brk_types` for `Sats`, `HalvingEpoch`, `OutputType`
+- `brk_types` for `Sats`, `Halving`, `OutputType`
 - `brk_traversable` for data structure traversal

crates/brk_cohort/src/addr.rs

@@ -0,0 +1,82 @@
+use brk_traversable::Traversable;
+use rayon::prelude::*;
+
+use crate::Filter;
+
+use super::{AmountRange, OverAmount, UnderAmount};
+
+#[derive(Default, Clone, Traversable)]
+pub struct AddrGroups<T> {
+    pub over_amount: OverAmount<T>,
+    pub amount_range: AmountRange<T>,
+    pub under_amount: UnderAmount<T>,
+}
+
+impl<T> AddrGroups<T> {
+    pub fn new<F>(mut create: F) -> Self
+    where
+        F: FnMut(Filter, &'static str) -> T,
+    {
+        Self {
+            over_amount: OverAmount::new(&mut create),
+            amount_range: AmountRange::new(&mut create),
+            under_amount: UnderAmount::new(&mut create),
+        }
+    }
+
+    pub fn try_new<F, E>(create: &F) -> Result<Self, E>
+    where
+        F: Fn(Filter, &'static str) -> Result<T, E>,
+    {
+        Ok(Self {
+            over_amount: OverAmount::try_new(create)?,
+            amount_range: AmountRange::try_new(create)?,
+            under_amount: UnderAmount::try_new(create)?,
+        })
+    }
+
+    pub fn iter(&self) -> impl Iterator<Item = &T> {
+        self.over_amount
+            .iter()
+            .chain(self.amount_range.iter())
+            .chain(self.under_amount.iter())
+    }
+
+    pub fn iter_mut(&mut self) -> impl Iterator<Item = &mut T> {
+        self.over_amount
+            .iter_mut()
+            .chain(self.amount_range.iter_mut())
+            .chain(self.under_amount.iter_mut())
+    }
+
+    pub fn par_iter_mut(&mut self) -> impl ParallelIterator<Item = &mut T>
+    where
+        T: Send + Sync,
+    {
+        self.over_amount
+            .par_iter_mut()
+            .chain(self.amount_range.par_iter_mut())
+            .chain(self.under_amount.par_iter_mut())
+    }
+
+    pub fn iter_separate(&self) -> impl Iterator<Item = &T> {
+        self.amount_range.iter()
+    }
+
+    pub fn iter_separate_mut(&mut self) -> impl Iterator<Item = &mut T> {
+        self.amount_range.iter_mut()
+    }
+
+    pub fn par_iter_separate_mut(&mut self) -> impl ParallelIterator<Item = &mut T>
+    where
+        T: Send + Sync,
+    {
+        self.amount_range.par_iter_mut()
+    }
+
+    pub fn iter_overlapping_mut(&mut self) -> impl Iterator<Item = &mut T> {
+        self.under_amount
+            .iter_mut()
+            .chain(self.over_amount.iter_mut())
+    }
+}

crates/brk_cohort/src/address.rs

@@ -1,116 +0,0 @@
-use brk_traversable::Traversable;
-use rayon::prelude::*;
-use vecdb::AnyExportableVec;
-
-use crate::Filter;
-
-use super::{ByAmountRange, ByGreatEqualAmount, ByLowerThanAmount};
-
-#[derive(Default, Clone)]
-pub struct AddressGroups<T> {
-    pub ge_amount: ByGreatEqualAmount<T>,
-    pub amount_range: ByAmountRange<T>,
-    pub lt_amount: ByLowerThanAmount<T>,
-}
-
-impl<T> AddressGroups<T> {
-    pub fn new<F>(mut create: F) -> Self
-    where
-        F: FnMut(Filter, &'static str) -> T,
-    {
-        Self {
-            ge_amount: ByGreatEqualAmount::new(&mut create),
-            amount_range: ByAmountRange::new(&mut create),
-            lt_amount: ByLowerThanAmount::new(&mut create),
-        }
-    }
-
-    pub fn try_new<F, E>(create: &F) -> Result<Self, E>
-    where
-        F: Fn(Filter, &'static str) -> Result<T, E>,
-    {
-        Ok(Self {
-            ge_amount: ByGreatEqualAmount::try_new(create)?,
-            amount_range: ByAmountRange::try_new(create)?,
-            lt_amount: ByLowerThanAmount::try_new(create)?,
-        })
-    }
-
-    pub fn iter(&self) -> impl Iterator<Item = &T> {
-        self.ge_amount
-            .iter()
-            .chain(self.amount_range.iter())
-            .chain(self.lt_amount.iter())
-    }
-
-    pub fn iter_mut(&mut self) -> impl Iterator<Item = &mut T> {
-        self.ge_amount
-            .iter_mut()
-            .chain(self.amount_range.iter_mut())
-            .chain(self.lt_amount.iter_mut())
-    }
-
-    pub fn par_iter_mut(&mut self) -> impl ParallelIterator<Item = &mut T>
-    where
-        T: Send + Sync,
-    {
-        self.ge_amount
-            .par_iter_mut()
-            .chain(self.amount_range.par_iter_mut())
-            .chain(self.lt_amount.par_iter_mut())
-    }
-
-    pub fn iter_separate(&self) -> impl Iterator<Item = &T> {
-        self.amount_range.iter()
-    }
-
-    pub fn iter_separate_mut(&mut self) -> impl Iterator<Item = &mut T> {
-        self.amount_range.iter_mut()
-    }
-
-    pub fn par_iter_separate_mut(&mut self) -> impl ParallelIterator<Item = &mut T>
-    where
-        T: Send + Sync,
-    {
-        self.amount_range.par_iter_mut()
-    }
-
-    pub fn iter_overlapping_mut(&mut self) -> impl Iterator<Item = &mut T> {
-        self.lt_amount.iter_mut().chain(self.ge_amount.iter_mut())
-    }
-}
-
-impl<T> Traversable for AddressGroups<T>
-where
-    ByGreatEqualAmount<T>: brk_traversable::Traversable,
-    ByAmountRange<T>: brk_traversable::Traversable,
-    ByLowerThanAmount<T>: brk_traversable::Traversable,
-    T: Send + Sync,
-{
-    fn to_tree_node(&self) -> brk_traversable::TreeNode {
-        brk_traversable::TreeNode::Branch(
-            [
-                (String::from("ge_amount"), self.ge_amount.to_tree_node()),
-                (
-                    String::from("amount_range"),
-                    self.amount_range.to_tree_node(),
-                ),
-                (String::from("lt_amount"), self.lt_amount.to_tree_node()),
-            ]
-            .into(),
-        )
-    }
-
-    fn iter_any_exportable(&self) -> impl Iterator<Item = &dyn AnyExportableVec> {
-        [
-            Box::new(self.ge_amount.iter_any_exportable())
-                as Box<dyn Iterator<Item = &dyn AnyExportableVec>>,
-            Box::new(self.amount_range.iter_any_exportable())
-                as Box<dyn Iterator<Item = &dyn AnyExportableVec>>,
-            Box::new(self.lt_amount.iter_any_exportable())
-                as Box<dyn Iterator<Item = &dyn AnyExportableVec>>,
-        ]
-        .into_iter()
-        .flatten()
-    }
-}

crates/brk_cohort/src/age_range.rs

@@ -1,7 +1,7 @@
 use std::ops::Range;
 
-use brk_types::Age;
 use brk_traversable::Traversable;
+use brk_types::Age;
 use rayon::iter::{IntoParallelIterator, ParallelIterator};
 use serde::Serialize;
 
@@ -32,14 +32,14 @@ pub const HOURS_15Y: usize = 24 * 15 * 365;
 /// Age boundaries in hours. Defines the cohort ranges:
 /// [0, 1h), [1h, 1d), [1d, 1w), [1w, 1m), ..., [15y, ∞)
 pub const AGE_BOUNDARIES: [usize; 20] = [
-    HOURS_1H, HOURS_1D, HOURS_1W, HOURS_1M, HOURS_2M, HOURS_3M, HOURS_4M,
-    HOURS_5M, HOURS_6M, HOURS_1Y, HOURS_2Y, HOURS_3Y, HOURS_4Y, HOURS_5Y,
-    HOURS_6Y, HOURS_7Y, HOURS_8Y, HOURS_10Y, HOURS_12Y, HOURS_15Y,
+    HOURS_1H, HOURS_1D, HOURS_1W, HOURS_1M, HOURS_2M, HOURS_3M, HOURS_4M, HOURS_5M, HOURS_6M,
+    HOURS_1Y, HOURS_2Y, HOURS_3Y, HOURS_4Y, HOURS_5Y, HOURS_6Y, HOURS_7Y, HOURS_8Y, HOURS_10Y,
+    HOURS_12Y, HOURS_15Y,
 ];
 
 /// Age range bounds (end = usize::MAX means unbounded)
-pub const AGE_RANGE_BOUNDS: ByAgeRange<Range<usize>> = ByAgeRange {
-    up_to_1h: 0..HOURS_1H,
+pub const AGE_RANGE_BOUNDS: AgeRange<Range<usize>> = AgeRange {
+    under_1h: 0..HOURS_1H,
     _1h_to_1d: HOURS_1H..HOURS_1D,
     _1d_to_1w: HOURS_1D..HOURS_1W,
     _1w_to_1m: HOURS_1W..HOURS_1M,
@@ -59,12 +59,12 @@ pub const AGE_RANGE_BOUNDS: ByAgeRange<Range<usize>> = ByAgeRange {
     _8y_to_10y: HOURS_8Y..HOURS_10Y,
     _10y_to_12y: HOURS_10Y..HOURS_12Y,
     _12y_to_15y: HOURS_12Y..HOURS_15Y,
-    from_15y: HOURS_15Y..usize::MAX,
+    over_15y: HOURS_15Y..usize::MAX,
 };
 
 /// Age range filters
-pub const AGE_RANGE_FILTERS: ByAgeRange<Filter> = ByAgeRange {
-    up_to_1h: Filter::Time(TimeFilter::Range(AGE_RANGE_BOUNDS.up_to_1h)),
+pub const AGE_RANGE_FILTERS: AgeRange<Filter> = AgeRange {
+    under_1h: Filter::Time(TimeFilter::Range(AGE_RANGE_BOUNDS.under_1h)),
     _1h_to_1d: Filter::Time(TimeFilter::Range(AGE_RANGE_BOUNDS._1h_to_1d)),
     _1d_to_1w: Filter::Time(TimeFilter::Range(AGE_RANGE_BOUNDS._1d_to_1w)),
     _1w_to_1m: Filter::Time(TimeFilter::Range(AGE_RANGE_BOUNDS._1w_to_1m)),
@@ -84,12 +84,12 @@ pub const AGE_RANGE_FILTERS: ByAgeRange<Filter> = ByAgeRange {
     _8y_to_10y: Filter::Time(TimeFilter::Range(AGE_RANGE_BOUNDS._8y_to_10y)),
     _10y_to_12y: Filter::Time(TimeFilter::Range(AGE_RANGE_BOUNDS._10y_to_12y)),
     _12y_to_15y: Filter::Time(TimeFilter::Range(AGE_RANGE_BOUNDS._12y_to_15y)),
-    from_15y: Filter::Time(TimeFilter::Range(AGE_RANGE_BOUNDS.from_15y)),
+    over_15y: Filter::Time(TimeFilter::Range(AGE_RANGE_BOUNDS.over_15y)),
 };
 
 /// Age range names
-pub const AGE_RANGE_NAMES: ByAgeRange<CohortName> = ByAgeRange {
-    up_to_1h: CohortName::new("under_1h_old", "<1h", "Under 1 Hour Old"),
+pub const AGE_RANGE_NAMES: AgeRange<CohortName> = AgeRange {
+    under_1h: CohortName::new("under_1h_old", "<1h", "Under 1 Hour Old"),
     _1h_to_1d: CohortName::new("1h_to_1d_old", "1h-1d", "1 Hour to 1 Day Old"),
     _1d_to_1w: CohortName::new("1d_to_1w_old", "1d-1w", "1 Day to 1 Week Old"),
     _1w_to_1m: CohortName::new("1w_to_1m_old", "1w-1m", "1 Week to 1 Month Old"),
@@ -109,18 +109,18 @@ pub const AGE_RANGE_NAMES: ByAgeRange<CohortName> = ByAgeRange {
     _8y_to_10y: CohortName::new("8y_to_10y_old", "8y-10y", "8 to 10 Years Old"),
     _10y_to_12y: CohortName::new("10y_to_12y_old", "10y-12y", "10 to 12 Years Old"),
     _12y_to_15y: CohortName::new("12y_to_15y_old", "12y-15y", "12 to 15 Years Old"),
-    from_15y: CohortName::new("over_15y_old", "15y+", "15+ Years Old"),
+    over_15y: CohortName::new("over_15y_old", "15y+", "15+ Years Old"),
 };
 
-impl ByAgeRange<CohortName> {
+impl AgeRange<CohortName> {
     pub const fn names() -> &'static Self {
         &AGE_RANGE_NAMES
     }
 }
 
 #[derive(Default, Clone, Traversable, Serialize)]
-pub struct ByAgeRange<T> {
-    pub up_to_1h: T,
+pub struct AgeRange<T> {
+    pub under_1h: T,
     pub _1h_to_1d: T,
     pub _1d_to_1w: T,
     pub _1w_to_1m: T,
@@ -140,15 +140,15 @@ pub struct ByAgeRange<T> {
     pub _8y_to_10y: T,
     pub _10y_to_12y: T,
     pub _12y_to_15y: T,
-    pub from_15y: T,
+    pub over_15y: T,
 }
 
-impl<T> ByAgeRange<T> {
+impl<T> AgeRange<T> {
     /// Get mutable reference by Age. O(1).
     #[inline]
     pub fn get_mut(&mut self, age: Age) -> &mut T {
         match age.hours() {
-            0..HOURS_1H => &mut self.up_to_1h,
+            0..HOURS_1H => &mut self.under_1h,
             HOURS_1H..HOURS_1D => &mut self._1h_to_1d,
             HOURS_1D..HOURS_1W => &mut self._1d_to_1w,
             HOURS_1W..HOURS_1M => &mut self._1w_to_1m,
@@ -168,7 +168,7 @@ impl<T> ByAgeRange<T> {
             HOURS_8Y..HOURS_10Y => &mut self._8y_to_10y,
             HOURS_10Y..HOURS_12Y => &mut self._10y_to_12y,
             HOURS_12Y..HOURS_15Y => &mut self._12y_to_15y,
-            _ => &mut self.from_15y,
+            _ => &mut self.over_15y,
         }
     }
 
@@ -176,7 +176,7 @@ impl<T> ByAgeRange<T> {
     #[inline]
     pub fn get(&self, age: Age) -> &T {
         match age.hours() {
-            0..HOURS_1H => &self.up_to_1h,
+            0..HOURS_1H => &self.under_1h,
             HOURS_1H..HOURS_1D => &self._1h_to_1d,
             HOURS_1D..HOURS_1W => &self._1d_to_1w,
             HOURS_1W..HOURS_1M => &self._1w_to_1m,
@@ -196,7 +196,56 @@ impl<T> ByAgeRange<T> {
             HOURS_8Y..HOURS_10Y => &self._8y_to_10y,
             HOURS_10Y..HOURS_12Y => &self._10y_to_12y,
             HOURS_12Y..HOURS_15Y => &self._12y_to_15y,
-            _ => &self.from_15y,
+            _ => &self.over_15y,
+        }
+    }
+
+    pub fn from_array(arr: [T; 21]) -> Self {
+        let [
+            a0,
+            a1,
+            a2,
+            a3,
+            a4,
+            a5,
+            a6,
+            a7,
+            a8,
+            a9,
+            a10,
+            a11,
+            a12,
+            a13,
+            a14,
+            a15,
+            a16,
+            a17,
+            a18,
+            a19,
+            a20,
+        ] = arr;
+        Self {
+            under_1h: a0,
+            _1h_to_1d: a1,
+            _1d_to_1w: a2,
+            _1w_to_1m: a3,
+            _1m_to_2m: a4,
+            _2m_to_3m: a5,
+            _3m_to_4m: a6,
+            _4m_to_5m: a7,
+            _5m_to_6m: a8,
+            _6m_to_1y: a9,
+            _1y_to_2y: a10,
+            _2y_to_3y: a11,
+            _3y_to_4y: a12,
+            _4y_to_5y: a13,
+            _5y_to_6y: a14,
+            _6y_to_7y: a15,
+            _7y_to_8y: a16,
+            _8y_to_10y: a17,
+            _10y_to_12y: a18,
+            _12y_to_15y: a19,
+            over_15y: a20,
         }
     }
 
@@ -207,7 +256,7 @@ impl<T> ByAgeRange<T> {
         let f = AGE_RANGE_FILTERS;
         let n = AGE_RANGE_NAMES;
         Self {
-            up_to_1h: create(f.up_to_1h.clone(), n.up_to_1h.id),
+            under_1h: create(f.under_1h.clone(), n.under_1h.id),
             _1h_to_1d: create(f._1h_to_1d.clone(), n._1h_to_1d.id),
             _1d_to_1w: create(f._1d_to_1w.clone(), n._1d_to_1w.id),
             _1w_to_1m: create(f._1w_to_1m.clone(), n._1w_to_1m.id),
@@ -227,7 +276,7 @@ impl<T> ByAgeRange<T> {
             _8y_to_10y: create(f._8y_to_10y.clone(), n._8y_to_10y.id),
             _10y_to_12y: create(f._10y_to_12y.clone(), n._10y_to_12y.id),
             _12y_to_15y: create(f._12y_to_15y.clone(), n._12y_to_15y.id),
-            from_15y: create(f.from_15y.clone(), n.from_15y.id),
+            over_15y: create(f.over_15y.clone(), n.over_15y.id),
         }
     }
 
@@ -238,7 +287,7 @@ impl<T> ByAgeRange<T> {
         let f = AGE_RANGE_FILTERS;
         let n = AGE_RANGE_NAMES;
         Ok(Self {
-            up_to_1h: create(f.up_to_1h.clone(), n.up_to_1h.id)?,
+            under_1h: create(f.under_1h.clone(), n.under_1h.id)?,
             _1h_to_1d: create(f._1h_to_1d.clone(), n._1h_to_1d.id)?,
             _1d_to_1w: create(f._1d_to_1w.clone(), n._1d_to_1w.id)?,
             _1w_to_1m: create(f._1w_to_1m.clone(), n._1w_to_1m.id)?,
@@ -258,13 +307,13 @@ impl<T> ByAgeRange<T> {
             _8y_to_10y: create(f._8y_to_10y.clone(), n._8y_to_10y.id)?,
             _10y_to_12y: create(f._10y_to_12y.clone(), n._10y_to_12y.id)?,
             _12y_to_15y: create(f._12y_to_15y.clone(), n._12y_to_15y.id)?,
-            from_15y: create(f.from_15y.clone(), n.from_15y.id)?,
+            over_15y: create(f.over_15y.clone(), n.over_15y.id)?,
         })
     }
 
     pub fn iter(&self) -> impl Iterator<Item = &T> {
         [
-            &self.up_to_1h,
+            &self.under_1h,
             &self._1h_to_1d,
             &self._1d_to_1w,
             &self._1w_to_1m,
@@ -284,14 +333,14 @@ impl<T> ByAgeRange<T> {
             &self._8y_to_10y,
             &self._10y_to_12y,
             &self._12y_to_15y,
-            &self.from_15y,
+            &self.over_15y,
         ]
         .into_iter()
     }
 
     pub fn iter_mut(&mut self) -> impl Iterator<Item = &mut T> {
         [
-            &mut self.up_to_1h,
+            &mut self.under_1h,
             &mut self._1h_to_1d,
             &mut self._1d_to_1w,
             &mut self._1w_to_1m,
@@ -311,7 +360,7 @@ impl<T> ByAgeRange<T> {
             &mut self._8y_to_10y,
             &mut self._10y_to_12y,
             &mut self._12y_to_15y,
-            &mut self.from_15y,
+            &mut self.over_15y,
         ]
         .into_iter()
     }
@@ -321,7 +370,7 @@ impl<T> ByAgeRange<T> {
         T: Send + Sync,
     {
         [
-            &mut self.up_to_1h,
+            &mut self.under_1h,
             &mut self._1h_to_1d,
             &mut self._1d_to_1w,
             &mut self._1w_to_1m,
@@ -341,7 +390,7 @@ impl<T> ByAgeRange<T> {
             &mut self._8y_to_10y,
             &mut self._10y_to_12y,
             &mut self._12y_to_15y,
-            &mut self.from_15y,
+            &mut self.over_15y,
         ]
         .into_par_iter()
     }

crates/brk_cohort/src/amount_range.rs

@@ -13,7 +13,7 @@ pub struct AmountBucket(u8);
 
 impl AmountBucket {
     /// Returns (self, other) if buckets differ, None if same.
-    /// Use with `ByAmountRange::get_mut_by_bucket` to avoid recomputing.
+    /// Use with `AmountRange::get_mut_by_bucket` to avoid recomputing.
     #[inline(always)]
     pub fn transition_to(self, other: Self) -> Option<(Self, Self)> {
         if self != other {
@@ -59,7 +59,7 @@ pub fn amounts_in_different_buckets(a: Sats, b: Sats) -> bool {
 }
 
 /// Amount range bounds
-pub const AMOUNT_RANGE_BOUNDS: ByAmountRange<Range<Sats>> = ByAmountRange {
+pub const AMOUNT_RANGE_BOUNDS: AmountRange<Range<Sats>> = AmountRange {
     _0sats: Sats::ZERO..Sats::_1,
     _1sat_to_10sats: Sats::_1..Sats::_10,
     _10sats_to_100sats: Sats::_10..Sats::_100,
@@ -74,62 +74,34 @@ pub const AMOUNT_RANGE_BOUNDS: ByAmountRange<Range<Sats>> = ByAmountRange {
     _100btc_to_1k_btc: Sats::_100BTC..Sats::_1K_BTC,
     _1k_btc_to_10k_btc: Sats::_1K_BTC..Sats::_10K_BTC,
     _10k_btc_to_100k_btc: Sats::_10K_BTC..Sats::_100K_BTC,
-    _100k_btc_or_more: Sats::_100K_BTC..Sats::MAX,
+    over_100k_btc: Sats::_100K_BTC..Sats::MAX,
 };
 
 /// Amount range names
-pub const AMOUNT_RANGE_NAMES: ByAmountRange<CohortName> = ByAmountRange {
-    _0sats: CohortName::new("with_0sats", "0 sats", "0 Sats"),
-    _1sat_to_10sats: CohortName::new("above_1sat_under_10sats", "1-10 sats", "1-10 Sats"),
-    _10sats_to_100sats: CohortName::new(
-        "above_10sats_under_100sats",
-        "10-100 sats",
-        "10-100 Sats",
-    ),
-    _100sats_to_1k_sats: CohortName::new(
-        "above_100sats_under_1k_sats",
-        "100-1k sats",
-        "100-1K Sats",
-    ),
-    _1k_sats_to_10k_sats: CohortName::new(
-        "above_1k_sats_under_10k_sats",
-        "1k-10k sats",
-        "1K-10K Sats",
-    ),
+pub const AMOUNT_RANGE_NAMES: AmountRange<CohortName> = AmountRange {
+    _0sats: CohortName::new("0sats", "0 sats", "0 Sats"),
+    _1sat_to_10sats: CohortName::new("1sat_to_10sats", "1-10 sats", "1-10 Sats"),
+    _10sats_to_100sats: CohortName::new("10sats_to_100sats", "10-100 sats", "10-100 Sats"),
+    _100sats_to_1k_sats: CohortName::new("100sats_to_1k_sats", "100-1k sats", "100-1K Sats"),
+    _1k_sats_to_10k_sats: CohortName::new("1k_sats_to_10k_sats", "1k-10k sats", "1K-10K Sats"),
     _10k_sats_to_100k_sats: CohortName::new(
-        "above_10k_sats_under_100k_sats",
+        "10k_sats_to_100k_sats",
         "10k-100k sats",
         "10K-100K Sats",
     ),
-    _100k_sats_to_1m_sats: CohortName::new(
-        "above_100k_sats_under_1m_sats",
-        "100k-1M sats",
-        "100K-1M Sats",
-    ),
-    _1m_sats_to_10m_sats: CohortName::new(
-        "above_1m_sats_under_10m_sats",
-        "1M-10M sats",
-        "1M-10M Sats",
-    ),
-    _10m_sats_to_1btc: CohortName::new("above_10m_sats_under_1btc", "0.1-1 BTC", "0.1-1 BTC"),
-    _1btc_to_10btc: CohortName::new("above_1btc_under_10btc", "1-10 BTC", "1-10 BTC"),
-    _10btc_to_100btc: CohortName::new("above_10btc_under_100btc", "10-100 BTC", "10-100 BTC"),
-    _100btc_to_1k_btc: CohortName::new("above_100btc_under_1k_btc", "100-1k BTC", "100-1K BTC"),
-    _1k_btc_to_10k_btc: CohortName::new(
-        "above_1k_btc_under_10k_btc",
-        "1k-10k BTC",
-        "1K-10K BTC",
-    ),
-    _10k_btc_to_100k_btc: CohortName::new(
-        "above_10k_btc_under_100k_btc",
-        "10k-100k BTC",
-        "10K-100K BTC",
-    ),
-    _100k_btc_or_more: CohortName::new("above_100k_btc", "100k+ BTC", "100K+ BTC"),
+    _100k_sats_to_1m_sats: CohortName::new("100k_sats_to_1m_sats", "100k-1M sats", "100K-1M Sats"),
+    _1m_sats_to_10m_sats: CohortName::new("1m_sats_to_10m_sats", "1M-10M sats", "1M-10M Sats"),
+    _10m_sats_to_1btc: CohortName::new("10m_sats_to_1btc", "0.1-1 BTC", "0.1-1 BTC"),
+    _1btc_to_10btc: CohortName::new("1btc_to_10btc", "1-10 BTC", "1-10 BTC"),
+    _10btc_to_100btc: CohortName::new("10btc_to_100btc", "10-100 BTC", "10-100 BTC"),
+    _100btc_to_1k_btc: CohortName::new("100btc_to_1k_btc", "100-1k BTC", "100-1K BTC"),
+    _1k_btc_to_10k_btc: CohortName::new("1k_btc_to_10k_btc", "1k-10k BTC", "1K-10K BTC"),
+    _10k_btc_to_100k_btc: CohortName::new("10k_btc_to_100k_btc", "10k-100k BTC", "10K-100K BTC"),
+    over_100k_btc: CohortName::new("over_100k_btc", "100k+ BTC", "100K+ BTC"),
 };
 
 /// Amount range filters
-pub const AMOUNT_RANGE_FILTERS: ByAmountRange<Filter> = ByAmountRange {
+pub const AMOUNT_RANGE_FILTERS: AmountRange<Filter> = AmountRange {
     _0sats: Filter::Amount(AmountFilter::Range(AMOUNT_RANGE_BOUNDS._0sats)),
     _1sat_to_10sats: Filter::Amount(AmountFilter::Range(AMOUNT_RANGE_BOUNDS._1sat_to_10sats)),
     _10sats_to_100sats: Filter::Amount(AmountFilter::Range(AMOUNT_RANGE_BOUNDS._10sats_to_100sats)),
@@ -156,11 +128,11 @@ pub const AMOUNT_RANGE_FILTERS: ByAmountRange<Filter> = ByAmountRange {
     _10k_btc_to_100k_btc: Filter::Amount(AmountFilter::Range(
         AMOUNT_RANGE_BOUNDS._10k_btc_to_100k_btc,
     )),
-    _100k_btc_or_more: Filter::Amount(AmountFilter::Range(AMOUNT_RANGE_BOUNDS._100k_btc_or_more)),
+    over_100k_btc: Filter::Amount(AmountFilter::Range(AMOUNT_RANGE_BOUNDS.over_100k_btc)),
 };
 
 #[derive(Debug, Default, Clone, Traversable, Serialize)]
-pub struct ByAmountRange<T> {
+pub struct AmountRange<T> {
     pub _0sats: T,
     pub _1sat_to_10sats: T,
     pub _10sats_to_100sats: T,
@@ -175,16 +147,16 @@ pub struct ByAmountRange<T> {
     pub _100btc_to_1k_btc: T,
     pub _1k_btc_to_10k_btc: T,
     pub _10k_btc_to_100k_btc: T,
-    pub _100k_btc_or_more: T,
+    pub over_100k_btc: T,
 }
 
-impl ByAmountRange<CohortName> {
+impl AmountRange<CohortName> {
     pub const fn names() -> &'static Self {
         &AMOUNT_RANGE_NAMES
     }
 }
 
-impl<T> ByAmountRange<T> {
+impl<T> AmountRange<T> {
     pub fn new<F>(mut create: F) -> Self
     where
         F: FnMut(Filter, &'static str) -> T,
@@ -212,7 +184,7 @@ impl<T> ByAmountRange<T> {
             _100btc_to_1k_btc: create(f._100btc_to_1k_btc.clone(), n._100btc_to_1k_btc.id),
             _1k_btc_to_10k_btc: create(f._1k_btc_to_10k_btc.clone(), n._1k_btc_to_10k_btc.id),
             _10k_btc_to_100k_btc: create(f._10k_btc_to_100k_btc.clone(), n._10k_btc_to_100k_btc.id),
-            _100k_btc_or_more: create(f._100k_btc_or_more.clone(), n._100k_btc_or_more.id),
+            over_100k_btc: create(f.over_100k_btc.clone(), n.over_100k_btc.id),
         }
     }
 
@@ -252,7 +224,7 @@ impl<T> ByAmountRange<T> {
                 f._10k_btc_to_100k_btc.clone(),
                 n._10k_btc_to_100k_btc.id,
             )?,
-            _100k_btc_or_more: create(f._100k_btc_or_more.clone(), n._100k_btc_or_more.id)?,
+            over_100k_btc: create(f.over_100k_btc.clone(), n.over_100k_btc.id)?,
         })
     }
 
@@ -273,7 +245,7 @@ impl<T> ByAmountRange<T> {
             11 => &self._100btc_to_1k_btc,
             12 => &self._1k_btc_to_10k_btc,
             13 => &self._10k_btc_to_100k_btc,
-            _ => &self._100k_btc_or_more,
+            _ => &self.over_100k_btc,
         }
     }
 
@@ -301,7 +273,7 @@ impl<T> ByAmountRange<T> {
             11 => &mut self._100btc_to_1k_btc,
             12 => &mut self._1k_btc_to_10k_btc,
             13 => &mut self._10k_btc_to_100k_btc,
-            _ => &mut self._100k_btc_or_more,
+            _ => &mut self.over_100k_btc,
         }
     }
 
@@ -321,7 +293,7 @@ impl<T> ByAmountRange<T> {
             &self._100btc_to_1k_btc,
             &self._1k_btc_to_10k_btc,
             &self._10k_btc_to_100k_btc,
-            &self._100k_btc_or_more,
+            &self.over_100k_btc,
         ]
         .into_iter()
     }
@@ -342,7 +314,7 @@ impl<T> ByAmountRange<T> {
             (Sats::_100BTC, &self._100btc_to_1k_btc),
             (Sats::_1K_BTC, &self._1k_btc_to_10k_btc),
             (Sats::_10K_BTC, &self._10k_btc_to_100k_btc),
-            (Sats::_100K_BTC, &self._100k_btc_or_more),
+            (Sats::_100K_BTC, &self.over_100k_btc),
         ]
         .into_iter()
     }
@@ -363,7 +335,7 @@ impl<T> ByAmountRange<T> {
             &mut self._100btc_to_1k_btc,
             &mut self._1k_btc_to_10k_btc,
             &mut self._10k_btc_to_100k_btc,
-            &mut self._100k_btc_or_more,
+            &mut self.over_100k_btc,
         ]
         .into_iter()
     }
@@ -387,13 +359,13 @@ impl<T> ByAmountRange<T> {
             &mut self._100btc_to_1k_btc,
             &mut self._1k_btc_to_10k_btc,
             &mut self._10k_btc_to_100k_btc,
-            &mut self._100k_btc_or_more,
+            &mut self.over_100k_btc,
         ]
         .into_par_iter()
     }
 }
 
-impl<T> Add for ByAmountRange<T>
+impl<T> Add for AmountRange<T>
 where
     T: Add<Output = T>,
 {
@@ -414,12 +386,12 @@ where
             _100btc_to_1k_btc: self._100btc_to_1k_btc + rhs._100btc_to_1k_btc,
             _1k_btc_to_10k_btc: self._1k_btc_to_10k_btc + rhs._1k_btc_to_10k_btc,
             _10k_btc_to_100k_btc: self._10k_btc_to_100k_btc + rhs._10k_btc_to_100k_btc,
-            _100k_btc_or_more: self._100k_btc_or_more + rhs._100k_btc_or_more,
+            over_100k_btc: self.over_100k_btc + rhs.over_100k_btc,
         }
     }
 }
 
-impl<T> AddAssign for ByAmountRange<T>
+impl<T> AddAssign for AmountRange<T>
 where
     T: AddAssign,
 {
@@ -438,6 +410,6 @@ where
         self._100btc_to_1k_btc += rhs._100btc_to_1k_btc;
         self._1k_btc_to_10k_btc += rhs._1k_btc_to_10k_btc;
         self._10k_btc_to_100k_btc += rhs._10k_btc_to_100k_btc;
-        self._100k_btc_or_more += rhs._100k_btc_or_more;
+        self.over_100k_btc += rhs.over_100k_btc;
     }
 }

crates/brk_cohort/src/by_addr_type.rs

@@ -17,7 +17,7 @@ pub const P2TR: &str = "p2tr";
 pub const P2A: &str = "p2a";
 
 #[derive(Default, Clone, Debug, Traversable)]
-pub struct ByAddressType<T> {
+pub struct ByAddrType<T> {
     pub p2pk65: T,
     pub p2pk33: T,
     pub p2pkh: T,
@@ -28,7 +28,7 @@ pub struct ByAddressType<T> {
     pub p2a: T,
 }
 
-impl<T> ByAddressType<T> {
+impl<T> ByAddrType<T> {
     pub fn new<F>(mut create: F) -> Self
     where
         F: FnMut(Filter) -> T,
@@ -61,6 +61,19 @@ impl<T> ByAddressType<T> {
         })
     }
 
+    pub fn map_with_name<U>(&self, f: impl Fn(&'static str, &T) -> U) -> ByAddrType<U> {
+        ByAddrType {
+            p2pk65: f(P2PK65, &self.p2pk65),
+            p2pk33: f(P2PK33, &self.p2pk33),
+            p2pkh: f(P2PKH, &self.p2pkh),
+            p2sh: f(P2SH, &self.p2sh),
+            p2wpkh: f(P2WPKH, &self.p2wpkh),
+            p2wsh: f(P2WSH, &self.p2wsh),
+            p2tr: f(P2TR, &self.p2tr),
+            p2a: f(P2A, &self.p2a),
+        }
+    }
+
     pub fn new_with_index<F>(f: F) -> Result<Self>
     where
         F: Fn(usize) -> Result<T>,
@@ -78,13 +91,13 @@ impl<T> ByAddressType<T> {
     }
 
     #[inline]
-    pub fn get_unwrap(&self, addresstype: OutputType) -> &T {
-        self.get(addresstype).unwrap()
+    pub fn get_unwrap(&self, addr_type: OutputType) -> &T {
+        self.get(addr_type).unwrap()
     }
 
     #[inline]
-    pub fn get(&self, address_type: OutputType) -> Option<&T> {
-        match address_type {
+    pub fn get(&self, addr_type: OutputType) -> Option<&T> {
+        match addr_type {
             OutputType::P2PK65 => Some(&self.p2pk65),
             OutputType::P2PK33 => Some(&self.p2pk33),
             OutputType::P2PKH => Some(&self.p2pkh),
@@ -98,13 +111,13 @@ impl<T> ByAddressType<T> {
     }
 
     #[inline]
-    pub fn get_mut_unwrap(&mut self, addresstype: OutputType) -> &mut T {
-        self.get_mut(addresstype).unwrap()
+    pub fn get_mut_unwrap(&mut self, addr_type: OutputType) -> &mut T {
+        self.get_mut(addr_type).unwrap()
     }
 
     #[inline]
-    pub fn get_mut(&mut self, address_type: OutputType) -> Option<&mut T> {
-        match address_type {
+    pub fn get_mut(&mut self, addr_type: OutputType) -> Option<&mut T> {
+        match addr_type {
             OutputType::P2PK65 => Some(&mut self.p2pk65),
             OutputType::P2PK33 => Some(&mut self.p2pk33),
             OutputType::P2PKH => Some(&mut self.p2pkh),
@@ -230,7 +243,7 @@ impl<T> ByAddressType<T> {
     }
 }
 
-impl<T> Add for ByAddressType<T>
+impl<T> Add for ByAddrType<T>
 where
     T: Add<Output = T>,
 {
@@ -249,7 +262,7 @@ where
     }
 }
 
-impl<T> AddAssign for ByAddressType<T>
+impl<T> AddAssign for ByAddrType<T>
 where
     T: AddAssign,
 {
@@ -265,7 +278,7 @@ where
     }
 }
 
-impl<T> ByAddressType<Option<T>> {
+impl<T> ByAddrType<Option<T>> {
     pub fn take(&mut self) {
         self.values_mut().for_each(|opt| {
             opt.take();
@@ -273,12 +286,12 @@ impl<T> ByAddressType<Option<T>> {
     }
 }
 
-/// Zip one ByAddressType with a function, producing a new ByAddressType.
-pub fn zip_by_addresstype<S, R, F>(source: &ByAddressType<S>, f: F) -> Result<ByAddressType<R>>
+/// Zip one ByAddrType with a function, producing a new ByAddrType.
+pub fn zip_by_addr_type<S, R, F>(source: &ByAddrType<S>, f: F) -> Result<ByAddrType<R>>
 where
     F: Fn(&'static str, &S) -> Result<R>,
 {
-    Ok(ByAddressType {
+    Ok(ByAddrType {
         p2pk65: f(P2PK65, &source.p2pk65)?,
         p2pk33: f(P2PK33, &source.p2pk33)?,
         p2pkh: f(P2PKH, &source.p2pkh)?,
@@ -290,16 +303,16 @@ where
     })
 }
 
-/// Zip two ByAddressTypes with a function, producing a new ByAddressType.
-pub fn zip2_by_addresstype<S1, S2, R, F>(
-    a: &ByAddressType<S1>,
-    b: &ByAddressType<S2>,
+/// Zip two ByAddrTypes with a function, producing a new ByAddrType.
+pub fn zip2_by_addr_type<S1, S2, R, F>(
+    a: &ByAddrType<S1>,
+    b: &ByAddrType<S2>,
     f: F,
-) -> Result<ByAddressType<R>>
+) -> Result<ByAddrType<R>>
 where
     F: Fn(&'static str, &S1, &S2) -> Result<R>,
 {
-    Ok(ByAddressType {
+    Ok(ByAddrType {
         p2pk65: f(P2PK65, &a.p2pk65, &b.p2pk65)?,
         p2pk33: f(P2PK33, &a.p2pk33, &b.p2pk33)?,
         p2pkh: f(P2PKH, &a.p2pkh, &b.p2pkh)?,

crates/brk_cohort/src/by_any_addr.rs

@@ -1,12 +1,12 @@
 use brk_traversable::Traversable;
 
 #[derive(Debug, Default, Traversable)]
-pub struct ByAnyAddress<T> {
+pub struct ByAnyAddr<T> {
     pub funded: T,
     pub empty: T,
 }
 
-impl<T> ByAnyAddress<Option<T>> {
+impl<T> ByAnyAddr<Option<T>> {
     pub fn take(&mut self) {
         self.funded.take();
         self.empty.take();

crates/brk_cohort/src/by_epoch.rs

@@ -1,17 +1,17 @@
 use brk_traversable::Traversable;
-use brk_types::{HalvingEpoch, Height};
+use brk_types::{Halving, Height};
 use rayon::iter::{IntoParallelIterator, ParallelIterator};
 use serde::Serialize;
 
 use super::{CohortName, Filter};
 
 /// Epoch values
-pub const EPOCH_VALUES: ByEpoch<HalvingEpoch> = ByEpoch {
-    _0: HalvingEpoch::new(0),
-    _1: HalvingEpoch::new(1),
-    _2: HalvingEpoch::new(2),
-    _3: HalvingEpoch::new(3),
-    _4: HalvingEpoch::new(4),
+pub const EPOCH_VALUES: ByEpoch<Halving> = ByEpoch {
+    _0: Halving::new(0),
+    _1: Halving::new(1),
+    _2: Halving::new(2),
+    _3: Halving::new(3),
+    _4: Halving::new(4),
 };
 
 /// Epoch filters
@@ -107,20 +107,20 @@ impl<T> ByEpoch<T> {
         .into_par_iter()
     }
 
-    pub fn mut_vec_from_height(&mut self, height: Height) -> &mut T {
-        let epoch = HalvingEpoch::from(height);
-        if epoch == HalvingEpoch::new(0) {
-            &mut self._0
-        } else if epoch == HalvingEpoch::new(1) {
-            &mut self._1
-        } else if epoch == HalvingEpoch::new(2) {
-            &mut self._2
-        } else if epoch == HalvingEpoch::new(3) {
-            &mut self._3
-        } else if epoch == HalvingEpoch::new(4) {
-            &mut self._4
+    pub fn mut_vec_from_height(&mut self, height: Height) -> Option<&mut T> {
+        let epoch = Halving::from(height);
+        if epoch == Halving::new(0) {
+            Some(&mut self._0)
+        } else if epoch == Halving::new(1) {
+            Some(&mut self._1)
+        } else if epoch == Halving::new(2) {
+            Some(&mut self._2)
+        } else if epoch == Halving::new(3) {
+            Some(&mut self._3)
+        } else if epoch == Halving::new(4) {
+            Some(&mut self._4)
         } else {
-            todo!("")
+            None
         }
     }
 }

crates/brk_cohort/src/by_type.rs

@@ -1,16 +1,34 @@
 use std::ops::{Add, AddAssign};
 
+use brk_traversable::Traversable;
 use brk_types::OutputType;
+use rayon::prelude::*;
 
-use super::{BySpendableType, ByUnspendableType};
+use super::{Filter, SpendableType, UnspendableType};
 
-#[derive(Default, Clone, Debug)]
-pub struct GroupedByType<T> {
-    pub spendable: BySpendableType<T>,
-    pub unspendable: ByUnspendableType<T>,
+pub const OP_RETURN: &str = "op_return";
+
+#[derive(Default, Clone, Debug, Traversable)]
+pub struct ByType<T> {
+    #[traversable(flatten)]
+    pub spendable: SpendableType<T>,
+    #[traversable(flatten)]
+    pub unspendable: UnspendableType<T>,
 }
 
-impl<T> GroupedByType<T> {
+impl<T> ByType<T> {
+    pub fn try_new<F, E>(mut create: F) -> Result<Self, E>
+    where
+        F: FnMut(Filter, &'static str) -> Result<T, E>,
+    {
+        Ok(Self {
+            spendable: SpendableType::try_new(&mut create)?,
+            unspendable: UnspendableType {
+                op_return: create(Filter::Type(OutputType::OpReturn), OP_RETURN)?,
+            },
+        })
+    }
+
     pub fn get(&self, output_type: OutputType) -> &T {
         match output_type {
             OutputType::P2PK65 => &self.spendable.p2pk65,
@@ -24,7 +42,7 @@ impl<T> GroupedByType<T> {
             OutputType::P2A => &self.spendable.p2a,
             OutputType::Empty => &self.spendable.empty,
             OutputType::Unknown => &self.spendable.unknown,
-            OutputType::OpReturn => &self.unspendable.opreturn,
+            OutputType::OpReturn => &self.unspendable.op_return,
         }
     }
 
@@ -41,12 +59,55 @@ impl<T> GroupedByType<T> {
             OutputType::P2A => &mut self.spendable.p2a,
             OutputType::Unknown => &mut self.spendable.unknown,
             OutputType::Empty => &mut self.spendable.empty,
-            OutputType::OpReturn => &mut self.unspendable.opreturn,
+            OutputType::OpReturn => &mut self.unspendable.op_return,
         }
     }
+
+    pub fn iter(&self) -> impl Iterator<Item = &T> {
+        self.spendable
+            .iter()
+            .chain(std::iter::once(&self.unspendable.op_return))
+    }
+
+    pub fn iter_mut(&mut self) -> impl Iterator<Item = &mut T> {
+        self.spendable
+            .iter_mut()
+            .chain(std::iter::once(&mut self.unspendable.op_return))
+    }
+
+    pub fn par_iter_mut(&mut self) -> impl ParallelIterator<Item = &mut T>
+    where
+        T: Send + Sync,
+    {
+        let Self {
+            spendable,
+            unspendable,
+        } = self;
+        spendable
+            .par_iter_mut()
+            .chain([&mut unspendable.op_return].into_par_iter())
+    }
+
+    pub fn iter_typed(&self) -> impl Iterator<Item = (OutputType, &T)> {
+        self.spendable
+            .iter_typed()
+            .chain(std::iter::once((
+                OutputType::OpReturn,
+                &self.unspendable.op_return,
+            )))
+    }
+
+    pub fn iter_typed_mut(&mut self) -> impl Iterator<Item = (OutputType, &mut T)> {
+        self.spendable
+            .iter_typed_mut()
+            .chain(std::iter::once((
+                OutputType::OpReturn,
+                &mut self.unspendable.op_return,
+            )))
+    }
 }
 
-impl<T> Add for GroupedByType<T>
+impl<T> Add for ByType<T>
 where
     T: Add<Output = T>,
 {
@@ -59,7 +120,7 @@ where
     }
 }
 
-impl<T> AddAssign for GroupedByType<T>
+impl<T> AddAssign for ByType<T>
 where
     T: AddAssign,
 {

crates/brk_cohort/src/by_value.rs

@@ -1,37 +0,0 @@
-#[derive(Default, Clone)]
-pub struct GroupedByValue<T> {
-    pub up_to_1cent: T,
-    pub from_1c_to_10c: T,
-    pub from_10c_to_1d: T,
-    pub from_1d_to_10d: T,
-    pub from_10usd_to_100usd: T,
-    pub from_100usd_to_1_000usd: T,
-    pub from_1_000usd_to_10_000usd: T,
-    pub from_10_000usd_to_100_000usd: T,
-    pub from_100_000usd_to_1_000_000usd: T,
-    pub from_1_000_000usd_to_10_000_000usd: T,
-    pub from_10_000_000usd_to_100_000_000usd: T,
-    pub from_100_000_000usd_to_1_000_000_000usd: T,
-    pub from_1_000_000_000usd: T,
-    // ...
-}
-
-impl<T> GroupedByValue<T> {
-    pub fn as_mut_vec(&mut self) -> Vec<&mut T> {
-        vec![
-            &mut self.up_to_1cent,
-            &mut self.from_1c_to_10c,
-            &mut self.from_10c_to_1d,
-            &mut self.from_1d_to_10d,
-            &mut self.from_10usd_to_100usd,
-            &mut self.from_100usd_to_1_000usd,
-            &mut self.from_1_000usd_to_10_000usd,
-            &mut self.from_10_000usd_to_100_000usd,
-            &mut self.from_100_000usd_to_1_000_000usd,
-            &mut self.from_1_000_000usd_to_10_000_000usd,
-            &mut self.from_10_000_000usd_to_100_000_000usd,
-            &mut self.from_100_000_000usd_to_1_000_000_000usd,
-            &mut self.from_1_000_000_000usd,
-        ]
-    }
-}

crates/brk_cohort/src/class.rs

@@ -5,8 +5,8 @@ use serde::Serialize;
 
 use super::{CohortName, Filter};
 
-/// Year values
-pub const YEAR_VALUES: ByYear<Year> = ByYear {
+/// Class values
+pub const CLASS_VALUES: Class<Year> = Class {
     _2009: Year::new(2009),
     _2010: Year::new(2010),
     _2011: Year::new(2011),
@@ -27,52 +27,52 @@ pub const YEAR_VALUES: ByYear<Year> = ByYear {
     _2026: Year::new(2026),
 };
 
-/// Year filters
-pub const YEAR_FILTERS: ByYear<Filter> = ByYear {
-    _2009: Filter::Year(YEAR_VALUES._2009),
-    _2010: Filter::Year(YEAR_VALUES._2010),
-    _2011: Filter::Year(YEAR_VALUES._2011),
-    _2012: Filter::Year(YEAR_VALUES._2012),
-    _2013: Filter::Year(YEAR_VALUES._2013),
-    _2014: Filter::Year(YEAR_VALUES._2014),
-    _2015: Filter::Year(YEAR_VALUES._2015),
-    _2016: Filter::Year(YEAR_VALUES._2016),
-    _2017: Filter::Year(YEAR_VALUES._2017),
-    _2018: Filter::Year(YEAR_VALUES._2018),
-    _2019: Filter::Year(YEAR_VALUES._2019),
-    _2020: Filter::Year(YEAR_VALUES._2020),
-    _2021: Filter::Year(YEAR_VALUES._2021),
-    _2022: Filter::Year(YEAR_VALUES._2022),
-    _2023: Filter::Year(YEAR_VALUES._2023),
-    _2024: Filter::Year(YEAR_VALUES._2024),
-    _2025: Filter::Year(YEAR_VALUES._2025),
-    _2026: Filter::Year(YEAR_VALUES._2026),
+/// Class filters
+pub const CLASS_FILTERS: Class<Filter> = Class {
+    _2009: Filter::Class(CLASS_VALUES._2009),
+    _2010: Filter::Class(CLASS_VALUES._2010),
+    _2011: Filter::Class(CLASS_VALUES._2011),
+    _2012: Filter::Class(CLASS_VALUES._2012),
+    _2013: Filter::Class(CLASS_VALUES._2013),
+    _2014: Filter::Class(CLASS_VALUES._2014),
+    _2015: Filter::Class(CLASS_VALUES._2015),
+    _2016: Filter::Class(CLASS_VALUES._2016),
+    _2017: Filter::Class(CLASS_VALUES._2017),
+    _2018: Filter::Class(CLASS_VALUES._2018),
+    _2019: Filter::Class(CLASS_VALUES._2019),
+    _2020: Filter::Class(CLASS_VALUES._2020),
+    _2021: Filter::Class(CLASS_VALUES._2021),
+    _2022: Filter::Class(CLASS_VALUES._2022),
+    _2023: Filter::Class(CLASS_VALUES._2023),
+    _2024: Filter::Class(CLASS_VALUES._2024),
+    _2025: Filter::Class(CLASS_VALUES._2025),
+    _2026: Filter::Class(CLASS_VALUES._2026),
 };
 
-/// Year names
-pub const YEAR_NAMES: ByYear<CohortName> = ByYear {
-    _2009: CohortName::new("year_2009", "2009", "Year 2009"),
-    _2010: CohortName::new("year_2010", "2010", "Year 2010"),
-    _2011: CohortName::new("year_2011", "2011", "Year 2011"),
-    _2012: CohortName::new("year_2012", "2012", "Year 2012"),
-    _2013: CohortName::new("year_2013", "2013", "Year 2013"),
-    _2014: CohortName::new("year_2014", "2014", "Year 2014"),
-    _2015: CohortName::new("year_2015", "2015", "Year 2015"),
-    _2016: CohortName::new("year_2016", "2016", "Year 2016"),
-    _2017: CohortName::new("year_2017", "2017", "Year 2017"),
-    _2018: CohortName::new("year_2018", "2018", "Year 2018"),
-    _2019: CohortName::new("year_2019", "2019", "Year 2019"),
-    _2020: CohortName::new("year_2020", "2020", "Year 2020"),
-    _2021: CohortName::new("year_2021", "2021", "Year 2021"),
-    _2022: CohortName::new("year_2022", "2022", "Year 2022"),
-    _2023: CohortName::new("year_2023", "2023", "Year 2023"),
-    _2024: CohortName::new("year_2024", "2024", "Year 2024"),
-    _2025: CohortName::new("year_2025", "2025", "Year 2025"),
-    _2026: CohortName::new("year_2026", "2026", "Year 2026"),
+/// Class names
+pub const CLASS_NAMES: Class<CohortName> = Class {
+    _2009: CohortName::new("class_2009", "2009", "Class 2009"),
+    _2010: CohortName::new("class_2010", "2010", "Class 2010"),
+    _2011: CohortName::new("class_2011", "2011", "Class 2011"),
+    _2012: CohortName::new("class_2012", "2012", "Class 2012"),
+    _2013: CohortName::new("class_2013", "2013", "Class 2013"),
+    _2014: CohortName::new("class_2014", "2014", "Class 2014"),
+    _2015: CohortName::new("class_2015", "2015", "Class 2015"),
+    _2016: CohortName::new("class_2016", "2016", "Class 2016"),
+    _2017: CohortName::new("class_2017", "2017", "Class 2017"),
+    _2018: CohortName::new("class_2018", "2018", "Class 2018"),
+    _2019: CohortName::new("class_2019", "2019", "Class 2019"),
+    _2020: CohortName::new("class_2020", "2020", "Class 2020"),
+    _2021: CohortName::new("class_2021", "2021", "Class 2021"),
+    _2022: CohortName::new("class_2022", "2022", "Class 2022"),
+    _2023: CohortName::new("class_2023", "2023", "Class 2023"),
+    _2024: CohortName::new("class_2024", "2024", "Class 2024"),
+    _2025: CohortName::new("class_2025", "2025", "Class 2025"),
+    _2026: CohortName::new("class_2026", "2026", "Class 2026"),
 };
 
 #[derive(Default, Clone, Traversable, Serialize)]
-pub struct ByYear<T> {
+pub struct Class<T> {
     pub _2009: T,
     pub _2010: T,
     pub _2011: T,
@@ -93,19 +93,19 @@ pub struct ByYear<T> {
     pub _2026: T,
 }
 
-impl ByYear<CohortName> {
+impl Class<CohortName> {
     pub const fn names() -> &'static Self {
-        &YEAR_NAMES
+        &CLASS_NAMES
     }
 }
 
-impl<T> ByYear<T> {
+impl<T> Class<T> {
     pub fn new<F>(mut create: F) -> Self
     where
         F: FnMut(Filter, &'static str) -> T,
     {
-        let f = YEAR_FILTERS;
-        let n = YEAR_NAMES;
+        let f = CLASS_FILTERS;
+        let n = CLASS_NAMES;
         Self {
             _2009: create(f._2009, n._2009.id),
             _2010: create(f._2010, n._2010.id),
@@ -132,8 +132,8 @@ impl<T> ByYear<T> {
     where
         F: FnMut(Filter, &'static str) -> Result<T, E>,
     {
-        let f = YEAR_FILTERS;
-        let n = YEAR_NAMES;
+        let f = CLASS_FILTERS;
+        let n = CLASS_NAMES;
         Ok(Self {
             _2009: create(f._2009, n._2009.id)?,
             _2010: create(f._2010, n._2010.id)?,
@@ -231,32 +231,32 @@ impl<T> ByYear<T> {
         .into_par_iter()
     }
 
-    pub fn mut_vec_from_timestamp(&mut self, timestamp: Timestamp) -> &mut T {
+    pub fn mut_vec_from_timestamp(&mut self, timestamp: Timestamp) -> Option<&mut T> {
         let year = Year::from(timestamp);
         self.get_mut(year)
     }
 
-    pub fn get_mut(&mut self, year: Year) -> &mut T {
+    pub fn get_mut(&mut self, year: Year) -> Option<&mut T> {
         match u16::from(year) {
-            2009 => &mut self._2009,
-            2010 => &mut self._2010,
-            2011 => &mut self._2011,
-            2012 => &mut self._2012,
-            2013 => &mut self._2013,
-            2014 => &mut self._2014,
-            2015 => &mut self._2015,
-            2016 => &mut self._2016,
-            2017 => &mut self._2017,
-            2018 => &mut self._2018,
-            2019 => &mut self._2019,
-            2020 => &mut self._2020,
-            2021 => &mut self._2021,
-            2022 => &mut self._2022,
-            2023 => &mut self._2023,
-            2024 => &mut self._2024,
-            2025 => &mut self._2025,
-            2026 => &mut self._2026,
-            _ => todo!("Year {} not yet supported", u16::from(year)),
+            2009 => Some(&mut self._2009),
+            2010 => Some(&mut self._2010),
+            2011 => Some(&mut self._2011),
+            2012 => Some(&mut self._2012),
+            2013 => Some(&mut self._2013),
+            2014 => Some(&mut self._2014),
+            2015 => Some(&mut self._2015),
+            2016 => Some(&mut self._2016),
+            2017 => Some(&mut self._2017),
+            2018 => Some(&mut self._2018),
+            2019 => Some(&mut self._2019),
+            2020 => Some(&mut self._2020),
+            2021 => Some(&mut self._2021),
+            2022 => Some(&mut self._2022),
+            2023 => Some(&mut self._2023),
+            2024 => Some(&mut self._2024),
+            2025 => Some(&mut self._2025),
+            2026 => Some(&mut self._2026),
+            _ => None,
         }
     }
 }

crates/brk_cohort/src/cohort_context.rs

@@ -6,14 +6,14 @@ pub enum CohortContext {
     /// UTXO-based cohorts: uses "utxos_" prefix for Time/Amount filters
     Utxo,
     /// Address-based cohorts: uses "addrs_" prefix for Amount filters
-    Address,
+    Addr,
 }
 
 impl CohortContext {
     pub fn prefix(&self) -> &'static str {
         match self {
             CohortContext::Utxo => "utxos",
-            CohortContext::Address => "addrs",
+            CohortContext::Addr => "addrs",
         }
     }
 
@@ -24,13 +24,15 @@ impl CohortContext {
     /// Build full name for a filter, adding prefix only for Time/Amount filters.
     ///
     /// Prefix rules:
-    /// - No prefix: `All`, `Term`, `Epoch`, `Year`, `Type`
+    /// - No prefix: `All`, `Term`, `Epoch`, `Class`, `Type`
     /// - Context prefix: `Time`, `Amount`
     pub fn full_name(&self, filter: &Filter, name: &str) -> String {
         match filter {
-            Filter::All | Filter::Term(_) | Filter::Epoch(_) | Filter::Year(_) | Filter::Type(_) => {
-                name.to_string()
-            }
+            Filter::All
+            | Filter::Term(_)
+            | Filter::Epoch(_)
+            | Filter::Class(_)
+            | Filter::Type(_) => name.to_string(),
             Filter::Time(_) | Filter::Amount(_) => self.prefixed(name),
         }
     }

crates/brk_cohort/src/filter.rs

@@ -1,4 +1,4 @@
-use brk_types::{HalvingEpoch, OutputType, Sats, Year};
+use brk_types::{Halving, OutputType, Sats, Year};
 
 use super::{AmountFilter, CohortContext, Term, TimeFilter};
 
@@ -8,8 +8,8 @@ pub enum Filter {
     Term(Term),
     Time(TimeFilter),
     Amount(AmountFilter),
-    Epoch(HalvingEpoch),
-    Year(Year),
+    Epoch(Halving),
+    Class(Year),
     Type(OutputType),
 }
 
@@ -69,10 +69,10 @@ impl Filter {
 
     /// Whether to compute extended metrics (realized cap ratios, profit/loss ratios, percentiles)
     /// For UTXO context: true only for age range cohorts (Range) and aggregate cohorts (All, Term)
-    /// For Address context: always false
+    /// For address context: always false
     pub fn is_extended(&self, context: CohortContext) -> bool {
         match context {
-            CohortContext::Address => false,
+            CohortContext::Addr => false,
             CohortContext::Utxo => {
                 matches!(
                     self,
@@ -89,13 +89,13 @@ impl Filter {
     }
 
     /// Whether to compute adjusted metrics (adjusted SOPR, adjusted value created/destroyed)
-    /// For UTXO context: true for All, STH, and max_age (LowerThan)
-    /// For Address context: always false
+    /// For UTXO context: true for All, STH, and under_age (LowerThan)
+    /// For address context: always false
     /// Note: LTH doesn't need adjusted (everything >= 5 months is already > 1 hour)
     /// Note: age ranges don't need adjusted (0-1h data lives in its own cohort)
     pub fn compute_adjusted(&self, context: CohortContext) -> bool {
         match context {
-            CohortContext::Address => false,
+            CohortContext::Addr => false,
             CohortContext::Utxo => matches!(
                 self,
                 Filter::All | Filter::Term(Term::Sth) | Filter::Time(TimeFilter::LowerThan(_))

crates/brk_cohort/src/lib.rs

@@ -1,51 +1,57 @@
 #![doc = include_str!("../README.md")]
 
-mod address;
+mod addr;
+mod age_range;
 mod amount_filter;
-mod by_address_type;
-mod by_age_range;
-mod by_amount_range;
-mod by_any_address;
+mod amount_range;
+mod by_addr_type;
+mod by_any_addr;
 mod by_epoch;
-mod by_ge_amount;
-mod by_year;
-mod by_lt_amount;
-mod by_max_age;
-mod by_min_age;
-mod by_spendable_type;
 mod by_term;
 mod by_type;
-mod by_unspendable_type;
+mod class;
 mod cohort_context;
 mod cohort_name;
 mod filter;
 mod filtered;
+mod loss;
+mod over_age;
+mod over_amount;
+mod profit;
+mod profitability_range;
+mod spendable_type;
 mod state_level;
 mod time_filter;
+mod under_age;
+mod under_amount;
+mod unspendable_type;
 mod utxo;
 
 pub use brk_types::{Age, Term};
 
-pub use address::*;
+pub use addr::*;
+pub use age_range::*;
 pub use amount_filter::*;
-pub use by_address_type::*;
-pub use by_age_range::*;
-pub use by_amount_range::*;
-pub use by_any_address::*;
+pub use amount_range::*;
+pub use by_addr_type::*;
+pub use by_any_addr::*;
 pub use by_epoch::*;
-pub use by_ge_amount::*;
-pub use by_lt_amount::*;
-pub use by_max_age::*;
-pub use by_min_age::*;
-pub use by_spendable_type::*;
 pub use by_term::*;
 pub use by_type::*;
-pub use by_unspendable_type::*;
-pub use by_year::*;
+pub use class::*;
 pub use cohort_context::*;
 pub use cohort_name::*;
 pub use filter::*;
 pub use filtered::*;
+pub use loss::*;
+pub use over_age::*;
+pub use over_amount::*;
+pub use profit::*;
+pub use profitability_range::*;
+pub use spendable_type::*;
 pub use state_level::*;
 pub use time_filter::*;
+pub use under_age::*;
+pub use under_amount::*;
+pub use unspendable_type::*;
 pub use utxo::*;

crates/brk_cohort/src/loss.rs

@@ -0,0 +1,158 @@
+use brk_traversable::Traversable;
+use rayon::prelude::*;
+use serde::Serialize;
+
+use super::CohortName;
+
+/// "At least X% loss" threshold names (9 thresholds).
+pub const LOSS_NAMES: Loss<CohortName> = Loss {
+    all: CohortName::new("utxos_in_loss", "All", "In Loss"),
+    _10pct: CohortName::new("utxos_over_10pct_in_loss", ">=10%", "Over 10% in Loss"),
+    _20pct: CohortName::new("utxos_over_20pct_in_loss", ">=20%", "Over 20% in Loss"),
+    _30pct: CohortName::new("utxos_over_30pct_in_loss", ">=30%", "Over 30% in Loss"),
+    _40pct: CohortName::new("utxos_over_40pct_in_loss", ">=40%", "Over 40% in Loss"),
+    _50pct: CohortName::new("utxos_over_50pct_in_loss", ">=50%", "Over 50% in Loss"),
+    _60pct: CohortName::new("utxos_over_60pct_in_loss", ">=60%", "Over 60% in Loss"),
+    _70pct: CohortName::new("utxos_over_70pct_in_loss", ">=70%", "Over 70% in Loss"),
+    _80pct: CohortName::new("utxos_over_80pct_in_loss", ">=80%", "Over 80% in Loss"),
+};
+
+/// Number of loss thresholds.
+pub const LOSS_COUNT: usize = 9;
+
+impl Loss<CohortName> {
+    pub const fn names() -> &'static Self {
+        &LOSS_NAMES
+    }
+}
+
+/// 9 "at least X% loss" aggregate thresholds.
+///
+/// Each is a suffix sum over the profitability ranges, from most loss-making up.
+#[derive(Default, Clone, Traversable, Serialize)]
+pub struct Loss<T> {
+    pub all: T,
+    pub _10pct: T,
+    pub _20pct: T,
+    pub _30pct: T,
+    pub _40pct: T,
+    pub _50pct: T,
+    pub _60pct: T,
+    pub _70pct: T,
+    pub _80pct: T,
+}
+
+impl<T> Loss<T> {
+    pub fn new<F>(mut create: F) -> Self
+    where
+        F: FnMut(&'static str) -> T,
+    {
+        let n = &LOSS_NAMES;
+        Self {
+            all: create(n.all.id),
+            _10pct: create(n._10pct.id),
+            _20pct: create(n._20pct.id),
+            _30pct: create(n._30pct.id),
+            _40pct: create(n._40pct.id),
+            _50pct: create(n._50pct.id),
+            _60pct: create(n._60pct.id),
+            _70pct: create(n._70pct.id),
+            _80pct: create(n._80pct.id),
+        }
+    }
+
+    pub fn try_new<F, E>(mut create: F) -> Result<Self, E>
+    where
+        F: FnMut(&'static str) -> Result<T, E>,
+    {
+        let n = &LOSS_NAMES;
+        Ok(Self {
+            all: create(n.all.id)?,
+            _10pct: create(n._10pct.id)?,
+            _20pct: create(n._20pct.id)?,
+            _30pct: create(n._30pct.id)?,
+            _40pct: create(n._40pct.id)?,
+            _50pct: create(n._50pct.id)?,
+            _60pct: create(n._60pct.id)?,
+            _70pct: create(n._70pct.id)?,
+            _80pct: create(n._80pct.id)?,
+        })
+    }
+
+    pub fn iter(&self) -> impl Iterator<Item = &T> {
+        [
+            &self.all,
+            &self._10pct,
+            &self._20pct,
+            &self._30pct,
+            &self._40pct,
+            &self._50pct,
+            &self._60pct,
+            &self._70pct,
+            &self._80pct,
+        ]
+        .into_iter()
+    }
+
+    pub fn iter_mut(&mut self) -> impl Iterator<Item = &mut T> {
+        [
+            &mut self.all,
+            &mut self._10pct,
+            &mut self._20pct,
+            &mut self._30pct,
+            &mut self._40pct,
+            &mut self._50pct,
+            &mut self._60pct,
+            &mut self._70pct,
+            &mut self._80pct,
+        ]
+        .into_iter()
+    }
+
+    pub fn par_iter_mut(&mut self) -> impl ParallelIterator<Item = &mut T>
+    where
+        T: Send + Sync,
+    {
+        [
+            &mut self.all,
+            &mut self._10pct,
+            &mut self._20pct,
+            &mut self._30pct,
+            &mut self._40pct,
+            &mut self._50pct,
+            &mut self._60pct,
+            &mut self._70pct,
+            &mut self._80pct,
+        ]
+        .into_par_iter()
+    }
+
+    /// Access as array for indexed accumulation.
+    pub fn as_array_mut(&mut self) -> [&mut T; LOSS_COUNT] {
+        [
+            &mut self.all,
+            &mut self._10pct,
+            &mut self._20pct,
+            &mut self._30pct,
+            &mut self._40pct,
+            &mut self._50pct,
+            &mut self._60pct,
+            &mut self._70pct,
+            &mut self._80pct,
+        ]
+    }
+
+    /// Iterate from narrowest (_80pct) to broadest (all), yielding each threshold
+    /// with a growing suffix slice of `ranges` (1 range, 2 ranges, ..., LOSS_COUNT).
+    pub fn iter_mut_with_growing_suffix<'a, R>(
+        &'a mut self,
+        ranges: &'a [R],
+    ) -> impl Iterator<Item = (&'a mut T, &'a [R])> {
+        let len = ranges.len();
+        self.as_array_mut()
+            .into_iter()
+            .rev()
+            .enumerate()
+            .map(move |(n, threshold)| (threshold, &ranges[len - 2 - n..]))
+    }
+}

crates/brk_cohort/src/over_age.rs

@@ -3,13 +3,13 @@ use rayon::prelude::*;
 use serde::Serialize;
 
 use super::{
-    CohortName, Filter, TimeFilter, HOURS_10Y, HOURS_12Y, HOURS_1D, HOURS_1M, HOURS_1W, HOURS_1Y,
-    HOURS_2M, HOURS_2Y, HOURS_3M, HOURS_3Y, HOURS_4M, HOURS_4Y, HOURS_5M, HOURS_5Y, HOURS_6M,
-    HOURS_6Y, HOURS_7Y, HOURS_8Y,
+    CohortName, Filter, HOURS_1D, HOURS_1M, HOURS_1W, HOURS_1Y, HOURS_2M, HOURS_2Y, HOURS_3M,
+    HOURS_3Y, HOURS_4M, HOURS_4Y, HOURS_5M, HOURS_5Y, HOURS_6M, HOURS_6Y, HOURS_7Y, HOURS_8Y,
+    HOURS_10Y, HOURS_12Y, TimeFilter,
 };
 
-/// Min age thresholds in hours
-pub const MIN_AGE_HOURS: ByMinAge<usize> = ByMinAge {
+/// Over-age thresholds in hours
+pub const OVER_AGE_HOURS: OverAge<usize> = OverAge {
     _1d: HOURS_1D,
     _1w: HOURS_1W,
     _1m: HOURS_1M,
@@ -30,30 +30,30 @@ pub const MIN_AGE_HOURS: ByMinAge<usize> = ByMinAge {
     _12y: HOURS_12Y,
 };
 
-/// Min age filters (GreaterOrEqual threshold in hours)
-pub const MIN_AGE_FILTERS: ByMinAge<Filter> = ByMinAge {
-    _1d: Filter::Time(TimeFilter::GreaterOrEqual(MIN_AGE_HOURS._1d)),
-    _1w: Filter::Time(TimeFilter::GreaterOrEqual(MIN_AGE_HOURS._1w)),
-    _1m: Filter::Time(TimeFilter::GreaterOrEqual(MIN_AGE_HOURS._1m)),
-    _2m: Filter::Time(TimeFilter::GreaterOrEqual(MIN_AGE_HOURS._2m)),
-    _3m: Filter::Time(TimeFilter::GreaterOrEqual(MIN_AGE_HOURS._3m)),
-    _4m: Filter::Time(TimeFilter::GreaterOrEqual(MIN_AGE_HOURS._4m)),
-    _5m: Filter::Time(TimeFilter::GreaterOrEqual(MIN_AGE_HOURS._5m)),
-    _6m: Filter::Time(TimeFilter::GreaterOrEqual(MIN_AGE_HOURS._6m)),
-    _1y: Filter::Time(TimeFilter::GreaterOrEqual(MIN_AGE_HOURS._1y)),
-    _2y: Filter::Time(TimeFilter::GreaterOrEqual(MIN_AGE_HOURS._2y)),
-    _3y: Filter::Time(TimeFilter::GreaterOrEqual(MIN_AGE_HOURS._3y)),
-    _4y: Filter::Time(TimeFilter::GreaterOrEqual(MIN_AGE_HOURS._4y)),
-    _5y: Filter::Time(TimeFilter::GreaterOrEqual(MIN_AGE_HOURS._5y)),
-    _6y: Filter::Time(TimeFilter::GreaterOrEqual(MIN_AGE_HOURS._6y)),
-    _7y: Filter::Time(TimeFilter::GreaterOrEqual(MIN_AGE_HOURS._7y)),
-    _8y: Filter::Time(TimeFilter::GreaterOrEqual(MIN_AGE_HOURS._8y)),
-    _10y: Filter::Time(TimeFilter::GreaterOrEqual(MIN_AGE_HOURS._10y)),
-    _12y: Filter::Time(TimeFilter::GreaterOrEqual(MIN_AGE_HOURS._12y)),
+/// Over-age filters (GreaterOrEqual threshold in hours)
+pub const OVER_AGE_FILTERS: OverAge<Filter> = OverAge {
+    _1d: Filter::Time(TimeFilter::GreaterOrEqual(OVER_AGE_HOURS._1d)),
+    _1w: Filter::Time(TimeFilter::GreaterOrEqual(OVER_AGE_HOURS._1w)),
+    _1m: Filter::Time(TimeFilter::GreaterOrEqual(OVER_AGE_HOURS._1m)),
+    _2m: Filter::Time(TimeFilter::GreaterOrEqual(OVER_AGE_HOURS._2m)),
+    _3m: Filter::Time(TimeFilter::GreaterOrEqual(OVER_AGE_HOURS._3m)),
+    _4m: Filter::Time(TimeFilter::GreaterOrEqual(OVER_AGE_HOURS._4m)),
+    _5m: Filter::Time(TimeFilter::GreaterOrEqual(OVER_AGE_HOURS._5m)),
+    _6m: Filter::Time(TimeFilter::GreaterOrEqual(OVER_AGE_HOURS._6m)),
+    _1y: Filter::Time(TimeFilter::GreaterOrEqual(OVER_AGE_HOURS._1y)),
+    _2y: Filter::Time(TimeFilter::GreaterOrEqual(OVER_AGE_HOURS._2y)),
+    _3y: Filter::Time(TimeFilter::GreaterOrEqual(OVER_AGE_HOURS._3y)),
+    _4y: Filter::Time(TimeFilter::GreaterOrEqual(OVER_AGE_HOURS._4y)),
+    _5y: Filter::Time(TimeFilter::GreaterOrEqual(OVER_AGE_HOURS._5y)),
+    _6y: Filter::Time(TimeFilter::GreaterOrEqual(OVER_AGE_HOURS._6y)),
+    _7y: Filter::Time(TimeFilter::GreaterOrEqual(OVER_AGE_HOURS._7y)),
+    _8y: Filter::Time(TimeFilter::GreaterOrEqual(OVER_AGE_HOURS._8y)),
+    _10y: Filter::Time(TimeFilter::GreaterOrEqual(OVER_AGE_HOURS._10y)),
+    _12y: Filter::Time(TimeFilter::GreaterOrEqual(OVER_AGE_HOURS._12y)),
 };
 
-/// Min age names
-pub const MIN_AGE_NAMES: ByMinAge<CohortName> = ByMinAge {
+/// Over-age names
+pub const OVER_AGE_NAMES: OverAge<CohortName> = OverAge {
     _1d: CohortName::new("over_1d_old", "1d+", "Over 1 Day Old"),
     _1w: CohortName::new("over_1w_old", "1w+", "Over 1 Week Old"),
     _1m: CohortName::new("over_1m_old", "1m+", "Over 1 Month Old"),
@@ -75,7 +75,7 @@ pub const MIN_AGE_NAMES: ByMinAge<CohortName> = ByMinAge {
 };
 
 #[derive(Default, Clone, Traversable, Serialize)]
-pub struct ByMinAge<T> {
+pub struct OverAge<T> {
     pub _1d: T,
     pub _1w: T,
     pub _1m: T,
@@ -96,19 +96,19 @@ pub struct ByMinAge<T> {
     pub _12y: T,
 }
 
-impl ByMinAge<CohortName> {
+impl OverAge<CohortName> {
     pub const fn names() -> &'static Self {
-        &MIN_AGE_NAMES
+        &OVER_AGE_NAMES
     }
 }
 
-impl<T> ByMinAge<T> {
+impl<T> OverAge<T> {
     pub fn new<F>(mut create: F) -> Self
     where
         F: FnMut(Filter, &'static str) -> T,
     {
-        let f = MIN_AGE_FILTERS;
-        let n = MIN_AGE_NAMES;
+        let f = OVER_AGE_FILTERS;
+        let n = OVER_AGE_NAMES;
         Self {
             _1d: create(f._1d.clone(), n._1d.id),
             _1w: create(f._1w.clone(), n._1w.id),
@@ -135,8 +135,8 @@ impl<T> ByMinAge<T> {
     where
         F: FnMut(Filter, &'static str) -> Result<T, E>,
     {
-        let f = MIN_AGE_FILTERS;
-        let n = MIN_AGE_NAMES;
+        let f = OVER_AGE_FILTERS;
+        let n = OVER_AGE_NAMES;
         Ok(Self {
             _1d: create(f._1d.clone(), n._1d.id)?,
             _1w: create(f._1w.clone(), n._1w.id)?,

crates/brk_cohort/src/over_amount.rs

@@ -5,8 +5,8 @@ use serde::Serialize;
 
 use super::{AmountFilter, CohortName, Filter};
 
-/// Greater-or-equal amount thresholds
-pub const GE_AMOUNT_THRESHOLDS: ByGreatEqualAmount<Sats> = ByGreatEqualAmount {
+/// Over-amount thresholds
+pub const OVER_AMOUNT_THRESHOLDS: OverAmount<Sats> = OverAmount {
     _1sat: Sats::_1,
     _10sats: Sats::_10,
     _100sats: Sats::_100,
@@ -22,8 +22,8 @@ pub const GE_AMOUNT_THRESHOLDS: ByGreatEqualAmount<Sats> = ByGreatEqualAmount {
     _10k_btc: Sats::_10K_BTC,
 };
 
-/// Greater-or-equal amount names
-pub const GE_AMOUNT_NAMES: ByGreatEqualAmount<CohortName> = ByGreatEqualAmount {
+/// Over-amount names
+pub const OVER_AMOUNT_NAMES: OverAmount<CohortName> = OverAmount {
     _1sat: CohortName::new("over_1sat", "1+ sats", "Over 1 Sat"),
     _10sats: CohortName::new("over_10sats", "10+ sats", "Over 10 Sats"),
     _100sats: CohortName::new("over_100sats", "100+ sats", "Over 100 Sats"),
@@ -39,27 +39,39 @@ pub const GE_AMOUNT_NAMES: ByGreatEqualAmount<CohortName> = ByGreatEqualAmount {
     _10k_btc: CohortName::new("over_10k_btc", "10k+ BTC", "Over 10K BTC"),
 };
 
-/// Greater-or-equal amount filters
-pub const GE_AMOUNT_FILTERS: ByGreatEqualAmount<Filter> = ByGreatEqualAmount {
-    _1sat: Filter::Amount(AmountFilter::GreaterOrEqual(GE_AMOUNT_THRESHOLDS._1sat)),
-    _10sats: Filter::Amount(AmountFilter::GreaterOrEqual(GE_AMOUNT_THRESHOLDS._10sats)),
-    _100sats: Filter::Amount(AmountFilter::GreaterOrEqual(GE_AMOUNT_THRESHOLDS._100sats)),
-    _1k_sats: Filter::Amount(AmountFilter::GreaterOrEqual(GE_AMOUNT_THRESHOLDS._1k_sats)),
-    _10k_sats: Filter::Amount(AmountFilter::GreaterOrEqual(GE_AMOUNT_THRESHOLDS._10k_sats)),
-    _100k_sats: Filter::Amount(AmountFilter::GreaterOrEqual(
-        GE_AMOUNT_THRESHOLDS._100k_sats,
+/// Over-amount filters
+pub const OVER_AMOUNT_FILTERS: OverAmount<Filter> = OverAmount {
+    _1sat: Filter::Amount(AmountFilter::GreaterOrEqual(OVER_AMOUNT_THRESHOLDS._1sat)),
+    _10sats: Filter::Amount(AmountFilter::GreaterOrEqual(OVER_AMOUNT_THRESHOLDS._10sats)),
+    _100sats: Filter::Amount(AmountFilter::GreaterOrEqual(
+        OVER_AMOUNT_THRESHOLDS._100sats,
+    )),
+    _1k_sats: Filter::Amount(AmountFilter::GreaterOrEqual(
+        OVER_AMOUNT_THRESHOLDS._1k_sats,
+    )),
+    _10k_sats: Filter::Amount(AmountFilter::GreaterOrEqual(
+        OVER_AMOUNT_THRESHOLDS._10k_sats,
+    )),
+    _100k_sats: Filter::Amount(AmountFilter::GreaterOrEqual(
+        OVER_AMOUNT_THRESHOLDS._100k_sats,
+    )),
+    _1m_sats: Filter::Amount(AmountFilter::GreaterOrEqual(
+        OVER_AMOUNT_THRESHOLDS._1m_sats,
+    )),
+    _10m_sats: Filter::Amount(AmountFilter::GreaterOrEqual(
+        OVER_AMOUNT_THRESHOLDS._10m_sats,
+    )),
+    _1btc: Filter::Amount(AmountFilter::GreaterOrEqual(OVER_AMOUNT_THRESHOLDS._1btc)),
+    _10btc: Filter::Amount(AmountFilter::GreaterOrEqual(OVER_AMOUNT_THRESHOLDS._10btc)),
+    _100btc: Filter::Amount(AmountFilter::GreaterOrEqual(OVER_AMOUNT_THRESHOLDS._100btc)),
+    _1k_btc: Filter::Amount(AmountFilter::GreaterOrEqual(OVER_AMOUNT_THRESHOLDS._1k_btc)),
+    _10k_btc: Filter::Amount(AmountFilter::GreaterOrEqual(
+        OVER_AMOUNT_THRESHOLDS._10k_btc,
     )),
-    _1m_sats: Filter::Amount(AmountFilter::GreaterOrEqual(GE_AMOUNT_THRESHOLDS._1m_sats)),
-    _10m_sats: Filter::Amount(AmountFilter::GreaterOrEqual(GE_AMOUNT_THRESHOLDS._10m_sats)),
-    _1btc: Filter::Amount(AmountFilter::GreaterOrEqual(GE_AMOUNT_THRESHOLDS._1btc)),
-    _10btc: Filter::Amount(AmountFilter::GreaterOrEqual(GE_AMOUNT_THRESHOLDS._10btc)),
-    _100btc: Filter::Amount(AmountFilter::GreaterOrEqual(GE_AMOUNT_THRESHOLDS._100btc)),
-    _1k_btc: Filter::Amount(AmountFilter::GreaterOrEqual(GE_AMOUNT_THRESHOLDS._1k_btc)),
-    _10k_btc: Filter::Amount(AmountFilter::GreaterOrEqual(GE_AMOUNT_THRESHOLDS._10k_btc)),
 };
 
 #[derive(Default, Clone, Traversable, Serialize)]
-pub struct ByGreatEqualAmount<T> {
+pub struct OverAmount<T> {
     pub _1sat: T,
     pub _10sats: T,
     pub _100sats: T,
@@ -75,19 +87,19 @@ pub struct ByGreatEqualAmount<T> {
     pub _10k_btc: T,
 }
 
-impl ByGreatEqualAmount<CohortName> {
+impl OverAmount<CohortName> {
     pub const fn names() -> &'static Self {
-        &GE_AMOUNT_NAMES
+        &OVER_AMOUNT_NAMES
     }
 }
 
-impl<T> ByGreatEqualAmount<T> {
+impl<T> OverAmount<T> {
     pub fn new<F>(mut create: F) -> Self
     where
         F: FnMut(Filter, &'static str) -> T,
     {
-        let f = GE_AMOUNT_FILTERS;
-        let n = GE_AMOUNT_NAMES;
+        let f = OVER_AMOUNT_FILTERS;
+        let n = OVER_AMOUNT_NAMES;
         Self {
             _1sat: create(f._1sat.clone(), n._1sat.id),
             _10sats: create(f._10sats.clone(), n._10sats.id),
@@ -109,8 +121,8 @@ impl<T> ByGreatEqualAmount<T> {
     where
         F: FnMut(Filter, &'static str) -> Result<T, E>,
     {
-        let f = GE_AMOUNT_FILTERS;
-        let n = GE_AMOUNT_NAMES;
+        let f = OVER_AMOUNT_FILTERS;
+        let n = OVER_AMOUNT_NAMES;
         Ok(Self {
             _1sat: create(f._1sat.clone(), n._1sat.id)?,
             _10sats: create(f._10sats.clone(), n._10sats.id)?,

crates/brk_cohort/src/profit.rs

@@ -0,0 +1,213 @@
+use brk_traversable::Traversable;
+use rayon::prelude::*;
+use serde::Serialize;
+
+use super::CohortName;
+
+/// "At least X% profit" threshold names (14 thresholds).
+pub const PROFIT_NAMES: Profit<CohortName> = Profit {
+    all: CohortName::new("utxos_in_profit", "All", "In Profit"),
+    _10pct: CohortName::new("utxos_over_10pct_in_profit", ">=10%", "Over 10% in Profit"),
+    _20pct: CohortName::new("utxos_over_20pct_in_profit", ">=20%", "Over 20% in Profit"),
+    _30pct: CohortName::new("utxos_over_30pct_in_profit", ">=30%", "Over 30% in Profit"),
+    _40pct: CohortName::new("utxos_over_40pct_in_profit", ">=40%", "Over 40% in Profit"),
+    _50pct: CohortName::new("utxos_over_50pct_in_profit", ">=50%", "Over 50% in Profit"),
+    _60pct: CohortName::new("utxos_over_60pct_in_profit", ">=60%", "Over 60% in Profit"),
+    _70pct: CohortName::new("utxos_over_70pct_in_profit", ">=70%", "Over 70% in Profit"),
+    _80pct: CohortName::new("utxos_over_80pct_in_profit", ">=80%", "Over 80% in Profit"),
+    _90pct: CohortName::new("utxos_over_90pct_in_profit", ">=90%", "Over 90% in Profit"),
+    _100pct: CohortName::new(
+        "utxos_over_100pct_in_profit",
+        ">=100%",
+        "Over 100% in Profit",
+    ),
+    _200pct: CohortName::new(
+        "utxos_over_200pct_in_profit",
+        ">=200%",
+        "Over 200% in Profit",
+    ),
+    _300pct: CohortName::new(
+        "utxos_over_300pct_in_profit",
+        ">=300%",
+        "Over 300% in Profit",
+    ),
+    _500pct: CohortName::new(
+        "utxos_over_500pct_in_profit",
+        ">=500%",
+        "Over 500% in Profit",
+    ),
+};
+
+/// Number of profit thresholds.
+pub const PROFIT_COUNT: usize = 14;
+
+impl Profit<CohortName> {
+    pub const fn names() -> &'static Self {
+        &PROFIT_NAMES
+    }
+}
+
+/// 14 "at least X% profit" aggregate thresholds.
+///
+/// Each is a prefix sum over the profitability ranges, from most profitable down.
+#[derive(Default, Clone, Traversable, Serialize)]
+pub struct Profit<T> {
+    pub all: T,
+    pub _10pct: T,
+    pub _20pct: T,
+    pub _30pct: T,
+    pub _40pct: T,
+    pub _50pct: T,
+    pub _60pct: T,
+    pub _70pct: T,
+    pub _80pct: T,
+    pub _90pct: T,
+    pub _100pct: T,
+    pub _200pct: T,
+    pub _300pct: T,
+    pub _500pct: T,
+}
+
+impl<T> Profit<T> {
+    pub fn new<F>(mut create: F) -> Self
+    where
+        F: FnMut(&'static str) -> T,
+    {
+        let n = &PROFIT_NAMES;
+        Self {
+            all: create(n.all.id),
+            _10pct: create(n._10pct.id),
+            _20pct: create(n._20pct.id),
+            _30pct: create(n._30pct.id),
+            _40pct: create(n._40pct.id),
+            _50pct: create(n._50pct.id),
+            _60pct: create(n._60pct.id),
+            _70pct: create(n._70pct.id),
+            _80pct: create(n._80pct.id),
+            _90pct: create(n._90pct.id),
+            _100pct: create(n._100pct.id),
+            _200pct: create(n._200pct.id),
+            _300pct: create(n._300pct.id),
+            _500pct: create(n._500pct.id),
+        }
+    }
+
+    pub fn try_new<F, E>(mut create: F) -> Result<Self, E>
+    where
+        F: FnMut(&'static str) -> Result<T, E>,
+    {
+        let n = &PROFIT_NAMES;
+        Ok(Self {
+            all: create(n.all.id)?,
+            _10pct: create(n._10pct.id)?,
+            _20pct: create(n._20pct.id)?,
+            _30pct: create(n._30pct.id)?,
+            _40pct: create(n._40pct.id)?,
+            _50pct: create(n._50pct.id)?,
+            _60pct: create(n._60pct.id)?,
+            _70pct: create(n._70pct.id)?,
+            _80pct: create(n._80pct.id)?,
+            _90pct: create(n._90pct.id)?,
+            _100pct: create(n._100pct.id)?,
+            _200pct: create(n._200pct.id)?,
+            _300pct: create(n._300pct.id)?,
+            _500pct: create(n._500pct.id)?,
+        })
+    }
+
+    pub fn iter(&self) -> impl Iterator<Item = &T> {
+        [
+            &self.all,
+            &self._10pct,
+            &self._20pct,
+            &self._30pct,
+            &self._40pct,
+            &self._50pct,
+            &self._60pct,
+            &self._70pct,
+            &self._80pct,
+            &self._90pct,
+            &self._100pct,
+            &self._200pct,
+            &self._300pct,
+            &self._500pct,
+        ]
+        .into_iter()
+    }
+
+    pub fn iter_mut(&mut self) -> impl Iterator<Item = &mut T> {
+        [
+            &mut self.all,
+            &mut self._10pct,
+            &mut self._20pct,
+            &mut self._30pct,
+            &mut self._40pct,
+            &mut self._50pct,
+            &mut self._60pct,
+            &mut self._70pct,
+            &mut self._80pct,
+            &mut self._90pct,
+            &mut self._100pct,
+            &mut self._200pct,
+            &mut self._300pct,
+            &mut self._500pct,
+        ]
+        .into_iter()
+    }
+
+    pub fn par_iter_mut(&mut self) -> impl ParallelIterator<Item = &mut T>
+    where
+        T: Send + Sync,
+    {
+        [
+            &mut self.all,
+            &mut self._10pct,
+            &mut self._20pct,
+            &mut self._30pct,
+            &mut self._40pct,
+            &mut self._50pct,
+            &mut self._60pct,
+            &mut self._70pct,
+            &mut self._80pct,
+            &mut self._90pct,
+            &mut self._100pct,
+            &mut self._200pct,
+            &mut self._300pct,
+            &mut self._500pct,
+        ]
+        .into_par_iter()
+    }
+
+    /// Access as array for indexed accumulation.
+    pub fn as_array_mut(&mut self) -> [&mut T; PROFIT_COUNT] {
+        [
+            &mut self.all,
+            &mut self._10pct,
+            &mut self._20pct,
+            &mut self._30pct,
+            &mut self._40pct,
+            &mut self._50pct,
+            &mut self._60pct,
+            &mut self._70pct,
+            &mut self._80pct,
+            &mut self._90pct,
+            &mut self._100pct,
+            &mut self._200pct,
+            &mut self._300pct,
+            &mut self._500pct,
+        ]
+    }
+
+    /// Iterate from narrowest (_500pct) to broadest (all), yielding each threshold
+    /// with a growing prefix slice of `ranges` (1 range, 2 ranges, ..., PROFIT_COUNT).
+    pub fn iter_mut_with_growing_prefix<'a, R>(
+        &'a mut self,
+        ranges: &'a [R],
+    ) -> impl Iterator<Item = (&'a mut T, &'a [R])> {
+        self.as_array_mut()
+            .into_iter()
+            .rev()
+            .enumerate()
+            .map(move |(n, threshold)| (threshold, &ranges[..n + 2]))
+    }
+}

crates/brk_cohort/src/profitability_range.rs

@@ -0,0 +1,486 @@
+use brk_traversable::Traversable;
+use brk_types::Cents;
+use rayon::prelude::*;
+use serde::Serialize;
+
+use super::CohortName;
+
+/// Number of profitability range boundaries (24 boundaries → 25 buckets).
+pub const PROFITABILITY_BOUNDARY_COUNT: usize = 24;
+
+/// Compute 24 boundary prices from spot price for profitability bucketing.
+///
+/// Boundaries are returned in ascending price order (most profitable first → least profitable last).
+/// Bucket assignment: prices ascending in k-way merge means we start at the most-profitable bucket
+/// (lowest cost basis = highest profit) and advance the cursor as price crosses each boundary.
+///
+/// For P% profit: boundary = spot × 100 / (100 + P)
+/// For L% loss:   boundary = spot × 100 / (100 - L)
+///
+/// Returns boundaries in ascending order:
+/// [spot/11, spot/6, spot/4, spot/3, spot/2, spot×100/190, spot×100/180, ..., spot×100/10]
+pub fn compute_profitability_boundaries(spot: Cents) -> [Cents; PROFITABILITY_BOUNDARY_COUNT] {
+    let s = spot.as_u128();
+    // Divisors in ascending boundary order (ascending price):
+    // over_1000pct_in_profit: price < spot/11          → boundary at spot*100/1100 = spot/11
+    // 500pct_to_1000pct_in_profit: spot/11 ≤ p < spot/6   → boundary at spot*100/600  = spot/6
+    // 300pct_to_500pct_in_profit: spot/6 ≤ p < spot/4     → boundary at spot*100/400  = spot/4
+    // 200pct_to_300pct_in_profit: spot/4 ≤ p < spot/3     → boundary at spot*100/300  = spot/3
+    // 100pct_to_200pct_in_profit: spot/3 ≤ p < spot/2     → boundary at spot*100/200  = spot/2
+    // 90pct_to_100pct_in_profit: spot/2 ≤ p < spot*100/190 → boundary at spot*100/190
+    // 80pct_to_90pct_in_profit:                            → boundary at spot*100/180
+    // 70pct_to_80pct_in_profit:                            → boundary at spot*100/170
+    // 60pct_to_70pct_in_profit:                            → boundary at spot*100/160
+    // 50pct_to_60pct_in_profit:                            → boundary at spot*100/150
+    // 40pct_to_50pct_in_profit:                            → boundary at spot*100/140
+    // 30pct_to_40pct_in_profit:                            → boundary at spot*100/130
+    // 20pct_to_30pct_in_profit:                            → boundary at spot*100/120
+    // 10pct_to_20pct_in_profit:                            → boundary at spot*100/110
+    // 0pct_to_10pct_in_profit:                             → boundary at spot (= spot*100/100)
+    // 0pct_to_10pct_in_loss: spot ≤ p < spot*100/90    → boundary at spot*100/90
+    // 10pct_to_20pct_in_loss:                          → boundary at spot*100/80
+    // 20pct_to_30pct_in_loss:                          → boundary at spot*100/70
+    // 30pct_to_40pct_in_loss:                          → boundary at spot*100/60
+    // 40pct_to_50pct_in_loss:                          → boundary at spot*100/50 = spot*2
+    // 50pct_to_60pct_in_loss:                          → boundary at spot*100/40 = spot*5/2
+    // 60pct_to_70pct_in_loss:                          → boundary at spot*100/30 = spot*10/3
+    // 70pct_to_80pct_in_loss:                          → boundary at spot*100/20 = spot*5
+    // 80pct_to_90pct_in_loss:                          → boundary at spot*100/10 = spot*10
+    // 90pct_to_100pct_in_loss: spot*10 ≤ p              (no upper boundary)
+    let divisors: [u128; PROFITABILITY_BOUNDARY_COUNT] = [
+        1100, // >1000% profit upper bound (spot/11)
+        600,  // 500-1000% profit upper bound (spot/6)
+        400,  // 300-500% profit upper bound (spot/4)
+        300,  // 200-300% profit upper bound (spot/3)
+        200,  // 100-200% profit upper bound (spot/2)
+        190,  // 90-100% profit upper bound
+        180,  // 80-90% profit upper bound
+        170,  // 70-80% profit upper bound
+        160,  // 60-70% profit upper bound
+        150,  // 50-60% profit upper bound
+        140,  // 40-50% profit upper bound
+        130,  // 30-40% profit upper bound
+        120,  // 20-30% profit upper bound
+        110,  // 10-20% profit upper bound
+        100,  // 0-10% profit upper bound (= spot)
+        90,   // 0-10% loss upper bound
+        80,   // 10-20% loss upper bound
+        70,   // 20-30% loss upper bound
+        60,   // 30-40% loss upper bound
+        50,   // 40-50% loss upper bound
+        40,   // 50-60% loss upper bound
+        30,   // 60-70% loss upper bound
+        20,   // 70-80% loss upper bound
+        10,   // 80-90% loss upper bound
+    ];
+
+    let mut boundaries = [Cents::ZERO; PROFITABILITY_BOUNDARY_COUNT];
+    for (i, &d) in divisors.iter().enumerate() {
+        boundaries[i] = Cents::from(s * 100 / d);
+    }
+    boundaries
+}
+
+/// Profitability range names (25 ranges, from most profitable to most in loss)
+pub const PROFITABILITY_RANGE_NAMES: ProfitabilityRange<CohortName> = ProfitabilityRange {
+    over_1000pct_in_profit: CohortName::new(
+        "utxos_over_1000pct_in_profit",
+        "+>1000%",
+        "Over 1000% in Profit",
+    ),
+    _500pct_to_1000pct_in_profit: CohortName::new(
+        "utxos_500pct_to_1000pct_in_profit",
+        "+500-1000%",
+        "500-1000% in Profit",
+    ),
+    _300pct_to_500pct_in_profit: CohortName::new(
+        "utxos_300pct_to_500pct_in_profit",
+        "+300-500%",
+        "300-500% in Profit",
+    ),
+    _200pct_to_300pct_in_profit: CohortName::new(
+        "utxos_200pct_to_300pct_in_profit",
+        "+200-300%",
+        "200-300% in Profit",
+    ),
+    _100pct_to_200pct_in_profit: CohortName::new(
+        "utxos_100pct_to_200pct_in_profit",
+        "+100-200%",
+        "100-200% in Profit",
+    ),
+    _90pct_to_100pct_in_profit: CohortName::new(
+        "utxos_90pct_to_100pct_in_profit",
+        "+90-100%",
+        "90-100% in Profit",
+    ),
+    _80pct_to_90pct_in_profit: CohortName::new(
+        "utxos_80pct_to_90pct_in_profit",
+        "+80-90%",
+        "80-90% in Profit",
+    ),
+    _70pct_to_80pct_in_profit: CohortName::new(
+        "utxos_70pct_to_80pct_in_profit",
+        "+70-80%",
+        "70-80% in Profit",
+    ),
+    _60pct_to_70pct_in_profit: CohortName::new(
+        "utxos_60pct_to_70pct_in_profit",
+        "+60-70%",
+        "60-70% in Profit",
+    ),
+    _50pct_to_60pct_in_profit: CohortName::new(
+        "utxos_50pct_to_60pct_in_profit",
+        "+50-60%",
+        "50-60% in Profit",
+    ),
+    _40pct_to_50pct_in_profit: CohortName::new(
+        "utxos_40pct_to_50pct_in_profit",
+        "+40-50%",
+        "40-50% in Profit",
+    ),
+    _30pct_to_40pct_in_profit: CohortName::new(
+        "utxos_30pct_to_40pct_in_profit",
+        "+30-40%",
+        "30-40% in Profit",
+    ),
+    _20pct_to_30pct_in_profit: CohortName::new(
+        "utxos_20pct_to_30pct_in_profit",
+        "+20-30%",
+        "20-30% in Profit",
+    ),
+    _10pct_to_20pct_in_profit: CohortName::new(
+        "utxos_10pct_to_20pct_in_profit",
+        "+10-20%",
+        "10-20% in Profit",
+    ),
+    _0pct_to_10pct_in_profit: CohortName::new(
+        "utxos_0pct_to_10pct_in_profit",
+        "+0-10%",
+        "0-10% in Profit",
+    ),
+    _0pct_to_10pct_in_loss: CohortName::new(
+        "utxos_0pct_to_10pct_in_loss",
+        "-0-10%",
+        "0-10% in Loss",
+    ),
+    _10pct_to_20pct_in_loss: CohortName::new(
+        "utxos_10pct_to_20pct_in_loss",
+        "-10-20%",
+        "10-20% in Loss",
+    ),
+    _20pct_to_30pct_in_loss: CohortName::new(
+        "utxos_20pct_to_30pct_in_loss",
+        "-20-30%",
+        "20-30% in Loss",
+    ),
+    _30pct_to_40pct_in_loss: CohortName::new(
+        "utxos_30pct_to_40pct_in_loss",
+        "-30-40%",
+        "30-40% in Loss",
+    ),
+    _40pct_to_50pct_in_loss: CohortName::new(
+        "utxos_40pct_to_50pct_in_loss",
+        "-40-50%",
+        "40-50% in Loss",
+    ),
+    _50pct_to_60pct_in_loss: CohortName::new(
+        "utxos_50pct_to_60pct_in_loss",
+        "-50-60%",
+        "50-60% in Loss",
+    ),
+    _60pct_to_70pct_in_loss: CohortName::new(
+        "utxos_60pct_to_70pct_in_loss",
+        "-60-70%",
+        "60-70% in Loss",
+    ),
+    _70pct_to_80pct_in_loss: CohortName::new(
+        "utxos_70pct_to_80pct_in_loss",
+        "-70-80%",
+        "70-80% in Loss",
+    ),
+    _80pct_to_90pct_in_loss: CohortName::new(
+        "utxos_80pct_to_90pct_in_loss",
+        "-80-90%",
+        "80-90% in Loss",
+    ),
+    _90pct_to_100pct_in_loss: CohortName::new(
+        "utxos_90pct_to_100pct_in_loss",
+        "-90-100%",
+        "90-100% in Loss",
+    ),
+};
+
+impl ProfitabilityRange<CohortName> {
+    pub const fn names() -> &'static Self {
+        &PROFITABILITY_RANGE_NAMES
+    }
+}
+
+/// 25 profitability range buckets ordered from most profitable to most in loss.
+///
+/// During the k-way merge (ascending price order), the cursor starts at bucket 0
+/// (over_1000pct_in_profit, lowest cost basis) and advances as price crosses each boundary.
+#[derive(Default, Clone, Traversable, Serialize)]
+pub struct ProfitabilityRange<T> {
+    pub over_1000pct_in_profit: T,
+    pub _500pct_to_1000pct_in_profit: T,
+    pub _300pct_to_500pct_in_profit: T,
+    pub _200pct_to_300pct_in_profit: T,
+    pub _100pct_to_200pct_in_profit: T,
+    pub _90pct_to_100pct_in_profit: T,
+    pub _80pct_to_90pct_in_profit: T,
+    pub _70pct_to_80pct_in_profit: T,
+    pub _60pct_to_70pct_in_profit: T,
+    pub _50pct_to_60pct_in_profit: T,
+    pub _40pct_to_50pct_in_profit: T,
+    pub _30pct_to_40pct_in_profit: T,
+    pub _20pct_to_30pct_in_profit: T,
+    pub _10pct_to_20pct_in_profit: T,
+    pub _0pct_to_10pct_in_profit: T,
+    pub _0pct_to_10pct_in_loss: T,
+    pub _10pct_to_20pct_in_loss: T,
+    pub _20pct_to_30pct_in_loss: T,
+    pub _30pct_to_40pct_in_loss: T,
+    pub _40pct_to_50pct_in_loss: T,
+    pub _50pct_to_60pct_in_loss: T,
+    pub _60pct_to_70pct_in_loss: T,
+    pub _70pct_to_80pct_in_loss: T,
+    pub _80pct_to_90pct_in_loss: T,
+    pub _90pct_to_100pct_in_loss: T,
+}
+
+/// Number of profitability range buckets.
+pub const PROFITABILITY_RANGE_COUNT: usize = 25;
+
+impl<T> ProfitabilityRange<T> {
+    pub fn new<F>(mut create: F) -> Self
+    where
+        F: FnMut(&'static str) -> T,
+    {
+        let n = &PROFITABILITY_RANGE_NAMES;
+        Self {
+            over_1000pct_in_profit: create(n.over_1000pct_in_profit.id),
+            _500pct_to_1000pct_in_profit: create(n._500pct_to_1000pct_in_profit.id),
+            _300pct_to_500pct_in_profit: create(n._300pct_to_500pct_in_profit.id),
+            _200pct_to_300pct_in_profit: create(n._200pct_to_300pct_in_profit.id),
+            _100pct_to_200pct_in_profit: create(n._100pct_to_200pct_in_profit.id),
+            _90pct_to_100pct_in_profit: create(n._90pct_to_100pct_in_profit.id),
+            _80pct_to_90pct_in_profit: create(n._80pct_to_90pct_in_profit.id),
+            _70pct_to_80pct_in_profit: create(n._70pct_to_80pct_in_profit.id),
+            _60pct_to_70pct_in_profit: create(n._60pct_to_70pct_in_profit.id),
+            _50pct_to_60pct_in_profit: create(n._50pct_to_60pct_in_profit.id),
+            _40pct_to_50pct_in_profit: create(n._40pct_to_50pct_in_profit.id),
+            _30pct_to_40pct_in_profit: create(n._30pct_to_40pct_in_profit.id),
+            _20pct_to_30pct_in_profit: create(n._20pct_to_30pct_in_profit.id),
+            _10pct_to_20pct_in_profit: create(n._10pct_to_20pct_in_profit.id),
+            _0pct_to_10pct_in_profit: create(n._0pct_to_10pct_in_profit.id),
+            _0pct_to_10pct_in_loss: create(n._0pct_to_10pct_in_loss.id),
+            _10pct_to_20pct_in_loss: create(n._10pct_to_20pct_in_loss.id),
+            _20pct_to_30pct_in_loss: create(n._20pct_to_30pct_in_loss.id),
+            _30pct_to_40pct_in_loss: create(n._30pct_to_40pct_in_loss.id),
+            _40pct_to_50pct_in_loss: create(n._40pct_to_50pct_in_loss.id),
+            _50pct_to_60pct_in_loss: create(n._50pct_to_60pct_in_loss.id),
+            _60pct_to_70pct_in_loss: create(n._60pct_to_70pct_in_loss.id),
+            _70pct_to_80pct_in_loss: create(n._70pct_to_80pct_in_loss.id),
+            _80pct_to_90pct_in_loss: create(n._80pct_to_90pct_in_loss.id),
+            _90pct_to_100pct_in_loss: create(n._90pct_to_100pct_in_loss.id),
+        }
+    }
+
+    pub fn try_new<F, E>(mut create: F) -> Result<Self, E>
+    where
+        F: FnMut(&'static str) -> Result<T, E>,
+    {
+        let n = &PROFITABILITY_RANGE_NAMES;
+        Ok(Self {
+            over_1000pct_in_profit: create(n.over_1000pct_in_profit.id)?,
+            _500pct_to_1000pct_in_profit: create(n._500pct_to_1000pct_in_profit.id)?,
+            _300pct_to_500pct_in_profit: create(n._300pct_to_500pct_in_profit.id)?,
+            _200pct_to_300pct_in_profit: create(n._200pct_to_300pct_in_profit.id)?,
+            _100pct_to_200pct_in_profit: create(n._100pct_to_200pct_in_profit.id)?,
+            _90pct_to_100pct_in_profit: create(n._90pct_to_100pct_in_profit.id)?,
+            _80pct_to_90pct_in_profit: create(n._80pct_to_90pct_in_profit.id)?,
+            _70pct_to_80pct_in_profit: create(n._70pct_to_80pct_in_profit.id)?,
+            _60pct_to_70pct_in_profit: create(n._60pct_to_70pct_in_profit.id)?,
+            _50pct_to_60pct_in_profit: create(n._50pct_to_60pct_in_profit.id)?,
+            _40pct_to_50pct_in_profit: create(n._40pct_to_50pct_in_profit.id)?,
+            _30pct_to_40pct_in_profit: create(n._30pct_to_40pct_in_profit.id)?,
+            _20pct_to_30pct_in_profit: create(n._20pct_to_30pct_in_profit.id)?,
+            _10pct_to_20pct_in_profit: create(n._10pct_to_20pct_in_profit.id)?,
+            _0pct_to_10pct_in_profit: create(n._0pct_to_10pct_in_profit.id)?,
+            _0pct_to_10pct_in_loss: create(n._0pct_to_10pct_in_loss.id)?,
+            _10pct_to_20pct_in_loss: create(n._10pct_to_20pct_in_loss.id)?,
+            _20pct_to_30pct_in_loss: create(n._20pct_to_30pct_in_loss.id)?,
+            _30pct_to_40pct_in_loss: create(n._30pct_to_40pct_in_loss.id)?,
+            _40pct_to_50pct_in_loss: create(n._40pct_to_50pct_in_loss.id)?,
+            _50pct_to_60pct_in_loss: create(n._50pct_to_60pct_in_loss.id)?,
+            _60pct_to_70pct_in_loss: create(n._60pct_to_70pct_in_loss.id)?,
+            _70pct_to_80pct_in_loss: create(n._70pct_to_80pct_in_loss.id)?,
+            _80pct_to_90pct_in_loss: create(n._80pct_to_90pct_in_loss.id)?,
+            _90pct_to_100pct_in_loss: create(n._90pct_to_100pct_in_loss.id)?,
+        })
+    }
+
+    pub fn iter(&self) -> impl Iterator<Item = &T> {
+        [
+            &self.over_1000pct_in_profit,
+            &self._500pct_to_1000pct_in_profit,
+            &self._300pct_to_500pct_in_profit,
+            &self._200pct_to_300pct_in_profit,
+            &self._100pct_to_200pct_in_profit,
+            &self._90pct_to_100pct_in_profit,
+            &self._80pct_to_90pct_in_profit,
+            &self._70pct_to_80pct_in_profit,
+            &self._60pct_to_70pct_in_profit,
+            &self._50pct_to_60pct_in_profit,
+            &self._40pct_to_50pct_in_profit,
+            &self._30pct_to_40pct_in_profit,
+            &self._20pct_to_30pct_in_profit,
+            &self._10pct_to_20pct_in_profit,
+            &self._0pct_to_10pct_in_profit,
+            &self._0pct_to_10pct_in_loss,
+            &self._10pct_to_20pct_in_loss,
+            &self._20pct_to_30pct_in_loss,
+            &self._30pct_to_40pct_in_loss,
+            &self._40pct_to_50pct_in_loss,
+            &self._50pct_to_60pct_in_loss,
+            &self._60pct_to_70pct_in_loss,
+            &self._70pct_to_80pct_in_loss,
+            &self._80pct_to_90pct_in_loss,
+            &self._90pct_to_100pct_in_loss,
+        ]
+        .into_iter()
+    }
+
+    pub fn iter_mut(&mut self) -> impl Iterator<Item = &mut T> {
+        self.iter_mut_with_is_profit().map(|(_, v)| v)
+    }
+
+    /// Iterate mutably, yielding `(is_profit, &mut T)` for each range.
+    pub fn iter_mut_with_is_profit(&mut self) -> impl Iterator<Item = (bool, &mut T)> {
+        [
+            (true, &mut self.over_1000pct_in_profit),
+            (true, &mut self._500pct_to_1000pct_in_profit),
+            (true, &mut self._300pct_to_500pct_in_profit),
+            (true, &mut self._200pct_to_300pct_in_profit),
+            (true, &mut self._100pct_to_200pct_in_profit),
+            (true, &mut self._90pct_to_100pct_in_profit),
+            (true, &mut self._80pct_to_90pct_in_profit),
+            (true, &mut self._70pct_to_80pct_in_profit),
+            (true, &mut self._60pct_to_70pct_in_profit),
+            (true, &mut self._50pct_to_60pct_in_profit),
+            (true, &mut self._40pct_to_50pct_in_profit),
+            (true, &mut self._30pct_to_40pct_in_profit),
+            (true, &mut self._20pct_to_30pct_in_profit),
+            (true, &mut self._10pct_to_20pct_in_profit),
+            (true, &mut self._0pct_to_10pct_in_profit),
+            (false, &mut self._0pct_to_10pct_in_loss),
+            (false, &mut self._10pct_to_20pct_in_loss),
+            (false, &mut self._20pct_to_30pct_in_loss),
+            (false, &mut self._30pct_to_40pct_in_loss),
+            (false, &mut self._40pct_to_50pct_in_loss),
+            (false, &mut self._50pct_to_60pct_in_loss),
+            (false, &mut self._60pct_to_70pct_in_loss),
+            (false, &mut self._70pct_to_80pct_in_loss),
+            (false, &mut self._80pct_to_90pct_in_loss),
+            (false, &mut self._90pct_to_100pct_in_loss),
+        ]
+        .into_iter()
+    }
+
+    pub fn par_iter_mut(&mut self) -> impl ParallelIterator<Item = &mut T>
+    where
+        T: Send + Sync,
+    {
+        [
+            &mut self.over_1000pct_in_profit,
+            &mut self._500pct_to_1000pct_in_profit,
+            &mut self._300pct_to_500pct_in_profit,
+            &mut self._200pct_to_300pct_in_profit,
+            &mut self._100pct_to_200pct_in_profit,
+            &mut self._90pct_to_100pct_in_profit,
+            &mut self._80pct_to_90pct_in_profit,
+            &mut self._70pct_to_80pct_in_profit,
+            &mut self._60pct_to_70pct_in_profit,
+            &mut self._50pct_to_60pct_in_profit,
+            &mut self._40pct_to_50pct_in_profit,
+            &mut self._30pct_to_40pct_in_profit,
+            &mut self._20pct_to_30pct_in_profit,
+            &mut self._10pct_to_20pct_in_profit,
+            &mut self._0pct_to_10pct_in_profit,
+            &mut self._0pct_to_10pct_in_loss,
+            &mut self._10pct_to_20pct_in_loss,
+            &mut self._20pct_to_30pct_in_loss,
+            &mut self._30pct_to_40pct_in_loss,
+            &mut self._40pct_to_50pct_in_loss,
+            &mut self._50pct_to_60pct_in_loss,
+            &mut self._60pct_to_70pct_in_loss,
+            &mut self._70pct_to_80pct_in_loss,
+            &mut self._80pct_to_90pct_in_loss,
+            &mut self._90pct_to_100pct_in_loss,
+        ]
+        .into_par_iter()
+    }
+
+    /// Access as a fixed-size array of references (for indexed access during merge).
+    pub fn as_array(&self) -> [&T; PROFITABILITY_RANGE_COUNT] {
+        [
+            &self.over_1000pct_in_profit,
+            &self._500pct_to_1000pct_in_profit,
+            &self._300pct_to_500pct_in_profit,
+            &self._200pct_to_300pct_in_profit,
+            &self._100pct_to_200pct_in_profit,
+            &self._90pct_to_100pct_in_profit,
+            &self._80pct_to_90pct_in_profit,
+            &self._70pct_to_80pct_in_profit,
+            &self._60pct_to_70pct_in_profit,
+            &self._50pct_to_60pct_in_profit,
+            &self._40pct_to_50pct_in_profit,
+            &self._30pct_to_40pct_in_profit,
+            &self._20pct_to_30pct_in_profit,
+            &self._10pct_to_20pct_in_profit,
+            &self._0pct_to_10pct_in_profit,
+            &self._0pct_to_10pct_in_loss,
+            &self._10pct_to_20pct_in_loss,
+            &self._20pct_to_30pct_in_loss,
+            &self._30pct_to_40pct_in_loss,
+            &self._40pct_to_50pct_in_loss,
+            &self._50pct_to_60pct_in_loss,
+            &self._60pct_to_70pct_in_loss,
+            &self._70pct_to_80pct_in_loss,
+            &self._80pct_to_90pct_in_loss,
+            &self._90pct_to_100pct_in_loss,
+        ]
+    }
+
+    /// Access as a fixed-size array of mutable references (for indexed access during merge).
+    pub fn as_array_mut(&mut self) -> [&mut T; PROFITABILITY_RANGE_COUNT] {
+        [
+            &mut self.over_1000pct_in_profit,
+            &mut self._500pct_to_1000pct_in_profit,
+            &mut self._300pct_to_500pct_in_profit,
+            &mut self._200pct_to_300pct_in_profit,
+            &mut self._100pct_to_200pct_in_profit,
+            &mut self._90pct_to_100pct_in_profit,
+            &mut self._80pct_to_90pct_in_profit,
+            &mut self._70pct_to_80pct_in_profit,
+            &mut self._60pct_to_70pct_in_profit,
+            &mut self._50pct_to_60pct_in_profit,
+            &mut self._40pct_to_50pct_in_profit,
+            &mut self._30pct_to_40pct_in_profit,
+            &mut self._20pct_to_30pct_in_profit,
+            &mut self._10pct_to_20pct_in_profit,
+            &mut self._0pct_to_10pct_in_profit,
+            &mut self._0pct_to_10pct_in_loss,
+            &mut self._10pct_to_20pct_in_loss,
+            &mut self._20pct_to_30pct_in_loss,
+            &mut self._30pct_to_40pct_in_loss,
+            &mut self._40pct_to_50pct_in_loss,
+            &mut self._50pct_to_60pct_in_loss,
+            &mut self._60pct_to_70pct_in_loss,
+            &mut self._70pct_to_80pct_in_loss,
+            &mut self._80pct_to_90pct_in_loss,
+            &mut self._90pct_to_100pct_in_loss,
+        ]
+    }
+}

crates/brk_cohort/src/spendable_type.rs

@@ -8,7 +8,7 @@ use serde::Serialize;
 use super::{CohortName, Filter};
 
 /// Spendable type values
-pub const SPENDABLE_TYPE_VALUES: BySpendableType<OutputType> = BySpendableType {
+pub const SPENDABLE_TYPE_VALUES: SpendableType<OutputType> = SpendableType {
     p2pk65: OutputType::P2PK65,
     p2pk33: OutputType::P2PK33,
     p2pkh: OutputType::P2PKH,
@@ -23,7 +23,7 @@ pub const SPENDABLE_TYPE_VALUES: BySpendableType<OutputType> = BySpendableType {
 };
 
 /// Spendable type filters
-pub const SPENDABLE_TYPE_FILTERS: BySpendableType<Filter> = BySpendableType {
+pub const SPENDABLE_TYPE_FILTERS: SpendableType<Filter> = SpendableType {
     p2pk65: Filter::Type(SPENDABLE_TYPE_VALUES.p2pk65),
     p2pk33: Filter::Type(SPENDABLE_TYPE_VALUES.p2pk33),
     p2pkh: Filter::Type(SPENDABLE_TYPE_VALUES.p2pkh),
@@ -38,7 +38,7 @@ pub const SPENDABLE_TYPE_FILTERS: BySpendableType<Filter> = BySpendableType {
 };
 
 /// Spendable type names
-pub const SPENDABLE_TYPE_NAMES: BySpendableType<CohortName> = BySpendableType {
+pub const SPENDABLE_TYPE_NAMES: SpendableType<CohortName> = SpendableType {
     p2pk65: CohortName::new("p2pk65", "P2PK65", "Pay to Public Key (65 bytes)"),
     p2pk33: CohortName::new("p2pk33", "P2PK33", "Pay to Public Key (33 bytes)"),
     p2pkh: CohortName::new("p2pkh", "P2PKH", "Pay to Public Key Hash"),
@@ -53,7 +53,7 @@ pub const SPENDABLE_TYPE_NAMES: BySpendableType<CohortName> = BySpendableType {
 };
 
 #[derive(Default, Clone, Debug, Traversable, Serialize)]
-pub struct BySpendableType<T> {
+pub struct SpendableType<T> {
     pub p2pk65: T,
     pub p2pk33: T,
     pub p2pkh: T,
@@ -67,13 +67,13 @@ pub struct BySpendableType<T> {
     pub empty: T,
 }
 
-impl BySpendableType<CohortName> {
+impl SpendableType<CohortName> {
     pub const fn names() -> &'static Self {
         &SPENDABLE_TYPE_NAMES
     }
 }
 
-impl<T> BySpendableType<T> {
+impl<T> SpendableType<T> {
     pub fn new<F>(mut create: F) -> Self
     where
         F: FnMut(Filter, &'static str) -> T,
@@ -116,6 +116,23 @@ impl<T> BySpendableType<T> {
         })
     }
 
+    pub fn get(&self, output_type: OutputType) -> &T {
+        match output_type {
+            OutputType::P2PK65 => &self.p2pk65,
+            OutputType::P2PK33 => &self.p2pk33,
+            OutputType::P2PKH => &self.p2pkh,
+            OutputType::P2MS => &self.p2ms,
+            OutputType::P2SH => &self.p2sh,
+            OutputType::P2WPKH => &self.p2wpkh,
+            OutputType::P2WSH => &self.p2wsh,
+            OutputType::P2TR => &self.p2tr,
+            OutputType::P2A => &self.p2a,
+            OutputType::Unknown => &self.unknown,
+            OutputType::Empty => &self.empty,
+            _ => unreachable!(),
+        }
+    }
+
     pub fn get_mut(&mut self, output_type: OutputType) -> &mut T {
         match output_type {
             OutputType::P2PK65 => &mut self.p2pk65,
@@ -222,7 +239,7 @@ impl<T> BySpendableType<T> {
     }
 }
 
-impl<T> Add for BySpendableType<T>
+impl<T> Add for SpendableType<T>
 where
     T: Add<Output = T>,
 {
@@ -244,7 +261,7 @@ where
     }
 }
 
-impl<T> AddAssign for BySpendableType<T>
+impl<T> AddAssign for SpendableType<T>
 where
     T: AddAssign,
 {

crates/brk_cohort/src/time_filter.rs

@@ -8,11 +8,11 @@ pub enum TimeFilter {
 }
 
 impl TimeFilter {
-    pub fn contains(&self, days: usize) -> bool {
+    pub fn contains(&self, hours: usize) -> bool {
         match self {
-            TimeFilter::LowerThan(max) => days < *max,
-            TimeFilter::Range(r) => r.contains(&days),
-            TimeFilter::GreaterOrEqual(min) => days >= *min,
+            TimeFilter::LowerThan(max) => hours < *max,
+            TimeFilter::Range(r) => r.contains(&hours),
+            TimeFilter::GreaterOrEqual(min) => hours >= *min,
         }
     }
 

crates/brk_cohort/src/under_age.rs

@@ -3,13 +3,13 @@ use rayon::prelude::*;
 use serde::Serialize;
 
 use super::{
-    CohortName, Filter, TimeFilter, HOURS_10Y, HOURS_12Y, HOURS_15Y, HOURS_1M, HOURS_1W, HOURS_1Y,
-    HOURS_2M, HOURS_2Y, HOURS_3M, HOURS_3Y, HOURS_4M, HOURS_4Y, HOURS_5M, HOURS_5Y, HOURS_6M,
-    HOURS_6Y, HOURS_7Y, HOURS_8Y,
+    CohortName, Filter, HOURS_1M, HOURS_1W, HOURS_1Y, HOURS_2M, HOURS_2Y, HOURS_3M, HOURS_3Y,
+    HOURS_4M, HOURS_4Y, HOURS_5M, HOURS_5Y, HOURS_6M, HOURS_6Y, HOURS_7Y, HOURS_8Y, HOURS_10Y,
+    HOURS_12Y, HOURS_15Y, TimeFilter,
 };
 
-/// Max age thresholds in hours
-pub const MAX_AGE_HOURS: ByMaxAge<usize> = ByMaxAge {
+/// Under-age thresholds in hours
+pub const UNDER_AGE_HOURS: UnderAge<usize> = UnderAge {
     _1w: HOURS_1W,
     _1m: HOURS_1M,
     _2m: HOURS_2M,
@@ -30,30 +30,30 @@ pub const MAX_AGE_HOURS: ByMaxAge<usize> = ByMaxAge {
     _15y: HOURS_15Y,
 };
 
-/// Max age filters (LowerThan threshold in hours)
-pub const MAX_AGE_FILTERS: ByMaxAge<Filter> = ByMaxAge {
-    _1w: Filter::Time(TimeFilter::LowerThan(MAX_AGE_HOURS._1w)),
-    _1m: Filter::Time(TimeFilter::LowerThan(MAX_AGE_HOURS._1m)),
-    _2m: Filter::Time(TimeFilter::LowerThan(MAX_AGE_HOURS._2m)),
-    _3m: Filter::Time(TimeFilter::LowerThan(MAX_AGE_HOURS._3m)),
-    _4m: Filter::Time(TimeFilter::LowerThan(MAX_AGE_HOURS._4m)),
-    _5m: Filter::Time(TimeFilter::LowerThan(MAX_AGE_HOURS._5m)),
-    _6m: Filter::Time(TimeFilter::LowerThan(MAX_AGE_HOURS._6m)),
-    _1y: Filter::Time(TimeFilter::LowerThan(MAX_AGE_HOURS._1y)),
-    _2y: Filter::Time(TimeFilter::LowerThan(MAX_AGE_HOURS._2y)),
-    _3y: Filter::Time(TimeFilter::LowerThan(MAX_AGE_HOURS._3y)),
-    _4y: Filter::Time(TimeFilter::LowerThan(MAX_AGE_HOURS._4y)),
-    _5y: Filter::Time(TimeFilter::LowerThan(MAX_AGE_HOURS._5y)),
-    _6y: Filter::Time(TimeFilter::LowerThan(MAX_AGE_HOURS._6y)),
-    _7y: Filter::Time(TimeFilter::LowerThan(MAX_AGE_HOURS._7y)),
-    _8y: Filter::Time(TimeFilter::LowerThan(MAX_AGE_HOURS._8y)),
-    _10y: Filter::Time(TimeFilter::LowerThan(MAX_AGE_HOURS._10y)),
-    _12y: Filter::Time(TimeFilter::LowerThan(MAX_AGE_HOURS._12y)),
-    _15y: Filter::Time(TimeFilter::LowerThan(MAX_AGE_HOURS._15y)),
+/// Under-age filters (LowerThan threshold in hours)
+pub const UNDER_AGE_FILTERS: UnderAge<Filter> = UnderAge {
+    _1w: Filter::Time(TimeFilter::LowerThan(UNDER_AGE_HOURS._1w)),
+    _1m: Filter::Time(TimeFilter::LowerThan(UNDER_AGE_HOURS._1m)),
+    _2m: Filter::Time(TimeFilter::LowerThan(UNDER_AGE_HOURS._2m)),
+    _3m: Filter::Time(TimeFilter::LowerThan(UNDER_AGE_HOURS._3m)),
+    _4m: Filter::Time(TimeFilter::LowerThan(UNDER_AGE_HOURS._4m)),
+    _5m: Filter::Time(TimeFilter::LowerThan(UNDER_AGE_HOURS._5m)),
+    _6m: Filter::Time(TimeFilter::LowerThan(UNDER_AGE_HOURS._6m)),
+    _1y: Filter::Time(TimeFilter::LowerThan(UNDER_AGE_HOURS._1y)),
+    _2y: Filter::Time(TimeFilter::LowerThan(UNDER_AGE_HOURS._2y)),
+    _3y: Filter::Time(TimeFilter::LowerThan(UNDER_AGE_HOURS._3y)),
+    _4y: Filter::Time(TimeFilter::LowerThan(UNDER_AGE_HOURS._4y)),
+    _5y: Filter::Time(TimeFilter::LowerThan(UNDER_AGE_HOURS._5y)),
+    _6y: Filter::Time(TimeFilter::LowerThan(UNDER_AGE_HOURS._6y)),
+    _7y: Filter::Time(TimeFilter::LowerThan(UNDER_AGE_HOURS._7y)),
+    _8y: Filter::Time(TimeFilter::LowerThan(UNDER_AGE_HOURS._8y)),
+    _10y: Filter::Time(TimeFilter::LowerThan(UNDER_AGE_HOURS._10y)),
+    _12y: Filter::Time(TimeFilter::LowerThan(UNDER_AGE_HOURS._12y)),
+    _15y: Filter::Time(TimeFilter::LowerThan(UNDER_AGE_HOURS._15y)),
 };
 
-/// Max age names
-pub const MAX_AGE_NAMES: ByMaxAge<CohortName> = ByMaxAge {
+/// Under-age names
+pub const UNDER_AGE_NAMES: UnderAge<CohortName> = UnderAge {
     _1w: CohortName::new("under_1w_old", "<1w", "Under 1 Week Old"),
     _1m: CohortName::new("under_1m_old", "<1m", "Under 1 Month Old"),
     _2m: CohortName::new("under_2m_old", "<2m", "Under 2 Months Old"),
@@ -75,7 +75,7 @@ pub const MAX_AGE_NAMES: ByMaxAge<CohortName> = ByMaxAge {
 };
 
 #[derive(Default, Clone, Traversable, Serialize)]
-pub struct ByMaxAge<T> {
+pub struct UnderAge<T> {
     pub _1w: T,
     pub _1m: T,
     pub _2m: T,
@@ -96,19 +96,19 @@ pub struct ByMaxAge<T> {
     pub _15y: T,
 }
 
-impl ByMaxAge<CohortName> {
+impl UnderAge<CohortName> {
     pub const fn names() -> &'static Self {
-        &MAX_AGE_NAMES
+        &UNDER_AGE_NAMES
     }
 }
 
-impl<T> ByMaxAge<T> {
+impl<T> UnderAge<T> {
     pub fn new<F>(mut create: F) -> Self
     where
         F: FnMut(Filter, &'static str) -> T,
     {
-        let f = MAX_AGE_FILTERS;
-        let n = MAX_AGE_NAMES;
+        let f = UNDER_AGE_FILTERS;
+        let n = UNDER_AGE_NAMES;
         Self {
             _1w: create(f._1w.clone(), n._1w.id),
             _1m: create(f._1m.clone(), n._1m.id),
@@ -135,8 +135,8 @@ impl<T> ByMaxAge<T> {
     where
         F: FnMut(Filter, &'static str) -> Result<T, E>,
     {
-        let f = MAX_AGE_FILTERS;
-        let n = MAX_AGE_NAMES;
+        let f = UNDER_AGE_FILTERS;
+        let n = UNDER_AGE_NAMES;
         Ok(Self {
             _1w: create(f._1w.clone(), n._1w.id)?,
             _1m: create(f._1m.clone(), n._1m.id)?,

crates/brk_cohort/src/under_amount.rs

@@ -5,8 +5,8 @@ use serde::Serialize;
 
 use super::{AmountFilter, CohortName, Filter};
 
-/// Lower-than amount thresholds
-pub const LT_AMOUNT_THRESHOLDS: ByLowerThanAmount<Sats> = ByLowerThanAmount {
+/// Under-amount thresholds
+pub const UNDER_AMOUNT_THRESHOLDS: UnderAmount<Sats> = UnderAmount {
     _10sats: Sats::_10,
     _100sats: Sats::_100,
     _1k_sats: Sats::_1K,
@@ -22,8 +22,8 @@ pub const LT_AMOUNT_THRESHOLDS: ByLowerThanAmount<Sats> = ByLowerThanAmount {
     _100k_btc: Sats::_100K_BTC,
 };
 
-/// Lower-than amount names
-pub const LT_AMOUNT_NAMES: ByLowerThanAmount<CohortName> = ByLowerThanAmount {
+/// Under-amount names
+pub const UNDER_AMOUNT_NAMES: UnderAmount<CohortName> = UnderAmount {
     _10sats: CohortName::new("under_10sats", "<10 sats", "Under 10 Sats"),
     _100sats: CohortName::new("under_100sats", "<100 sats", "Under 100 Sats"),
     _1k_sats: CohortName::new("under_1k_sats", "<1k sats", "Under 1K Sats"),
@@ -39,25 +39,25 @@ pub const LT_AMOUNT_NAMES: ByLowerThanAmount<CohortName> = ByLowerThanAmount {
     _100k_btc: CohortName::new("under_100k_btc", "<100k BTC", "Under 100K BTC"),
 };
 
-/// Lower-than amount filters
-pub const LT_AMOUNT_FILTERS: ByLowerThanAmount<Filter> = ByLowerThanAmount {
-    _10sats: Filter::Amount(AmountFilter::LowerThan(LT_AMOUNT_THRESHOLDS._10sats)),
-    _100sats: Filter::Amount(AmountFilter::LowerThan(LT_AMOUNT_THRESHOLDS._100sats)),
-    _1k_sats: Filter::Amount(AmountFilter::LowerThan(LT_AMOUNT_THRESHOLDS._1k_sats)),
-    _10k_sats: Filter::Amount(AmountFilter::LowerThan(LT_AMOUNT_THRESHOLDS._10k_sats)),
-    _100k_sats: Filter::Amount(AmountFilter::LowerThan(LT_AMOUNT_THRESHOLDS._100k_sats)),
-    _1m_sats: Filter::Amount(AmountFilter::LowerThan(LT_AMOUNT_THRESHOLDS._1m_sats)),
-    _10m_sats: Filter::Amount(AmountFilter::LowerThan(LT_AMOUNT_THRESHOLDS._10m_sats)),
-    _1btc: Filter::Amount(AmountFilter::LowerThan(LT_AMOUNT_THRESHOLDS._1btc)),
-    _10btc: Filter::Amount(AmountFilter::LowerThan(LT_AMOUNT_THRESHOLDS._10btc)),
-    _100btc: Filter::Amount(AmountFilter::LowerThan(LT_AMOUNT_THRESHOLDS._100btc)),
-    _1k_btc: Filter::Amount(AmountFilter::LowerThan(LT_AMOUNT_THRESHOLDS._1k_btc)),
-    _10k_btc: Filter::Amount(AmountFilter::LowerThan(LT_AMOUNT_THRESHOLDS._10k_btc)),
-    _100k_btc: Filter::Amount(AmountFilter::LowerThan(LT_AMOUNT_THRESHOLDS._100k_btc)),
+/// Under-amount filters
+pub const UNDER_AMOUNT_FILTERS: UnderAmount<Filter> = UnderAmount {
+    _10sats: Filter::Amount(AmountFilter::LowerThan(UNDER_AMOUNT_THRESHOLDS._10sats)),
+    _100sats: Filter::Amount(AmountFilter::LowerThan(UNDER_AMOUNT_THRESHOLDS._100sats)),
+    _1k_sats: Filter::Amount(AmountFilter::LowerThan(UNDER_AMOUNT_THRESHOLDS._1k_sats)),
+    _10k_sats: Filter::Amount(AmountFilter::LowerThan(UNDER_AMOUNT_THRESHOLDS._10k_sats)),
+    _100k_sats: Filter::Amount(AmountFilter::LowerThan(UNDER_AMOUNT_THRESHOLDS._100k_sats)),
+    _1m_sats: Filter::Amount(AmountFilter::LowerThan(UNDER_AMOUNT_THRESHOLDS._1m_sats)),
+    _10m_sats: Filter::Amount(AmountFilter::LowerThan(UNDER_AMOUNT_THRESHOLDS._10m_sats)),
+    _1btc: Filter::Amount(AmountFilter::LowerThan(UNDER_AMOUNT_THRESHOLDS._1btc)),
+    _10btc: Filter::Amount(AmountFilter::LowerThan(UNDER_AMOUNT_THRESHOLDS._10btc)),
+    _100btc: Filter::Amount(AmountFilter::LowerThan(UNDER_AMOUNT_THRESHOLDS._100btc)),
+    _1k_btc: Filter::Amount(AmountFilter::LowerThan(UNDER_AMOUNT_THRESHOLDS._1k_btc)),
+    _10k_btc: Filter::Amount(AmountFilter::LowerThan(UNDER_AMOUNT_THRESHOLDS._10k_btc)),
+    _100k_btc: Filter::Amount(AmountFilter::LowerThan(UNDER_AMOUNT_THRESHOLDS._100k_btc)),
 };
 
 #[derive(Default, Clone, Traversable, Serialize)]
-pub struct ByLowerThanAmount<T> {
+pub struct UnderAmount<T> {
     pub _10sats: T,
     pub _100sats: T,
     pub _1k_sats: T,
@@ -73,19 +73,19 @@ pub struct ByLowerThanAmount<T> {
     pub _100k_btc: T,
 }
 
-impl ByLowerThanAmount<CohortName> {
+impl UnderAmount<CohortName> {
     pub const fn names() -> &'static Self {
-        &LT_AMOUNT_NAMES
+        &UNDER_AMOUNT_NAMES
     }
 }
 
-impl<T> ByLowerThanAmount<T> {
+impl<T> UnderAmount<T> {
     pub fn new<F>(mut create: F) -> Self
     where
         F: FnMut(Filter, &'static str) -> T,
     {
-        let f = LT_AMOUNT_FILTERS;
-        let n = LT_AMOUNT_NAMES;
+        let f = UNDER_AMOUNT_FILTERS;
+        let n = UNDER_AMOUNT_NAMES;
         Self {
             _10sats: create(f._10sats.clone(), n._10sats.id),
             _100sats: create(f._100sats.clone(), n._100sats.id),
@@ -107,8 +107,8 @@ impl<T> ByLowerThanAmount<T> {
     where
         F: FnMut(Filter, &'static str) -> Result<T, E>,
     {
-        let f = LT_AMOUNT_FILTERS;
-        let n = LT_AMOUNT_NAMES;
+        let f = UNDER_AMOUNT_FILTERS;
+        let n = UNDER_AMOUNT_NAMES;
         Ok(Self {
             _10sats: create(f._10sats.clone(), n._10sats.id)?,
             _100sats: create(f._100sats.clone(), n._100sats.id)?,

crates/brk_cohort/src/unspendable_type.rs

@@ -3,33 +3,33 @@ use std::ops::{Add, AddAssign};
 use brk_traversable::Traversable;
 
 #[derive(Default, Clone, Debug, Traversable)]
-pub struct ByUnspendableType<T> {
-    pub opreturn: T,
+pub struct UnspendableType<T> {
+    pub op_return: T,
 }
 
-impl<T> ByUnspendableType<T> {
+impl<T> UnspendableType<T> {
     pub fn as_vec(&self) -> [&T; 1] {
-        [&self.opreturn]
+        [&self.op_return]
     }
 }
 
-impl<T> Add for ByUnspendableType<T>
+impl<T> Add for UnspendableType<T>
 where
     T: Add<Output = T>,
 {
     type Output = Self;
     fn add(self, rhs: Self) -> Self::Output {
         Self {
-            opreturn: self.opreturn + rhs.opreturn,
+            op_return: self.op_return + rhs.op_return,
         }
     }
 }
 
-impl<T> AddAssign for ByUnspendableType<T>
+impl<T> AddAssign for UnspendableType<T>
 where
     T: AddAssign,
 {
     fn add_assign(&mut self, rhs: Self) {
-        self.opreturn += rhs.opreturn;
+        self.op_return += rhs.op_return;
     }
 }

crates/brk_cohort/src/utxo.rs

@@ -2,23 +2,23 @@ use brk_traversable::Traversable;
 use rayon::prelude::*;
 
 use crate::{
-    ByAgeRange, ByAmountRange, ByEpoch, ByGreatEqualAmount, ByLowerThanAmount, ByMaxAge, ByMinAge,
-    BySpendableType, ByTerm, ByYear, Filter,
+    AgeRange, AmountRange, ByEpoch, ByTerm, Class, Filter, OverAge, OverAmount, SpendableType,
+    UnderAge, UnderAmount,
 };
 
 #[derive(Default, Clone, Traversable)]
 pub struct UTXOGroups<T> {
     pub all: T,
-    pub age_range: ByAgeRange<T>,
+    pub age_range: AgeRange<T>,
     pub epoch: ByEpoch<T>,
-    pub year: ByYear<T>,
-    pub min_age: ByMinAge<T>,
-    pub ge_amount: ByGreatEqualAmount<T>,
-    pub amount_range: ByAmountRange<T>,
+    pub class: Class<T>,
+    pub over_age: OverAge<T>,
+    pub over_amount: OverAmount<T>,
+    pub amount_range: AmountRange<T>,
     pub term: ByTerm<T>,
-    pub type_: BySpendableType<T>,
-    pub max_age: ByMaxAge<T>,
-    pub lt_amount: ByLowerThanAmount<T>,
+    pub type_: SpendableType<T>,
+    pub under_age: UnderAge<T>,
+    pub under_amount: UnderAmount<T>,
 }
 
 impl<T> UTXOGroups<T> {
@@ -28,16 +28,16 @@ impl<T> UTXOGroups<T> {
     {
         Self {
             all: create(Filter::All, ""),
-            age_range: ByAgeRange::new(&mut create),
+            age_range: AgeRange::new(&mut create),
             epoch: ByEpoch::new(&mut create),
-            year: ByYear::new(&mut create),
-            min_age: ByMinAge::new(&mut create),
-            ge_amount: ByGreatEqualAmount::new(&mut create),
-            amount_range: ByAmountRange::new(&mut create),
+            class: Class::new(&mut create),
+            over_age: OverAge::new(&mut create),
+            over_amount: OverAmount::new(&mut create),
+            amount_range: AmountRange::new(&mut create),
             term: ByTerm::new(&mut create),
-            type_: BySpendableType::new(&mut create),
-            max_age: ByMaxAge::new(&mut create),
-            lt_amount: ByLowerThanAmount::new(&mut create),
+            type_: SpendableType::new(&mut create),
+            under_age: UnderAge::new(&mut create),
+            under_amount: UnderAmount::new(&mut create),
         }
     }
 
@@ -45,14 +45,14 @@ impl<T> UTXOGroups<T> {
         [&self.all]
             .into_iter()
             .chain(self.term.iter())
-            .chain(self.max_age.iter())
-            .chain(self.min_age.iter())
-            .chain(self.ge_amount.iter())
+            .chain(self.under_age.iter())
+            .chain(self.over_age.iter())
+            .chain(self.over_amount.iter())
             .chain(self.age_range.iter())
             .chain(self.epoch.iter())
-            .chain(self.year.iter())
+            .chain(self.class.iter())
             .chain(self.amount_range.iter())
-            .chain(self.lt_amount.iter())
+            .chain(self.under_amount.iter())
             .chain(self.type_.iter())
     }
 
@@ -60,14 +60,14 @@ impl<T> UTXOGroups<T> {
         [&mut self.all]
             .into_iter()
             .chain(self.term.iter_mut())
-            .chain(self.max_age.iter_mut())
-            .chain(self.min_age.iter_mut())
-            .chain(self.ge_amount.iter_mut())
+            .chain(self.under_age.iter_mut())
+            .chain(self.over_age.iter_mut())
+            .chain(self.over_amount.iter_mut())
             .chain(self.age_range.iter_mut())
             .chain(self.epoch.iter_mut())
-            .chain(self.year.iter_mut())
+            .chain(self.class.iter_mut())
             .chain(self.amount_range.iter_mut())
-            .chain(self.lt_amount.iter_mut())
+            .chain(self.under_amount.iter_mut())
             .chain(self.type_.iter_mut())
     }
 
@@ -78,14 +78,14 @@ impl<T> UTXOGroups<T> {
         [&mut self.all]
             .into_par_iter()
             .chain(self.term.par_iter_mut())
-            .chain(self.max_age.par_iter_mut())
-            .chain(self.min_age.par_iter_mut())
-            .chain(self.ge_amount.par_iter_mut())
+            .chain(self.under_age.par_iter_mut())
+            .chain(self.over_age.par_iter_mut())
+            .chain(self.over_amount.par_iter_mut())
             .chain(self.age_range.par_iter_mut())
             .chain(self.epoch.par_iter_mut())
-            .chain(self.year.par_iter_mut())
+            .chain(self.class.par_iter_mut())
             .chain(self.amount_range.par_iter_mut())
-            .chain(self.lt_amount.par_iter_mut())
+            .chain(self.under_amount.par_iter_mut())
             .chain(self.type_.par_iter_mut())
     }
 
@@ -93,7 +93,7 @@ impl<T> UTXOGroups<T> {
         self.age_range
             .iter()
             .chain(self.epoch.iter())
-            .chain(self.year.iter())
+            .chain(self.class.iter())
             .chain(self.amount_range.iter())
             .chain(self.type_.iter())
     }
@@ -102,7 +102,7 @@ impl<T> UTXOGroups<T> {
         self.age_range
             .iter_mut()
             .chain(self.epoch.iter_mut())
-            .chain(self.year.iter_mut())
+            .chain(self.class.iter_mut())
             .chain(self.amount_range.iter_mut())
             .chain(self.type_.iter_mut())
     }
@@ -114,7 +114,7 @@ impl<T> UTXOGroups<T> {
         self.age_range
             .par_iter_mut()
             .chain(self.epoch.par_iter_mut())
-            .chain(self.year.par_iter_mut())
+            .chain(self.class.par_iter_mut())
             .chain(self.amount_range.par_iter_mut())
             .chain(self.type_.par_iter_mut())
     }
@@ -123,10 +123,10 @@ impl<T> UTXOGroups<T> {
         [&mut self.all]
             .into_iter()
             .chain(self.term.iter_mut())
-            .chain(self.max_age.iter_mut())
-            .chain(self.min_age.iter_mut())
-            .chain(self.lt_amount.iter_mut())
-            .chain(self.ge_amount.iter_mut())
+            .chain(self.under_age.iter_mut())
+            .chain(self.over_age.iter_mut())
+            .chain(self.under_amount.iter_mut())
+            .chain(self.over_amount.iter_mut())
     }
 
     /// Iterator over aggregate cohorts (all, sth, lth) that compute values from sub-cohorts.

crates/brk_computer/.gitignore

@@ -1,3 +1,4 @@
 *.md
 !README.md
 /*.py
+/*.json

crates/brk_computer/Cargo.toml

@@ -6,31 +6,31 @@ edition.workspace = true
 license.workspace = true
 homepage.workspace = true
 repository.workspace = true
+exclude = ["examples/"]
 
 [dependencies]
 bitcoin = { workspace = true }
 brk_error = { workspace = true, features = ["vecdb"] }
-brk_fetcher = { workspace = true }
 brk_cohort = { workspace = true }
 brk_indexer = { workspace = true }
-brk_iterator = { workspace = true }
+brk_oracle = { workspace = true }
 brk_logger = { workspace = true }
-brk_reader = { workspace = true }
-brk_rpc = { workspace = true }
-brk_store = { workspace = true }
+brk_rpc = { workspace = true, features = ["corepc"] }
 brk_traversable = { workspace = true }
 brk_types = { workspace = true }
 derive_more = { workspace = true }
+parking_lot = { workspace = true }
 tracing = { workspace = true }
-pco = "1.0.0"
 rayon = { workspace = true }
 rustc-hash = { workspace = true }
 schemars = { workspace = true }
 serde = { workspace = true }
+serde_json = { workspace = true }
 smallvec = { workspace = true }
 vecdb = { workspace = true }
 
 [dev-dependencies]
+brk_reader = { workspace = true }
 brk_alloc = { workspace = true }
 brk_bencher = { workspace = true }
 color-eyre = { workspace = true }

crates/brk_computer/README.md

@@ -19,7 +19,7 @@ Compute 1000+ on-chain metrics from indexed blockchain data: supply breakdowns,
 ## Core API
 
 ```rust,ignore
-let mut computer = Computer::forced_import(&outputs_path, &indexer, Some(fetcher))?;
+let mut computer = Computer::forced_import(&outputs_path, &indexer)?;
 
 // Compute all metrics for new blocks
 computer.compute(&indexer, starting_indexes, &reader, &exit)?;
@@ -40,7 +40,7 @@ let realized_cap = computer.distribution.utxo_cohorts.all.metrics.realized.unwra
 | `cointime` | Liveliness, vaultedness, true market mean |
 | `pools` | Per-pool block counts, rewards, fees |
 | `market` | Market cap, NVT, Puell multiple |
-| `price` | Height-to-price mapping from fetched data |
+| `price` | Height-to-price mapping from on-chain oracle |
 
 ## Cohort System
 
@@ -50,6 +50,17 @@ UTXO and address cohorts support filtering by:
 - **Type**: P2PK, P2PKH, P2MS, P2SH, P2WPKH, P2WSH, P2TR, P2A
 - **Epoch**: By halving epoch
 
+```rust,ignore
+// Access metrics for a specific UTXO cohort (e.g. long-term holders)
+let lth_supply = computer.distribution.utxo_cohorts.lth.metrics.supply.total.sats.height;
+
+// Access metrics for an address cohort (e.g. 1-10 BTC holders)
+let whale_count = computer.distribution.address_cohorts.from_1_to_10.metrics.address_count.height;
+
+// Access metrics for all UTXOs combined
+let sopr = computer.distribution.utxo_cohorts.all.metrics.realized.unwrap().sopr.height;
+```
+
 ## Performance
 
 ### End-to-End
@@ -71,6 +82,6 @@ Use [mimalloc v3](https://crates.io/crates/mimalloc) as the global allocator to
 
 - `brk_indexer` for indexed blockchain data
 - `brk_cohort` for cohort filtering
-- `brk_fetcher` for price data
+- `brk_oracle` for on-chain price data
 - `brk_reader` for raw block access
 - `brk_traversable` for data export

crates/brk_computer/examples/computer.rs

@@ -1,16 +1,13 @@
 use std::{
     env,
     path::Path,
-    thread::{self, sleep},
+    thread::sleep,
     time::{Duration, Instant},
 };
 
 use brk_alloc::Mimalloc;
 use brk_computer::Computer;
-use brk_error::Result;
-use brk_fetcher::Fetcher;
 use brk_indexer::Indexer;
-use brk_iterator::Blocks;
 use brk_reader::Reader;
 use brk_rpc::{Auth, Client};
 use vecdb::Exit;
@@ -18,17 +15,6 @@ use vecdb::Exit;
 pub fn main() -> color_eyre::Result<()> {
     color_eyre::install()?;
 
-    // Can't increase main thread's stack size, thus we need to use another thread
-    thread::Builder::new()
-        .stack_size(512 * 1024 * 1024)
-        .spawn(run)?
-        .join()
-        .unwrap()?;
-
-    Ok(())
-}
-
-fn run() -> Result<()> {
     brk_logger::init(Some(Path::new(".log")))?;
 
     let bitcoin_dir = Client::default_bitcoin_path();
@@ -44,12 +30,8 @@ fn run() -> Result<()> {
 
     let reader = Reader::new(bitcoin_dir.join("blocks"), &client);
 
-    let blocks = Blocks::new(&client, &reader);
-
     let mut indexer = Indexer::forced_import(&outputs_dir)?;
 
-    let fetcher = Fetcher::import(None)?;
-
     let exit = Exit::new();
     exit.set_ctrlc_handler();
 
@@ -57,21 +39,21 @@ fn run() -> Result<()> {
     let chain_height = client.get_last_height()?;
     let indexed_height = indexer.vecs.starting_height();
     if u32::from(chain_height).saturating_sub(u32::from(indexed_height)) > 1000 {
-        indexer.checked_index(&blocks, &client, &exit)?;
+        indexer.checked_index(&reader, &client, &exit)?;
         drop(indexer);
         Mimalloc::collect();
         indexer = Indexer::forced_import(&outputs_dir)?;
     }
 
-    let mut computer = Computer::forced_import(&outputs_dir, &indexer, Some(fetcher))?;
+    let mut computer = Computer::forced_import(&outputs_dir, &indexer)?;
 
     loop {
         let i = Instant::now();
-        let starting_indexes = indexer.checked_index(&blocks, &client, &exit)?;
+        let starting_indexes = indexer.checked_index(&reader, &client, &exit)?;
 
         Mimalloc::collect();
 
-        computer.compute(&indexer, starting_indexes, &reader, &exit)?;
+        computer.compute(&indexer, starting_indexes, &exit)?;
         dbg!(i.elapsed());
         sleep(Duration::from_secs(10));
     }

crates/brk_computer/examples/computer_bench.rs

@@ -1,27 +1,16 @@
-use std::{env, path::Path, thread, time::Instant};
+use std::{env, path::Path, time::Instant};
 
 use brk_alloc::Mimalloc;
 use brk_bencher::Bencher;
 use brk_computer::Computer;
 use brk_error::Result;
-use brk_fetcher::Fetcher;
 use brk_indexer::Indexer;
-use brk_iterator::Blocks;
 use brk_reader::Reader;
 use brk_rpc::{Auth, Client};
 use tracing::{debug, info};
 use vecdb::Exit;
 
 pub fn main() -> Result<()> {
-    // Can't increase main thread's stack size, thus we need to use another thread
-    thread::Builder::new()
-        .stack_size(512 * 1024 * 1024)
-        .spawn(run)?
-        .join()
-        .unwrap()
-}
-
-fn run() -> Result<()> {
     brk_logger::init(None)?;
 
     let bitcoin_dir = Client::default_bitcoin_path();
@@ -38,13 +27,9 @@ fn run() -> Result<()> {
 
     let reader = Reader::new(bitcoin_dir.join("blocks"), &client);
 
-    let blocks = Blocks::new(&client, &reader);
-
     let mut indexer = Indexer::forced_import(&outputs_dir)?;
 
-    let fetcher = Fetcher::import(None)?;
-
-    let mut computer = Computer::forced_import(&outputs_benches_dir, &indexer, Some(fetcher))?;
+    let mut computer = Computer::forced_import(&outputs_benches_dir, &indexer)?;
 
     let mut bencher =
         Bencher::from_cargo_env(env!("CARGO_PKG_NAME"), &outputs_dir.join("computed"))?;
@@ -59,13 +44,13 @@ fn run() -> Result<()> {
     });
 
     let i = Instant::now();
-    let starting_indexes = indexer.index(&blocks, &client, &exit)?;
+    let starting_indexes = indexer.index(&reader, &client, &exit)?;
     info!("Done in {:?}", i.elapsed());
 
     Mimalloc::collect();
 
     let i = Instant::now();
-    computer.compute(&indexer, starting_indexes, &reader, &exit)?;
+    computer.compute(&indexer, starting_indexes, &exit)?;
     info!("Done in {:?}", i.elapsed());
 
     // We want to benchmark the drop too

crates/brk_computer/examples/computer_read.rs

@@ -1,51 +1,36 @@
-use std::{env, path::Path, thread, time::Instant};
+use std::{env, path::Path, time::Instant};
 
 use brk_computer::Computer;
 use brk_error::Result;
-use brk_fetcher::Fetcher;
 use brk_indexer::Indexer;
-use vecdb::{AnySerializableVec, AnyVec, Exit};
+use vecdb::{AnySerializableVec, AnyVec};
 
 pub fn main() -> Result<()> {
-    // Can't increase main thread's stack size, thus we need to use another thread
-    thread::Builder::new()
-        .stack_size(512 * 1024 * 1024)
-        .spawn(run)?
-        .join()
-        .unwrap()
-}
-
-fn run() -> Result<()> {
     brk_logger::init(None)?;
 
     let outputs_dir = Path::new(&env::var("HOME").unwrap()).join(".brk");
 
     let indexer = Indexer::forced_import(&outputs_dir)?;
 
-    let fetcher = Fetcher::import(None)?;
+    let computer = Computer::forced_import(&outputs_dir, &indexer)?;
 
-    let exit = Exit::new();
-    exit.set_ctrlc_handler();
-
-    let computer = Computer::forced_import(&outputs_dir, &indexer, Some(fetcher))?;
-
-    // Test emptyaddressdata (underlying BytesVec) - direct access
-    let empty_data = &computer.distribution.addresses_data.empty;
-    println!("emptyaddressdata (BytesVec) len: {}", empty_data.len());
+    // Test empty_addr_data (underlying BytesVec) - direct access
+    let empty_data = &computer.distribution.addrs_data.empty;
+    println!("empty_addr_data (BytesVec) len: {}", empty_data.len());
 
     let start = Instant::now();
     let mut buf = Vec::new();
     empty_data.write_json(Some(empty_data.len() - 1), Some(empty_data.len()), &mut buf)?;
     println!(
-        "emptyaddressdata last item JSON: {}",
+        "empty_addr_data last item JSON: {}",
         String::from_utf8_lossy(&buf)
     );
     println!("Time for BytesVec write_json: {:?}", start.elapsed());
 
-    // Test emptyaddressindex (LazyVecFrom1 wrapper) - computed access
-    let empty_index = &computer.distribution.emptyaddressindex;
+    // Test empty_addr_index (LazyVecFrom1 wrapper) - computed access
+    let empty_index = &computer.distribution.addrs.empty_index;
     println!(
-        "\nemptyaddressindex (LazyVecFrom1) len: {}",
+        "\nempty_addr_index (LazyVecFrom1) len: {}",
         empty_index.len()
     );
 
@@ -57,14 +42,14 @@ fn run() -> Result<()> {
         &mut buf,
     )?;
     println!(
-        "emptyaddressindex last item JSON: {}",
+        "empty_addr_index last item JSON: {}",
         String::from_utf8_lossy(&buf)
     );
     println!("Time for LazyVecFrom1 write_json: {:?}", start.elapsed());
 
     // Compare with funded versions
-    let funded_data = &computer.distribution.addresses_data.funded;
-    println!("\nfundedaddressdata (BytesVec) len: {}", funded_data.len());
+    let funded_data = &computer.distribution.addrs_data.funded;
+    println!("\nfunded_addr_data (BytesVec) len: {}", funded_data.len());
 
     let start = Instant::now();
     let mut buf = Vec::new();
@@ -74,7 +59,7 @@ fn run() -> Result<()> {
         &mut buf,
     )?;
     println!(
-        "fundedaddressdata last item JSON: {}",
+        "funded_addr_data last item JSON: {}",
         String::from_utf8_lossy(&buf)
     );
     println!("Time for BytesVec write_json: {:?}", start.elapsed());

crates/brk_computer/examples/full_bench.rs

@@ -1,17 +1,14 @@
 use std::{
     env, fs,
     path::Path,
-    thread::{self, sleep},
+    thread::sleep,
     time::{Duration, Instant},
 };
 
 use brk_alloc::Mimalloc;
 use brk_bencher::Bencher;
 use brk_computer::Computer;
-use brk_error::Result;
-use brk_fetcher::{Fetcher, PriceSource};
 use brk_indexer::Indexer;
-use brk_iterator::Blocks;
 use brk_reader::Reader;
 use brk_rpc::{Auth, Client};
 use tracing::{debug, info};
@@ -20,17 +17,6 @@ use vecdb::Exit;
 pub fn main() -> color_eyre::Result<()> {
     color_eyre::install()?;
 
-    // Can't increase main thread's stack size, thus we need to use another thread
-    thread::Builder::new()
-        .stack_size(512 * 1024 * 1024)
-        .spawn(run)?
-        .join()
-        .unwrap()?;
-
-    Ok(())
-}
-
-fn run() -> Result<()> {
     let bitcoin_dir = Client::default_bitcoin_path();
     // let bitcoin_dir = Path::new("/Volumes/WD_BLACK1/bitcoin");
 
@@ -58,35 +44,29 @@ fn run() -> Result<()> {
 
     let reader = Reader::new(bitcoin_dir.join("blocks"), &client);
 
-    let blocks = Blocks::new(&client, &reader);
-
-    let fetcher = Fetcher::import(None)?;
-
-    info!("Ping: {:?}", fetcher.brk.ping()?);
-
     let mut indexer = Indexer::forced_import(&outputs_dir)?;
 
     // Pre-run indexer if too far behind, then drop and reimport to reduce memory
     let chain_height = client.get_last_height()?;
     let indexed_height = indexer.vecs.starting_height();
     if chain_height.saturating_sub(*indexed_height) > 1000 {
-        indexer.index(&blocks, &client, &exit)?;
+        indexer.index(&reader, &client, &exit)?;
         drop(indexer);
         Mimalloc::collect();
         indexer = Indexer::forced_import(&outputs_dir)?;
     }
 
-    let mut computer = Computer::forced_import(&outputs_dir, &indexer, Some(fetcher))?;
+    let mut computer = Computer::forced_import(&outputs_dir, &indexer)?;
 
     loop {
         let i = Instant::now();
-        let starting_indexes = indexer.index(&blocks, &client, &exit)?;
+        let starting_indexes = indexer.index(&reader, &client, &exit)?;
         info!("Done in {:?}", i.elapsed());
 
         Mimalloc::collect();
 
         let i = Instant::now();
-        computer.compute(&indexer, starting_indexes, &reader, &exit)?;
+        computer.compute(&indexer, starting_indexes, &exit)?;
         info!("Done in {:?}", i.elapsed());
 
         sleep(Duration::from_secs(60));

crates/brk_computer/examples/tree.rs

@@ -0,0 +1,36 @@
+use std::{env, fs, path::Path};
+
+use brk_computer::Computer;
+use brk_indexer::Indexer;
+use brk_traversable::{Traversable, TreeNode};
+
+pub fn main() -> color_eyre::Result<()> {
+    color_eyre::install()?;
+
+    let tmp = env::temp_dir().join("brk_tree_gen");
+    fs::create_dir_all(&tmp)?;
+
+    let indexer = Indexer::forced_import(&tmp)?;
+    let computer = Computer::forced_import(&tmp, &indexer)?;
+
+    let tree = TreeNode::Branch(
+        [
+            ("indexed".to_string(), indexer.vecs.to_tree_node()),
+            ("computed".to_string(), computer.to_tree_node()),
+        ]
+        .into_iter()
+        .collect(),
+    )
+    .merge_branches()
+    .expect("Tree merge failed");
+
+    let json = serde_json::to_string_pretty(&tree)?;
+
+    let out_path = Path::new(env!("CARGO_MANIFEST_DIR")).join("tree.json");
+    fs::write(&out_path, &json)?;
+    eprintln!("Wrote {} bytes to {}", json.len(), out_path.display());
+
+    fs::remove_dir_all(&tmp)?;
+
+    Ok(())
+}

crates/brk_computer/src/blocks/compute.rs

@@ -1,59 +1,59 @@
+use std::thread;
+
 use brk_error::Result;
 use brk_indexer::Indexer;
+use brk_types::Indexes;
 use vecdb::Exit;
 
-use crate::{ComputeIndexes, indexes, transactions};
+use crate::indexes;
 
 use super::Vecs;
 
 impl Vecs {
-    pub fn compute(
+    pub(crate) fn compute(
         &mut self,
         indexer: &Indexer,
         indexes: &indexes::Vecs,
-        transactions: &transactions::Vecs,
-        starting_indexes: &ComputeIndexes,
+        starting_indexes: &Indexes,
         exit: &Exit,
     ) -> Result<()> {
-        // Core block metrics
-        self.count
-            .compute(indexer, indexes, &self.time, starting_indexes, exit)?;
-        self.interval.compute(indexes, starting_indexes, exit)?;
-        self.size
-            .compute(indexer, indexes, starting_indexes, exit)?;
-        self.weight
-            .compute(indexer, indexes, starting_indexes, exit)?;
+        self.db.sync_bg_tasks()?;
 
-        // Time metrics (timestamps)
-        self.time.compute(indexes, starting_indexes, exit)?;
+        // lookback depends on indexes.timestamp.monotonic
+        self.lookback.compute(indexes, starting_indexes, exit)?;
 
-        // Epoch metrics
-        self.difficulty
-            .compute(indexer, indexes, starting_indexes, exit)?;
-        self.halving.compute(indexes, starting_indexes, exit)?;
+        // Parallel: remaining sub-modules are independent of each other.
+        // size depends on lookback (already computed above).
+        let Vecs {
+            lookback,
+            count,
+            interval,
+            size,
+            weight,
+            difficulty,
+            halving,
+            ..
+        } = self;
+        thread::scope(|s| -> Result<()> {
+            let r1 = s.spawn(|| count.compute(indexer, starting_indexes, exit));
+            let r2 = s.spawn(|| interval.compute(indexer, starting_indexes, exit));
+            let r3 = s.spawn(|| weight.compute(indexer, starting_indexes, exit));
+            let r4 = s.spawn(|| difficulty.compute(indexer, indexes, starting_indexes, exit));
+            let r5 = s.spawn(|| halving.compute(indexes, starting_indexes, exit));
+            size.compute(indexer, &*lookback, starting_indexes, exit)?;
+            r1.join().unwrap()?;
+            r2.join().unwrap()?;
+            r3.join().unwrap()?;
+            r4.join().unwrap()?;
+            r5.join().unwrap()?;
+            Ok(())
+        })?;
 
-        // Rewards depends on count and transactions fees
-        self.rewards.compute(
-            indexer,
-            indexes,
-            &self.count,
-            &transactions.fees,
-            starting_indexes,
-            exit,
-        )?;
-
-        // Mining depends on count, difficulty, and rewards
-        self.mining.compute(
-            indexes,
-            &self.count,
-            &self.difficulty,
-            &self.rewards,
-            starting_indexes,
-            exit,
-        )?;
-
-        let _lock = exit.lock();
-        self.db.compact()?;
+        let exit = exit.clone();
+        self.db.run_bg(move |db| {
+            let _lock = exit.lock();
+            db.compact_deferred_default()
+        });
         Ok(())
     }
 }

crates/brk_computer/src/blocks/count/compute.rs

@@ -1,119 +1,26 @@
 use brk_error::Result;
 use brk_indexer::Indexer;
-use brk_types::{Height, StoredU32};
-use vecdb::{EagerVec, Exit, PcoVec, TypedVecIterator};
+use brk_types::{Indexes, StoredU32};
+use vecdb::Exit;
 
-use super::super::time;
 use super::Vecs;
-use crate::{ComputeIndexes, indexes, internal::ComputedFromHeightLast};
 
 impl Vecs {
-    pub fn compute(
+    pub(crate) fn compute(
         &mut self,
         indexer: &Indexer,
-        indexes: &indexes::Vecs,
-        time: &time::Vecs,
-        starting_indexes: &ComputeIndexes,
+        starting_indexes: &Indexes,
         exit: &Exit,
     ) -> Result<()> {
-        self.block_count
-            .compute_all(indexes, starting_indexes, exit, |v| {
-                v.compute_range(
-                    starting_indexes.height,
-                    &indexer.vecs.blocks.weight,
-                    |h| (h, StoredU32::from(1_u32)),
-                    exit,
-                )?;
-                Ok(())
-            })?;
-
-        // Compute rolling window starts
-        self.compute_rolling_start(time, starting_indexes, exit, 1, |s| &mut s._24h_start)?;
-        self.compute_rolling_start(time, starting_indexes, exit, 7, |s| &mut s._1w_start)?;
-        self.compute_rolling_start(time, starting_indexes, exit, 30, |s| &mut s._1m_start)?;
-        self.compute_rolling_start(time, starting_indexes, exit, 365, |s| &mut s._1y_start)?;
-
-        // Compute rolling window block counts
-        self.compute_rolling_block_count(
-            indexes,
-            starting_indexes,
+        // Block count raw + cumulative
+        self.total.block.compute_range(
+            starting_indexes.height,
+            &indexer.vecs.blocks.weight,
+            |h| (h, StoredU32::from(1_u32)),
             exit,
-            &self._24h_start.clone(),
-            |s| &mut s._24h_block_count,
-        )?;
-        self.compute_rolling_block_count(
-            indexes,
-            starting_indexes,
-            exit,
-            &self._1w_start.clone(),
-            |s| &mut s._1w_block_count,
-        )?;
-        self.compute_rolling_block_count(
-            indexes,
-            starting_indexes,
-            exit,
-            &self._1m_start.clone(),
-            |s| &mut s._1m_block_count,
-        )?;
-        self.compute_rolling_block_count(
-            indexes,
-            starting_indexes,
-            exit,
-            &self._1y_start.clone(),
-            |s| &mut s._1y_block_count,
         )?;
+        self.total.compute_rest(starting_indexes.height, exit)?;
 
         Ok(())
     }
-
-    fn compute_rolling_start<F>(
-        &mut self,
-        time: &time::Vecs,
-        starting_indexes: &ComputeIndexes,
-        exit: &Exit,
-        days: usize,
-        get_field: F,
-    ) -> Result<()>
-    where
-        F: FnOnce(&mut Self) -> &mut EagerVec<PcoVec<Height, Height>>,
-    {
-        let mut iter = time.timestamp_monotonic.into_iter();
-        let mut prev = Height::ZERO;
-        Ok(get_field(self).compute_transform(
-            starting_indexes.height,
-            &time.timestamp_monotonic,
-            |(h, t, ..)| {
-                while t.difference_in_days_between(iter.get_unwrap(prev)) >= days {
-                    prev.increment();
-                    if prev > h {
-                        unreachable!()
-                    }
-                }
-                (h, prev)
-            },
-            exit,
-        )?)
-    }
-
-    fn compute_rolling_block_count<F>(
-        &mut self,
-        indexes: &indexes::Vecs,
-        starting_indexes: &ComputeIndexes,
-        exit: &Exit,
-        start_height: &EagerVec<PcoVec<Height, Height>>,
-        get_field: F,
-    ) -> Result<()>
-    where
-        F: FnOnce(&mut Self) -> &mut ComputedFromHeightLast<StoredU32>,
-    {
-        get_field(self).compute_all(indexes, starting_indexes, exit, |v| {
-            v.compute_transform(
-                starting_indexes.height,
-                start_height,
-                |(h, start, ..)| (h, StoredU32::from(*h + 1 - *start)),
-                exit,
-            )?;
-            Ok(())
-        })
-    }
 }

crates/brk_computer/src/blocks/count/import.rs

@@ -1,61 +1,52 @@
 use brk_error::Result;
-use brk_types::{StoredU64, Version};
-use vecdb::{Database, ImportableVec};
+use brk_types::Version;
+use vecdb::Database;
 
 use super::Vecs;
 use crate::{
-    blocks::{
-        TARGET_BLOCKS_PER_DAY, TARGET_BLOCKS_PER_DECADE, TARGET_BLOCKS_PER_MONTH,
-        TARGET_BLOCKS_PER_QUARTER, TARGET_BLOCKS_PER_SEMESTER, TARGET_BLOCKS_PER_WEEK,
-        TARGET_BLOCKS_PER_YEAR,
-    },
     indexes,
-    internal::{ComputedFromHeightLast, ComputedFromHeightSumCum, LazyFromDate},
+    internal::{
+        BlockCountTarget1m, BlockCountTarget1w, BlockCountTarget1y, BlockCountTarget24h,
+        ConstantVecs, PerBlockCumulativeRolling, WindowStartVec, Windows,
+    },
 };
 
 impl Vecs {
-    pub fn forced_import(db: &Database, version: Version, indexes: &indexes::Vecs) -> Result<Self> {
+    pub(crate) fn forced_import(
+        db: &Database,
+        version: Version,
+        indexes: &indexes::Vecs,
+        cached_starts: &Windows<&WindowStartVec>,
+    ) -> Result<Self> {
         Ok(Self {
-            block_count_target: LazyFromDate::new(
-                "block_count_target",
-                version,
-                indexes,
-                |_, _| Some(StoredU64::from(TARGET_BLOCKS_PER_DAY)),
-                |_, _| Some(StoredU64::from(TARGET_BLOCKS_PER_WEEK)),
-                |_, _| Some(StoredU64::from(TARGET_BLOCKS_PER_MONTH)),
-                |_, _| Some(StoredU64::from(TARGET_BLOCKS_PER_QUARTER)),
-                |_, _| Some(StoredU64::from(TARGET_BLOCKS_PER_SEMESTER)),
-                |_, _| Some(StoredU64::from(TARGET_BLOCKS_PER_YEAR)),
-                |_, _| Some(StoredU64::from(TARGET_BLOCKS_PER_DECADE)),
-            ),
-            block_count: ComputedFromHeightSumCum::forced_import(db, "block_count", version, indexes)?,
-            _24h_start: ImportableVec::forced_import(db, "24h_start", version)?,
-            _1w_start: ImportableVec::forced_import(db, "1w_start", version)?,
-            _1m_start: ImportableVec::forced_import(db, "1m_start", version)?,
-            _1y_start: ImportableVec::forced_import(db, "1y_start", version)?,
-            _24h_block_count: ComputedFromHeightLast::forced_import(
+            target: Windows {
+                _24h: ConstantVecs::new::<BlockCountTarget24h>(
+                    "block_count_target_24h",
+                    version,
+                    indexes,
+                ),
+                _1w: ConstantVecs::new::<BlockCountTarget1w>(
+                    "block_count_target_1w",
+                    version,
+                    indexes,
+                ),
+                _1m: ConstantVecs::new::<BlockCountTarget1m>(
+                    "block_count_target_1m",
+                    version,
+                    indexes,
+                ),
+                _1y: ConstantVecs::new::<BlockCountTarget1y>(
+                    "block_count_target_1y",
+                    version,
+                    indexes,
+                ),
+            },
+            total: PerBlockCumulativeRolling::forced_import(
                 db,
-                "24h_block_count",
-                version,
-                indexes,
-            )?,
-            _1w_block_count: ComputedFromHeightLast::forced_import(
-                db,
-                "1w_block_count",
-                version,
-                indexes,
-            )?,
-            _1m_block_count: ComputedFromHeightLast::forced_import(
-                db,
-                "1m_block_count",
-                version,
-                indexes,
-            )?,
-            _1y_block_count: ComputedFromHeightLast::forced_import(
-                db,
-                "1y_block_count",
-                version,
+                "block_count",
+                version + Version::ONE,
                 indexes,
+                cached_starts,
             )?,
         })
     }

crates/brk_computer/src/blocks/count/vecs.rs

@@ -1,21 +1,11 @@
 use brk_traversable::Traversable;
-use brk_types::{Height, StoredU32, StoredU64};
-use vecdb::{EagerVec, PcoVec};
+use brk_types::{StoredU32, StoredU64};
+use vecdb::{Rw, StorageMode};
 
-use crate::internal::{ComputedFromHeightLast, ComputedFromHeightSumCum, LazyFromDate};
+use crate::internal::{ConstantVecs, PerBlockCumulativeRolling, Windows};
 
-#[derive(Clone, Traversable)]
-pub struct Vecs {
-    pub block_count_target: LazyFromDate<StoredU64>,
-    pub block_count: ComputedFromHeightSumCum<StoredU32>,
-    // Rolling window starts (height-indexed only, no date aggregation needed)
-    pub _24h_start: EagerVec<PcoVec<Height, Height>>,
-    pub _1w_start: EagerVec<PcoVec<Height, Height>>,
-    pub _1m_start: EagerVec<PcoVec<Height, Height>>,
-    pub _1y_start: EagerVec<PcoVec<Height, Height>>,
-    // Rolling window block counts
-    pub _24h_block_count: ComputedFromHeightLast<StoredU32>,
-    pub _1w_block_count: ComputedFromHeightLast<StoredU32>,
-    pub _1m_block_count: ComputedFromHeightLast<StoredU32>,
-    pub _1y_block_count: ComputedFromHeightLast<StoredU32>,
+#[derive(Traversable)]
+pub struct Vecs<M: StorageMode = Rw> {
+    pub target: Windows<ConstantVecs<StoredU64>>,
+    pub total: PerBlockCumulativeRolling<StoredU32, StoredU64, M>,
 }

crates/brk_computer/src/blocks/difficulty/compute.rs

@@ -1,102 +1,38 @@
 use brk_error::Result;
 use brk_indexer::Indexer;
-use brk_types::{StoredF32, StoredU32};
-use vecdb::{Exit, TypedVecIterator};
+use brk_types::{Indexes, StoredU32};
+use vecdb::Exit;
 
-use super::super::TARGET_BLOCKS_PER_DAY_F32;
 use super::Vecs;
-use crate::{ComputeIndexes, indexes};
+use crate::indexes;
 
 impl Vecs {
-    pub fn compute(
+    pub(crate) fn compute(
         &mut self,
         indexer: &Indexer,
         indexes: &indexes::Vecs,
-        starting_indexes: &ComputeIndexes,
+        starting_indexes: &Indexes,
         exit: &Exit,
     ) -> Result<()> {
-        // Derive dateindex/period stats from raw difficulty
-        self.raw.derive_from(
-            indexes,
-            starting_indexes,
+        self.adjustment.bps.height.compute_ratio_change(
+            starting_indexes.height,
             &indexer.vecs.blocks.difficulty,
+            2016,
             exit,
         )?;
 
-        // Compute difficulty as hash rate equivalent
-        self.as_hash
-            .compute_all(indexes, starting_indexes, exit, |v| {
-                let multiplier = 2.0_f64.powi(32) / 600.0;
-                v.compute_transform(
-                    starting_indexes.height,
-                    &indexer.vecs.blocks.difficulty,
-                    |(i, v, ..)| (i, StoredF32::from(*v * multiplier)),
-                    exit,
-                )?;
-                Ok(())
-            })?;
-
-        // Compute difficulty adjustment percentage
-        self.adjustment
-            .compute_all(indexes, starting_indexes, exit, |v| {
-                v.compute_percentage_change(
-                    starting_indexes.height,
-                    &indexer.vecs.blocks.difficulty,
-                    1,
-                    exit,
-                )?;
-                Ok(())
-            })?;
-
-        // Compute epoch by dateindex
-        let mut height_to_difficultyepoch_iter = indexes.height.difficultyepoch.into_iter();
-        self.epoch.compute_all(starting_indexes, exit, |vec| {
-            let mut height_count_iter = indexes.dateindex.height_count.into_iter();
-            vec.compute_transform(
-                starting_indexes.dateindex,
-                &indexes.dateindex.first_height,
-                |(di, height, ..)| {
-                    (
-                        di,
-                        height_to_difficultyepoch_iter
-                            .get_unwrap(height + (*height_count_iter.get_unwrap(di) - 1)),
-                    )
-                },
-                exit,
-            )?;
-            Ok(())
-        })?;
-
-        // Compute blocks before next adjustment
-        self.blocks_before_next_adjustment.compute_all(
-            indexes,
-            starting_indexes,
+        self.epoch.height.compute_transform(
+            starting_indexes.height,
+            &indexes.height.epoch,
+            |(h, epoch, ..)| (h, epoch),
             exit,
-            |v| {
-                v.compute_transform(
-                    starting_indexes.height,
-                    &indexes.height.identity,
-                    |(h, ..)| (h, StoredU32::from(h.left_before_next_diff_adj())),
-                    exit,
-                )?;
-                Ok(())
-            },
         )?;
 
-        // Compute days before next adjustment
-        self.days_before_next_adjustment.compute_all(
-            indexes,
-            starting_indexes,
+        self.blocks_to_retarget.height.compute_transform(
+            starting_indexes.height,
+            &indexes.height.epoch,
+            |(h, ..)| (h, StoredU32::from(h.left_before_next_diff_adj())),
             exit,
-            |v| {
-                v.compute_transform(
-                    starting_indexes.height,
-                    &self.blocks_before_next_adjustment.height,
-                    |(h, blocks, ..)| (h, (*blocks as f32 / TARGET_BLOCKS_PER_DAY_F32).into()),
-                    exit,
-                )?;
-                Ok(())
-            },
         )?;
 
         Ok(())

crates/brk_computer/src/blocks/difficulty/import.rs

@@ -1,19 +1,18 @@
 use brk_error::Result;
 use brk_indexer::Indexer;
 use brk_types::Version;
-use vecdb::{Database, IterableCloneableVec};
+use vecdb::{Database, ReadableCloneableVec};
 
 use super::Vecs;
 use crate::{
     indexes,
     internal::{
-        ComputedFromHeightLast, ComputedFromHeightSum, ComputedFromDateLast,
-        ComputedHeightDerivedLast,
+        BlocksToDaysF32, DifficultyToHashF64, LazyPerBlock, PerBlock, PercentPerBlock, Resolutions,
     },
 };
 
 impl Vecs {
-    pub fn forced_import(
+    pub(crate) fn forced_import(
         db: &Database,
         version: Version,
         indexer: &Indexer,
@@ -21,29 +20,40 @@ impl Vecs {
     ) -> Result<Self> {
         let v2 = Version::TWO;
 
+        let hashrate = LazyPerBlock::from_height_source::<DifficultyToHashF64, _>(
+            "difficulty_hashrate",
+            version,
+            indexer.vecs.blocks.difficulty.read_only_clone(),
+            indexes,
+        );
+
+        let blocks_to_retarget =
+            PerBlock::forced_import(db, "blocks_to_retarget", version + v2, indexes)?;
+
+        let days_to_retarget = LazyPerBlock::from_computed::<BlocksToDaysF32>(
+            "days_to_retarget",
+            version + v2,
+            blocks_to_retarget.height.read_only_boxed_clone(),
+            &blocks_to_retarget,
+        );
+
         Ok(Self {
-            raw: ComputedHeightDerivedLast::forced_import(
-                db,
+            value: Resolutions::forced_import(
                 "difficulty",
-                indexer.vecs.blocks.difficulty.boxed_clone(),
+                indexer.vecs.blocks.difficulty.read_only_clone(),
                 version,
                 indexes,
-            )?,
-            as_hash: ComputedFromHeightLast::forced_import(db, "difficulty_as_hash", version, indexes)?,
-            adjustment: ComputedFromHeightSum::forced_import(db, "difficulty_adjustment", version, indexes)?,
-            epoch: ComputedFromDateLast::forced_import(db, "difficultyepoch", version, indexes)?,
-            blocks_before_next_adjustment: ComputedFromHeightLast::forced_import(
+            ),
+            hashrate,
+            adjustment: PercentPerBlock::forced_import(
                 db,
-                "blocks_before_next_difficulty_adjustment",
-                version + v2,
-                indexes,
-            )?,
-            days_before_next_adjustment: ComputedFromHeightLast::forced_import(
-                db,
-                "days_before_next_difficulty_adjustment",
-                version + v2,
+                "difficulty_adjustment",
+                version + Version::ONE,
                 indexes,
             )?,
+            epoch: PerBlock::forced_import(db, "difficulty_epoch", version, indexes)?,
+            blocks_to_retarget,
+            days_to_retarget,
         })
     }
 }

crates/brk_computer/src/blocks/difficulty/vecs.rs

@@ -1,18 +1,14 @@
 use brk_traversable::Traversable;
-use brk_types::{DifficultyEpoch, StoredF32, StoredF64, StoredU32};
+use brk_types::{BasisPointsSigned32, Epoch, StoredF32, StoredF64, StoredU32};
+use vecdb::{Rw, StorageMode};
 
-use crate::internal::{
-    ComputedFromHeightLast, ComputedFromHeightSum, ComputedFromDateLast, ComputedHeightDerivedLast,
-};
-
-/// Difficulty metrics: raw difficulty, derived stats, adjustment, and countdown
-#[derive(Clone, Traversable)]
-pub struct Vecs {
-    /// Raw difficulty with dateindex/period stats - merges with indexer's raw
-    pub raw: ComputedHeightDerivedLast<StoredF64>,
-    pub as_hash: ComputedFromHeightLast<StoredF32>,
-    pub adjustment: ComputedFromHeightSum<StoredF32>,
-    pub epoch: ComputedFromDateLast<DifficultyEpoch>,
-    pub blocks_before_next_adjustment: ComputedFromHeightLast<StoredU32>,
-    pub days_before_next_adjustment: ComputedFromHeightLast<StoredF32>,
+use crate::internal::{LazyPerBlock, PerBlock, PercentPerBlock, Resolutions};
+#[derive(Traversable)]
+pub struct Vecs<M: StorageMode = Rw> {
+    pub value: Resolutions<StoredF64>,
+    pub hashrate: LazyPerBlock<StoredF64>,
+    pub adjustment: PercentPerBlock<BasisPointsSigned32, M>,
+    pub epoch: PerBlock<Epoch, M>,
+    pub blocks_to_retarget: PerBlock<StoredU32, M>,
+    pub days_to_retarget: LazyPerBlock<StoredF32, StoredU32>,
 }

crates/brk_computer/src/blocks/halving/compute.rs

@@ -1,57 +1,30 @@
 use brk_error::Result;
-use brk_types::StoredU32;
-use vecdb::{Exit, TypedVecIterator};
+use brk_types::{Indexes, StoredU32};
+use vecdb::Exit;
 
-use super::super::TARGET_BLOCKS_PER_DAY_F32;
 use super::Vecs;
-use crate::{ComputeIndexes, indexes};
+use crate::indexes;
 
 impl Vecs {
-    pub fn compute(
+    pub(crate) fn compute(
         &mut self,
         indexes: &indexes::Vecs,
-        starting_indexes: &ComputeIndexes,
+        starting_indexes: &Indexes,
         exit: &Exit,
     ) -> Result<()> {
-        let mut height_to_halvingepoch_iter = indexes.height.halvingepoch.into_iter();
-        self.epoch.compute_all(starting_indexes, exit, |vec| {
-            let mut height_count_iter = indexes.dateindex.height_count.into_iter();
-            vec.compute_transform(
-                starting_indexes.dateindex,
-                &indexes.dateindex.first_height,
-                |(di, height, ..)| {
-                    (
-                        di,
-                        height_to_halvingepoch_iter
-                            .get_unwrap(height + (*height_count_iter.get_unwrap(di) - 1)),
-                    )
-                },
-                exit,
-            )?;
-            Ok(())
-        })?;
+        self.epoch.height.compute_transform(
+            starting_indexes.height,
+            &indexes.height.halving,
+            |(h, epoch, ..)| (h, epoch),
+            exit,
+        )?;
 
-        self.blocks_before_next_halving
-            .compute_all(indexes, starting_indexes, exit, |v| {
-                v.compute_transform(
-                    starting_indexes.height,
-                    &indexes.height.identity,
-                    |(h, ..)| (h, StoredU32::from(h.left_before_next_halving())),
-                    exit,
-                )?;
-                Ok(())
-            })?;
-
-        self.days_before_next_halving
-            .compute_all(indexes, starting_indexes, exit, |v| {
-                v.compute_transform(
-                    starting_indexes.height,
-                    &self.blocks_before_next_halving.height,
-                    |(h, blocks, ..)| (h, (*blocks as f32 / TARGET_BLOCKS_PER_DAY_F32).into()),
-                    exit,
-                )?;
-                Ok(())
-            })?;
+        self.blocks_to_halving.height.compute_transform(
+            starting_indexes.height,
+            &indexes.height.halving,
+            |(h, ..)| (h, StoredU32::from(h.left_before_next_halving())),
+            exit,
+        )?;
 
         Ok(())
     }

crates/brk_computer/src/blocks/halving/import.rs

@@ -1,31 +1,35 @@
 use brk_error::Result;
 use brk_types::Version;
-use vecdb::Database;
+use vecdb::{Database, ReadableCloneableVec};
 
 use super::Vecs;
 use crate::{
     indexes,
-    internal::{ComputedFromHeightLast, ComputedFromDateLast},
+    internal::{BlocksToDaysF32, LazyPerBlock, PerBlock},
 };
 
 impl Vecs {
-    pub fn forced_import(db: &Database, version: Version, indexes: &indexes::Vecs) -> Result<Self> {
+    pub(crate) fn forced_import(
+        db: &Database,
+        version: Version,
+        indexes: &indexes::Vecs,
+    ) -> Result<Self> {
         let v2 = Version::TWO;
 
+        let blocks_to_halving =
+            PerBlock::forced_import(db, "blocks_to_halving", version + v2, indexes)?;
+
+        let days_to_halving = LazyPerBlock::from_computed::<BlocksToDaysF32>(
+            "days_to_halving",
+            version + v2,
+            blocks_to_halving.height.read_only_boxed_clone(),
+            &blocks_to_halving,
+        );
+
         Ok(Self {
-            epoch: ComputedFromDateLast::forced_import(db, "halvingepoch", version, indexes)?,
-            blocks_before_next_halving: ComputedFromHeightLast::forced_import(
-                db,
-                "blocks_before_next_halving",
-                version + v2,
-                indexes,
-            )?,
-            days_before_next_halving: ComputedFromHeightLast::forced_import(
-                db,
-                "days_before_next_halving",
-                version + v2,
-                indexes,
-            )?,
+            epoch: PerBlock::forced_import(db, "halving_epoch", version, indexes)?,
+            blocks_to_halving,
+            days_to_halving,
         })
     }
 }

crates/brk_computer/src/blocks/halving/vecs.rs

@@ -1,12 +1,11 @@
 use brk_traversable::Traversable;
-use brk_types::{HalvingEpoch, StoredF32, StoredU32};
+use brk_types::{Halving, StoredF32, StoredU32};
+use vecdb::{Rw, StorageMode};
 
-use crate::internal::{ComputedFromHeightLast, ComputedFromDateLast};
-
-/// Halving epoch metrics and countdown
-#[derive(Clone, Traversable)]
-pub struct Vecs {
-    pub epoch: ComputedFromDateLast<HalvingEpoch>,
-    pub blocks_before_next_halving: ComputedFromHeightLast<StoredU32>,
-    pub days_before_next_halving: ComputedFromHeightLast<StoredF32>,
+use crate::internal::{LazyPerBlock, PerBlock};
+#[derive(Traversable)]
+pub struct Vecs<M: StorageMode = Rw> {
+    pub epoch: PerBlock<Halving, M>,
+    pub blocks_to_halving: PerBlock<StoredU32, M>,
+    pub days_to_halving: LazyPerBlock<StoredF32, StoredU32>,
 }

crates/brk_computer/src/blocks/import.rs

@@ -2,60 +2,47 @@ use std::path::Path;
 
 use brk_error::Result;
 use brk_indexer::Indexer;
-use brk_traversable::Traversable;
 use brk_types::Version;
-use vecdb::{Database, PAGE_SIZE};
 
-use crate::{indexes, price};
+use crate::{
+    indexes,
+    internal::db_utils::{finalize_db, open_db},
+};
 
 use super::{
-    CountVecs, DifficultyVecs, HalvingVecs, IntervalVecs, MiningVecs, RewardsVecs, SizeVecs,
-    TimeVecs, Vecs, WeightVecs,
+    CountVecs, DifficultyVecs, HalvingVecs, IntervalVecs, LookbackVecs, SizeVecs, Vecs, WeightVecs,
 };
 
 impl Vecs {
-    pub fn forced_import(
+    pub(crate) fn forced_import(
         parent_path: &Path,
         parent_version: Version,
         indexer: &Indexer,
         indexes: &indexes::Vecs,
-        price: Option<&price::Vecs>,
     ) -> Result<Self> {
-        let db = Database::open(&parent_path.join(super::DB_NAME))?;
-        db.set_min_len(PAGE_SIZE * 50_000_000)?;
-
+        let db = open_db(parent_path, super::DB_NAME, 1_000_000)?;
         let version = parent_version;
 
-        let count = CountVecs::forced_import(&db, version, indexes)?;
-        let interval = IntervalVecs::forced_import(&db, version, indexer, indexes)?;
-        let size = SizeVecs::forced_import(&db, version, indexer, indexes)?;
-        let weight = WeightVecs::forced_import(&db, version, indexer, indexes)?;
-        let time = TimeVecs::forced_import(&db, version, indexer, indexes)?;
-        let mining = MiningVecs::forced_import(&db, version, indexes)?;
-        let rewards = RewardsVecs::forced_import(&db, version, indexes, price)?;
+        let lookback = LookbackVecs::forced_import(&db, version)?;
+        let cached_starts = lookback.cached_window_starts();
+        let count = CountVecs::forced_import(&db, version, indexes, &cached_starts)?;
+        let interval = IntervalVecs::forced_import(&db, version, indexes, &cached_starts)?;
+        let size = SizeVecs::forced_import(&db, version, indexes, &cached_starts)?;
+        let weight = WeightVecs::forced_import(&db, version, indexes, &cached_starts, &size)?;
         let difficulty = DifficultyVecs::forced_import(&db, version, indexer, indexes)?;
         let halving = HalvingVecs::forced_import(&db, version, indexes)?;
 
         let this = Self {
             db,
             count,
+            lookback,
             interval,
             size,
             weight,
-            time,
-            mining,
-            rewards,
             difficulty,
             halving,
         };
-
-        this.db.retain_regions(
-            this.iter_any_exportable()
-                .flat_map(|v| v.region_names())
-                .collect(),
-        )?;
-        this.db.compact()?;
-
+        finalize_db(&this.db, &this)?;
         Ok(this)
     }
 }

crates/brk_computer/src/blocks/interval/compute.rs

@@ -1,17 +1,38 @@
 use brk_error::Result;
-use vecdb::Exit;
+use brk_indexer::Indexer;
+use brk_types::{CheckedSub, Indexes, Timestamp};
+use vecdb::{Exit, ReadableVec};
 
 use super::Vecs;
-use crate::{ComputeIndexes, indexes};
 
 impl Vecs {
-    pub fn compute(
+    pub(crate) fn compute(
         &mut self,
-        indexes: &indexes::Vecs,
-        starting_indexes: &ComputeIndexes,
+        indexer: &Indexer,
+        starting_indexes: &Indexes,
         exit: &Exit,
     ) -> Result<()> {
-        self.interval.derive_from(indexes, starting_indexes, exit)?;
+        let mut prev_timestamp = None;
+        self.0.compute(starting_indexes.height, exit, |vec| {
+            vec.compute_transform(
+                starting_indexes.height,
+                &indexer.vecs.blocks.timestamp,
+                |(h, timestamp, ..)| {
+                    let interval = if let Some(prev_h) = h.decremented() {
+                        let prev = prev_timestamp.unwrap_or_else(|| {
+                            indexer.vecs.blocks.timestamp.collect_one(prev_h).unwrap()
+                        });
+                        timestamp.checked_sub(prev).unwrap_or(Timestamp::ZERO)
+                    } else {
+                        Timestamp::ZERO
+                    };
+                    prev_timestamp = Some(timestamp);
+                    (h, interval)
+                },
+                exit,
+            )?;
+            Ok(())
+        })?;
 
         Ok(())
     }

crates/brk_computer/src/blocks/interval/import.rs

@@ -1,37 +1,28 @@
 use brk_error::Result;
-use brk_indexer::Indexer;
-use brk_types::{CheckedSub, Height, Timestamp, Version};
-use vecdb::{Database, VecIndex};
+use brk_types::Version;
+use vecdb::Database;
 
 use super::Vecs;
-use crate::{indexes, internal::LazyFromHeightDistribution};
+use crate::{
+    indexes,
+    internal::{PerBlockRollingAverage, WindowStartVec, Windows},
+};
 
 impl Vecs {
-    pub fn forced_import(
+    pub(crate) fn forced_import(
         db: &Database,
         version: Version,
-        indexer: &Indexer,
         indexes: &indexes::Vecs,
+        cached_starts: &Windows<&WindowStartVec>,
     ) -> Result<Self> {
-        let interval = LazyFromHeightDistribution::forced_import_with_init(
+        let interval = PerBlockRollingAverage::forced_import(
             db,
             "block_interval",
             version,
-            indexer.vecs.blocks.timestamp.clone(),
             indexes,
-            |height: Height, timestamp_iter| {
-                let timestamp = timestamp_iter.get_at(height.to_usize())?;
-                let interval = height.decremented().map_or(Timestamp::ZERO, |prev_h| {
-                    timestamp_iter
-                        .get_at(prev_h.to_usize())
-                        .map_or(Timestamp::ZERO, |prev_t| {
-                            timestamp.checked_sub(prev_t).unwrap_or(Timestamp::ZERO)
-                        })
-                });
-                Some(interval)
-            },
+            cached_starts,
         )?;
 
-        Ok(Self { interval })
+        Ok(Self(interval))
     }
 }