brk-client 0.1.0__py3-none-any.whl → 0.1.0a3__py3-none-any.whl

brk_client/__init__.py

@@ -1,10 +1,7 @@
 # Auto-generated BRK Python client
 # Do not edit manually
 
-from __future__ import annotations
-
 import json
-from dataclasses import dataclass
 from http.client import HTTPConnection, HTTPSConnection
 from typing import (
     Any,
@@ -284,23 +281,14 @@ PoolSlug = Literal[
 QuarterIndex = int
 # Transaction locktime
 RawLockTime = int
-# Fractional satoshis (f64) - for representing USD prices in sats
-#
-# Formula: `sats_fract = usd_value * 100_000_000 / btc_price`
-#
-# When BTC is $100,000:
-# - $1 = 1,000 sats
-# - $0.001 = 1 sat
-# - $0.0001 = 0.1 sats (fractional)
-SatsFract = float
 SemesterIndex = int
-# Fixed-size boolean value optimized for on-disk storage (stored as u8)
+# Fixed-size boolean value optimized for on-disk storage (stored as u16)
 StoredBool = int
 # Stored 32-bit floating point value
 StoredF32 = float
 # Fixed-size 64-bit floating point value optimized for on-disk storage
 StoredF64 = float
-StoredI8 = int
+StoredI16 = int
 StoredU16 = int
 # Fixed-size 32-bit unsigned integer optimized for on-disk storage
 StoredU32 = int
@@ -352,7 +340,6 @@ Index = Literal[
     "yearindex",
     "loadedaddressindex",
     "emptyaddressindex",
-    "pairoutputindex",
 ]
 # Hierarchical tree node for organizing metrics into categories
 TreeNode = Union[dict[str, "TreeNode"], "MetricLeafWithSchema"]
@@ -1383,15 +1370,12 @@ def _p(prefix: str, acc: str) -> str:
     return f"{prefix}_{acc}" if acc else prefix
 
 
-@dataclass
-class MetricData(Generic[T]):
+class MetricData(TypedDict, Generic[T]):
     """Metric data with range information."""
 
-    version: int
     total: int
     start: int
     end: int
-    stamp: str
     data: List[T]
 
 
@@ -1437,9 +1421,8 @@ class _EndpointConfig:
         p = self.path()
         return f"{p}?{query}" if query else p
 
-    def get_json(self) -> MetricData:
-        data = self.client.get_json(self._build_path())
-        return MetricData(**data)
+    def get_json(self) -> Any:
+        return self.client.get_json(self._build_path())
 
     def get_csv(self) -> str:
         return self.client.get_text(self._build_path(format="csv"))
@@ -1698,7 +1681,7 @@ _i31 = ("loadedaddressindex",)
 _i32 = ("emptyaddressindex",)
 
 
-def _ep(c: BrkClientBase, n: str, i: Index) -> MetricEndpointBuilder[Any]:
+def _ep(c: BrkClientBase, n: str, i: Index) -> MetricEndpointBuilder:
     return MetricEndpointBuilder(c, n, i)
 
 
@@ -1738,8 +1721,6 @@ class _MetricPattern1By(Generic[T]):
 
 
 class MetricPattern1(Generic[T]):
-    by: _MetricPattern1By[T]
-
     def __init__(self, c: BrkClientBase, n: str):
         self._n, self.by = n, _MetricPattern1By(c, n)
 
@@ -1784,8 +1765,6 @@ class _MetricPattern2By(Generic[T]):
 
 
 class MetricPattern2(Generic[T]):
-    by: _MetricPattern2By[T]
-
     def __init__(self, c: BrkClientBase, n: str):
         self._n, self.by = n, _MetricPattern2By(c, n)
 
@@ -1830,8 +1809,6 @@ class _MetricPattern3By(Generic[T]):
 
 
 class MetricPattern3(Generic[T]):
-    by: _MetricPattern3By[T]
-
     def __init__(self, c: BrkClientBase, n: str):
         self._n, self.by = n, _MetricPattern3By(c, n)
 
@@ -1873,8 +1850,6 @@ class _MetricPattern4By(Generic[T]):
 
 
 class MetricPattern4(Generic[T]):
-    by: _MetricPattern4By[T]
-
     def __init__(self, c: BrkClientBase, n: str):
         self._n, self.by = n, _MetricPattern4By(c, n)
 
@@ -1901,8 +1876,6 @@ class _MetricPattern5By(Generic[T]):
 
 
 class MetricPattern5(Generic[T]):
-    by: _MetricPattern5By[T]
-
     def __init__(self, c: BrkClientBase, n: str):
         self._n, self.by = n, _MetricPattern5By(c, n)
 
@@ -1926,8 +1899,6 @@ class _MetricPattern6By(Generic[T]):
 
 
 class MetricPattern6(Generic[T]):
-    by: _MetricPattern6By[T]
-
     def __init__(self, c: BrkClientBase, n: str):
         self._n, self.by = n, _MetricPattern6By(c, n)
 
@@ -1951,8 +1922,6 @@ class _MetricPattern7By(Generic[T]):
 
 
 class MetricPattern7(Generic[T]):
-    by: _MetricPattern7By[T]
-
     def __init__(self, c: BrkClientBase, n: str):
         self._n, self.by = n, _MetricPattern7By(c, n)
 
@@ -1976,8 +1945,6 @@ class _MetricPattern8By(Generic[T]):
 
 
 class MetricPattern8(Generic[T]):
-    by: _MetricPattern8By[T]
-
     def __init__(self, c: BrkClientBase, n: str):
         self._n, self.by = n, _MetricPattern8By(c, n)
 
@@ -2001,8 +1968,6 @@ class _MetricPattern9By(Generic[T]):
 
 
 class MetricPattern9(Generic[T]):
-    by: _MetricPattern9By[T]
-
     def __init__(self, c: BrkClientBase, n: str):
         self._n, self.by = n, _MetricPattern9By(c, n)
 
@@ -2026,8 +1991,6 @@ class _MetricPattern10By(Generic[T]):
 
 
 class MetricPattern10(Generic[T]):
-    by: _MetricPattern10By[T]
-
     def __init__(self, c: BrkClientBase, n: str):
         self._n, self.by = n, _MetricPattern10By(c, n)
 
@@ -2051,8 +2014,6 @@ class _MetricPattern11By(Generic[T]):
 
 
 class MetricPattern11(Generic[T]):
-    by: _MetricPattern11By[T]
-
     def __init__(self, c: BrkClientBase, n: str):
         self._n, self.by = n, _MetricPattern11By(c, n)
 
@@ -2076,8 +2037,6 @@ class _MetricPattern12By(Generic[T]):
 
 
 class MetricPattern12(Generic[T]):
-    by: _MetricPattern12By[T]
-
     def __init__(self, c: BrkClientBase, n: str):
         self._n, self.by = n, _MetricPattern12By(c, n)
 
@@ -2101,8 +2060,6 @@ class _MetricPattern13By(Generic[T]):
 
 
 class MetricPattern13(Generic[T]):
-    by: _MetricPattern13By[T]
-
     def __init__(self, c: BrkClientBase, n: str):
         self._n, self.by = n, _MetricPattern13By(c, n)
 
@@ -2126,8 +2083,6 @@ class _MetricPattern14By(Generic[T]):
 
 
 class MetricPattern14(Generic[T]):
-    by: _MetricPattern14By[T]
-
     def __init__(self, c: BrkClientBase, n: str):
         self._n, self.by = n, _MetricPattern14By(c, n)
 
@@ -2151,8 +2106,6 @@ class _MetricPattern15By(Generic[T]):
 
 
 class MetricPattern15(Generic[T]):
-    by: _MetricPattern15By[T]
-
     def __init__(self, c: BrkClientBase, n: str):
         self._n, self.by = n, _MetricPattern15By(c, n)
 
@@ -2176,8 +2129,6 @@ class _MetricPattern16By(Generic[T]):
 
 
 class MetricPattern16(Generic[T]):
-    by: _MetricPattern16By[T]
-
     def __init__(self, c: BrkClientBase, n: str):
         self._n, self.by = n, _MetricPattern16By(c, n)
 
@@ -2201,8 +2152,6 @@ class _MetricPattern17By(Generic[T]):
 
 
 class MetricPattern17(Generic[T]):
-    by: _MetricPattern17By[T]
-
     def __init__(self, c: BrkClientBase, n: str):
         self._n, self.by = n, _MetricPattern17By(c, n)
 
@@ -2226,8 +2175,6 @@ class _MetricPattern18By(Generic[T]):
 
 
 class MetricPattern18(Generic[T]):
-    by: _MetricPattern18By[T]
-
     def __init__(self, c: BrkClientBase, n: str):
         self._n, self.by = n, _MetricPattern18By(c, n)
 
@@ -2251,8 +2198,6 @@ class _MetricPattern19By(Generic[T]):
 
 
 class MetricPattern19(Generic[T]):
-    by: _MetricPattern19By[T]
-
     def __init__(self, c: BrkClientBase, n: str):
         self._n, self.by = n, _MetricPattern19By(c, n)
 
@@ -2276,8 +2221,6 @@ class _MetricPattern20By(Generic[T]):
 
 
 class MetricPattern20(Generic[T]):
-    by: _MetricPattern20By[T]
-
     def __init__(self, c: BrkClientBase, n: str):
         self._n, self.by = n, _MetricPattern20By(c, n)
 
@@ -2301,8 +2244,6 @@ class _MetricPattern21By(Generic[T]):
 
 
 class MetricPattern21(Generic[T]):
-    by: _MetricPattern21By[T]
-
     def __init__(self, c: BrkClientBase, n: str):
         self._n, self.by = n, _MetricPattern21By(c, n)
 
@@ -2326,8 +2267,6 @@ class _MetricPattern22By(Generic[T]):
 
 
 class MetricPattern22(Generic[T]):
-    by: _MetricPattern22By[T]
-
     def __init__(self, c: BrkClientBase, n: str):
         self._n, self.by = n, _MetricPattern22By(c, n)
 
@@ -2351,8 +2290,6 @@ class _MetricPattern23By(Generic[T]):
 
 
 class MetricPattern23(Generic[T]):
-    by: _MetricPattern23By[T]
-
     def __init__(self, c: BrkClientBase, n: str):
         self._n, self.by = n, _MetricPattern23By(c, n)
 
@@ -2376,8 +2313,6 @@ class _MetricPattern24By(Generic[T]):
 
 
 class MetricPattern24(Generic[T]):
-    by: _MetricPattern24By[T]
-
     def __init__(self, c: BrkClientBase, n: str):
         self._n, self.by = n, _MetricPattern24By(c, n)
 
@@ -2401,8 +2336,6 @@ class _MetricPattern25By(Generic[T]):
 
 
 class MetricPattern25(Generic[T]):
-    by: _MetricPattern25By[T]
-
     def __init__(self, c: BrkClientBase, n: str):
         self._n, self.by = n, _MetricPattern25By(c, n)
 
@@ -2426,8 +2359,6 @@ class _MetricPattern26By(Generic[T]):
 
 
 class MetricPattern26(Generic[T]):
-    by: _MetricPattern26By[T]
-
     def __init__(self, c: BrkClientBase, n: str):
         self._n, self.by = n, _MetricPattern26By(c, n)
 
@@ -2451,8 +2382,6 @@ class _MetricPattern27By(Generic[T]):
 
 
 class MetricPattern27(Generic[T]):
-    by: _MetricPattern27By[T]
-
     def __init__(self, c: BrkClientBase, n: str):
         self._n, self.by = n, _MetricPattern27By(c, n)
 
@@ -2476,8 +2405,6 @@ class _MetricPattern28By(Generic[T]):
 
 
 class MetricPattern28(Generic[T]):
-    by: _MetricPattern28By[T]
-
     def __init__(self, c: BrkClientBase, n: str):
         self._n, self.by = n, _MetricPattern28By(c, n)
 
@@ -2501,8 +2428,6 @@ class _MetricPattern29By(Generic[T]):
 
 
 class MetricPattern29(Generic[T]):
-    by: _MetricPattern29By[T]
-
     def __init__(self, c: BrkClientBase, n: str):
         self._n, self.by = n, _MetricPattern29By(c, n)
 
@@ -2526,8 +2451,6 @@ class _MetricPattern30By(Generic[T]):
 
 
 class MetricPattern30(Generic[T]):
-    by: _MetricPattern30By[T]
-
     def __init__(self, c: BrkClientBase, n: str):
         self._n, self.by = n, _MetricPattern30By(c, n)
 
@@ -2551,8 +2474,6 @@ class _MetricPattern31By(Generic[T]):
 
 
 class MetricPattern31(Generic[T]):
-    by: _MetricPattern31By[T]
-
     def __init__(self, c: BrkClientBase, n: str):
         self._n, self.by = n, _MetricPattern31By(c, n)
 
@@ -2576,8 +2497,6 @@ class _MetricPattern32By(Generic[T]):
 
 
 class MetricPattern32(Generic[T]):
-    by: _MetricPattern32By[T]
-
     def __init__(self, c: BrkClientBase, n: str):
         self._n, self.by = n, _MetricPattern32By(c, n)
 
@@ -2653,7 +2572,7 @@ class RealizedPattern3:
         self.realized_loss_rel_to_realized_cap: BlockCountPattern[StoredF32] = (
             BlockCountPattern(client, _m(acc, "realized_loss_rel_to_realized_cap"))
         )
-        self.realized_price: ActivePricePattern = ActivePricePattern(
+        self.realized_price: MetricPattern1[Dollars] = MetricPattern1(
             client, _m(acc, "realized_price")
         )
         self.realized_price_extra: ActivePriceRatioPattern = ActivePriceRatioPattern(
@@ -2753,7 +2672,7 @@ class RealizedPattern4:
         self.realized_loss_rel_to_realized_cap: BlockCountPattern[StoredF32] = (
             BlockCountPattern(client, _m(acc, "realized_loss_rel_to_realized_cap"))
         )
-        self.realized_price: ActivePricePattern = ActivePricePattern(
+        self.realized_price: MetricPattern1[Dollars] = MetricPattern1(
             client, _m(acc, "realized_price")
         )
         self.realized_price_extra: RealizedPriceExtraPattern = (
@@ -2800,43 +2719,69 @@ class Ratio1ySdPattern:
 
     def __init__(self, client: BrkClientBase, acc: str):
         """Create pattern node with accumulated metric name."""
-        self._0sd_usd: _0sdUsdPattern = _0sdUsdPattern(client, _m(acc, "0sd_usd"))
+        self._0sd_usd: MetricPattern4[Dollars] = MetricPattern4(
+            client, _m(acc, "0sd_usd")
+        )
         self.m0_5sd: MetricPattern4[StoredF32] = MetricPattern4(
             client, _m(acc, "m0_5sd")
         )
-        self.m0_5sd_usd: _0sdUsdPattern = _0sdUsdPattern(client, _m(acc, "m0_5sd_usd"))
+        self.m0_5sd_usd: MetricPattern4[Dollars] = MetricPattern4(
+            client, _m(acc, "m0_5sd_usd")
+        )
         self.m1_5sd: MetricPattern4[StoredF32] = MetricPattern4(
             client, _m(acc, "m1_5sd")
         )
-        self.m1_5sd_usd: _0sdUsdPattern = _0sdUsdPattern(client, _m(acc, "m1_5sd_usd"))
+        self.m1_5sd_usd: MetricPattern4[Dollars] = MetricPattern4(
+            client, _m(acc, "m1_5sd_usd")
+        )
         self.m1sd: MetricPattern4[StoredF32] = MetricPattern4(client, _m(acc, "m1sd"))
-        self.m1sd_usd: _0sdUsdPattern = _0sdUsdPattern(client, _m(acc, "m1sd_usd"))
+        self.m1sd_usd: MetricPattern4[Dollars] = MetricPattern4(
+            client, _m(acc, "m1sd_usd")
+        )
         self.m2_5sd: MetricPattern4[StoredF32] = MetricPattern4(
             client, _m(acc, "m2_5sd")
         )
-        self.m2_5sd_usd: _0sdUsdPattern = _0sdUsdPattern(client, _m(acc, "m2_5sd_usd"))
+        self.m2_5sd_usd: MetricPattern4[Dollars] = MetricPattern4(
+            client, _m(acc, "m2_5sd_usd")
+        )
         self.m2sd: MetricPattern4[StoredF32] = MetricPattern4(client, _m(acc, "m2sd"))
-        self.m2sd_usd: _0sdUsdPattern = _0sdUsdPattern(client, _m(acc, "m2sd_usd"))
+        self.m2sd_usd: MetricPattern4[Dollars] = MetricPattern4(
+            client, _m(acc, "m2sd_usd")
+        )
         self.m3sd: MetricPattern4[StoredF32] = MetricPattern4(client, _m(acc, "m3sd"))
-        self.m3sd_usd: _0sdUsdPattern = _0sdUsdPattern(client, _m(acc, "m3sd_usd"))
+        self.m3sd_usd: MetricPattern4[Dollars] = MetricPattern4(
+            client, _m(acc, "m3sd_usd")
+        )
         self.p0_5sd: MetricPattern4[StoredF32] = MetricPattern4(
             client, _m(acc, "p0_5sd")
         )
-        self.p0_5sd_usd: _0sdUsdPattern = _0sdUsdPattern(client, _m(acc, "p0_5sd_usd"))
+        self.p0_5sd_usd: MetricPattern4[Dollars] = MetricPattern4(
+            client, _m(acc, "p0_5sd_usd")
+        )
         self.p1_5sd: MetricPattern4[StoredF32] = MetricPattern4(
             client, _m(acc, "p1_5sd")
         )
-        self.p1_5sd_usd: _0sdUsdPattern = _0sdUsdPattern(client, _m(acc, "p1_5sd_usd"))
+        self.p1_5sd_usd: MetricPattern4[Dollars] = MetricPattern4(
+            client, _m(acc, "p1_5sd_usd")
+        )
         self.p1sd: MetricPattern4[StoredF32] = MetricPattern4(client, _m(acc, "p1sd"))
-        self.p1sd_usd: _0sdUsdPattern = _0sdUsdPattern(client, _m(acc, "p1sd_usd"))
+        self.p1sd_usd: MetricPattern4[Dollars] = MetricPattern4(
+            client, _m(acc, "p1sd_usd")
+        )
         self.p2_5sd: MetricPattern4[StoredF32] = MetricPattern4(
             client, _m(acc, "p2_5sd")
         )
-        self.p2_5sd_usd: _0sdUsdPattern = _0sdUsdPattern(client, _m(acc, "p2_5sd_usd"))
+        self.p2_5sd_usd: MetricPattern4[Dollars] = MetricPattern4(
+            client, _m(acc, "p2_5sd_usd")
+        )
         self.p2sd: MetricPattern4[StoredF32] = MetricPattern4(client, _m(acc, "p2sd"))
-        self.p2sd_usd: _0sdUsdPattern = _0sdUsdPattern(client, _m(acc, "p2sd_usd"))
+        self.p2sd_usd: MetricPattern4[Dollars] = MetricPattern4(
+            client, _m(acc, "p2sd_usd")
+        )
         self.p3sd: MetricPattern4[StoredF32] = MetricPattern4(client, _m(acc, "p3sd"))
-        self.p3sd_usd: _0sdUsdPattern = _0sdUsdPattern(client, _m(acc, "p3sd_usd"))
+        self.p3sd_usd: MetricPattern4[Dollars] = MetricPattern4(
+            client, _m(acc, "p3sd_usd")
+        )
         self.sd: MetricPattern4[StoredF32] = MetricPattern4(client, _m(acc, "sd"))
         self.sma: MetricPattern4[StoredF32] = MetricPattern4(client, _m(acc, "sma"))
         self.zscore: MetricPattern4[StoredF32] = MetricPattern4(
@@ -2887,7 +2832,7 @@ class RealizedPattern2:
         self.realized_loss_rel_to_realized_cap: BlockCountPattern[StoredF32] = (
             BlockCountPattern(client, _m(acc, "realized_loss_rel_to_realized_cap"))
         )
-        self.realized_price: ActivePricePattern = ActivePricePattern(
+        self.realized_price: MetricPattern1[Dollars] = MetricPattern1(
             client, _m(acc, "realized_price")
         )
         self.realized_price_extra: ActivePriceRatioPattern = ActivePriceRatioPattern(
@@ -2972,7 +2917,7 @@ class RealizedPattern:
         self.realized_loss_rel_to_realized_cap: BlockCountPattern[StoredF32] = (
             BlockCountPattern(client, _m(acc, "realized_loss_rel_to_realized_cap"))
         )
-        self.realized_price: ActivePricePattern = ActivePricePattern(
+        self.realized_price: MetricPattern1[Dollars] = MetricPattern1(
             client, _m(acc, "realized_price")
         )
         self.realized_price_extra: RealizedPriceExtraPattern = (
@@ -3019,7 +2964,7 @@ class Price111dSmaPattern:
 
     def __init__(self, client: BrkClientBase, acc: str):
         """Create pattern node with accumulated metric name."""
-        self.price: _0sdUsdPattern = _0sdUsdPattern(client, acc)
+        self.price: MetricPattern4[Dollars] = MetricPattern4(client, acc)
         self.ratio: MetricPattern4[StoredF32] = MetricPattern4(client, _m(acc, "ratio"))
         self.ratio_1m_sma: MetricPattern4[StoredF32] = MetricPattern4(
             client, _m(acc, "ratio_1m_sma")
@@ -3039,68 +2984,42 @@ class Price111dSmaPattern:
         self.ratio_pct1: MetricPattern4[StoredF32] = MetricPattern4(
             client, _m(acc, "ratio_pct1")
         )
-        self.ratio_pct1_usd: _0sdUsdPattern = _0sdUsdPattern(
+        self.ratio_pct1_usd: MetricPattern4[Dollars] = MetricPattern4(
             client, _m(acc, "ratio_pct1_usd")
         )
         self.ratio_pct2: MetricPattern4[StoredF32] = MetricPattern4(
             client, _m(acc, "ratio_pct2")
         )
-        self.ratio_pct2_usd: _0sdUsdPattern = _0sdUsdPattern(
+        self.ratio_pct2_usd: MetricPattern4[Dollars] = MetricPattern4(
             client, _m(acc, "ratio_pct2_usd")
         )
         self.ratio_pct5: MetricPattern4[StoredF32] = MetricPattern4(
             client, _m(acc, "ratio_pct5")
         )
-        self.ratio_pct5_usd: _0sdUsdPattern = _0sdUsdPattern(
+        self.ratio_pct5_usd: MetricPattern4[Dollars] = MetricPattern4(
             client, _m(acc, "ratio_pct5_usd")
         )
         self.ratio_pct95: MetricPattern4[StoredF32] = MetricPattern4(
             client, _m(acc, "ratio_pct95")
         )
-        self.ratio_pct95_usd: _0sdUsdPattern = _0sdUsdPattern(
+        self.ratio_pct95_usd: MetricPattern4[Dollars] = MetricPattern4(
             client, _m(acc, "ratio_pct95_usd")
         )
         self.ratio_pct98: MetricPattern4[StoredF32] = MetricPattern4(
             client, _m(acc, "ratio_pct98")
         )
-        self.ratio_pct98_usd: _0sdUsdPattern = _0sdUsdPattern(
+        self.ratio_pct98_usd: MetricPattern4[Dollars] = MetricPattern4(
             client, _m(acc, "ratio_pct98_usd")
         )
         self.ratio_pct99: MetricPattern4[StoredF32] = MetricPattern4(
             client, _m(acc, "ratio_pct99")
         )
-        self.ratio_pct99_usd: _0sdUsdPattern = _0sdUsdPattern(
+        self.ratio_pct99_usd: MetricPattern4[Dollars] = MetricPattern4(
             client, _m(acc, "ratio_pct99_usd")
         )
         self.ratio_sd: Ratio1ySdPattern = Ratio1ySdPattern(client, _m(acc, "ratio"))
 
 
-class PercentilesPattern:
-    """Pattern struct for repeated tree structure."""
-
-    def __init__(self, client: BrkClientBase, acc: str):
-        """Create pattern node with accumulated metric name."""
-        self.pct05: _0sdUsdPattern = _0sdUsdPattern(client, _m(acc, "pct05"))
-        self.pct10: _0sdUsdPattern = _0sdUsdPattern(client, _m(acc, "pct10"))
-        self.pct15: _0sdUsdPattern = _0sdUsdPattern(client, _m(acc, "pct15"))
-        self.pct20: _0sdUsdPattern = _0sdUsdPattern(client, _m(acc, "pct20"))
-        self.pct25: _0sdUsdPattern = _0sdUsdPattern(client, _m(acc, "pct25"))
-        self.pct30: _0sdUsdPattern = _0sdUsdPattern(client, _m(acc, "pct30"))
-        self.pct35: _0sdUsdPattern = _0sdUsdPattern(client, _m(acc, "pct35"))
-        self.pct40: _0sdUsdPattern = _0sdUsdPattern(client, _m(acc, "pct40"))
-        self.pct45: _0sdUsdPattern = _0sdUsdPattern(client, _m(acc, "pct45"))
-        self.pct50: _0sdUsdPattern = _0sdUsdPattern(client, _m(acc, "pct50"))
-        self.pct55: _0sdUsdPattern = _0sdUsdPattern(client, _m(acc, "pct55"))
-        self.pct60: _0sdUsdPattern = _0sdUsdPattern(client, _m(acc, "pct60"))
-        self.pct65: _0sdUsdPattern = _0sdUsdPattern(client, _m(acc, "pct65"))
-        self.pct70: _0sdUsdPattern = _0sdUsdPattern(client, _m(acc, "pct70"))
-        self.pct75: _0sdUsdPattern = _0sdUsdPattern(client, _m(acc, "pct75"))
-        self.pct80: _0sdUsdPattern = _0sdUsdPattern(client, _m(acc, "pct80"))
-        self.pct85: _0sdUsdPattern = _0sdUsdPattern(client, _m(acc, "pct85"))
-        self.pct90: _0sdUsdPattern = _0sdUsdPattern(client, _m(acc, "pct90"))
-        self.pct95: _0sdUsdPattern = _0sdUsdPattern(client, _m(acc, "pct95"))
-
-
 class ActivePriceRatioPattern:
     """Pattern struct for repeated tree structure."""
 
@@ -3119,42 +3038,68 @@ class ActivePriceRatioPattern:
         self.ratio_pct1: MetricPattern4[StoredF32] = MetricPattern4(
             client, _m(acc, "pct1")
         )
-        self.ratio_pct1_usd: _0sdUsdPattern = _0sdUsdPattern(
+        self.ratio_pct1_usd: MetricPattern4[Dollars] = MetricPattern4(
             client, _m(acc, "pct1_usd")
         )
         self.ratio_pct2: MetricPattern4[StoredF32] = MetricPattern4(
             client, _m(acc, "pct2")
         )
-        self.ratio_pct2_usd: _0sdUsdPattern = _0sdUsdPattern(
+        self.ratio_pct2_usd: MetricPattern4[Dollars] = MetricPattern4(
             client, _m(acc, "pct2_usd")
         )
         self.ratio_pct5: MetricPattern4[StoredF32] = MetricPattern4(
             client, _m(acc, "pct5")
         )
-        self.ratio_pct5_usd: _0sdUsdPattern = _0sdUsdPattern(
+        self.ratio_pct5_usd: MetricPattern4[Dollars] = MetricPattern4(
             client, _m(acc, "pct5_usd")
         )
         self.ratio_pct95: MetricPattern4[StoredF32] = MetricPattern4(
             client, _m(acc, "pct95")
         )
-        self.ratio_pct95_usd: _0sdUsdPattern = _0sdUsdPattern(
+        self.ratio_pct95_usd: MetricPattern4[Dollars] = MetricPattern4(
             client, _m(acc, "pct95_usd")
         )
         self.ratio_pct98: MetricPattern4[StoredF32] = MetricPattern4(
             client, _m(acc, "pct98")
         )
-        self.ratio_pct98_usd: _0sdUsdPattern = _0sdUsdPattern(
+        self.ratio_pct98_usd: MetricPattern4[Dollars] = MetricPattern4(
             client, _m(acc, "pct98_usd")
         )
         self.ratio_pct99: MetricPattern4[StoredF32] = MetricPattern4(
             client, _m(acc, "pct99")
         )
-        self.ratio_pct99_usd: _0sdUsdPattern = _0sdUsdPattern(
+        self.ratio_pct99_usd: MetricPattern4[Dollars] = MetricPattern4(
             client, _m(acc, "pct99_usd")
         )
         self.ratio_sd: Ratio1ySdPattern = Ratio1ySdPattern(client, acc)
 
 
+class PercentilesPattern:
+    """Pattern struct for repeated tree structure."""
+
+    def __init__(self, client: BrkClientBase, acc: str):
+        """Create pattern node with accumulated metric name."""
+        self.pct05: MetricPattern4[Dollars] = MetricPattern4(client, _m(acc, "pct05"))
+        self.pct10: MetricPattern4[Dollars] = MetricPattern4(client, _m(acc, "pct10"))
+        self.pct15: MetricPattern4[Dollars] = MetricPattern4(client, _m(acc, "pct15"))
+        self.pct20: MetricPattern4[Dollars] = MetricPattern4(client, _m(acc, "pct20"))
+        self.pct25: MetricPattern4[Dollars] = MetricPattern4(client, _m(acc, "pct25"))
+        self.pct30: MetricPattern4[Dollars] = MetricPattern4(client, _m(acc, "pct30"))
+        self.pct35: MetricPattern4[Dollars] = MetricPattern4(client, _m(acc, "pct35"))
+        self.pct40: MetricPattern4[Dollars] = MetricPattern4(client, _m(acc, "pct40"))
+        self.pct45: MetricPattern4[Dollars] = MetricPattern4(client, _m(acc, "pct45"))
+        self.pct50: MetricPattern4[Dollars] = MetricPattern4(client, _m(acc, "pct50"))
+        self.pct55: MetricPattern4[Dollars] = MetricPattern4(client, _m(acc, "pct55"))
+        self.pct60: MetricPattern4[Dollars] = MetricPattern4(client, _m(acc, "pct60"))
+        self.pct65: MetricPattern4[Dollars] = MetricPattern4(client, _m(acc, "pct65"))
+        self.pct70: MetricPattern4[Dollars] = MetricPattern4(client, _m(acc, "pct70"))
+        self.pct75: MetricPattern4[Dollars] = MetricPattern4(client, _m(acc, "pct75"))
+        self.pct80: MetricPattern4[Dollars] = MetricPattern4(client, _m(acc, "pct80"))
+        self.pct85: MetricPattern4[Dollars] = MetricPattern4(client, _m(acc, "pct85"))
+        self.pct90: MetricPattern4[Dollars] = MetricPattern4(client, _m(acc, "pct90"))
+        self.pct95: MetricPattern4[Dollars] = MetricPattern4(client, _m(acc, "pct95"))
+
+
 class RelativePattern5:
     """Pattern struct for repeated tree structure."""
 
@@ -3256,9 +3201,6 @@ class AaopoolPattern:
         self.blocks_mined: BlockCountPattern[StoredU32] = BlockCountPattern(
             client, _m(acc, "blocks_mined")
         )
-        self.blocks_since_block: MetricPattern1[StoredU32] = MetricPattern1(
-            client, _m(acc, "blocks_since_block")
-        )
         self.coinbase: CoinbasePattern2 = CoinbasePattern2(client, _m(acc, "coinbase"))
         self.days_since_block: MetricPattern4[StoredU16] = MetricPattern4(
             client, _m(acc, "days_since_block")
@@ -3274,6 +3216,26 @@ class AaopoolPattern:
         )
 
 
+class LookbackPattern(Generic[T]):
+    """Pattern struct for repeated tree structure."""
+
+    def __init__(self, client: BrkClientBase, acc: str):
+        """Create pattern node with accumulated metric name."""
+        self._10y: MetricPattern4[T] = MetricPattern4(client, _m(acc, "10y_ago"))
+        self._1d: MetricPattern4[T] = MetricPattern4(client, _m(acc, "1d_ago"))
+        self._1m: MetricPattern4[T] = MetricPattern4(client, _m(acc, "1m_ago"))
+        self._1w: MetricPattern4[T] = MetricPattern4(client, _m(acc, "1w_ago"))
+        self._1y: MetricPattern4[T] = MetricPattern4(client, _m(acc, "1y_ago"))
+        self._2y: MetricPattern4[T] = MetricPattern4(client, _m(acc, "2y_ago"))
+        self._3m: MetricPattern4[T] = MetricPattern4(client, _m(acc, "3m_ago"))
+        self._3y: MetricPattern4[T] = MetricPattern4(client, _m(acc, "3y_ago"))
+        self._4y: MetricPattern4[T] = MetricPattern4(client, _m(acc, "4y_ago"))
+        self._5y: MetricPattern4[T] = MetricPattern4(client, _m(acc, "5y_ago"))
+        self._6m: MetricPattern4[T] = MetricPattern4(client, _m(acc, "6m_ago"))
+        self._6y: MetricPattern4[T] = MetricPattern4(client, _m(acc, "6y_ago"))
+        self._8y: MetricPattern4[T] = MetricPattern4(client, _m(acc, "8y_ago"))
+
+
 class PeriodLumpSumStackPattern:
     """Pattern struct for repeated tree structure."""
 
@@ -3293,7 +3255,7 @@ class PeriodLumpSumStackPattern:
         self._8y: _2015Pattern = _2015Pattern(client, _p("8y", acc))
 
 
-class PeriodDaysInLossPattern(Generic[T]):
+class PeriodAveragePricePattern(Generic[T]):
     """Pattern struct for repeated tree structure."""
 
     def __init__(self, client: BrkClientBase, acc: str):
@@ -3312,49 +3274,6 @@ class PeriodDaysInLossPattern(Generic[T]):
         self._8y: MetricPattern4[T] = MetricPattern4(client, _p("8y", acc))
 
 
-class ClassDaysInLossPattern(Generic[T]):
-    """Pattern struct for repeated tree structure."""
-
-    def __init__(self, client: BrkClientBase, acc: str):
-        """Create pattern node with accumulated metric name."""
-        self._2015: MetricPattern4[T] = MetricPattern4(
-            client, _m(acc, "2015_max_drawdown")
-        )
-        self._2016: MetricPattern4[T] = MetricPattern4(
-            client, _m(acc, "2016_max_drawdown")
-        )
-        self._2017: MetricPattern4[T] = MetricPattern4(
-            client, _m(acc, "2017_max_drawdown")
-        )
-        self._2018: MetricPattern4[T] = MetricPattern4(
-            client, _m(acc, "2018_max_drawdown")
-        )
-        self._2019: MetricPattern4[T] = MetricPattern4(
-            client, _m(acc, "2019_max_drawdown")
-        )
-        self._2020: MetricPattern4[T] = MetricPattern4(
-            client, _m(acc, "2020_max_drawdown")
-        )
-        self._2021: MetricPattern4[T] = MetricPattern4(
-            client, _m(acc, "2021_max_drawdown")
-        )
-        self._2022: MetricPattern4[T] = MetricPattern4(
-            client, _m(acc, "2022_max_drawdown")
-        )
-        self._2023: MetricPattern4[T] = MetricPattern4(
-            client, _m(acc, "2023_max_drawdown")
-        )
-        self._2024: MetricPattern4[T] = MetricPattern4(
-            client, _m(acc, "2024_max_drawdown")
-        )
-        self._2025: MetricPattern4[T] = MetricPattern4(
-            client, _m(acc, "2025_max_drawdown")
-        )
-        self._2026: MetricPattern4[T] = MetricPattern4(
-            client, _m(acc, "2026_max_drawdown")
-        )
-
-
 class BitcoinPattern:
     """Pattern struct for repeated tree structure."""
 
@@ -3377,6 +3296,24 @@ class BitcoinPattern:
         self.sum: MetricPattern2[Bitcoin] = MetricPattern2(client, _m(acc, "sum"))
 
 
+class ClassAveragePricePattern(Generic[T]):
+    """Pattern struct for repeated tree structure."""
+
+    def __init__(self, client: BrkClientBase, acc: str):
+        """Create pattern node with accumulated metric name."""
+        self._2015: MetricPattern4[T] = MetricPattern4(client, _m(acc, "2015_returns"))
+        self._2016: MetricPattern4[T] = MetricPattern4(client, _m(acc, "2016_returns"))
+        self._2017: MetricPattern4[T] = MetricPattern4(client, _m(acc, "2017_returns"))
+        self._2018: MetricPattern4[T] = MetricPattern4(client, _m(acc, "2018_returns"))
+        self._2019: MetricPattern4[T] = MetricPattern4(client, _m(acc, "2019_returns"))
+        self._2020: MetricPattern4[T] = MetricPattern4(client, _m(acc, "2020_returns"))
+        self._2021: MetricPattern4[T] = MetricPattern4(client, _m(acc, "2021_returns"))
+        self._2022: MetricPattern4[T] = MetricPattern4(client, _m(acc, "2022_returns"))
+        self._2023: MetricPattern4[T] = MetricPattern4(client, _m(acc, "2023_returns"))
+        self._2024: MetricPattern4[T] = MetricPattern4(client, _m(acc, "2024_returns"))
+        self._2025: MetricPattern4[T] = MetricPattern4(client, _m(acc, "2025_returns"))
+
+
 class DollarsPattern(Generic[T]):
     """Pattern struct for repeated tree structure."""
 
@@ -3520,22 +3457,6 @@ class AddrCountPattern:
         self.p2wsh: MetricPattern1[StoredU64] = MetricPattern1(client, _p("p2wsh", acc))
 
 
-class FeeRatePattern(Generic[T]):
-    """Pattern struct for repeated tree structure."""
-
-    def __init__(self, client: BrkClientBase, acc: str):
-        """Create pattern node with accumulated metric name."""
-        self.average: MetricPattern1[T] = MetricPattern1(client, _m(acc, "average"))
-        self.max: MetricPattern1[T] = MetricPattern1(client, _m(acc, "max"))
-        self.median: MetricPattern11[T] = MetricPattern11(client, _m(acc, "median"))
-        self.min: MetricPattern1[T] = MetricPattern1(client, _m(acc, "min"))
-        self.pct10: MetricPattern11[T] = MetricPattern11(client, _m(acc, "pct10"))
-        self.pct25: MetricPattern11[T] = MetricPattern11(client, _m(acc, "pct25"))
-        self.pct75: MetricPattern11[T] = MetricPattern11(client, _m(acc, "pct75"))
-        self.pct90: MetricPattern11[T] = MetricPattern11(client, _m(acc, "pct90"))
-        self.txindex: MetricPattern27[T] = MetricPattern27(client, acc)
-
-
 class FullnessPattern(Generic[T]):
     """Pattern struct for repeated tree structure."""
 
@@ -3552,6 +3473,22 @@ class FullnessPattern(Generic[T]):
         self.pct90: MetricPattern6[T] = MetricPattern6(client, _m(acc, "pct90"))
 
 
+class FeeRatePattern(Generic[T]):
+    """Pattern struct for repeated tree structure."""
+
+    def __init__(self, client: BrkClientBase, acc: str):
+        """Create pattern node with accumulated metric name."""
+        self.average: MetricPattern1[T] = MetricPattern1(client, _m(acc, "average"))
+        self.max: MetricPattern1[T] = MetricPattern1(client, _m(acc, "max"))
+        self.median: MetricPattern11[T] = MetricPattern11(client, _m(acc, "median"))
+        self.min: MetricPattern1[T] = MetricPattern1(client, _m(acc, "min"))
+        self.pct10: MetricPattern11[T] = MetricPattern11(client, _m(acc, "pct10"))
+        self.pct25: MetricPattern11[T] = MetricPattern11(client, _m(acc, "pct25"))
+        self.pct75: MetricPattern11[T] = MetricPattern11(client, _m(acc, "pct75"))
+        self.pct90: MetricPattern11[T] = MetricPattern11(client, _m(acc, "pct90"))
+        self.txindex: MetricPattern27[T] = MetricPattern27(client, acc)
+
+
 class _0satsPattern:
     """Pattern struct for repeated tree structure."""
 
@@ -3569,7 +3506,7 @@ class _0satsPattern:
         self.unrealized: UnrealizedPattern = UnrealizedPattern(client, acc)
 
 
-class _0satsPattern2:
+class _100btcPattern:
     """Pattern struct for repeated tree structure."""
 
     def __init__(self, client: BrkClientBase, acc: str):
@@ -3578,7 +3515,7 @@ class _0satsPattern2:
         self.cost_basis: CostBasisPattern = CostBasisPattern(client, acc)
         self.outputs: OutputsPattern = OutputsPattern(client, _m(acc, "utxo_count"))
         self.realized: RealizedPattern = RealizedPattern(client, acc)
-        self.relative: RelativePattern4 = RelativePattern4(client, _m(acc, "supply_in"))
+        self.relative: RelativePattern = RelativePattern(client, acc)
         self.supply: SupplyPattern2 = SupplyPattern2(client, _m(acc, "supply"))
         self.unrealized: UnrealizedPattern = UnrealizedPattern(client, acc)
 
@@ -3597,6 +3534,34 @@ class PeriodCagrPattern:
         self._8y: MetricPattern4[StoredF32] = MetricPattern4(client, _p("8y", acc))
 
 
+class UnrealizedPattern:
+    """Pattern struct for repeated tree structure."""
+
+    def __init__(self, client: BrkClientBase, acc: str):
+        """Create pattern node with accumulated metric name."""
+        self.neg_unrealized_loss: MetricPattern1[Dollars] = MetricPattern1(
+            client, _m(acc, "neg_unrealized_loss")
+        )
+        self.net_unrealized_pnl: MetricPattern1[Dollars] = MetricPattern1(
+            client, _m(acc, "net_unrealized_pnl")
+        )
+        self.supply_in_loss: ActiveSupplyPattern = ActiveSupplyPattern(
+            client, _m(acc, "supply_in_loss")
+        )
+        self.supply_in_profit: ActiveSupplyPattern = ActiveSupplyPattern(
+            client, _m(acc, "supply_in_profit")
+        )
+        self.total_unrealized_pnl: MetricPattern1[Dollars] = MetricPattern1(
+            client, _m(acc, "total_unrealized_pnl")
+        )
+        self.unrealized_loss: MetricPattern1[Dollars] = MetricPattern1(
+            client, _m(acc, "unrealized_loss")
+        )
+        self.unrealized_profit: MetricPattern1[Dollars] = MetricPattern1(
+            client, _m(acc, "unrealized_profit")
+        )
+
+
 class _10yTo12yPattern:
     """Pattern struct for repeated tree structure."""
 
@@ -3611,7 +3576,7 @@ class _10yTo12yPattern:
         self.unrealized: UnrealizedPattern = UnrealizedPattern(client, acc)
 
 
-class _100btcPattern:
+class _0satsPattern2:
     """Pattern struct for repeated tree structure."""
 
     def __init__(self, client: BrkClientBase, acc: str):
@@ -3620,7 +3585,7 @@ class _100btcPattern:
         self.cost_basis: CostBasisPattern = CostBasisPattern(client, acc)
         self.outputs: OutputsPattern = OutputsPattern(client, _m(acc, "utxo_count"))
         self.realized: RealizedPattern = RealizedPattern(client, acc)
-        self.relative: RelativePattern = RelativePattern(client, acc)
+        self.relative: RelativePattern4 = RelativePattern4(client, _m(acc, "supply_in"))
         self.supply: SupplyPattern2 = SupplyPattern2(client, _m(acc, "supply"))
         self.unrealized: UnrealizedPattern = UnrealizedPattern(client, acc)
 
@@ -3639,57 +3604,6 @@ class _10yPattern:
         self.unrealized: UnrealizedPattern = UnrealizedPattern(client, acc)
 
 
-class UnrealizedPattern:
-    """Pattern struct for repeated tree structure."""
-
-    def __init__(self, client: BrkClientBase, acc: str):
-        """Create pattern node with accumulated metric name."""
-        self.neg_unrealized_loss: MetricPattern1[Dollars] = MetricPattern1(
-            client, _m(acc, "neg_unrealized_loss")
-        )
-        self.net_unrealized_pnl: MetricPattern1[Dollars] = MetricPattern1(
-            client, _m(acc, "net_unrealized_pnl")
-        )
-        self.supply_in_loss: ActiveSupplyPattern = ActiveSupplyPattern(
-            client, _m(acc, "supply_in_loss")
-        )
-        self.supply_in_profit: ActiveSupplyPattern = ActiveSupplyPattern(
-            client, _m(acc, "supply_in_profit")
-        )
-        self.total_unrealized_pnl: MetricPattern1[Dollars] = MetricPattern1(
-            client, _m(acc, "total_unrealized_pnl")
-        )
-        self.unrealized_loss: MetricPattern1[Dollars] = MetricPattern1(
-            client, _m(acc, "unrealized_loss")
-        )
-        self.unrealized_profit: MetricPattern1[Dollars] = MetricPattern1(
-            client, _m(acc, "unrealized_profit")
-        )
-
-
-class AllPattern:
-    """Pattern struct for repeated tree structure."""
-
-    def __init__(self, client: BrkClientBase, acc: str):
-        """Create pattern node with accumulated metric name."""
-        self.balance_decreased: FullnessPattern[StoredU32] = FullnessPattern(
-            client, _m(acc, "balance_decreased")
-        )
-        self.balance_increased: FullnessPattern[StoredU32] = FullnessPattern(
-            client, _m(acc, "balance_increased")
-        )
-        self.both: FullnessPattern[StoredU32] = FullnessPattern(client, _m(acc, "both"))
-        self.reactivated: FullnessPattern[StoredU32] = FullnessPattern(
-            client, _m(acc, "reactivated")
-        )
-        self.receiving: FullnessPattern[StoredU32] = FullnessPattern(
-            client, _m(acc, "receiving")
-        )
-        self.sending: FullnessPattern[StoredU32] = FullnessPattern(
-            client, _m(acc, "sending")
-        )
-
-
 class ActivityPattern2:
     """Pattern struct for repeated tree structure."""
 
@@ -3723,30 +3637,24 @@ class SplitPattern2(Generic[T]):
         self.open: MetricPattern1[T] = MetricPattern1(client, _m(acc, "open"))
 
 
-class CoinbasePattern:
+class _2015Pattern:
     """Pattern struct for repeated tree structure."""
 
     def __init__(self, client: BrkClientBase, acc: str):
         """Create pattern node with accumulated metric name."""
-        self.bitcoin: BitcoinPattern = BitcoinPattern(client, _m(acc, "btc"))
-        self.dollars: DollarsPattern[Dollars] = DollarsPattern(client, _m(acc, "usd"))
-        self.sats: DollarsPattern[Sats] = DollarsPattern(client, acc)
+        self.bitcoin: MetricPattern4[Bitcoin] = MetricPattern4(client, _m(acc, "btc"))
+        self.dollars: MetricPattern4[Dollars] = MetricPattern4(client, _m(acc, "usd"))
+        self.sats: MetricPattern4[Sats] = MetricPattern4(client, acc)
 
 
-class CostBasisPattern2:
+class CoinbasePattern:
     """Pattern struct for repeated tree structure."""
 
     def __init__(self, client: BrkClientBase, acc: str):
         """Create pattern node with accumulated metric name."""
-        self.max: ActivePricePattern = ActivePricePattern(
-            client, _m(acc, "max_cost_basis")
-        )
-        self.min: ActivePricePattern = ActivePricePattern(
-            client, _m(acc, "min_cost_basis")
-        )
-        self.percentiles: PercentilesPattern = PercentilesPattern(
-            client, _m(acc, "cost_basis")
-        )
+        self.bitcoin: BitcoinPattern = BitcoinPattern(client, _m(acc, "btc"))
+        self.dollars: DollarsPattern[Dollars] = DollarsPattern(client, _m(acc, "usd"))
+        self.sats: DollarsPattern[Sats] = DollarsPattern(client, acc)
 
 
 class CoinbasePattern2:
@@ -3775,16 +3683,20 @@ class SegwitAdoptionPattern:
         self.sum: MetricPattern2[StoredF32] = MetricPattern2(client, _m(acc, "sum"))
 
 
-class UnclaimedRewardsPattern:
+class CostBasisPattern2:
     """Pattern struct for repeated tree structure."""
 
     def __init__(self, client: BrkClientBase, acc: str):
         """Create pattern node with accumulated metric name."""
-        self.bitcoin: BitcoinPattern2[Bitcoin] = BitcoinPattern2(client, _m(acc, "btc"))
-        self.dollars: BlockCountPattern[Dollars] = BlockCountPattern(
-            client, _m(acc, "usd")
+        self.max: MetricPattern1[Dollars] = MetricPattern1(
+            client, _m(acc, "max_cost_basis")
+        )
+        self.min: MetricPattern1[Dollars] = MetricPattern1(
+            client, _m(acc, "min_cost_basis")
+        )
+        self.percentiles: PercentilesPattern = PercentilesPattern(
+            client, _m(acc, "cost_basis")
         )
-        self.sats: BlockCountPattern[Sats] = BlockCountPattern(client, acc)
 
 
 class ActiveSupplyPattern:
@@ -3797,23 +3709,16 @@ class ActiveSupplyPattern:
         self.sats: MetricPattern1[Sats] = MetricPattern1(client, acc)
 
 
-class _2015Pattern:
-    """Pattern struct for repeated tree structure."""
-
-    def __init__(self, client: BrkClientBase, acc: str):
-        """Create pattern node with accumulated metric name."""
-        self.bitcoin: MetricPattern4[Bitcoin] = MetricPattern4(client, _m(acc, "btc"))
-        self.dollars: MetricPattern4[Dollars] = MetricPattern4(client, _m(acc, "usd"))
-        self.sats: MetricPattern4[Sats] = MetricPattern4(client, acc)
-
-
-class ActivePricePattern:
+class UnclaimedRewardsPattern:
     """Pattern struct for repeated tree structure."""
 
     def __init__(self, client: BrkClientBase, acc: str):
         """Create pattern node with accumulated metric name."""
-        self.dollars: MetricPattern1[Dollars] = MetricPattern1(client, acc)
-        self.sats: MetricPattern1[SatsFract] = MetricPattern1(client, _m(acc, "sats"))
+        self.bitcoin: BitcoinPattern2[Bitcoin] = BitcoinPattern2(client, _m(acc, "btc"))
+        self.dollars: BlockCountPattern[Dollars] = BlockCountPattern(
+            client, _m(acc, "usd")
+        )
+        self.sats: BlockCountPattern[Sats] = BlockCountPattern(client, acc)
 
 
 class CostBasisPattern:
@@ -3821,30 +3726,23 @@ class CostBasisPattern:
 
     def __init__(self, client: BrkClientBase, acc: str):
         """Create pattern node with accumulated metric name."""
-        self.max: ActivePricePattern = ActivePricePattern(
+        self.max: MetricPattern1[Dollars] = MetricPattern1(
             client, _m(acc, "max_cost_basis")
         )
-        self.min: ActivePricePattern = ActivePricePattern(
+        self.min: MetricPattern1[Dollars] = MetricPattern1(
             client, _m(acc, "min_cost_basis")
         )
 
 
-class _0sdUsdPattern:
-    """Pattern struct for repeated tree structure."""
-
-    def __init__(self, client: BrkClientBase, acc: str):
-        """Create pattern node with accumulated metric name."""
-        self.dollars: MetricPattern4[Dollars] = MetricPattern4(client, acc)
-        self.sats: MetricPattern4[SatsFract] = MetricPattern4(client, _m(acc, "sats"))
-
-
-class _1dReturns1mSdPattern:
+class SupplyPattern2:
     """Pattern struct for repeated tree structure."""
 
     def __init__(self, client: BrkClientBase, acc: str):
         """Create pattern node with accumulated metric name."""
-        self.sd: MetricPattern4[StoredF32] = MetricPattern4(client, _m(acc, "sd"))
-        self.sma: MetricPattern4[StoredF32] = MetricPattern4(client, _m(acc, "sma"))
+        self.halved: ActiveSupplyPattern = ActiveSupplyPattern(
+            client, _m(acc, "halved")
+        )
+        self.total: ActiveSupplyPattern = ActiveSupplyPattern(client, acc)
 
 
 class RelativePattern4:
@@ -3860,15 +3758,13 @@ class RelativePattern4:
         )
 
 
-class SupplyPattern2:
+class _1dReturns1mSdPattern:
     """Pattern struct for repeated tree structure."""
 
     def __init__(self, client: BrkClientBase, acc: str):
         """Create pattern node with accumulated metric name."""
-        self.halved: ActiveSupplyPattern = ActiveSupplyPattern(
-            client, _m(acc, "halved")
-        )
-        self.total: ActiveSupplyPattern = ActiveSupplyPattern(client, acc)
+        self.sd: MetricPattern4[StoredF32] = MetricPattern4(client, _m(acc, "sd"))
+        self.sma: MetricPattern4[StoredF32] = MetricPattern4(client, _m(acc, "sma"))
 
 
 class BlockCountPattern(Generic[T]):
@@ -3882,15 +3778,6 @@ class BlockCountPattern(Generic[T]):
         self.sum: MetricPattern1[T] = MetricPattern1(client, acc)
 
 
-class SatsPattern(Generic[T]):
-    """Pattern struct for repeated tree structure."""
-
-    def __init__(self, client: BrkClientBase, acc: str):
-        """Create pattern node with accumulated metric name."""
-        self.ohlc: MetricPattern1[T] = MetricPattern1(client, _m(acc, "ohlc"))
-        self.split: SplitPattern2[T] = SplitPattern2(client, acc)
-
-
 class BitcoinPattern2(Generic[T]):
     """Pattern struct for repeated tree structure."""
 
@@ -3902,12 +3789,13 @@ class BitcoinPattern2(Generic[T]):
         self.sum: MetricPattern1[T] = MetricPattern1(client, acc)
 
 
-class OutputsPattern:
+class SatsPattern(Generic[T]):
     """Pattern struct for repeated tree structure."""
 
     def __init__(self, client: BrkClientBase, acc: str):
         """Create pattern node with accumulated metric name."""
-        self.utxo_count: MetricPattern1[StoredU64] = MetricPattern1(client, acc)
+        self.ohlc: MetricPattern1[T] = MetricPattern1(client, _m(acc, "ohlc_sats"))
+        self.split: SplitPattern2[T] = SplitPattern2(client, _m(acc, "sats"))
 
 
 class RealizedPriceExtraPattern:
@@ -3918,6 +3806,14 @@ class RealizedPriceExtraPattern:
         self.ratio: MetricPattern4[StoredF32] = MetricPattern4(client, acc)
 
 
+class OutputsPattern:
+    """Pattern struct for repeated tree structure."""
+
+    def __init__(self, client: BrkClientBase, acc: str):
+        """Create pattern node with accumulated metric name."""
+        self.utxo_count: MetricPattern1[StoredU64] = MetricPattern1(client, acc)
+
+
 # Metrics tree classes
 
 
@@ -4250,25 +4146,25 @@ class MetricsTree_Cointime_Pricing:
     """Metrics tree node."""
 
     def __init__(self, client: BrkClientBase, base_path: str = ""):
-        self.active_price: ActivePricePattern = ActivePricePattern(
+        self.active_price: MetricPattern1[Dollars] = MetricPattern1(
             client, "active_price"
         )
         self.active_price_ratio: ActivePriceRatioPattern = ActivePriceRatioPattern(
             client, "active_price_ratio"
         )
-        self.cointime_price: ActivePricePattern = ActivePricePattern(
+        self.cointime_price: MetricPattern1[Dollars] = MetricPattern1(
             client, "cointime_price"
         )
         self.cointime_price_ratio: ActivePriceRatioPattern = ActivePriceRatioPattern(
             client, "cointime_price_ratio"
         )
-        self.true_market_mean: ActivePricePattern = ActivePricePattern(
+        self.true_market_mean: MetricPattern1[Dollars] = MetricPattern1(
             client, "true_market_mean"
         )
         self.true_market_mean_ratio: ActivePriceRatioPattern = ActivePriceRatioPattern(
             client, "true_market_mean_ratio"
         )
-        self.vaulted_price: ActivePricePattern = ActivePricePattern(
+        self.vaulted_price: MetricPattern1[Dollars] = MetricPattern1(
             client, "vaulted_price"
         )
         self.vaulted_price_ratio: ActivePriceRatioPattern = ActivePriceRatioPattern(
@@ -4276,19 +4172,6 @@ class MetricsTree_Cointime_Pricing:
         )
 
 
-class MetricsTree_Cointime_ReserveRisk:
-    """Metrics tree node."""
-
-    def __init__(self, client: BrkClientBase, base_path: str = ""):
-        self.hodl_bank: MetricPattern6[StoredF64] = MetricPattern6(client, "hodl_bank")
-        self.reserve_risk: MetricPattern4[StoredF64] = MetricPattern4(
-            client, "reserve_risk"
-        )
-        self.vocdd_365d_sma: MetricPattern6[StoredF64] = MetricPattern6(
-            client, "vocdd_365d_sma"
-        )
-
-
 class MetricsTree_Cointime_Supply:
     """Metrics tree node."""
 
@@ -4314,7 +4197,6 @@ class MetricsTree_Cointime_Value:
         self.cointime_value_stored: BlockCountPattern[StoredF64] = BlockCountPattern(
             client, "cointime_value_stored"
         )
-        self.vocdd: BlockCountPattern[StoredF64] = BlockCountPattern(client, "vocdd")
 
 
 class MetricsTree_Cointime:
@@ -4331,9 +4213,6 @@ class MetricsTree_Cointime:
         self.pricing: MetricsTree_Cointime_Pricing = MetricsTree_Cointime_Pricing(
             client
         )
-        self.reserve_risk: MetricsTree_Cointime_ReserveRisk = (
-            MetricsTree_Cointime_ReserveRisk(client)
-        )
         self.supply: MetricsTree_Cointime_Supply = MetricsTree_Cointime_Supply(client)
         self.value: MetricsTree_Cointime_Value = MetricsTree_Cointime_Value(client)
 
@@ -4384,35 +4263,20 @@ class MetricsTree_Constants:
         self.constant_80: MetricPattern1[StoredU16] = MetricPattern1(
             client, "constant_80"
         )
-        self.constant_minus_1: MetricPattern1[StoredI8] = MetricPattern1(
+        self.constant_minus_1: MetricPattern1[StoredI16] = MetricPattern1(
             client, "constant_minus_1"
         )
-        self.constant_minus_2: MetricPattern1[StoredI8] = MetricPattern1(
+        self.constant_minus_2: MetricPattern1[StoredI16] = MetricPattern1(
             client, "constant_minus_2"
         )
-        self.constant_minus_3: MetricPattern1[StoredI8] = MetricPattern1(
+        self.constant_minus_3: MetricPattern1[StoredI16] = MetricPattern1(
             client, "constant_minus_3"
         )
-        self.constant_minus_4: MetricPattern1[StoredI8] = MetricPattern1(
+        self.constant_minus_4: MetricPattern1[StoredI16] = MetricPattern1(
             client, "constant_minus_4"
         )
 
 
-class MetricsTree_Distribution_AddressActivity:
-    """Metrics tree node."""
-
-    def __init__(self, client: BrkClientBase, base_path: str = ""):
-        self.all: AllPattern = AllPattern(client, "address_activity")
-        self.p2a: AllPattern = AllPattern(client, "p2a_address_activity")
-        self.p2pk33: AllPattern = AllPattern(client, "p2pk33_address_activity")
-        self.p2pk65: AllPattern = AllPattern(client, "p2pk65_address_activity")
-        self.p2pkh: AllPattern = AllPattern(client, "p2pkh_address_activity")
-        self.p2sh: AllPattern = AllPattern(client, "p2sh_address_activity")
-        self.p2tr: AllPattern = AllPattern(client, "p2tr_address_activity")
-        self.p2wpkh: AllPattern = AllPattern(client, "p2wpkh_address_activity")
-        self.p2wsh: AllPattern = AllPattern(client, "p2wsh_address_activity")
-
-
 class MetricsTree_Distribution_AddressCohorts_AmountRange:
     """Metrics tree node."""
 
@@ -4466,19 +4330,19 @@ class MetricsTree_Distribution_AddressCohorts_GeAmount:
     """Metrics tree node."""
 
     def __init__(self, client: BrkClientBase, base_path: str = ""):
-        self._100btc: _0satsPattern = _0satsPattern(client, "addrs_over_100btc")
-        self._100k_sats: _0satsPattern = _0satsPattern(client, "addrs_over_100k_sats")
-        self._100sats: _0satsPattern = _0satsPattern(client, "addrs_over_100sats")
-        self._10btc: _0satsPattern = _0satsPattern(client, "addrs_over_10btc")
-        self._10k_btc: _0satsPattern = _0satsPattern(client, "addrs_over_10k_btc")
-        self._10k_sats: _0satsPattern = _0satsPattern(client, "addrs_over_10k_sats")
-        self._10m_sats: _0satsPattern = _0satsPattern(client, "addrs_over_10m_sats")
-        self._10sats: _0satsPattern = _0satsPattern(client, "addrs_over_10sats")
-        self._1btc: _0satsPattern = _0satsPattern(client, "addrs_over_1btc")
-        self._1k_btc: _0satsPattern = _0satsPattern(client, "addrs_over_1k_btc")
-        self._1k_sats: _0satsPattern = _0satsPattern(client, "addrs_over_1k_sats")
-        self._1m_sats: _0satsPattern = _0satsPattern(client, "addrs_over_1m_sats")
-        self._1sat: _0satsPattern = _0satsPattern(client, "addrs_over_1sat")
+        self._100btc: _0satsPattern = _0satsPattern(client, "addrs_above_100btc")
+        self._100k_sats: _0satsPattern = _0satsPattern(client, "addrs_above_100k_sats")
+        self._100sats: _0satsPattern = _0satsPattern(client, "addrs_above_100sats")
+        self._10btc: _0satsPattern = _0satsPattern(client, "addrs_above_10btc")
+        self._10k_btc: _0satsPattern = _0satsPattern(client, "addrs_above_10k_btc")
+        self._10k_sats: _0satsPattern = _0satsPattern(client, "addrs_above_10k_sats")
+        self._10m_sats: _0satsPattern = _0satsPattern(client, "addrs_above_10m_sats")
+        self._10sats: _0satsPattern = _0satsPattern(client, "addrs_above_10sats")
+        self._1btc: _0satsPattern = _0satsPattern(client, "addrs_above_1btc")
+        self._1k_btc: _0satsPattern = _0satsPattern(client, "addrs_above_1k_btc")
+        self._1k_sats: _0satsPattern = _0satsPattern(client, "addrs_above_1k_sats")
+        self._1m_sats: _0satsPattern = _0satsPattern(client, "addrs_above_1m_sats")
+        self._1sat: _0satsPattern = _0satsPattern(client, "addrs_above_1sat")
 
 
 class MetricsTree_Distribution_AddressCohorts_LtAmount:
@@ -4557,139 +4421,79 @@ class MetricsTree_Distribution_AnyAddressIndexes:
         )
 
 
-class MetricsTree_Distribution_GrowthRate:
-    """Metrics tree node."""
-
-    def __init__(self, client: BrkClientBase, base_path: str = ""):
-        self.all: FullnessPattern[StoredF32] = FullnessPattern(client, "growth_rate")
-        self.p2a: FullnessPattern[StoredF32] = FullnessPattern(
-            client, "p2a_growth_rate"
-        )
-        self.p2pk33: FullnessPattern[StoredF32] = FullnessPattern(
-            client, "p2pk33_growth_rate"
-        )
-        self.p2pk65: FullnessPattern[StoredF32] = FullnessPattern(
-            client, "p2pk65_growth_rate"
-        )
-        self.p2pkh: FullnessPattern[StoredF32] = FullnessPattern(
-            client, "p2pkh_growth_rate"
-        )
-        self.p2sh: FullnessPattern[StoredF32] = FullnessPattern(
-            client, "p2sh_growth_rate"
-        )
-        self.p2tr: FullnessPattern[StoredF32] = FullnessPattern(
-            client, "p2tr_growth_rate"
-        )
-        self.p2wpkh: FullnessPattern[StoredF32] = FullnessPattern(
-            client, "p2wpkh_growth_rate"
-        )
-        self.p2wsh: FullnessPattern[StoredF32] = FullnessPattern(
-            client, "p2wsh_growth_rate"
-        )
-
-
-class MetricsTree_Distribution_NewAddrCount:
-    """Metrics tree node."""
-
-    def __init__(self, client: BrkClientBase, base_path: str = ""):
-        self.all: DollarsPattern[StoredU64] = DollarsPattern(client, "new_addr_count")
-        self.p2a: DollarsPattern[StoredU64] = DollarsPattern(
-            client, "p2a_new_addr_count"
-        )
-        self.p2pk33: DollarsPattern[StoredU64] = DollarsPattern(
-            client, "p2pk33_new_addr_count"
-        )
-        self.p2pk65: DollarsPattern[StoredU64] = DollarsPattern(
-            client, "p2pk65_new_addr_count"
-        )
-        self.p2pkh: DollarsPattern[StoredU64] = DollarsPattern(
-            client, "p2pkh_new_addr_count"
-        )
-        self.p2sh: DollarsPattern[StoredU64] = DollarsPattern(
-            client, "p2sh_new_addr_count"
-        )
-        self.p2tr: DollarsPattern[StoredU64] = DollarsPattern(
-            client, "p2tr_new_addr_count"
-        )
-        self.p2wpkh: DollarsPattern[StoredU64] = DollarsPattern(
-            client, "p2wpkh_new_addr_count"
-        )
-        self.p2wsh: DollarsPattern[StoredU64] = DollarsPattern(
-            client, "p2wsh_new_addr_count"
-        )
-
-
 class MetricsTree_Distribution_UtxoCohorts_AgeRange:
     """Metrics tree node."""
 
     def __init__(self, client: BrkClientBase, base_path: str = ""):
         self._10y_to_12y: _10yTo12yPattern = _10yTo12yPattern(
-            client, "utxos_10y_to_12y_old"
+            client, "utxos_at_least_10y_up_to_12y_old"
         )
         self._12y_to_15y: _10yTo12yPattern = _10yTo12yPattern(
-            client, "utxos_12y_to_15y_old"
+            client, "utxos_at_least_12y_up_to_15y_old"
         )
         self._1d_to_1w: _10yTo12yPattern = _10yTo12yPattern(
-            client, "utxos_1d_to_1w_old"
+            client, "utxos_at_least_1d_up_to_1w_old"
         )
         self._1h_to_1d: _10yTo12yPattern = _10yTo12yPattern(
-            client, "utxos_1h_to_1d_old"
+            client, "utxos_at_least_1h_up_to_1d_old"
         )
         self._1m_to_2m: _10yTo12yPattern = _10yTo12yPattern(
-            client, "utxos_1m_to_2m_old"
+            client, "utxos_at_least_1m_up_to_2m_old"
         )
         self._1w_to_1m: _10yTo12yPattern = _10yTo12yPattern(
-            client, "utxos_1w_to_1m_old"
+            client, "utxos_at_least_1w_up_to_1m_old"
         )
         self._1y_to_2y: _10yTo12yPattern = _10yTo12yPattern(
-            client, "utxos_1y_to_2y_old"
+            client, "utxos_at_least_1y_up_to_2y_old"
         )
         self._2m_to_3m: _10yTo12yPattern = _10yTo12yPattern(
-            client, "utxos_2m_to_3m_old"
+            client, "utxos_at_least_2m_up_to_3m_old"
         )
         self._2y_to_3y: _10yTo12yPattern = _10yTo12yPattern(
-            client, "utxos_2y_to_3y_old"
+            client, "utxos_at_least_2y_up_to_3y_old"
         )
         self._3m_to_4m: _10yTo12yPattern = _10yTo12yPattern(
-            client, "utxos_3m_to_4m_old"
+            client, "utxos_at_least_3m_up_to_4m_old"
         )
         self._3y_to_4y: _10yTo12yPattern = _10yTo12yPattern(
-            client, "utxos_3y_to_4y_old"
+            client, "utxos_at_least_3y_up_to_4y_old"
         )
         self._4m_to_5m: _10yTo12yPattern = _10yTo12yPattern(
-            client, "utxos_4m_to_5m_old"
+            client, "utxos_at_least_4m_up_to_5m_old"
         )
         self._4y_to_5y: _10yTo12yPattern = _10yTo12yPattern(
-            client, "utxos_4y_to_5y_old"
+            client, "utxos_at_least_4y_up_to_5y_old"
         )
         self._5m_to_6m: _10yTo12yPattern = _10yTo12yPattern(
-            client, "utxos_5m_to_6m_old"
+            client, "utxos_at_least_5m_up_to_6m_old"
         )
         self._5y_to_6y: _10yTo12yPattern = _10yTo12yPattern(
-            client, "utxos_5y_to_6y_old"
+            client, "utxos_at_least_5y_up_to_6y_old"
         )
         self._6m_to_1y: _10yTo12yPattern = _10yTo12yPattern(
-            client, "utxos_6m_to_1y_old"
+            client, "utxos_at_least_6m_up_to_1y_old"
         )
         self._6y_to_7y: _10yTo12yPattern = _10yTo12yPattern(
-            client, "utxos_6y_to_7y_old"
+            client, "utxos_at_least_6y_up_to_7y_old"
         )
         self._7y_to_8y: _10yTo12yPattern = _10yTo12yPattern(
-            client, "utxos_7y_to_8y_old"
+            client, "utxos_at_least_7y_up_to_8y_old"
         )
         self._8y_to_10y: _10yTo12yPattern = _10yTo12yPattern(
-            client, "utxos_8y_to_10y_old"
+            client, "utxos_at_least_8y_up_to_10y_old"
         )
-        self.from_15y: _10yTo12yPattern = _10yTo12yPattern(client, "utxos_over_15y_old")
-        self.up_to_1h: _10yTo12yPattern = _10yTo12yPattern(client, "utxos_under_1h_old")
+        self.from_15y: _10yTo12yPattern = _10yTo12yPattern(
+            client, "utxos_at_least_15y_old"
+        )
+        self.up_to_1h: _10yTo12yPattern = _10yTo12yPattern(client, "utxos_up_to_1h_old")
 
 
 class MetricsTree_Distribution_UtxoCohorts_All_CostBasis:
     """Metrics tree node."""
 
     def __init__(self, client: BrkClientBase, base_path: str = ""):
-        self.max: ActivePricePattern = ActivePricePattern(client, "max_cost_basis")
-        self.min: ActivePricePattern = ActivePricePattern(client, "min_cost_basis")
+        self.max: MetricPattern1[Dollars] = MetricPattern1(client, "max_cost_basis")
+        self.min: MetricPattern1[Dollars] = MetricPattern1(client, "min_cost_basis")
         self.percentiles: PercentilesPattern = PercentilesPattern(client, "cost_basis")
 
 
@@ -4800,19 +4604,21 @@ class MetricsTree_Distribution_UtxoCohorts_GeAmount:
     """Metrics tree node."""
 
     def __init__(self, client: BrkClientBase, base_path: str = ""):
-        self._100btc: _100btcPattern = _100btcPattern(client, "utxos_over_100btc")
-        self._100k_sats: _100btcPattern = _100btcPattern(client, "utxos_over_100k_sats")
-        self._100sats: _100btcPattern = _100btcPattern(client, "utxos_over_100sats")
-        self._10btc: _100btcPattern = _100btcPattern(client, "utxos_over_10btc")
-        self._10k_btc: _100btcPattern = _100btcPattern(client, "utxos_over_10k_btc")
-        self._10k_sats: _100btcPattern = _100btcPattern(client, "utxos_over_10k_sats")
-        self._10m_sats: _100btcPattern = _100btcPattern(client, "utxos_over_10m_sats")
-        self._10sats: _100btcPattern = _100btcPattern(client, "utxos_over_10sats")
-        self._1btc: _100btcPattern = _100btcPattern(client, "utxos_over_1btc")
-        self._1k_btc: _100btcPattern = _100btcPattern(client, "utxos_over_1k_btc")
-        self._1k_sats: _100btcPattern = _100btcPattern(client, "utxos_over_1k_sats")
-        self._1m_sats: _100btcPattern = _100btcPattern(client, "utxos_over_1m_sats")
-        self._1sat: _100btcPattern = _100btcPattern(client, "utxos_over_1sat")
+        self._100btc: _100btcPattern = _100btcPattern(client, "utxos_above_100btc")
+        self._100k_sats: _100btcPattern = _100btcPattern(
+            client, "utxos_above_100k_sats"
+        )
+        self._100sats: _100btcPattern = _100btcPattern(client, "utxos_above_100sats")
+        self._10btc: _100btcPattern = _100btcPattern(client, "utxos_above_10btc")
+        self._10k_btc: _100btcPattern = _100btcPattern(client, "utxos_above_10k_btc")
+        self._10k_sats: _100btcPattern = _100btcPattern(client, "utxos_above_10k_sats")
+        self._10m_sats: _100btcPattern = _100btcPattern(client, "utxos_above_10m_sats")
+        self._10sats: _100btcPattern = _100btcPattern(client, "utxos_above_10sats")
+        self._1btc: _100btcPattern = _100btcPattern(client, "utxos_above_1btc")
+        self._1k_btc: _100btcPattern = _100btcPattern(client, "utxos_above_1k_btc")
+        self._1k_sats: _100btcPattern = _100btcPattern(client, "utxos_above_1k_sats")
+        self._1m_sats: _100btcPattern = _100btcPattern(client, "utxos_above_1m_sats")
+        self._1sat: _100btcPattern = _100btcPattern(client, "utxos_above_1sat")
 
 
 class MetricsTree_Distribution_UtxoCohorts_LtAmount:
@@ -4840,48 +4646,48 @@ class MetricsTree_Distribution_UtxoCohorts_MaxAge:
     """Metrics tree node."""
 
     def __init__(self, client: BrkClientBase, base_path: str = ""):
-        self._10y: _10yPattern = _10yPattern(client, "utxos_under_10y_old")
-        self._12y: _10yPattern = _10yPattern(client, "utxos_under_12y_old")
-        self._15y: _10yPattern = _10yPattern(client, "utxos_under_15y_old")
-        self._1m: _10yPattern = _10yPattern(client, "utxos_under_1m_old")
-        self._1w: _10yPattern = _10yPattern(client, "utxos_under_1w_old")
-        self._1y: _10yPattern = _10yPattern(client, "utxos_under_1y_old")
-        self._2m: _10yPattern = _10yPattern(client, "utxos_under_2m_old")
-        self._2y: _10yPattern = _10yPattern(client, "utxos_under_2y_old")
-        self._3m: _10yPattern = _10yPattern(client, "utxos_under_3m_old")
-        self._3y: _10yPattern = _10yPattern(client, "utxos_under_3y_old")
-        self._4m: _10yPattern = _10yPattern(client, "utxos_under_4m_old")
-        self._4y: _10yPattern = _10yPattern(client, "utxos_under_4y_old")
-        self._5m: _10yPattern = _10yPattern(client, "utxos_under_5m_old")
-        self._5y: _10yPattern = _10yPattern(client, "utxos_under_5y_old")
-        self._6m: _10yPattern = _10yPattern(client, "utxos_under_6m_old")
-        self._6y: _10yPattern = _10yPattern(client, "utxos_under_6y_old")
-        self._7y: _10yPattern = _10yPattern(client, "utxos_under_7y_old")
-        self._8y: _10yPattern = _10yPattern(client, "utxos_under_8y_old")
+        self._10y: _10yPattern = _10yPattern(client, "utxos_up_to_10y_old")
+        self._12y: _10yPattern = _10yPattern(client, "utxos_up_to_12y_old")
+        self._15y: _10yPattern = _10yPattern(client, "utxos_up_to_15y_old")
+        self._1m: _10yPattern = _10yPattern(client, "utxos_up_to_1m_old")
+        self._1w: _10yPattern = _10yPattern(client, "utxos_up_to_1w_old")
+        self._1y: _10yPattern = _10yPattern(client, "utxos_up_to_1y_old")
+        self._2m: _10yPattern = _10yPattern(client, "utxos_up_to_2m_old")
+        self._2y: _10yPattern = _10yPattern(client, "utxos_up_to_2y_old")
+        self._3m: _10yPattern = _10yPattern(client, "utxos_up_to_3m_old")
+        self._3y: _10yPattern = _10yPattern(client, "utxos_up_to_3y_old")
+        self._4m: _10yPattern = _10yPattern(client, "utxos_up_to_4m_old")
+        self._4y: _10yPattern = _10yPattern(client, "utxos_up_to_4y_old")
+        self._5m: _10yPattern = _10yPattern(client, "utxos_up_to_5m_old")
+        self._5y: _10yPattern = _10yPattern(client, "utxos_up_to_5y_old")
+        self._6m: _10yPattern = _10yPattern(client, "utxos_up_to_6m_old")
+        self._6y: _10yPattern = _10yPattern(client, "utxos_up_to_6y_old")
+        self._7y: _10yPattern = _10yPattern(client, "utxos_up_to_7y_old")
+        self._8y: _10yPattern = _10yPattern(client, "utxos_up_to_8y_old")
 
 
 class MetricsTree_Distribution_UtxoCohorts_MinAge:
     """Metrics tree node."""
 
     def __init__(self, client: BrkClientBase, base_path: str = ""):
-        self._10y: _100btcPattern = _100btcPattern(client, "utxos_over_10y_old")
-        self._12y: _100btcPattern = _100btcPattern(client, "utxos_over_12y_old")
-        self._1d: _100btcPattern = _100btcPattern(client, "utxos_over_1d_old")
-        self._1m: _100btcPattern = _100btcPattern(client, "utxos_over_1m_old")
-        self._1w: _100btcPattern = _100btcPattern(client, "utxos_over_1w_old")
-        self._1y: _100btcPattern = _100btcPattern(client, "utxos_over_1y_old")
-        self._2m: _100btcPattern = _100btcPattern(client, "utxos_over_2m_old")
-        self._2y: _100btcPattern = _100btcPattern(client, "utxos_over_2y_old")
-        self._3m: _100btcPattern = _100btcPattern(client, "utxos_over_3m_old")
-        self._3y: _100btcPattern = _100btcPattern(client, "utxos_over_3y_old")
-        self._4m: _100btcPattern = _100btcPattern(client, "utxos_over_4m_old")
-        self._4y: _100btcPattern = _100btcPattern(client, "utxos_over_4y_old")
-        self._5m: _100btcPattern = _100btcPattern(client, "utxos_over_5m_old")
-        self._5y: _100btcPattern = _100btcPattern(client, "utxos_over_5y_old")
-        self._6m: _100btcPattern = _100btcPattern(client, "utxos_over_6m_old")
-        self._6y: _100btcPattern = _100btcPattern(client, "utxos_over_6y_old")
-        self._7y: _100btcPattern = _100btcPattern(client, "utxos_over_7y_old")
-        self._8y: _100btcPattern = _100btcPattern(client, "utxos_over_8y_old")
+        self._10y: _100btcPattern = _100btcPattern(client, "utxos_at_least_10y_old")
+        self._12y: _100btcPattern = _100btcPattern(client, "utxos_at_least_12y_old")
+        self._1d: _100btcPattern = _100btcPattern(client, "utxos_at_least_1d_old")
+        self._1m: _100btcPattern = _100btcPattern(client, "utxos_at_least_1m_old")
+        self._1w: _100btcPattern = _100btcPattern(client, "utxos_at_least_1w_old")
+        self._1y: _100btcPattern = _100btcPattern(client, "utxos_at_least_1y_old")
+        self._2m: _100btcPattern = _100btcPattern(client, "utxos_at_least_2m_old")
+        self._2y: _100btcPattern = _100btcPattern(client, "utxos_at_least_2y_old")
+        self._3m: _100btcPattern = _100btcPattern(client, "utxos_at_least_3m_old")
+        self._3y: _100btcPattern = _100btcPattern(client, "utxos_at_least_3y_old")
+        self._4m: _100btcPattern = _100btcPattern(client, "utxos_at_least_4m_old")
+        self._4y: _100btcPattern = _100btcPattern(client, "utxos_at_least_4y_old")
+        self._5m: _100btcPattern = _100btcPattern(client, "utxos_at_least_5m_old")
+        self._5y: _100btcPattern = _100btcPattern(client, "utxos_at_least_5y_old")
+        self._6m: _100btcPattern = _100btcPattern(client, "utxos_at_least_6m_old")
+        self._6y: _100btcPattern = _100btcPattern(client, "utxos_at_least_6y_old")
+        self._7y: _100btcPattern = _100btcPattern(client, "utxos_at_least_7y_old")
+        self._8y: _100btcPattern = _100btcPattern(client, "utxos_at_least_8y_old")
 
 
 class MetricsTree_Distribution_UtxoCohorts_Term_Long:
@@ -5007,9 +4813,6 @@ class MetricsTree_Distribution:
 
     def __init__(self, client: BrkClientBase, base_path: str = ""):
         self.addr_count: AddrCountPattern = AddrCountPattern(client, "addr_count")
-        self.address_activity: MetricsTree_Distribution_AddressActivity = (
-            MetricsTree_Distribution_AddressActivity(client)
-        )
         self.address_cohorts: MetricsTree_Distribution_AddressCohorts = (
             MetricsTree_Distribution_AddressCohorts(client)
         )
@@ -5028,18 +4831,9 @@ class MetricsTree_Distribution:
         self.emptyaddressindex: MetricPattern32[EmptyAddressIndex] = MetricPattern32(
             client, "emptyaddressindex"
         )
-        self.growth_rate: MetricsTree_Distribution_GrowthRate = (
-            MetricsTree_Distribution_GrowthRate(client)
-        )
         self.loadedaddressindex: MetricPattern31[LoadedAddressIndex] = MetricPattern31(
             client, "loadedaddressindex"
         )
-        self.new_addr_count: MetricsTree_Distribution_NewAddrCount = (
-            MetricsTree_Distribution_NewAddrCount(client)
-        )
-        self.total_addr_count: AddrCountPattern = AddrCountPattern(
-            client, "total_addr_count"
-        )
         self.utxo_cohorts: MetricsTree_Distribution_UtxoCohorts = (
             MetricsTree_Distribution_UtxoCohorts(client)
         )
@@ -5261,7 +5055,7 @@ class MetricsTree_Indexes_Height:
 
     def __init__(self, client: BrkClientBase, base_path: str = ""):
         self.dateindex: MetricPattern11[DateIndex] = MetricPattern11(
-            client, "dateindex"
+            client, "height_dateindex"
         )
         self.difficultyepoch: MetricPattern11[DifficultyEpoch] = MetricPattern11(
             client, "difficultyepoch"
@@ -5476,7 +5270,7 @@ class MetricsTree_Market_Ath:
         self.max_years_between_price_aths: MetricPattern4[StoredF32] = MetricPattern4(
             client, "max_years_between_price_aths"
         )
-        self.price_ath: ActivePricePattern = ActivePricePattern(client, "price_ath")
+        self.price_ath: MetricPattern1[Dollars] = MetricPattern1(client, "price_ath")
         self.price_drawdown: MetricPattern3[StoredF32] = MetricPattern3(
             client, "price_drawdown"
         )
@@ -5489,210 +5283,39 @@ class MetricsTree_Market_Dca_ClassAveragePrice:
     """Metrics tree node."""
 
     def __init__(self, client: BrkClientBase, base_path: str = ""):
-        self._2015: _0sdUsdPattern = _0sdUsdPattern(
+        self._2015: MetricPattern4[Dollars] = MetricPattern4(
             client, "dca_class_2015_average_price"
         )
-        self._2016: _0sdUsdPattern = _0sdUsdPattern(
+        self._2016: MetricPattern4[Dollars] = MetricPattern4(
             client, "dca_class_2016_average_price"
         )
-        self._2017: _0sdUsdPattern = _0sdUsdPattern(
+        self._2017: MetricPattern4[Dollars] = MetricPattern4(
             client, "dca_class_2017_average_price"
         )
-        self._2018: _0sdUsdPattern = _0sdUsdPattern(
+        self._2018: MetricPattern4[Dollars] = MetricPattern4(
             client, "dca_class_2018_average_price"
         )
-        self._2019: _0sdUsdPattern = _0sdUsdPattern(
+        self._2019: MetricPattern4[Dollars] = MetricPattern4(
             client, "dca_class_2019_average_price"
         )
-        self._2020: _0sdUsdPattern = _0sdUsdPattern(
+        self._2020: MetricPattern4[Dollars] = MetricPattern4(
             client, "dca_class_2020_average_price"
         )
-        self._2021: _0sdUsdPattern = _0sdUsdPattern(
+        self._2021: MetricPattern4[Dollars] = MetricPattern4(
             client, "dca_class_2021_average_price"
         )
-        self._2022: _0sdUsdPattern = _0sdUsdPattern(
+        self._2022: MetricPattern4[Dollars] = MetricPattern4(
             client, "dca_class_2022_average_price"
         )
-        self._2023: _0sdUsdPattern = _0sdUsdPattern(
+        self._2023: MetricPattern4[Dollars] = MetricPattern4(
             client, "dca_class_2023_average_price"
         )
-        self._2024: _0sdUsdPattern = _0sdUsdPattern(
+        self._2024: MetricPattern4[Dollars] = MetricPattern4(
             client, "dca_class_2024_average_price"
         )
-        self._2025: _0sdUsdPattern = _0sdUsdPattern(
+        self._2025: MetricPattern4[Dollars] = MetricPattern4(
             client, "dca_class_2025_average_price"
         )
-        self._2026: _0sdUsdPattern = _0sdUsdPattern(
-            client, "dca_class_2026_average_price"
-        )
-
-
-class MetricsTree_Market_Dca_ClassDaysInLoss:
-    """Metrics tree node."""
-
-    def __init__(self, client: BrkClientBase, base_path: str = ""):
-        self._2015: MetricPattern4[StoredU32] = MetricPattern4(
-            client, "dca_class_2015_days_in_loss"
-        )
-        self._2016: MetricPattern4[StoredU32] = MetricPattern4(
-            client, "dca_class_2016_days_in_loss"
-        )
-        self._2017: MetricPattern4[StoredU32] = MetricPattern4(
-            client, "dca_class_2017_days_in_loss"
-        )
-        self._2018: MetricPattern4[StoredU32] = MetricPattern4(
-            client, "dca_class_2018_days_in_loss"
-        )
-        self._2019: MetricPattern4[StoredU32] = MetricPattern4(
-            client, "dca_class_2019_days_in_loss"
-        )
-        self._2020: MetricPattern4[StoredU32] = MetricPattern4(
-            client, "dca_class_2020_days_in_loss"
-        )
-        self._2021: MetricPattern4[StoredU32] = MetricPattern4(
-            client, "dca_class_2021_days_in_loss"
-        )
-        self._2022: MetricPattern4[StoredU32] = MetricPattern4(
-            client, "dca_class_2022_days_in_loss"
-        )
-        self._2023: MetricPattern4[StoredU32] = MetricPattern4(
-            client, "dca_class_2023_days_in_loss"
-        )
-        self._2024: MetricPattern4[StoredU32] = MetricPattern4(
-            client, "dca_class_2024_days_in_loss"
-        )
-        self._2025: MetricPattern4[StoredU32] = MetricPattern4(
-            client, "dca_class_2025_days_in_loss"
-        )
-        self._2026: MetricPattern4[StoredU32] = MetricPattern4(
-            client, "dca_class_2026_days_in_loss"
-        )
-
-
-class MetricsTree_Market_Dca_ClassDaysInProfit:
-    """Metrics tree node."""
-
-    def __init__(self, client: BrkClientBase, base_path: str = ""):
-        self._2015: MetricPattern4[StoredU32] = MetricPattern4(
-            client, "dca_class_2015_days_in_profit"
-        )
-        self._2016: MetricPattern4[StoredU32] = MetricPattern4(
-            client, "dca_class_2016_days_in_profit"
-        )
-        self._2017: MetricPattern4[StoredU32] = MetricPattern4(
-            client, "dca_class_2017_days_in_profit"
-        )
-        self._2018: MetricPattern4[StoredU32] = MetricPattern4(
-            client, "dca_class_2018_days_in_profit"
-        )
-        self._2019: MetricPattern4[StoredU32] = MetricPattern4(
-            client, "dca_class_2019_days_in_profit"
-        )
-        self._2020: MetricPattern4[StoredU32] = MetricPattern4(
-            client, "dca_class_2020_days_in_profit"
-        )
-        self._2021: MetricPattern4[StoredU32] = MetricPattern4(
-            client, "dca_class_2021_days_in_profit"
-        )
-        self._2022: MetricPattern4[StoredU32] = MetricPattern4(
-            client, "dca_class_2022_days_in_profit"
-        )
-        self._2023: MetricPattern4[StoredU32] = MetricPattern4(
-            client, "dca_class_2023_days_in_profit"
-        )
-        self._2024: MetricPattern4[StoredU32] = MetricPattern4(
-            client, "dca_class_2024_days_in_profit"
-        )
-        self._2025: MetricPattern4[StoredU32] = MetricPattern4(
-            client, "dca_class_2025_days_in_profit"
-        )
-        self._2026: MetricPattern4[StoredU32] = MetricPattern4(
-            client, "dca_class_2026_days_in_profit"
-        )
-
-
-class MetricsTree_Market_Dca_ClassMaxReturn:
-    """Metrics tree node."""
-
-    def __init__(self, client: BrkClientBase, base_path: str = ""):
-        self._2015: MetricPattern4[StoredF32] = MetricPattern4(
-            client, "dca_class_2015_max_return"
-        )
-        self._2016: MetricPattern4[StoredF32] = MetricPattern4(
-            client, "dca_class_2016_max_return"
-        )
-        self._2017: MetricPattern4[StoredF32] = MetricPattern4(
-            client, "dca_class_2017_max_return"
-        )
-        self._2018: MetricPattern4[StoredF32] = MetricPattern4(
-            client, "dca_class_2018_max_return"
-        )
-        self._2019: MetricPattern4[StoredF32] = MetricPattern4(
-            client, "dca_class_2019_max_return"
-        )
-        self._2020: MetricPattern4[StoredF32] = MetricPattern4(
-            client, "dca_class_2020_max_return"
-        )
-        self._2021: MetricPattern4[StoredF32] = MetricPattern4(
-            client, "dca_class_2021_max_return"
-        )
-        self._2022: MetricPattern4[StoredF32] = MetricPattern4(
-            client, "dca_class_2022_max_return"
-        )
-        self._2023: MetricPattern4[StoredF32] = MetricPattern4(
-            client, "dca_class_2023_max_return"
-        )
-        self._2024: MetricPattern4[StoredF32] = MetricPattern4(
-            client, "dca_class_2024_max_return"
-        )
-        self._2025: MetricPattern4[StoredF32] = MetricPattern4(
-            client, "dca_class_2025_max_return"
-        )
-        self._2026: MetricPattern4[StoredF32] = MetricPattern4(
-            client, "dca_class_2026_max_return"
-        )
-
-
-class MetricsTree_Market_Dca_ClassReturns:
-    """Metrics tree node."""
-
-    def __init__(self, client: BrkClientBase, base_path: str = ""):
-        self._2015: MetricPattern4[StoredF32] = MetricPattern4(
-            client, "dca_class_2015_returns"
-        )
-        self._2016: MetricPattern4[StoredF32] = MetricPattern4(
-            client, "dca_class_2016_returns"
-        )
-        self._2017: MetricPattern4[StoredF32] = MetricPattern4(
-            client, "dca_class_2017_returns"
-        )
-        self._2018: MetricPattern4[StoredF32] = MetricPattern4(
-            client, "dca_class_2018_returns"
-        )
-        self._2019: MetricPattern4[StoredF32] = MetricPattern4(
-            client, "dca_class_2019_returns"
-        )
-        self._2020: MetricPattern4[StoredF32] = MetricPattern4(
-            client, "dca_class_2020_returns"
-        )
-        self._2021: MetricPattern4[StoredF32] = MetricPattern4(
-            client, "dca_class_2021_returns"
-        )
-        self._2022: MetricPattern4[StoredF32] = MetricPattern4(
-            client, "dca_class_2022_returns"
-        )
-        self._2023: MetricPattern4[StoredF32] = MetricPattern4(
-            client, "dca_class_2023_returns"
-        )
-        self._2024: MetricPattern4[StoredF32] = MetricPattern4(
-            client, "dca_class_2024_returns"
-        )
-        self._2025: MetricPattern4[StoredF32] = MetricPattern4(
-            client, "dca_class_2025_returns"
-        )
-        self._2026: MetricPattern4[StoredF32] = MetricPattern4(
-            client, "dca_class_2026_returns"
-        )
 
 
 class MetricsTree_Market_Dca_ClassStack:
@@ -5710,25 +5333,6 @@ class MetricsTree_Market_Dca_ClassStack:
         self._2023: _2015Pattern = _2015Pattern(client, "dca_class_2023_stack")
         self._2024: _2015Pattern = _2015Pattern(client, "dca_class_2024_stack")
         self._2025: _2015Pattern = _2015Pattern(client, "dca_class_2025_stack")
-        self._2026: _2015Pattern = _2015Pattern(client, "dca_class_2026_stack")
-
-
-class MetricsTree_Market_Dca_PeriodAveragePrice:
-    """Metrics tree node."""
-
-    def __init__(self, client: BrkClientBase, base_path: str = ""):
-        self._10y: _0sdUsdPattern = _0sdUsdPattern(client, "10y_dca_average_price")
-        self._1m: _0sdUsdPattern = _0sdUsdPattern(client, "1m_dca_average_price")
-        self._1w: _0sdUsdPattern = _0sdUsdPattern(client, "1w_dca_average_price")
-        self._1y: _0sdUsdPattern = _0sdUsdPattern(client, "1y_dca_average_price")
-        self._2y: _0sdUsdPattern = _0sdUsdPattern(client, "2y_dca_average_price")
-        self._3m: _0sdUsdPattern = _0sdUsdPattern(client, "3m_dca_average_price")
-        self._3y: _0sdUsdPattern = _0sdUsdPattern(client, "3y_dca_average_price")
-        self._4y: _0sdUsdPattern = _0sdUsdPattern(client, "4y_dca_average_price")
-        self._5y: _0sdUsdPattern = _0sdUsdPattern(client, "5y_dca_average_price")
-        self._6m: _0sdUsdPattern = _0sdUsdPattern(client, "6m_dca_average_price")
-        self._6y: _0sdUsdPattern = _0sdUsdPattern(client, "6y_dca_average_price")
-        self._8y: _0sdUsdPattern = _0sdUsdPattern(client, "8y_dca_average_price")
 
 
 class MetricsTree_Market_Dca:
@@ -5738,60 +5342,21 @@ class MetricsTree_Market_Dca:
         self.class_average_price: MetricsTree_Market_Dca_ClassAveragePrice = (
             MetricsTree_Market_Dca_ClassAveragePrice(client)
         )
-        self.class_days_in_loss: MetricsTree_Market_Dca_ClassDaysInLoss = (
-            MetricsTree_Market_Dca_ClassDaysInLoss(client)
-        )
-        self.class_days_in_profit: MetricsTree_Market_Dca_ClassDaysInProfit = (
-            MetricsTree_Market_Dca_ClassDaysInProfit(client)
-        )
-        self.class_max_drawdown: ClassDaysInLossPattern[StoredF32] = (
-            ClassDaysInLossPattern(client, "dca_class")
-        )
-        self.class_max_return: MetricsTree_Market_Dca_ClassMaxReturn = (
-            MetricsTree_Market_Dca_ClassMaxReturn(client)
-        )
-        self.class_returns: MetricsTree_Market_Dca_ClassReturns = (
-            MetricsTree_Market_Dca_ClassReturns(client)
+        self.class_returns: ClassAveragePricePattern[StoredF32] = (
+            ClassAveragePricePattern(client, "dca_class")
         )
         self.class_stack: MetricsTree_Market_Dca_ClassStack = (
             MetricsTree_Market_Dca_ClassStack(client)
         )
-        self.period_average_price: MetricsTree_Market_Dca_PeriodAveragePrice = (
-            MetricsTree_Market_Dca_PeriodAveragePrice(client)
+        self.period_average_price: PeriodAveragePricePattern[Dollars] = (
+            PeriodAveragePricePattern(client, "dca_average_price")
         )
         self.period_cagr: PeriodCagrPattern = PeriodCagrPattern(client, "dca_cagr")
-        self.period_days_in_loss: PeriodDaysInLossPattern[StoredU32] = (
-            PeriodDaysInLossPattern(client, "dca_days_in_loss")
-        )
-        self.period_days_in_profit: PeriodDaysInLossPattern[StoredU32] = (
-            PeriodDaysInLossPattern(client, "dca_days_in_profit")
-        )
-        self.period_lump_sum_days_in_loss: PeriodDaysInLossPattern[StoredU32] = (
-            PeriodDaysInLossPattern(client, "lump_sum_days_in_loss")
-        )
-        self.period_lump_sum_days_in_profit: PeriodDaysInLossPattern[StoredU32] = (
-            PeriodDaysInLossPattern(client, "lump_sum_days_in_profit")
-        )
-        self.period_lump_sum_max_drawdown: PeriodDaysInLossPattern[StoredF32] = (
-            PeriodDaysInLossPattern(client, "lump_sum_max_drawdown")
-        )
-        self.period_lump_sum_max_return: PeriodDaysInLossPattern[StoredF32] = (
-            PeriodDaysInLossPattern(client, "lump_sum_max_return")
-        )
-        self.period_lump_sum_returns: PeriodDaysInLossPattern[StoredF32] = (
-            PeriodDaysInLossPattern(client, "lump_sum_returns")
-        )
         self.period_lump_sum_stack: PeriodLumpSumStackPattern = (
             PeriodLumpSumStackPattern(client, "lump_sum_stack")
         )
-        self.period_max_drawdown: PeriodDaysInLossPattern[StoredF32] = (
-            PeriodDaysInLossPattern(client, "dca_max_drawdown")
-        )
-        self.period_max_return: PeriodDaysInLossPattern[StoredF32] = (
-            PeriodDaysInLossPattern(client, "dca_max_return")
-        )
-        self.period_returns: PeriodDaysInLossPattern[StoredF32] = (
-            PeriodDaysInLossPattern(client, "dca_returns")
+        self.period_returns: PeriodAveragePricePattern[StoredF32] = (
+            PeriodAveragePricePattern(client, "dca_returns")
         )
         self.period_stack: PeriodLumpSumStackPattern = PeriodLumpSumStackPattern(
             client, "dca_stack"
@@ -5843,25 +5408,6 @@ class MetricsTree_Market_Indicators:
         )
 
 
-class MetricsTree_Market_Lookback:
-    """Metrics tree node."""
-
-    def __init__(self, client: BrkClientBase, base_path: str = ""):
-        self._10y: _0sdUsdPattern = _0sdUsdPattern(client, "price_10y_ago")
-        self._1d: _0sdUsdPattern = _0sdUsdPattern(client, "price_1d_ago")
-        self._1m: _0sdUsdPattern = _0sdUsdPattern(client, "price_1m_ago")
-        self._1w: _0sdUsdPattern = _0sdUsdPattern(client, "price_1w_ago")
-        self._1y: _0sdUsdPattern = _0sdUsdPattern(client, "price_1y_ago")
-        self._2y: _0sdUsdPattern = _0sdUsdPattern(client, "price_2y_ago")
-        self._3m: _0sdUsdPattern = _0sdUsdPattern(client, "price_3m_ago")
-        self._3y: _0sdUsdPattern = _0sdUsdPattern(client, "price_3y_ago")
-        self._4y: _0sdUsdPattern = _0sdUsdPattern(client, "price_4y_ago")
-        self._5y: _0sdUsdPattern = _0sdUsdPattern(client, "price_5y_ago")
-        self._6m: _0sdUsdPattern = _0sdUsdPattern(client, "price_6m_ago")
-        self._6y: _0sdUsdPattern = _0sdUsdPattern(client, "price_6y_ago")
-        self._8y: _0sdUsdPattern = _0sdUsdPattern(client, "price_8y_ago")
-
-
 class MetricsTree_Market_MovingAverage:
     """Metrics tree node."""
 
@@ -5908,10 +5454,10 @@ class MetricsTree_Market_MovingAverage:
         self.price_200d_sma: Price111dSmaPattern = Price111dSmaPattern(
             client, "price_200d_sma"
         )
-        self.price_200d_sma_x0_8: _0sdUsdPattern = _0sdUsdPattern(
+        self.price_200d_sma_x0_8: MetricPattern4[Dollars] = MetricPattern4(
             client, "price_200d_sma_x0_8"
         )
-        self.price_200d_sma_x2_4: _0sdUsdPattern = _0sdUsdPattern(
+        self.price_200d_sma_x2_4: MetricPattern4[Dollars] = MetricPattern4(
             client, "price_200d_sma_x2_4"
         )
         self.price_200w_ema: Price111dSmaPattern = Price111dSmaPattern(
@@ -5944,7 +5490,7 @@ class MetricsTree_Market_MovingAverage:
         self.price_350d_sma: Price111dSmaPattern = Price111dSmaPattern(
             client, "price_350d_sma"
         )
-        self.price_350d_sma_x2: _0sdUsdPattern = _0sdUsdPattern(
+        self.price_350d_sma_x2: MetricPattern4[Dollars] = MetricPattern4(
             client, "price_350d_sma_x2"
         )
         self.price_4y_ema: Price111dSmaPattern = Price111dSmaPattern(
@@ -5977,17 +5523,33 @@ class MetricsTree_Market_Range:
     """Metrics tree node."""
 
     def __init__(self, client: BrkClientBase, base_path: str = ""):
-        self.price_1m_max: _0sdUsdPattern = _0sdUsdPattern(client, "price_1m_max")
-        self.price_1m_min: _0sdUsdPattern = _0sdUsdPattern(client, "price_1m_min")
-        self.price_1w_max: _0sdUsdPattern = _0sdUsdPattern(client, "price_1w_max")
-        self.price_1w_min: _0sdUsdPattern = _0sdUsdPattern(client, "price_1w_min")
-        self.price_1y_max: _0sdUsdPattern = _0sdUsdPattern(client, "price_1y_max")
-        self.price_1y_min: _0sdUsdPattern = _0sdUsdPattern(client, "price_1y_min")
+        self.price_1m_max: MetricPattern4[Dollars] = MetricPattern4(
+            client, "price_1m_max"
+        )
+        self.price_1m_min: MetricPattern4[Dollars] = MetricPattern4(
+            client, "price_1m_min"
+        )
+        self.price_1w_max: MetricPattern4[Dollars] = MetricPattern4(
+            client, "price_1w_max"
+        )
+        self.price_1w_min: MetricPattern4[Dollars] = MetricPattern4(
+            client, "price_1w_min"
+        )
+        self.price_1y_max: MetricPattern4[Dollars] = MetricPattern4(
+            client, "price_1y_max"
+        )
+        self.price_1y_min: MetricPattern4[Dollars] = MetricPattern4(
+            client, "price_1y_min"
+        )
         self.price_2w_choppiness_index: MetricPattern4[StoredF32] = MetricPattern4(
             client, "price_2w_choppiness_index"
         )
-        self.price_2w_max: _0sdUsdPattern = _0sdUsdPattern(client, "price_2w_max")
-        self.price_2w_min: _0sdUsdPattern = _0sdUsdPattern(client, "price_2w_min")
+        self.price_2w_max: MetricPattern4[Dollars] = MetricPattern4(
+            client, "price_2w_max"
+        )
+        self.price_2w_min: MetricPattern4[Dollars] = MetricPattern4(
+            client, "price_2w_min"
+        )
         self.price_true_range: MetricPattern6[StoredF32] = MetricPattern6(
             client, "price_true_range"
         )
@@ -6084,7 +5646,7 @@ class MetricsTree_Market:
         self.indicators: MetricsTree_Market_Indicators = MetricsTree_Market_Indicators(
             client
         )
-        self.lookback: MetricsTree_Market_Lookback = MetricsTree_Market_Lookback(client)
+        self.lookback: LookbackPattern[Dollars] = LookbackPattern(client, "price")
         self.moving_average: MetricsTree_Market_MovingAverage = (
             MetricsTree_Market_MovingAverage(client)
         )
@@ -6347,12 +5909,30 @@ class MetricsTree_Price_Cents:
         )
 
 
-class MetricsTree_Price_Sats:
+class MetricsTree_Price_Oracle:
+    """Metrics tree node."""
+
+    def __init__(self, client: BrkClientBase, base_path: str = ""):
+        self.ohlc_cents: MetricPattern6[OHLCCents] = MetricPattern6(
+            client, "oracle_ohlc_cents"
+        )
+        self.ohlc_dollars: MetricPattern6[OHLCDollars] = MetricPattern6(
+            client, "oracle_ohlc"
+        )
+        self.price_cents: MetricPattern11[Cents] = MetricPattern11(
+            client, "oracle_price_cents"
+        )
+        self.tx_count: MetricPattern6[StoredU32] = MetricPattern6(
+            client, "oracle_tx_count"
+        )
+
+
+class MetricsTree_Price_Usd:
     """Metrics tree node."""
 
     def __init__(self, client: BrkClientBase, base_path: str = ""):
-        self.ohlc: MetricPattern1[OHLCSats] = MetricPattern1(client, "price_ohlc_sats")
-        self.split: SplitPattern2[Sats] = SplitPattern2(client, "price_sats")
+        self.ohlc: MetricPattern1[OHLCDollars] = MetricPattern1(client, "price_ohlc")
+        self.split: SplitPattern2[Dollars] = SplitPattern2(client, "price")
 
 
 class MetricsTree_Price:
@@ -6360,8 +5940,9 @@ class MetricsTree_Price:
 
     def __init__(self, client: BrkClientBase, base_path: str = ""):
         self.cents: MetricsTree_Price_Cents = MetricsTree_Price_Cents(client)
-        self.sats: MetricsTree_Price_Sats = MetricsTree_Price_Sats(client)
-        self.usd: SatsPattern[OHLCDollars] = SatsPattern(client, "price")
+        self.oracle: MetricsTree_Price_Oracle = MetricsTree_Price_Oracle(client)
+        self.sats: SatsPattern[OHLCSats] = SatsPattern(client, "price")
+        self.usd: MetricsTree_Price_Usd = MetricsTree_Price_Usd(client)
 
 
 class MetricsTree_Scripts_Count:
@@ -6492,12 +6073,39 @@ class MetricsTree_Transactions_Count:
         self.tx_count: DollarsPattern[StoredU64] = DollarsPattern(client, "tx_count")
 
 
+class MetricsTree_Transactions_Fees_Fee_Dollars:
+    """Metrics tree node."""
+
+    def __init__(self, client: BrkClientBase, base_path: str = ""):
+        self.average: MetricPattern1[Dollars] = MetricPattern1(
+            client, "fee_usd_average"
+        )
+        self.cumulative: MetricPattern2[Dollars] = MetricPattern2(
+            client, "fee_usd_cumulative"
+        )
+        self.height_cumulative: MetricPattern11[Dollars] = MetricPattern11(
+            client, "fee_usd_cumulative"
+        )
+        self.max: MetricPattern1[Dollars] = MetricPattern1(client, "fee_usd_max")
+        self.median: MetricPattern11[Dollars] = MetricPattern11(
+            client, "fee_usd_median"
+        )
+        self.min: MetricPattern1[Dollars] = MetricPattern1(client, "fee_usd_min")
+        self.pct10: MetricPattern11[Dollars] = MetricPattern11(client, "fee_usd_pct10")
+        self.pct25: MetricPattern11[Dollars] = MetricPattern11(client, "fee_usd_pct25")
+        self.pct75: MetricPattern11[Dollars] = MetricPattern11(client, "fee_usd_pct75")
+        self.pct90: MetricPattern11[Dollars] = MetricPattern11(client, "fee_usd_pct90")
+        self.sum: MetricPattern1[Dollars] = MetricPattern1(client, "fee_usd_sum")
+
+
 class MetricsTree_Transactions_Fees_Fee:
     """Metrics tree node."""
 
     def __init__(self, client: BrkClientBase, base_path: str = ""):
         self.bitcoin: CountPattern2[Bitcoin] = CountPattern2(client, "fee_btc")
-        self.dollars: CountPattern2[Dollars] = CountPattern2(client, "fee_usd")
+        self.dollars: MetricsTree_Transactions_Fees_Fee_Dollars = (
+            MetricsTree_Transactions_Fees_Fee_Dollars(client)
+        )
         self.sats: CountPattern2[Sats] = CountPattern2(client, "fee")
         self.txindex: MetricPattern27[Sats] = MetricPattern27(client, "fee")
 
@@ -6544,9 +6152,6 @@ class MetricsTree_Transactions_Volume:
         self.outputs_per_sec: MetricPattern4[StoredF32] = MetricPattern4(
             client, "outputs_per_sec"
         )
-        self.received_sum: ActiveSupplyPattern = ActiveSupplyPattern(
-            client, "received_sum"
-        )
         self.sent_sum: ActiveSupplyPattern = ActiveSupplyPattern(client, "sent_sum")
         self.tx_per_sec: MetricPattern4[StoredF32] = MetricPattern4(
             client, "tx_per_sec"
@@ -6620,7 +6225,7 @@ class MetricsTree:
 class BrkClient(BrkClientBase):
     """Main BRK client with metrics tree and API methods."""
 
-    VERSION = "v0.1.0-beta.1"
+    VERSION = "v0.1.0-alpha.2"
 
     INDEXES = [
         "dateindex",
@@ -6650,7 +6255,6 @@ class BrkClient(BrkClientBase):
         "yearindex",
         "loadedaddressindex",
         "emptyaddressindex",
-        "pairoutputindex",
     ]
 
     POOL_ID_TO_POOL_NAME = {
@@ -6820,11 +6424,11 @@ class BrkClient(BrkClientBase):
     }
 
     EPOCH_NAMES = {
-        "_0": {"id": "epoch_0", "short": "0", "long": "Epoch 0"},
-        "_1": {"id": "epoch_1", "short": "1", "long": "Epoch 1"},
-        "_2": {"id": "epoch_2", "short": "2", "long": "Epoch 2"},
-        "_3": {"id": "epoch_3", "short": "3", "long": "Epoch 3"},
-        "_4": {"id": "epoch_4", "short": "4", "long": "Epoch 4"},
+        "_0": {"id": "epoch_0", "short": "Epoch 0", "long": "Epoch 0"},
+        "_1": {"id": "epoch_1", "short": "Epoch 1", "long": "Epoch 1"},
+        "_2": {"id": "epoch_2", "short": "Epoch 2", "long": "Epoch 2"},
+        "_3": {"id": "epoch_3", "short": "Epoch 3", "long": "Epoch 3"},
+        "_4": {"id": "epoch_4", "short": "Epoch 4", "long": "Epoch 4"},
     }
 
     YEAR_NAMES = {
@@ -6883,145 +6487,209 @@ class BrkClient(BrkClientBase):
     }
 
     AGE_RANGE_NAMES = {
-        "up_to_1h": {"id": "under_1h_old", "short": "<1h", "long": "Under 1 Hour Old"},
+        "up_to_1h": {"id": "up_to_1h_old", "short": "<1h", "long": "Up to 1 Hour Old"},
         "_1h_to_1d": {
-            "id": "1h_to_1d_old",
+            "id": "at_least_1h_up_to_1d_old",
             "short": "1h-1d",
             "long": "1 Hour to 1 Day Old",
         },
         "_1d_to_1w": {
-            "id": "1d_to_1w_old",
+            "id": "at_least_1d_up_to_1w_old",
             "short": "1d-1w",
             "long": "1 Day to 1 Week Old",
         },
         "_1w_to_1m": {
-            "id": "1w_to_1m_old",
+            "id": "at_least_1w_up_to_1m_old",
             "short": "1w-1m",
             "long": "1 Week to 1 Month Old",
         },
         "_1m_to_2m": {
-            "id": "1m_to_2m_old",
+            "id": "at_least_1m_up_to_2m_old",
             "short": "1m-2m",
             "long": "1 to 2 Months Old",
         },
         "_2m_to_3m": {
-            "id": "2m_to_3m_old",
+            "id": "at_least_2m_up_to_3m_old",
             "short": "2m-3m",
             "long": "2 to 3 Months Old",
         },
         "_3m_to_4m": {
-            "id": "3m_to_4m_old",
+            "id": "at_least_3m_up_to_4m_old",
             "short": "3m-4m",
             "long": "3 to 4 Months Old",
         },
         "_4m_to_5m": {
-            "id": "4m_to_5m_old",
+            "id": "at_least_4m_up_to_5m_old",
             "short": "4m-5m",
             "long": "4 to 5 Months Old",
         },
         "_5m_to_6m": {
-            "id": "5m_to_6m_old",
+            "id": "at_least_5m_up_to_6m_old",
             "short": "5m-6m",
             "long": "5 to 6 Months Old",
         },
         "_6m_to_1y": {
-            "id": "6m_to_1y_old",
+            "id": "at_least_6m_up_to_1y_old",
             "short": "6m-1y",
             "long": "6 Months to 1 Year Old",
         },
         "_1y_to_2y": {
-            "id": "1y_to_2y_old",
+            "id": "at_least_1y_up_to_2y_old",
             "short": "1y-2y",
             "long": "1 to 2 Years Old",
         },
         "_2y_to_3y": {
-            "id": "2y_to_3y_old",
+            "id": "at_least_2y_up_to_3y_old",
             "short": "2y-3y",
             "long": "2 to 3 Years Old",
         },
         "_3y_to_4y": {
-            "id": "3y_to_4y_old",
+            "id": "at_least_3y_up_to_4y_old",
             "short": "3y-4y",
             "long": "3 to 4 Years Old",
         },
         "_4y_to_5y": {
-            "id": "4y_to_5y_old",
+            "id": "at_least_4y_up_to_5y_old",
             "short": "4y-5y",
             "long": "4 to 5 Years Old",
         },
         "_5y_to_6y": {
-            "id": "5y_to_6y_old",
+            "id": "at_least_5y_up_to_6y_old",
             "short": "5y-6y",
             "long": "5 to 6 Years Old",
         },
         "_6y_to_7y": {
-            "id": "6y_to_7y_old",
+            "id": "at_least_6y_up_to_7y_old",
             "short": "6y-7y",
             "long": "6 to 7 Years Old",
         },
         "_7y_to_8y": {
-            "id": "7y_to_8y_old",
+            "id": "at_least_7y_up_to_8y_old",
             "short": "7y-8y",
             "long": "7 to 8 Years Old",
         },
         "_8y_to_10y": {
-            "id": "8y_to_10y_old",
+            "id": "at_least_8y_up_to_10y_old",
             "short": "8y-10y",
             "long": "8 to 10 Years Old",
         },
         "_10y_to_12y": {
-            "id": "10y_to_12y_old",
+            "id": "at_least_10y_up_to_12y_old",
             "short": "10y-12y",
             "long": "10 to 12 Years Old",
         },
         "_12y_to_15y": {
-            "id": "12y_to_15y_old",
+            "id": "at_least_12y_up_to_15y_old",
             "short": "12y-15y",
             "long": "12 to 15 Years Old",
         },
-        "from_15y": {"id": "over_15y_old", "short": "15y+", "long": "15+ Years Old"},
+        "from_15y": {
+            "id": "at_least_15y_old",
+            "short": "15y+",
+            "long": "15+ Years Old",
+        },
     }
 
     MAX_AGE_NAMES = {
-        "_1w": {"id": "under_1w_old", "short": "<1w", "long": "Under 1 Week Old"},
-        "_1m": {"id": "under_1m_old", "short": "<1m", "long": "Under 1 Month Old"},
-        "_2m": {"id": "under_2m_old", "short": "<2m", "long": "Under 2 Months Old"},
-        "_3m": {"id": "under_3m_old", "short": "<3m", "long": "Under 3 Months Old"},
-        "_4m": {"id": "under_4m_old", "short": "<4m", "long": "Under 4 Months Old"},
-        "_5m": {"id": "under_5m_old", "short": "<5m", "long": "Under 5 Months Old"},
-        "_6m": {"id": "under_6m_old", "short": "<6m", "long": "Under 6 Months Old"},
-        "_1y": {"id": "under_1y_old", "short": "<1y", "long": "Under 1 Year Old"},
-        "_2y": {"id": "under_2y_old", "short": "<2y", "long": "Under 2 Years Old"},
-        "_3y": {"id": "under_3y_old", "short": "<3y", "long": "Under 3 Years Old"},
-        "_4y": {"id": "under_4y_old", "short": "<4y", "long": "Under 4 Years Old"},
-        "_5y": {"id": "under_5y_old", "short": "<5y", "long": "Under 5 Years Old"},
-        "_6y": {"id": "under_6y_old", "short": "<6y", "long": "Under 6 Years Old"},
-        "_7y": {"id": "under_7y_old", "short": "<7y", "long": "Under 7 Years Old"},
-        "_8y": {"id": "under_8y_old", "short": "<8y", "long": "Under 8 Years Old"},
-        "_10y": {"id": "under_10y_old", "short": "<10y", "long": "Under 10 Years Old"},
-        "_12y": {"id": "under_12y_old", "short": "<12y", "long": "Under 12 Years Old"},
-        "_15y": {"id": "under_15y_old", "short": "<15y", "long": "Under 15 Years Old"},
+        "_1w": {"id": "up_to_1w_old", "short": "<1w", "long": "Up to 1 Week Old"},
+        "_1m": {"id": "up_to_1m_old", "short": "<1m", "long": "Up to 1 Month Old"},
+        "_2m": {"id": "up_to_2m_old", "short": "<2m", "long": "Up to 2 Months Old"},
+        "_3m": {"id": "up_to_3m_old", "short": "<3m", "long": "Up to 3 Months Old"},
+        "_4m": {"id": "up_to_4m_old", "short": "<4m", "long": "Up to 4 Months Old"},
+        "_5m": {"id": "up_to_5m_old", "short": "<5m", "long": "Up to 5 Months Old"},
+        "_6m": {"id": "up_to_6m_old", "short": "<6m", "long": "Up to 6 Months Old"},
+        "_1y": {"id": "up_to_1y_old", "short": "<1y", "long": "Up to 1 Year Old"},
+        "_2y": {"id": "up_to_2y_old", "short": "<2y", "long": "Up to 2 Years Old"},
+        "_3y": {"id": "up_to_3y_old", "short": "<3y", "long": "Up to 3 Years Old"},
+        "_4y": {"id": "up_to_4y_old", "short": "<4y", "long": "Up to 4 Years Old"},
+        "_5y": {"id": "up_to_5y_old", "short": "<5y", "long": "Up to 5 Years Old"},
+        "_6y": {"id": "up_to_6y_old", "short": "<6y", "long": "Up to 6 Years Old"},
+        "_7y": {"id": "up_to_7y_old", "short": "<7y", "long": "Up to 7 Years Old"},
+        "_8y": {"id": "up_to_8y_old", "short": "<8y", "long": "Up to 8 Years Old"},
+        "_10y": {"id": "up_to_10y_old", "short": "<10y", "long": "Up to 10 Years Old"},
+        "_12y": {"id": "up_to_12y_old", "short": "<12y", "long": "Up to 12 Years Old"},
+        "_15y": {"id": "up_to_15y_old", "short": "<15y", "long": "Up to 15 Years Old"},
     }
 
     MIN_AGE_NAMES = {
-        "_1d": {"id": "over_1d_old", "short": "1d+", "long": "Over 1 Day Old"},
-        "_1w": {"id": "over_1w_old", "short": "1w+", "long": "Over 1 Week Old"},
-        "_1m": {"id": "over_1m_old", "short": "1m+", "long": "Over 1 Month Old"},
-        "_2m": {"id": "over_2m_old", "short": "2m+", "long": "Over 2 Months Old"},
-        "_3m": {"id": "over_3m_old", "short": "3m+", "long": "Over 3 Months Old"},
-        "_4m": {"id": "over_4m_old", "short": "4m+", "long": "Over 4 Months Old"},
-        "_5m": {"id": "over_5m_old", "short": "5m+", "long": "Over 5 Months Old"},
-        "_6m": {"id": "over_6m_old", "short": "6m+", "long": "Over 6 Months Old"},
-        "_1y": {"id": "over_1y_old", "short": "1y+", "long": "Over 1 Year Old"},
-        "_2y": {"id": "over_2y_old", "short": "2y+", "long": "Over 2 Years Old"},
-        "_3y": {"id": "over_3y_old", "short": "3y+", "long": "Over 3 Years Old"},
-        "_4y": {"id": "over_4y_old", "short": "4y+", "long": "Over 4 Years Old"},
-        "_5y": {"id": "over_5y_old", "short": "5y+", "long": "Over 5 Years Old"},
-        "_6y": {"id": "over_6y_old", "short": "6y+", "long": "Over 6 Years Old"},
-        "_7y": {"id": "over_7y_old", "short": "7y+", "long": "Over 7 Years Old"},
-        "_8y": {"id": "over_8y_old", "short": "8y+", "long": "Over 8 Years Old"},
-        "_10y": {"id": "over_10y_old", "short": "10y+", "long": "Over 10 Years Old"},
-        "_12y": {"id": "over_12y_old", "short": "12y+", "long": "Over 12 Years Old"},
+        "_1d": {"id": "at_least_1d_old", "short": "1d+", "long": "At Least 1 Day Old"},
+        "_1w": {"id": "at_least_1w_old", "short": "1w+", "long": "At Least 1 Week Old"},
+        "_1m": {
+            "id": "at_least_1m_old",
+            "short": "1m+",
+            "long": "At Least 1 Month Old",
+        },
+        "_2m": {
+            "id": "at_least_2m_old",
+            "short": "2m+",
+            "long": "At Least 2 Months Old",
+        },
+        "_3m": {
+            "id": "at_least_3m_old",
+            "short": "3m+",
+            "long": "At Least 3 Months Old",
+        },
+        "_4m": {
+            "id": "at_least_4m_old",
+            "short": "4m+",
+            "long": "At Least 4 Months Old",
+        },
+        "_5m": {
+            "id": "at_least_5m_old",
+            "short": "5m+",
+            "long": "At Least 5 Months Old",
+        },
+        "_6m": {
+            "id": "at_least_6m_old",
+            "short": "6m+",
+            "long": "At Least 6 Months Old",
+        },
+        "_1y": {"id": "at_least_1y_old", "short": "1y+", "long": "At Least 1 Year Old"},
+        "_2y": {
+            "id": "at_least_2y_old",
+            "short": "2y+",
+            "long": "At Least 2 Years Old",
+        },
+        "_3y": {
+            "id": "at_least_3y_old",
+            "short": "3y+",
+            "long": "At Least 3 Years Old",
+        },
+        "_4y": {
+            "id": "at_least_4y_old",
+            "short": "4y+",
+            "long": "At Least 4 Years Old",
+        },
+        "_5y": {
+            "id": "at_least_5y_old",
+            "short": "5y+",
+            "long": "At Least 5 Years Old",
+        },
+        "_6y": {
+            "id": "at_least_6y_old",
+            "short": "6y+",
+            "long": "At Least 6 Years Old",
+        },
+        "_7y": {
+            "id": "at_least_7y_old",
+            "short": "7y+",
+            "long": "At Least 7 Years Old",
+        },
+        "_8y": {
+            "id": "at_least_8y_old",
+            "short": "8y+",
+            "long": "At Least 8 Years Old",
+        },
+        "_10y": {
+            "id": "at_least_10y_old",
+            "short": "10y+",
+            "long": "At Least 10 Years Old",
+        },
+        "_12y": {
+            "id": "at_least_12y_old",
+            "short": "12y+",
+            "long": "At Least 12 Years Old",
+        },
     }
 
     AMOUNT_RANGE_NAMES = {
@@ -7029,67 +6697,67 @@ class BrkClient(BrkClientBase):
         "_1sat_to_10sats": {
             "id": "above_1sat_under_10sats",
             "short": "1-10 sats",
-            "long": "1-10 Sats",
+            "long": "1 to 10 Sats",
         },
         "_10sats_to_100sats": {
             "id": "above_10sats_under_100sats",
             "short": "10-100 sats",
-            "long": "10-100 Sats",
+            "long": "10 to 100 Sats",
         },
         "_100sats_to_1k_sats": {
             "id": "above_100sats_under_1k_sats",
             "short": "100-1k sats",
-            "long": "100-1K Sats",
+            "long": "100 to 1K Sats",
         },
         "_1k_sats_to_10k_sats": {
             "id": "above_1k_sats_under_10k_sats",
             "short": "1k-10k sats",
-            "long": "1K-10K Sats",
+            "long": "1K to 10K Sats",
         },
         "_10k_sats_to_100k_sats": {
             "id": "above_10k_sats_under_100k_sats",
             "short": "10k-100k sats",
-            "long": "10K-100K Sats",
+            "long": "10K to 100K Sats",
         },
         "_100k_sats_to_1m_sats": {
             "id": "above_100k_sats_under_1m_sats",
             "short": "100k-1M sats",
-            "long": "100K-1M Sats",
+            "long": "100K to 1M Sats",
         },
         "_1m_sats_to_10m_sats": {
             "id": "above_1m_sats_under_10m_sats",
             "short": "1M-10M sats",
-            "long": "1M-10M Sats",
+            "long": "1M to 10M Sats",
         },
         "_10m_sats_to_1btc": {
             "id": "above_10m_sats_under_1btc",
             "short": "0.1-1 BTC",
-            "long": "0.1-1 BTC",
+            "long": "0.1 to 1 BTC",
         },
         "_1btc_to_10btc": {
             "id": "above_1btc_under_10btc",
             "short": "1-10 BTC",
-            "long": "1-10 BTC",
+            "long": "1 to 10 BTC",
         },
         "_10btc_to_100btc": {
             "id": "above_10btc_under_100btc",
             "short": "10-100 BTC",
-            "long": "10-100 BTC",
+            "long": "10 to 100 BTC",
         },
         "_100btc_to_1k_btc": {
             "id": "above_100btc_under_1k_btc",
             "short": "100-1k BTC",
-            "long": "100-1K BTC",
+            "long": "100 to 1K BTC",
         },
         "_1k_btc_to_10k_btc": {
             "id": "above_1k_btc_under_10k_btc",
             "short": "1k-10k BTC",
-            "long": "1K-10K BTC",
+            "long": "1K to 10K BTC",
         },
         "_10k_btc_to_100k_btc": {
             "id": "above_10k_btc_under_100k_btc",
             "short": "10k-100k BTC",
-            "long": "10K-100K BTC",
+            "long": "10K to 100K BTC",
         },
         "_100k_btc_or_more": {
             "id": "above_100k_btc",
@@ -7099,35 +6767,47 @@ class BrkClient(BrkClientBase):
     }
 
     GE_AMOUNT_NAMES = {
-        "_1sat": {"id": "over_1sat", "short": "1+ sats", "long": "Over 1 Sat"},
-        "_10sats": {"id": "over_10sats", "short": "10+ sats", "long": "Over 10 Sats"},
+        "_1sat": {"id": "above_1sat", "short": "1+ sats", "long": "Above 1 Sat"},
+        "_10sats": {"id": "above_10sats", "short": "10+ sats", "long": "Above 10 Sats"},
         "_100sats": {
-            "id": "over_100sats",
+            "id": "above_100sats",
             "short": "100+ sats",
-            "long": "Over 100 Sats",
+            "long": "Above 100 Sats",
+        },
+        "_1k_sats": {
+            "id": "above_1k_sats",
+            "short": "1k+ sats",
+            "long": "Above 1K Sats",
         },
-        "_1k_sats": {"id": "over_1k_sats", "short": "1k+ sats", "long": "Over 1K Sats"},
         "_10k_sats": {
-            "id": "over_10k_sats",
+            "id": "above_10k_sats",
             "short": "10k+ sats",
-            "long": "Over 10K Sats",
+            "long": "Above 10K Sats",
         },
         "_100k_sats": {
-            "id": "over_100k_sats",
+            "id": "above_100k_sats",
             "short": "100k+ sats",
-            "long": "Over 100K Sats",
+            "long": "Above 100K Sats",
+        },
+        "_1m_sats": {
+            "id": "above_1m_sats",
+            "short": "1M+ sats",
+            "long": "Above 1M Sats",
         },
-        "_1m_sats": {"id": "over_1m_sats", "short": "1M+ sats", "long": "Over 1M Sats"},
         "_10m_sats": {
-            "id": "over_10m_sats",
+            "id": "above_10m_sats",
             "short": "0.1+ BTC",
-            "long": "Over 0.1 BTC",
+            "long": "Above 0.1 BTC",
+        },
+        "_1btc": {"id": "above_1btc", "short": "1+ BTC", "long": "Above 1 BTC"},
+        "_10btc": {"id": "above_10btc", "short": "10+ BTC", "long": "Above 10 BTC"},
+        "_100btc": {"id": "above_100btc", "short": "100+ BTC", "long": "Above 100 BTC"},
+        "_1k_btc": {"id": "above_1k_btc", "short": "1k+ BTC", "long": "Above 1K BTC"},
+        "_10k_btc": {
+            "id": "above_10k_btc",
+            "short": "10k+ BTC",
+            "long": "Above 10K BTC",
         },
-        "_1btc": {"id": "over_1btc", "short": "1+ BTC", "long": "Over 1 BTC"},
-        "_10btc": {"id": "over_10btc", "short": "10+ BTC", "long": "Over 10 BTC"},
-        "_100btc": {"id": "over_100btc", "short": "100+ BTC", "long": "Over 100 BTC"},
-        "_1k_btc": {"id": "over_1k_btc", "short": "1k+ BTC", "long": "Over 1K BTC"},
-        "_10k_btc": {"id": "over_10k_btc", "short": "10k+ BTC", "long": "Over 10K BTC"},
     }
 
     LT_AMOUNT_NAMES = {
@@ -7190,14 +6870,6 @@ class BrkClient(BrkClientBase):
         """
         return MetricEndpointBuilder(self, metric, index)
 
-    def get_api(self) -> Any:
-        """Compact OpenAPI specification.
-
-        Compact OpenAPI specification optimized for LLM consumption. Removes redundant fields while preserving essential API information. Full spec available at `/openapi.json`.
-
-        Endpoint: `GET /api.json`"""
-        return self.get_json("/api.json")
-
     def get_address(self, address: Address) -> AddressStats:
         """Address information.
 
@@ -7748,14 +7420,6 @@ class BrkClient(BrkClientBase):
         Endpoint: `GET /health`"""
         return self.get_json("/health")
 
-    def get_openapi(self) -> Any:
-        """OpenAPI specification.
-
-        Full OpenAPI 3.1 specification for this API.
-
-        Endpoint: `GET /openapi.json`"""
-        return self.get_json("/openapi.json")
-
     def get_version(self) -> str:
         """API version.