brk-client 0.1.0a6__py3-none-any.whl → 0.1.0b1__py3-none-any.whl

brk_client/__init__.py

@@ -1,6 +1,8 @@
 # Auto-generated BRK Python client
 # Do not edit manually
 
+from __future__ import annotations
+from dataclasses import dataclass
 from typing import TypeVar, Generic, Any, Optional, List, Literal, TypedDict, Union, Protocol, overload
 from http.client import HTTPSConnection, HTTPConnection
 from urllib.parse import urlparse
@@ -106,13 +108,13 @@ QuarterIndex = int
 # Transaction locktime
 RawLockTime = int
 SemesterIndex = int
-# Fixed-size boolean value optimized for on-disk storage (stored as u16)
+# Fixed-size boolean value optimized for on-disk storage (stored as u8)
 StoredBool = int
 # Stored 32-bit floating point value
 StoredF32 = float
 # Fixed-size 64-bit floating point value optimized for on-disk storage
 StoredF64 = float
-StoredI16 = int
+StoredI8 = int
 StoredU16 = int
 # Fixed-size 32-bit unsigned integer optimized for on-disk storage
 StoredU32 = int
@@ -1039,11 +1041,14 @@ def _p(prefix: str, acc: str) -> str:
     return f"{prefix}_{acc}" if acc else prefix
 
 
-class MetricData(TypedDict, Generic[T]):
+@dataclass
+class MetricData(Generic[T]):
     """Metric data with range information."""
+    version: int
     total: int
     start: int
     end: int
+    stamp: str
     data: List[T]
 
 
@@ -1082,8 +1087,9 @@ class _EndpointConfig:
         p = self.path()
         return f"{p}?{query}" if query else p
 
-    def get_json(self) -> Any:
-        return self.client.get_json(self._build_path())
+    def get_json(self) -> MetricData:
+        data = self.client.get_json(self._build_path())
+        return MetricData(**data)
 
     def get_csv(self) -> str:
         return self.client.get_text(self._build_path(format='csv'))
@@ -1286,7 +1292,7 @@ _i31 = ('loadedaddressindex',)
 _i32 = ('emptyaddressindex',)
 _i33 = ('pairoutputindex',)
 
-def _ep(c: BrkClientBase, n: str, i: Index) -> MetricEndpointBuilder:
+def _ep(c: BrkClientBase, n: str, i: Index) -> MetricEndpointBuilder[Any]:
     return MetricEndpointBuilder(c, n, i)
 
 # Index accessor classes
@@ -1304,6 +1310,7 @@ class _MetricPattern1By(Generic[T]):
     def yearindex(self) -> MetricEndpointBuilder[T]: return _ep(self._c, self._n, 'yearindex')
 
 class MetricPattern1(Generic[T]):
+    by: _MetricPattern1By[T]
     def __init__(self, c: BrkClientBase, n: str): self._n, self.by = n, _MetricPattern1By(c, n)
     @property
     def name(self) -> str: return self._n
@@ -1322,6 +1329,7 @@ class _MetricPattern2By(Generic[T]):
     def yearindex(self) -> MetricEndpointBuilder[T]: return _ep(self._c, self._n, 'yearindex')
 
 class MetricPattern2(Generic[T]):
+    by: _MetricPattern2By[T]
     def __init__(self, c: BrkClientBase, n: str): self._n, self.by = n, _MetricPattern2By(c, n)
     @property
     def name(self) -> str: return self._n
@@ -1340,6 +1348,7 @@ class _MetricPattern3By(Generic[T]):
     def yearindex(self) -> MetricEndpointBuilder[T]: return _ep(self._c, self._n, 'yearindex')
 
 class MetricPattern3(Generic[T]):
+    by: _MetricPattern3By[T]
     def __init__(self, c: BrkClientBase, n: str): self._n, self.by = n, _MetricPattern3By(c, n)
     @property
     def name(self) -> str: return self._n
@@ -1357,6 +1366,7 @@ class _MetricPattern4By(Generic[T]):
     def yearindex(self) -> MetricEndpointBuilder[T]: return _ep(self._c, self._n, 'yearindex')
 
 class MetricPattern4(Generic[T]):
+    by: _MetricPattern4By[T]
     def __init__(self, c: BrkClientBase, n: str): self._n, self.by = n, _MetricPattern4By(c, n)
     @property
     def name(self) -> str: return self._n
@@ -1369,6 +1379,7 @@ class _MetricPattern5By(Generic[T]):
     def height(self) -> MetricEndpointBuilder[T]: return _ep(self._c, self._n, 'height')
 
 class MetricPattern5(Generic[T]):
+    by: _MetricPattern5By[T]
     def __init__(self, c: BrkClientBase, n: str): self._n, self.by = n, _MetricPattern5By(c, n)
     @property
     def name(self) -> str: return self._n
@@ -1380,6 +1391,7 @@ class _MetricPattern6By(Generic[T]):
     def dateindex(self) -> MetricEndpointBuilder[T]: return _ep(self._c, self._n, 'dateindex')
 
 class MetricPattern6(Generic[T]):
+    by: _MetricPattern6By[T]
     def __init__(self, c: BrkClientBase, n: str): self._n, self.by = n, _MetricPattern6By(c, n)
     @property
     def name(self) -> str: return self._n
@@ -1391,6 +1403,7 @@ class _MetricPattern7By(Generic[T]):
     def decadeindex(self) -> MetricEndpointBuilder[T]: return _ep(self._c, self._n, 'decadeindex')
 
 class MetricPattern7(Generic[T]):
+    by: _MetricPattern7By[T]
     def __init__(self, c: BrkClientBase, n: str): self._n, self.by = n, _MetricPattern7By(c, n)
     @property
     def name(self) -> str: return self._n
@@ -1402,6 +1415,7 @@ class _MetricPattern8By(Generic[T]):
     def difficultyepoch(self) -> MetricEndpointBuilder[T]: return _ep(self._c, self._n, 'difficultyepoch')
 
 class MetricPattern8(Generic[T]):
+    by: _MetricPattern8By[T]
     def __init__(self, c: BrkClientBase, n: str): self._n, self.by = n, _MetricPattern8By(c, n)
     @property
     def name(self) -> str: return self._n
@@ -1413,6 +1427,7 @@ class _MetricPattern9By(Generic[T]):
     def emptyoutputindex(self) -> MetricEndpointBuilder[T]: return _ep(self._c, self._n, 'emptyoutputindex')
 
 class MetricPattern9(Generic[T]):
+    by: _MetricPattern9By[T]
     def __init__(self, c: BrkClientBase, n: str): self._n, self.by = n, _MetricPattern9By(c, n)
     @property
     def name(self) -> str: return self._n
@@ -1424,6 +1439,7 @@ class _MetricPattern10By(Generic[T]):
     def halvingepoch(self) -> MetricEndpointBuilder[T]: return _ep(self._c, self._n, 'halvingepoch')
 
 class MetricPattern10(Generic[T]):
+    by: _MetricPattern10By[T]
     def __init__(self, c: BrkClientBase, n: str): self._n, self.by = n, _MetricPattern10By(c, n)
     @property
     def name(self) -> str: return self._n
@@ -1435,6 +1451,7 @@ class _MetricPattern11By(Generic[T]):
     def height(self) -> MetricEndpointBuilder[T]: return _ep(self._c, self._n, 'height')
 
 class MetricPattern11(Generic[T]):
+    by: _MetricPattern11By[T]
     def __init__(self, c: BrkClientBase, n: str): self._n, self.by = n, _MetricPattern11By(c, n)
     @property
     def name(self) -> str: return self._n
@@ -1446,6 +1463,7 @@ class _MetricPattern12By(Generic[T]):
     def txinindex(self) -> MetricEndpointBuilder[T]: return _ep(self._c, self._n, 'txinindex')
 
 class MetricPattern12(Generic[T]):
+    by: _MetricPattern12By[T]
     def __init__(self, c: BrkClientBase, n: str): self._n, self.by = n, _MetricPattern12By(c, n)
     @property
     def name(self) -> str: return self._n
@@ -1457,6 +1475,7 @@ class _MetricPattern13By(Generic[T]):
     def monthindex(self) -> MetricEndpointBuilder[T]: return _ep(self._c, self._n, 'monthindex')
 
 class MetricPattern13(Generic[T]):
+    by: _MetricPattern13By[T]
     def __init__(self, c: BrkClientBase, n: str): self._n, self.by = n, _MetricPattern13By(c, n)
     @property
     def name(self) -> str: return self._n
@@ -1468,6 +1487,7 @@ class _MetricPattern14By(Generic[T]):
     def opreturnindex(self) -> MetricEndpointBuilder[T]: return _ep(self._c, self._n, 'opreturnindex')
 
 class MetricPattern14(Generic[T]):
+    by: _MetricPattern14By[T]
     def __init__(self, c: BrkClientBase, n: str): self._n, self.by = n, _MetricPattern14By(c, n)
     @property
     def name(self) -> str: return self._n
@@ -1479,6 +1499,7 @@ class _MetricPattern15By(Generic[T]):
     def txoutindex(self) -> MetricEndpointBuilder[T]: return _ep(self._c, self._n, 'txoutindex')
 
 class MetricPattern15(Generic[T]):
+    by: _MetricPattern15By[T]
     def __init__(self, c: BrkClientBase, n: str): self._n, self.by = n, _MetricPattern15By(c, n)
     @property
     def name(self) -> str: return self._n
@@ -1490,6 +1511,7 @@ class _MetricPattern16By(Generic[T]):
     def p2aaddressindex(self) -> MetricEndpointBuilder[T]: return _ep(self._c, self._n, 'p2aaddressindex')
 
 class MetricPattern16(Generic[T]):
+    by: _MetricPattern16By[T]
     def __init__(self, c: BrkClientBase, n: str): self._n, self.by = n, _MetricPattern16By(c, n)
     @property
     def name(self) -> str: return self._n
@@ -1501,6 +1523,7 @@ class _MetricPattern17By(Generic[T]):
     def p2msoutputindex(self) -> MetricEndpointBuilder[T]: return _ep(self._c, self._n, 'p2msoutputindex')
 
 class MetricPattern17(Generic[T]):
+    by: _MetricPattern17By[T]
     def __init__(self, c: BrkClientBase, n: str): self._n, self.by = n, _MetricPattern17By(c, n)
     @property
     def name(self) -> str: return self._n
@@ -1512,6 +1535,7 @@ class _MetricPattern18By(Generic[T]):
     def p2pk33addressindex(self) -> MetricEndpointBuilder[T]: return _ep(self._c, self._n, 'p2pk33addressindex')
 
 class MetricPattern18(Generic[T]):
+    by: _MetricPattern18By[T]
     def __init__(self, c: BrkClientBase, n: str): self._n, self.by = n, _MetricPattern18By(c, n)
     @property
     def name(self) -> str: return self._n
@@ -1523,6 +1547,7 @@ class _MetricPattern19By(Generic[T]):
     def p2pk65addressindex(self) -> MetricEndpointBuilder[T]: return _ep(self._c, self._n, 'p2pk65addressindex')
 
 class MetricPattern19(Generic[T]):
+    by: _MetricPattern19By[T]
     def __init__(self, c: BrkClientBase, n: str): self._n, self.by = n, _MetricPattern19By(c, n)
     @property
     def name(self) -> str: return self._n
@@ -1534,6 +1559,7 @@ class _MetricPattern20By(Generic[T]):
     def p2pkhaddressindex(self) -> MetricEndpointBuilder[T]: return _ep(self._c, self._n, 'p2pkhaddressindex')
 
 class MetricPattern20(Generic[T]):
+    by: _MetricPattern20By[T]
     def __init__(self, c: BrkClientBase, n: str): self._n, self.by = n, _MetricPattern20By(c, n)
     @property
     def name(self) -> str: return self._n
@@ -1545,6 +1571,7 @@ class _MetricPattern21By(Generic[T]):
     def p2shaddressindex(self) -> MetricEndpointBuilder[T]: return _ep(self._c, self._n, 'p2shaddressindex')
 
 class MetricPattern21(Generic[T]):
+    by: _MetricPattern21By[T]
     def __init__(self, c: BrkClientBase, n: str): self._n, self.by = n, _MetricPattern21By(c, n)
     @property
     def name(self) -> str: return self._n
@@ -1556,6 +1583,7 @@ class _MetricPattern22By(Generic[T]):
     def p2traddressindex(self) -> MetricEndpointBuilder[T]: return _ep(self._c, self._n, 'p2traddressindex')
 
 class MetricPattern22(Generic[T]):
+    by: _MetricPattern22By[T]
     def __init__(self, c: BrkClientBase, n: str): self._n, self.by = n, _MetricPattern22By(c, n)
     @property
     def name(self) -> str: return self._n
@@ -1567,6 +1595,7 @@ class _MetricPattern23By(Generic[T]):
     def p2wpkhaddressindex(self) -> MetricEndpointBuilder[T]: return _ep(self._c, self._n, 'p2wpkhaddressindex')
 
 class MetricPattern23(Generic[T]):
+    by: _MetricPattern23By[T]
     def __init__(self, c: BrkClientBase, n: str): self._n, self.by = n, _MetricPattern23By(c, n)
     @property
     def name(self) -> str: return self._n
@@ -1578,6 +1607,7 @@ class _MetricPattern24By(Generic[T]):
     def p2wshaddressindex(self) -> MetricEndpointBuilder[T]: return _ep(self._c, self._n, 'p2wshaddressindex')
 
 class MetricPattern24(Generic[T]):
+    by: _MetricPattern24By[T]
     def __init__(self, c: BrkClientBase, n: str): self._n, self.by = n, _MetricPattern24By(c, n)
     @property
     def name(self) -> str: return self._n
@@ -1589,6 +1619,7 @@ class _MetricPattern25By(Generic[T]):
     def quarterindex(self) -> MetricEndpointBuilder[T]: return _ep(self._c, self._n, 'quarterindex')
 
 class MetricPattern25(Generic[T]):
+    by: _MetricPattern25By[T]
     def __init__(self, c: BrkClientBase, n: str): self._n, self.by = n, _MetricPattern25By(c, n)
     @property
     def name(self) -> str: return self._n
@@ -1600,6 +1631,7 @@ class _MetricPattern26By(Generic[T]):
     def semesterindex(self) -> MetricEndpointBuilder[T]: return _ep(self._c, self._n, 'semesterindex')
 
 class MetricPattern26(Generic[T]):
+    by: _MetricPattern26By[T]
     def __init__(self, c: BrkClientBase, n: str): self._n, self.by = n, _MetricPattern26By(c, n)
     @property
     def name(self) -> str: return self._n
@@ -1611,6 +1643,7 @@ class _MetricPattern27By(Generic[T]):
     def txindex(self) -> MetricEndpointBuilder[T]: return _ep(self._c, self._n, 'txindex')
 
 class MetricPattern27(Generic[T]):
+    by: _MetricPattern27By[T]
     def __init__(self, c: BrkClientBase, n: str): self._n, self.by = n, _MetricPattern27By(c, n)
     @property
     def name(self) -> str: return self._n
@@ -1622,6 +1655,7 @@ class _MetricPattern28By(Generic[T]):
     def unknownoutputindex(self) -> MetricEndpointBuilder[T]: return _ep(self._c, self._n, 'unknownoutputindex')
 
 class MetricPattern28(Generic[T]):
+    by: _MetricPattern28By[T]
     def __init__(self, c: BrkClientBase, n: str): self._n, self.by = n, _MetricPattern28By(c, n)
     @property
     def name(self) -> str: return self._n
@@ -1633,6 +1667,7 @@ class _MetricPattern29By(Generic[T]):
     def weekindex(self) -> MetricEndpointBuilder[T]: return _ep(self._c, self._n, 'weekindex')
 
 class MetricPattern29(Generic[T]):
+    by: _MetricPattern29By[T]
     def __init__(self, c: BrkClientBase, n: str): self._n, self.by = n, _MetricPattern29By(c, n)
     @property
     def name(self) -> str: return self._n
@@ -1644,6 +1679,7 @@ class _MetricPattern30By(Generic[T]):
     def yearindex(self) -> MetricEndpointBuilder[T]: return _ep(self._c, self._n, 'yearindex')
 
 class MetricPattern30(Generic[T]):
+    by: _MetricPattern30By[T]
     def __init__(self, c: BrkClientBase, n: str): self._n, self.by = n, _MetricPattern30By(c, n)
     @property
     def name(self) -> str: return self._n
@@ -1655,6 +1691,7 @@ class _MetricPattern31By(Generic[T]):
     def loadedaddressindex(self) -> MetricEndpointBuilder[T]: return _ep(self._c, self._n, 'loadedaddressindex')
 
 class MetricPattern31(Generic[T]):
+    by: _MetricPattern31By[T]
     def __init__(self, c: BrkClientBase, n: str): self._n, self.by = n, _MetricPattern31By(c, n)
     @property
     def name(self) -> str: return self._n
@@ -1666,6 +1703,7 @@ class _MetricPattern32By(Generic[T]):
     def emptyaddressindex(self) -> MetricEndpointBuilder[T]: return _ep(self._c, self._n, 'emptyaddressindex')
 
 class MetricPattern32(Generic[T]):
+    by: _MetricPattern32By[T]
     def __init__(self, c: BrkClientBase, n: str): self._n, self.by = n, _MetricPattern32By(c, n)
     @property
     def name(self) -> str: return self._n
@@ -1677,6 +1715,7 @@ class _MetricPattern33By(Generic[T]):
     def pairoutputindex(self) -> MetricEndpointBuilder[T]: return _ep(self._c, self._n, 'pairoutputindex')
 
 class MetricPattern33(Generic[T]):
+    by: _MetricPattern33By[T]
     def __init__(self, c: BrkClientBase, n: str): self._n, self.by = n, _MetricPattern33By(c, n)
     @property
     def name(self) -> str: return self._n
@@ -1883,31 +1922,6 @@ class Price111dSmaPattern:
         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: 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 ActivePriceRatioPattern:
     """Pattern struct for repeated tree structure."""
     
@@ -1933,6 +1947,31 @@ class ActivePriceRatioPattern:
         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."""
     
@@ -1971,6 +2010,7 @@ class AaopoolPattern:
         self._24h_blocks_mined: MetricPattern1[StoredU32] = MetricPattern1(client, _m(acc, '24h_blocks_mined'))
         self._24h_dominance: MetricPattern1[StoredF32] = MetricPattern1(client, _m(acc, '24h_dominance'))
         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'))
         self.dominance: MetricPattern1[StoredF32] = MetricPattern1(client, _m(acc, 'dominance'))
@@ -2014,6 +2054,24 @@ class PeriodLumpSumStackPattern:
         self._6y: _2015Pattern = _2015Pattern(client, _p('6y', acc))
         self._8y: _2015Pattern = _2015Pattern(client, _p('8y', acc))
 
+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_average_price'))
+        self._2016: MetricPattern4[T] = MetricPattern4(client, _m(acc, '2016_average_price'))
+        self._2017: MetricPattern4[T] = MetricPattern4(client, _m(acc, '2017_average_price'))
+        self._2018: MetricPattern4[T] = MetricPattern4(client, _m(acc, '2018_average_price'))
+        self._2019: MetricPattern4[T] = MetricPattern4(client, _m(acc, '2019_average_price'))
+        self._2020: MetricPattern4[T] = MetricPattern4(client, _m(acc, '2020_average_price'))
+        self._2021: MetricPattern4[T] = MetricPattern4(client, _m(acc, '2021_average_price'))
+        self._2022: MetricPattern4[T] = MetricPattern4(client, _m(acc, '2022_average_price'))
+        self._2023: MetricPattern4[T] = MetricPattern4(client, _m(acc, '2023_average_price'))
+        self._2024: MetricPattern4[T] = MetricPattern4(client, _m(acc, '2024_average_price'))
+        self._2025: MetricPattern4[T] = MetricPattern4(client, _m(acc, '2025_average_price'))
+        self._2026: MetricPattern4[T] = MetricPattern4(client, _m(acc, '2026_average_price'))
+
 class PeriodAveragePricePattern(Generic[T]):
     """Pattern struct for repeated tree structure."""
     
@@ -2066,23 +2124,6 @@ class DollarsPattern(Generic[T]):
         self.pct90: MetricPattern6[T] = MetricPattern6(client, _m(acc, 'pct90'))
         self.sum: MetricPattern2[T] = 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 RelativePattern:
     """Pattern struct for repeated tree structure."""
     
@@ -2204,19 +2245,6 @@ class PhaseDailyCentsPattern(Generic[T]):
         self.pct75: MetricPattern6[T] = MetricPattern6(client, _m(acc, 'pct75'))
         self.pct90: MetricPattern6[T] = MetricPattern6(client, _m(acc, 'pct90'))
 
-class PeriodCagrPattern:
-    """Pattern struct for repeated tree structure."""
-    
-    def __init__(self, client: BrkClientBase, acc: str):
-        """Create pattern node with accumulated metric name."""
-        self._10y: MetricPattern4[StoredF32] = MetricPattern4(client, _p('10y', acc))
-        self._2y: MetricPattern4[StoredF32] = MetricPattern4(client, _p('2y', acc))
-        self._3y: MetricPattern4[StoredF32] = MetricPattern4(client, _p('3y', acc))
-        self._4y: MetricPattern4[StoredF32] = MetricPattern4(client, _p('4y', acc))
-        self._5y: MetricPattern4[StoredF32] = MetricPattern4(client, _p('5y', acc))
-        self._6y: MetricPattern4[StoredF32] = MetricPattern4(client, _p('6y', acc))
-        self._8y: MetricPattern4[StoredF32] = MetricPattern4(client, _p('8y', acc))
-
 class _0satsPattern2:
     """Pattern struct for repeated tree structure."""
     
@@ -2230,7 +2258,7 @@ class _0satsPattern2:
         self.supply: SupplyPattern2 = SupplyPattern2(client, _m(acc, 'supply'))
         self.unrealized: UnrealizedPattern = UnrealizedPattern(client, acc)
 
-class _10yPattern:
+class _100btcPattern:
     """Pattern struct for repeated tree structure."""
     
     def __init__(self, client: BrkClientBase, acc: str):
@@ -2238,11 +2266,24 @@ class _10yPattern:
         self.activity: ActivityPattern2 = ActivityPattern2(client, acc)
         self.cost_basis: CostBasisPattern = CostBasisPattern(client, acc)
         self.outputs: OutputsPattern = OutputsPattern(client, _m(acc, 'utxo_count'))
-        self.realized: RealizedPattern4 = RealizedPattern4(client, acc)
+        self.realized: RealizedPattern = RealizedPattern(client, acc)
         self.relative: RelativePattern = RelativePattern(client, acc)
         self.supply: SupplyPattern2 = SupplyPattern2(client, _m(acc, 'supply'))
         self.unrealized: UnrealizedPattern = UnrealizedPattern(client, acc)
 
+class PeriodCagrPattern:
+    """Pattern struct for repeated tree structure."""
+    
+    def __init__(self, client: BrkClientBase, acc: str):
+        """Create pattern node with accumulated metric name."""
+        self._10y: MetricPattern4[StoredF32] = MetricPattern4(client, _p('10y', acc))
+        self._2y: MetricPattern4[StoredF32] = MetricPattern4(client, _p('2y', acc))
+        self._3y: MetricPattern4[StoredF32] = MetricPattern4(client, _p('3y', acc))
+        self._4y: MetricPattern4[StoredF32] = MetricPattern4(client, _p('4y', acc))
+        self._5y: MetricPattern4[StoredF32] = MetricPattern4(client, _p('5y', acc))
+        self._6y: MetricPattern4[StoredF32] = MetricPattern4(client, _p('6y', acc))
+        self._8y: MetricPattern4[StoredF32] = MetricPattern4(client, _p('8y', acc))
+
 class _10yTo12yPattern:
     """Pattern struct for repeated tree structure."""
     
@@ -2256,7 +2297,7 @@ class _10yTo12yPattern:
         self.supply: SupplyPattern2 = SupplyPattern2(client, _m(acc, 'supply'))
         self.unrealized: UnrealizedPattern = UnrealizedPattern(client, acc)
 
-class _100btcPattern:
+class _10yPattern:
     """Pattern struct for repeated tree structure."""
     
     def __init__(self, client: BrkClientBase, acc: str):
@@ -2264,7 +2305,7 @@ class _100btcPattern:
         self.activity: ActivityPattern2 = ActivityPattern2(client, acc)
         self.cost_basis: CostBasisPattern = CostBasisPattern(client, acc)
         self.outputs: OutputsPattern = OutputsPattern(client, _m(acc, 'utxo_count'))
-        self.realized: RealizedPattern = RealizedPattern(client, acc)
+        self.realized: RealizedPattern4 = RealizedPattern4(client, acc)
         self.relative: RelativePattern = RelativePattern(client, acc)
         self.supply: SupplyPattern2 = SupplyPattern2(client, _m(acc, 'supply'))
         self.unrealized: UnrealizedPattern = UnrealizedPattern(client, acc)
@@ -2312,42 +2353,51 @@ class CostBasisPattern2:
         self.min: MetricPattern1[Dollars] = MetricPattern1(client, _m(acc, 'min_cost_basis'))
         self.percentiles: PercentilesPattern = PercentilesPattern(client, _m(acc, 'cost_basis'))
 
-class CoinbasePattern:
+class ActiveSupplyPattern:
     """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: MetricPattern1[Bitcoin] = MetricPattern1(client, _m(acc, 'btc'))
+        self.dollars: MetricPattern1[Dollars] = MetricPattern1(client, _m(acc, 'usd'))
+        self.sats: MetricPattern1[Sats] = MetricPattern1(client, acc)
 
-class ActiveSupplyPattern:
+class SegwitAdoptionPattern:
     """Pattern struct for repeated tree structure."""
     
     def __init__(self, client: BrkClientBase, acc: str):
         """Create pattern node with accumulated metric name."""
-        self.bitcoin: MetricPattern1[Bitcoin] = MetricPattern1(client, _m(acc, 'btc'))
-        self.dollars: MetricPattern1[Dollars] = MetricPattern1(client, _m(acc, 'usd'))
-        self.sats: MetricPattern1[Sats] = MetricPattern1(client, acc)
+        self.base: MetricPattern11[StoredF32] = MetricPattern11(client, acc)
+        self.cumulative: MetricPattern2[StoredF32] = MetricPattern2(client, _m(acc, 'cumulative'))
+        self.sum: MetricPattern2[StoredF32] = MetricPattern2(client, _m(acc, 'sum'))
 
-class UnclaimedRewardsPattern:
+class CoinbasePattern2:
     """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.bitcoin: BlockCountPattern[Bitcoin] = BlockCountPattern(client, _m(acc, 'btc'))
         self.dollars: BlockCountPattern[Dollars] = BlockCountPattern(client, _m(acc, 'usd'))
         self.sats: BlockCountPattern[Sats] = BlockCountPattern(client, acc)
 
-class CoinbasePattern2:
+class UnclaimedRewardsPattern:
     """Pattern struct for repeated tree structure."""
     
     def __init__(self, client: BrkClientBase, acc: str):
         """Create pattern node with accumulated metric name."""
-        self.bitcoin: BlockCountPattern[Bitcoin] = BlockCountPattern(client, _m(acc, 'btc'))
+        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 CoinbasePattern:
+    """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)
+
 class _2015Pattern:
     """Pattern struct for repeated tree structure."""
     
@@ -2357,22 +2407,21 @@ class _2015Pattern:
         self.dollars: MetricPattern4[Dollars] = MetricPattern4(client, _m(acc, 'usd'))
         self.sats: MetricPattern4[Sats] = MetricPattern4(client, acc)
 
-class SegwitAdoptionPattern:
+class RelativePattern4:
     """Pattern struct for repeated tree structure."""
     
     def __init__(self, client: BrkClientBase, acc: str):
         """Create pattern node with accumulated metric name."""
-        self.base: MetricPattern11[StoredF32] = MetricPattern11(client, acc)
-        self.cumulative: MetricPattern2[StoredF32] = MetricPattern2(client, _m(acc, 'cumulative'))
-        self.sum: MetricPattern2[StoredF32] = MetricPattern2(client, _m(acc, 'sum'))
+        self.supply_in_loss_rel_to_own_supply: MetricPattern1[StoredF64] = MetricPattern1(client, _m(acc, 'loss_rel_to_own_supply'))
+        self.supply_in_profit_rel_to_own_supply: MetricPattern1[StoredF64] = MetricPattern1(client, _m(acc, 'profit_rel_to_own_supply'))
 
-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 CostBasisPattern:
     """Pattern struct for repeated tree structure."""
@@ -2382,28 +2431,28 @@ class CostBasisPattern:
         self.max: MetricPattern1[Dollars] = MetricPattern1(client, _m(acc, 'max_cost_basis'))
         self.min: MetricPattern1[Dollars] = MetricPattern1(client, _m(acc, 'min_cost_basis'))
 
-class RelativePattern4:
+class _1dReturns1mSdPattern:
     """Pattern struct for repeated tree structure."""
     
     def __init__(self, client: BrkClientBase, acc: str):
         """Create pattern node with accumulated metric name."""
-        self.supply_in_loss_rel_to_own_supply: MetricPattern1[StoredF64] = MetricPattern1(client, _m(acc, 'loss_rel_to_own_supply'))
-        self.supply_in_profit_rel_to_own_supply: MetricPattern1[StoredF64] = MetricPattern1(client, _m(acc, 'profit_rel_to_own_supply'))
+        self.sd: MetricPattern4[StoredF32] = MetricPattern4(client, _m(acc, 'sd'))
+        self.sma: MetricPattern4[StoredF32] = MetricPattern4(client, _m(acc, 'sma'))
 
-class SupplyPattern2:
+class BitcoinPattern2(Generic[T]):
     """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.cumulative: MetricPattern2[T] = MetricPattern2(client, _m(acc, 'cumulative'))
+        self.sum: MetricPattern1[T] = MetricPattern1(client, acc)
 
-class BitcoinPattern2(Generic[T]):
+class BlockCountPattern(Generic[T]):
     """Pattern struct for repeated tree structure."""
     
     def __init__(self, client: BrkClientBase, acc: str):
         """Create pattern node with accumulated metric name."""
-        self.cumulative: MetricPattern2[T] = MetricPattern2(client, _m(acc, 'cumulative'))
+        self.cumulative: MetricPattern1[T] = MetricPattern1(client, _m(acc, 'cumulative'))
         self.sum: MetricPattern1[T] = MetricPattern1(client, acc)
 
 class SatsPattern(Generic[T]):
@@ -2411,16 +2460,15 @@ class SatsPattern(Generic[T]):
     
     def __init__(self, client: BrkClientBase, acc: str):
         """Create pattern node with accumulated metric name."""
-        self.ohlc: MetricPattern1[T] = MetricPattern1(client, _m(acc, 'ohlc_sats'))
-        self.split: SplitPattern2[T] = SplitPattern2(client, _m(acc, 'sats'))
+        self.ohlc: MetricPattern1[T] = MetricPattern1(client, _m(acc, 'ohlc'))
+        self.split: SplitPattern2[T] = SplitPattern2(client, acc)
 
-class BlockCountPattern(Generic[T]):
+class RealizedPriceExtraPattern:
     """Pattern struct for repeated tree structure."""
     
     def __init__(self, client: BrkClientBase, acc: str):
         """Create pattern node with accumulated metric name."""
-        self.cumulative: MetricPattern1[T] = MetricPattern1(client, _m(acc, 'cumulative'))
-        self.sum: MetricPattern1[T] = MetricPattern1(client, acc)
+        self.ratio: MetricPattern4[StoredF32] = MetricPattern4(client, acc)
 
 class OutputsPattern:
     """Pattern struct for repeated tree structure."""
@@ -2429,13 +2477,6 @@ class OutputsPattern:
         """Create pattern node with accumulated metric name."""
         self.utxo_count: MetricPattern1[StoredU64] = MetricPattern1(client, acc)
 
-class RealizedPriceExtraPattern:
-    """Pattern struct for repeated tree structure."""
-    
-    def __init__(self, client: BrkClientBase, acc: str):
-        """Create pattern node with accumulated metric name."""
-        self.ratio: MetricPattern4[StoredF32] = MetricPattern4(client, acc)
-
 # Metrics tree classes
 
 class MetricsTree_Addresses:
@@ -2615,6 +2656,14 @@ class MetricsTree_Cointime_Pricing:
         self.vaulted_price: MetricPattern1[Dollars] = MetricPattern1(client, 'vaulted_price')
         self.vaulted_price_ratio: ActivePriceRatioPattern = ActivePriceRatioPattern(client, 'vaulted_price_ratio')
 
+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."""
     
@@ -2629,6 +2678,7 @@ class MetricsTree_Cointime_Value:
         self.cointime_value_created: BlockCountPattern[StoredF64] = BlockCountPattern(client, 'cointime_value_created')
         self.cointime_value_destroyed: BlockCountPattern[StoredF64] = BlockCountPattern(client, 'cointime_value_destroyed')
         self.cointime_value_stored: BlockCountPattern[StoredF64] = BlockCountPattern(client, 'cointime_value_stored')
+        self.vocdd: BlockCountPattern[StoredF64] = BlockCountPattern(client, 'vocdd')
 
 class MetricsTree_Cointime:
     """Metrics tree node."""
@@ -2638,6 +2688,7 @@ class MetricsTree_Cointime:
         self.adjusted: MetricsTree_Cointime_Adjusted = MetricsTree_Cointime_Adjusted(client)
         self.cap: MetricsTree_Cointime_Cap = MetricsTree_Cointime_Cap(client)
         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)
 
@@ -2659,10 +2710,10 @@ class MetricsTree_Constants:
         self.constant_61_8: MetricPattern1[StoredF32] = MetricPattern1(client, 'constant_61_8')
         self.constant_70: MetricPattern1[StoredU16] = MetricPattern1(client, 'constant_70')
         self.constant_80: MetricPattern1[StoredU16] = MetricPattern1(client, 'constant_80')
-        self.constant_minus_1: MetricPattern1[StoredI16] = MetricPattern1(client, 'constant_minus_1')
-        self.constant_minus_2: MetricPattern1[StoredI16] = MetricPattern1(client, 'constant_minus_2')
-        self.constant_minus_3: MetricPattern1[StoredI16] = MetricPattern1(client, 'constant_minus_3')
-        self.constant_minus_4: MetricPattern1[StoredI16] = MetricPattern1(client, 'constant_minus_4')
+        self.constant_minus_1: MetricPattern1[StoredI8] = MetricPattern1(client, 'constant_minus_1')
+        self.constant_minus_2: MetricPattern1[StoredI8] = MetricPattern1(client, 'constant_minus_2')
+        self.constant_minus_3: MetricPattern1[StoredI8] = MetricPattern1(client, 'constant_minus_3')
+        self.constant_minus_4: MetricPattern1[StoredI8] = MetricPattern1(client, 'constant_minus_4')
 
 class MetricsTree_Distribution_AddressCohorts_AmountRange:
     """Metrics tree node."""
@@ -2688,19 +2739,19 @@ class MetricsTree_Distribution_AddressCohorts_GeAmount:
     """Metrics tree node."""
     
     def __init__(self, client: BrkClientBase, base_path: str = ''):
-        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')
+        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')
 
 class MetricsTree_Distribution_AddressCohorts_LtAmount:
     """Metrics tree node."""
@@ -2752,27 +2803,27 @@ class MetricsTree_Distribution_UtxoCohorts_AgeRange:
     """Metrics tree node."""
     
     def __init__(self, client: BrkClientBase, base_path: str = ''):
-        self._10y_to_12y: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_at_least_10y_up_to_12y_old')
-        self._12y_to_15y: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_at_least_12y_up_to_15y_old')
-        self._1d_to_1w: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_at_least_1d_up_to_1w_old')
-        self._1h_to_1d: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_at_least_1h_up_to_1d_old')
-        self._1m_to_2m: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_at_least_1m_up_to_2m_old')
-        self._1w_to_1m: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_at_least_1w_up_to_1m_old')
-        self._1y_to_2y: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_at_least_1y_up_to_2y_old')
-        self._2m_to_3m: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_at_least_2m_up_to_3m_old')
-        self._2y_to_3y: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_at_least_2y_up_to_3y_old')
-        self._3m_to_4m: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_at_least_3m_up_to_4m_old')
-        self._3y_to_4y: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_at_least_3y_up_to_4y_old')
-        self._4m_to_5m: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_at_least_4m_up_to_5m_old')
-        self._4y_to_5y: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_at_least_4y_up_to_5y_old')
-        self._5m_to_6m: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_at_least_5m_up_to_6m_old')
-        self._5y_to_6y: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_at_least_5y_up_to_6y_old')
-        self._6m_to_1y: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_at_least_6m_up_to_1y_old')
-        self._6y_to_7y: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_at_least_6y_up_to_7y_old')
-        self._7y_to_8y: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_at_least_7y_up_to_8y_old')
-        self._8y_to_10y: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_at_least_8y_up_to_10y_old')
-        self.from_15y: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_at_least_15y_old')
-        self.up_to_1h: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_up_to_1h_old')
+        self._10y_to_12y: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_10y_to_12y_old')
+        self._12y_to_15y: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_12y_to_15y_old')
+        self._1d_to_1w: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_1d_to_1w_old')
+        self._1h_to_1d: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_1h_to_1d_old')
+        self._1m_to_2m: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_1m_to_2m_old')
+        self._1w_to_1m: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_1w_to_1m_old')
+        self._1y_to_2y: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_1y_to_2y_old')
+        self._2m_to_3m: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_2m_to_3m_old')
+        self._2y_to_3y: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_2y_to_3y_old')
+        self._3m_to_4m: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_3m_to_4m_old')
+        self._3y_to_4y: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_3y_to_4y_old')
+        self._4m_to_5m: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_4m_to_5m_old')
+        self._4y_to_5y: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_4y_to_5y_old')
+        self._5m_to_6m: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_5m_to_6m_old')
+        self._5y_to_6y: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_5y_to_6y_old')
+        self._6m_to_1y: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_6m_to_1y_old')
+        self._6y_to_7y: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_6y_to_7y_old')
+        self._7y_to_8y: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_7y_to_8y_old')
+        self._8y_to_10y: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_8y_to_10y_old')
+        self.from_15y: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_over_15y_old')
+        self.up_to_1h: _10yTo12yPattern = _10yTo12yPattern(client, 'utxos_under_1h_old')
 
 class MetricsTree_Distribution_UtxoCohorts_All_CostBasis:
     """Metrics tree node."""
@@ -2839,19 +2890,19 @@ class MetricsTree_Distribution_UtxoCohorts_GeAmount:
     """Metrics tree node."""
     
     def __init__(self, client: BrkClientBase, base_path: str = ''):
-        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')
+        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')
 
 class MetricsTree_Distribution_UtxoCohorts_LtAmount:
     """Metrics tree node."""
@@ -2875,47 +2926,47 @@ class MetricsTree_Distribution_UtxoCohorts_MaxAge:
     """Metrics tree node."""
     
     def __init__(self, client: BrkClientBase, base_path: str = ''):
-        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')
+        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')
 
 class MetricsTree_Distribution_UtxoCohorts_MinAge:
     """Metrics tree node."""
     
     def __init__(self, client: BrkClientBase, base_path: str = ''):
-        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')
+        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')
 
 class MetricsTree_Distribution_UtxoCohorts_Term_Long:
     """Metrics tree node."""
@@ -3269,21 +3320,90 @@ class MetricsTree_Market_Ath:
         self.price_drawdown: MetricPattern3[StoredF32] = MetricPattern3(client, 'price_drawdown')
         self.years_since_price_ath: MetricPattern4[StoredF32] = MetricPattern4(client, 'years_since_price_ath')
 
-class MetricsTree_Market_Dca_ClassAveragePrice:
+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[Dollars] = MetricPattern4(client, 'dca_class_2015_average_price')
-        self._2016: MetricPattern4[Dollars] = MetricPattern4(client, 'dca_class_2016_average_price')
-        self._2017: MetricPattern4[Dollars] = MetricPattern4(client, 'dca_class_2017_average_price')
-        self._2018: MetricPattern4[Dollars] = MetricPattern4(client, 'dca_class_2018_average_price')
-        self._2019: MetricPattern4[Dollars] = MetricPattern4(client, 'dca_class_2019_average_price')
-        self._2020: MetricPattern4[Dollars] = MetricPattern4(client, 'dca_class_2020_average_price')
-        self._2021: MetricPattern4[Dollars] = MetricPattern4(client, 'dca_class_2021_average_price')
-        self._2022: MetricPattern4[Dollars] = MetricPattern4(client, 'dca_class_2022_average_price')
-        self._2023: MetricPattern4[Dollars] = MetricPattern4(client, 'dca_class_2023_average_price')
-        self._2024: MetricPattern4[Dollars] = MetricPattern4(client, 'dca_class_2024_average_price')
-        self._2025: MetricPattern4[Dollars] = MetricPattern4(client, 'dca_class_2025_average_price')
+        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_ClassMaxDrawdown:
+    """Metrics tree node."""
+    
+    def __init__(self, client: BrkClientBase, base_path: str = ''):
+        self._2015: MetricPattern4[StoredF32] = MetricPattern4(client, 'dca_class_2015_max_drawdown')
+        self._2016: MetricPattern4[StoredF32] = MetricPattern4(client, 'dca_class_2016_max_drawdown')
+        self._2017: MetricPattern4[StoredF32] = MetricPattern4(client, 'dca_class_2017_max_drawdown')
+        self._2018: MetricPattern4[StoredF32] = MetricPattern4(client, 'dca_class_2018_max_drawdown')
+        self._2019: MetricPattern4[StoredF32] = MetricPattern4(client, 'dca_class_2019_max_drawdown')
+        self._2020: MetricPattern4[StoredF32] = MetricPattern4(client, 'dca_class_2020_max_drawdown')
+        self._2021: MetricPattern4[StoredF32] = MetricPattern4(client, 'dca_class_2021_max_drawdown')
+        self._2022: MetricPattern4[StoredF32] = MetricPattern4(client, 'dca_class_2022_max_drawdown')
+        self._2023: MetricPattern4[StoredF32] = MetricPattern4(client, 'dca_class_2023_max_drawdown')
+        self._2024: MetricPattern4[StoredF32] = MetricPattern4(client, 'dca_class_2024_max_drawdown')
+        self._2025: MetricPattern4[StoredF32] = MetricPattern4(client, 'dca_class_2025_max_drawdown')
+        self._2026: MetricPattern4[StoredF32] = MetricPattern4(client, 'dca_class_2026_max_drawdown')
+
+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:
     """Metrics tree node."""
@@ -3300,17 +3420,31 @@ 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:
     """Metrics tree node."""
     
     def __init__(self, client: BrkClientBase, base_path: str = ''):
-        self.class_average_price: MetricsTree_Market_Dca_ClassAveragePrice = MetricsTree_Market_Dca_ClassAveragePrice(client)
-        self.class_returns: ClassAveragePricePattern[StoredF32] = ClassAveragePricePattern(client, 'dca_class')
+        self.class_average_price: ClassAveragePricePattern[Dollars] = ClassAveragePricePattern(client, 'dca_class')
+        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: MetricsTree_Market_Dca_ClassMaxDrawdown = MetricsTree_Market_Dca_ClassMaxDrawdown(client)
+        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_stack: MetricsTree_Market_Dca_ClassStack = MetricsTree_Market_Dca_ClassStack(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: PeriodAveragePricePattern[StoredU32] = PeriodAveragePricePattern(client, 'dca_days_in_loss')
+        self.period_days_in_profit: PeriodAveragePricePattern[StoredU32] = PeriodAveragePricePattern(client, 'dca_days_in_profit')
+        self.period_lump_sum_days_in_loss: PeriodAveragePricePattern[StoredU32] = PeriodAveragePricePattern(client, 'lump_sum_days_in_loss')
+        self.period_lump_sum_days_in_profit: PeriodAveragePricePattern[StoredU32] = PeriodAveragePricePattern(client, 'lump_sum_days_in_profit')
+        self.period_lump_sum_max_drawdown: PeriodAveragePricePattern[StoredF32] = PeriodAveragePricePattern(client, 'lump_sum_max_drawdown')
+        self.period_lump_sum_max_return: PeriodAveragePricePattern[StoredF32] = PeriodAveragePricePattern(client, 'lump_sum_max_return')
+        self.period_lump_sum_returns: PeriodAveragePricePattern[StoredF32] = PeriodAveragePricePattern(client, 'lump_sum_returns')
         self.period_lump_sum_stack: PeriodLumpSumStackPattern = PeriodLumpSumStackPattern(client, 'lump_sum_stack')
+        self.period_max_drawdown: PeriodAveragePricePattern[StoredF32] = PeriodAveragePricePattern(client, 'dca_max_drawdown')
+        self.period_max_return: PeriodAveragePricePattern[StoredF32] = PeriodAveragePricePattern(client, 'dca_max_return')
         self.period_returns: PeriodAveragePricePattern[StoredF32] = PeriodAveragePricePattern(client, 'dca_returns')
         self.period_stack: PeriodLumpSumStackPattern = PeriodLumpSumStackPattern(client, 'dca_stack')
 
@@ -3675,7 +3809,11 @@ class MetricsTree_Price_Oracle:
     """Metrics tree node."""
     
     def __init__(self, client: BrkClientBase, base_path: str = ''):
+        self.close_ohlc_cents: MetricPattern6[OHLCCents] = MetricPattern6(client, 'close_ohlc_cents')
+        self.close_ohlc_dollars: MetricPattern6[OHLCDollars] = MetricPattern6(client, 'close_ohlc_dollars')
         self.height_to_first_pairoutputindex: MetricPattern11[PairOutputIndex] = MetricPattern11(client, 'height_to_first_pairoutputindex')
+        self.mid_ohlc_cents: MetricPattern6[OHLCCents] = MetricPattern6(client, 'mid_ohlc_cents')
+        self.mid_ohlc_dollars: MetricPattern6[OHLCDollars] = MetricPattern6(client, 'mid_ohlc_dollars')
         self.ohlc_cents: MetricPattern6[OHLCCents] = MetricPattern6(client, 'oracle_ohlc_cents')
         self.ohlc_dollars: MetricPattern6[OHLCDollars] = MetricPattern6(client, 'oracle_ohlc')
         self.output0_value: MetricPattern33[Sats] = MetricPattern33(client, 'pair_output0_value')
@@ -3702,12 +3840,12 @@ class MetricsTree_Price_Oracle:
         self.price_cents: MetricPattern11[Cents] = MetricPattern11(client, 'oracle_price_cents')
         self.tx_count: MetricPattern6[StoredU32] = MetricPattern6(client, 'oracle_tx_count')
 
-class MetricsTree_Price_Usd:
+class MetricsTree_Price_Sats:
     """Metrics tree node."""
     
     def __init__(self, client: BrkClientBase, base_path: str = ''):
-        self.ohlc: MetricPattern1[OHLCDollars] = MetricPattern1(client, 'price_ohlc')
-        self.split: SplitPattern2[Dollars] = SplitPattern2(client, 'price')
+        self.ohlc: MetricPattern1[OHLCSats] = MetricPattern1(client, 'price_ohlc_sats')
+        self.split: SplitPattern2[Sats] = SplitPattern2(client, 'price_sats')
 
 class MetricsTree_Price:
     """Metrics tree node."""
@@ -3715,8 +3853,8 @@ class MetricsTree_Price:
     def __init__(self, client: BrkClientBase, base_path: str = ''):
         self.cents: MetricsTree_Price_Cents = MetricsTree_Price_Cents(client)
         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)
+        self.sats: MetricsTree_Price_Sats = MetricsTree_Price_Sats(client)
+        self.usd: SatsPattern[OHLCDollars] = SatsPattern(client, 'price')
 
 class MetricsTree_Scripts_Count:
     """Metrics tree node."""
@@ -3798,28 +3936,12 @@ class MetricsTree_Transactions_Count:
         self.is_coinbase: MetricPattern27[StoredBool] = MetricPattern27(client, 'is_coinbase')
         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: MetricsTree_Transactions_Fees_Fee_Dollars = MetricsTree_Transactions_Fees_Fee_Dollars(client)
+        self.dollars: CountPattern2[Dollars] = CountPattern2(client, 'fee_usd')
         self.sats: CountPattern2[Sats] = CountPattern2(client, 'fee')
         self.txindex: MetricPattern27[Sats] = MetricPattern27(client, 'fee')
 
@@ -3854,6 +3976,7 @@ class MetricsTree_Transactions_Volume:
         self.annualized_volume: _2015Pattern = _2015Pattern(client, 'annualized_volume')
         self.inputs_per_sec: MetricPattern4[StoredF32] = MetricPattern4(client, 'inputs_per_sec')
         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')
 
@@ -3900,7 +4023,7 @@ class MetricsTree:
 class BrkClient(BrkClientBase):
     """Main BRK client with metrics tree and API methods."""
 
-    VERSION = "v0.1.0-alpha.3"
+    VERSION = "v0.1.0-beta.0"
 
     INDEXES = [
       "dateindex",
@@ -4110,27 +4233,27 @@ class BrkClient(BrkClientBase):
     EPOCH_NAMES = {
       "_0": {
         "id": "epoch_0",
-        "short": "Epoch 0",
+        "short": "0",
         "long": "Epoch 0"
       },
       "_1": {
         "id": "epoch_1",
-        "short": "Epoch 1",
+        "short": "1",
         "long": "Epoch 1"
       },
       "_2": {
         "id": "epoch_2",
-        "short": "Epoch 2",
+        "short": "2",
         "long": "Epoch 2"
       },
       "_3": {
         "id": "epoch_3",
-        "short": "Epoch 3",
+        "short": "3",
         "long": "Epoch 3"
       },
       "_4": {
         "id": "epoch_4",
-        "short": "Epoch 4",
+        "short": "4",
         "long": "Epoch 4"
       }
     }
@@ -4288,107 +4411,107 @@ class BrkClient(BrkClientBase):
 
     AGE_RANGE_NAMES = {
       "up_to_1h": {
-        "id": "up_to_1h_old",
+        "id": "under_1h_old",
         "short": "<1h",
-        "long": "Up to 1 Hour Old"
+        "long": "Under 1 Hour Old"
       },
       "_1h_to_1d": {
-        "id": "at_least_1h_up_to_1d_old",
+        "id": "1h_to_1d_old",
         "short": "1h-1d",
         "long": "1 Hour to 1 Day Old"
       },
       "_1d_to_1w": {
-        "id": "at_least_1d_up_to_1w_old",
+        "id": "1d_to_1w_old",
         "short": "1d-1w",
         "long": "1 Day to 1 Week Old"
       },
       "_1w_to_1m": {
-        "id": "at_least_1w_up_to_1m_old",
+        "id": "1w_to_1m_old",
         "short": "1w-1m",
         "long": "1 Week to 1 Month Old"
       },
       "_1m_to_2m": {
-        "id": "at_least_1m_up_to_2m_old",
+        "id": "1m_to_2m_old",
         "short": "1m-2m",
         "long": "1 to 2 Months Old"
       },
       "_2m_to_3m": {
-        "id": "at_least_2m_up_to_3m_old",
+        "id": "2m_to_3m_old",
         "short": "2m-3m",
         "long": "2 to 3 Months Old"
       },
       "_3m_to_4m": {
-        "id": "at_least_3m_up_to_4m_old",
+        "id": "3m_to_4m_old",
         "short": "3m-4m",
         "long": "3 to 4 Months Old"
       },
       "_4m_to_5m": {
-        "id": "at_least_4m_up_to_5m_old",
+        "id": "4m_to_5m_old",
         "short": "4m-5m",
         "long": "4 to 5 Months Old"
       },
       "_5m_to_6m": {
-        "id": "at_least_5m_up_to_6m_old",
+        "id": "5m_to_6m_old",
         "short": "5m-6m",
         "long": "5 to 6 Months Old"
       },
       "_6m_to_1y": {
-        "id": "at_least_6m_up_to_1y_old",
+        "id": "6m_to_1y_old",
         "short": "6m-1y",
         "long": "6 Months to 1 Year Old"
       },
       "_1y_to_2y": {
-        "id": "at_least_1y_up_to_2y_old",
+        "id": "1y_to_2y_old",
         "short": "1y-2y",
         "long": "1 to 2 Years Old"
       },
       "_2y_to_3y": {
-        "id": "at_least_2y_up_to_3y_old",
+        "id": "2y_to_3y_old",
         "short": "2y-3y",
         "long": "2 to 3 Years Old"
       },
       "_3y_to_4y": {
-        "id": "at_least_3y_up_to_4y_old",
+        "id": "3y_to_4y_old",
         "short": "3y-4y",
         "long": "3 to 4 Years Old"
       },
       "_4y_to_5y": {
-        "id": "at_least_4y_up_to_5y_old",
+        "id": "4y_to_5y_old",
         "short": "4y-5y",
         "long": "4 to 5 Years Old"
       },
       "_5y_to_6y": {
-        "id": "at_least_5y_up_to_6y_old",
+        "id": "5y_to_6y_old",
         "short": "5y-6y",
         "long": "5 to 6 Years Old"
       },
       "_6y_to_7y": {
-        "id": "at_least_6y_up_to_7y_old",
+        "id": "6y_to_7y_old",
         "short": "6y-7y",
         "long": "6 to 7 Years Old"
       },
       "_7y_to_8y": {
-        "id": "at_least_7y_up_to_8y_old",
+        "id": "7y_to_8y_old",
         "short": "7y-8y",
         "long": "7 to 8 Years Old"
       },
       "_8y_to_10y": {
-        "id": "at_least_8y_up_to_10y_old",
+        "id": "8y_to_10y_old",
         "short": "8y-10y",
         "long": "8 to 10 Years Old"
       },
       "_10y_to_12y": {
-        "id": "at_least_10y_up_to_12y_old",
+        "id": "10y_to_12y_old",
         "short": "10y-12y",
         "long": "10 to 12 Years Old"
       },
       "_12y_to_15y": {
-        "id": "at_least_12y_up_to_15y_old",
+        "id": "12y_to_15y_old",
         "short": "12y-15y",
         "long": "12 to 15 Years Old"
       },
       "from_15y": {
-        "id": "at_least_15y_old",
+        "id": "over_15y_old",
         "short": "15y+",
         "long": "15+ Years Old"
       }
@@ -4396,187 +4519,187 @@ class BrkClient(BrkClientBase):
 
     MAX_AGE_NAMES = {
       "_1w": {
-        "id": "up_to_1w_old",
+        "id": "under_1w_old",
         "short": "<1w",
-        "long": "Up to 1 Week Old"
+        "long": "Under 1 Week Old"
       },
       "_1m": {
-        "id": "up_to_1m_old",
+        "id": "under_1m_old",
         "short": "<1m",
-        "long": "Up to 1 Month Old"
+        "long": "Under 1 Month Old"
       },
       "_2m": {
-        "id": "up_to_2m_old",
+        "id": "under_2m_old",
         "short": "<2m",
-        "long": "Up to 2 Months Old"
+        "long": "Under 2 Months Old"
       },
       "_3m": {
-        "id": "up_to_3m_old",
+        "id": "under_3m_old",
         "short": "<3m",
-        "long": "Up to 3 Months Old"
+        "long": "Under 3 Months Old"
       },
       "_4m": {
-        "id": "up_to_4m_old",
+        "id": "under_4m_old",
         "short": "<4m",
-        "long": "Up to 4 Months Old"
+        "long": "Under 4 Months Old"
       },
       "_5m": {
-        "id": "up_to_5m_old",
+        "id": "under_5m_old",
         "short": "<5m",
-        "long": "Up to 5 Months Old"
+        "long": "Under 5 Months Old"
       },
       "_6m": {
-        "id": "up_to_6m_old",
+        "id": "under_6m_old",
         "short": "<6m",
-        "long": "Up to 6 Months Old"
+        "long": "Under 6 Months Old"
       },
       "_1y": {
-        "id": "up_to_1y_old",
+        "id": "under_1y_old",
         "short": "<1y",
-        "long": "Up to 1 Year Old"
+        "long": "Under 1 Year Old"
       },
       "_2y": {
-        "id": "up_to_2y_old",
+        "id": "under_2y_old",
         "short": "<2y",
-        "long": "Up to 2 Years Old"
+        "long": "Under 2 Years Old"
       },
       "_3y": {
-        "id": "up_to_3y_old",
+        "id": "under_3y_old",
         "short": "<3y",
-        "long": "Up to 3 Years Old"
+        "long": "Under 3 Years Old"
       },
       "_4y": {
-        "id": "up_to_4y_old",
+        "id": "under_4y_old",
         "short": "<4y",
-        "long": "Up to 4 Years Old"
+        "long": "Under 4 Years Old"
       },
       "_5y": {
-        "id": "up_to_5y_old",
+        "id": "under_5y_old",
         "short": "<5y",
-        "long": "Up to 5 Years Old"
+        "long": "Under 5 Years Old"
       },
       "_6y": {
-        "id": "up_to_6y_old",
+        "id": "under_6y_old",
         "short": "<6y",
-        "long": "Up to 6 Years Old"
+        "long": "Under 6 Years Old"
       },
       "_7y": {
-        "id": "up_to_7y_old",
+        "id": "under_7y_old",
         "short": "<7y",
-        "long": "Up to 7 Years Old"
+        "long": "Under 7 Years Old"
       },
       "_8y": {
-        "id": "up_to_8y_old",
+        "id": "under_8y_old",
         "short": "<8y",
-        "long": "Up to 8 Years Old"
+        "long": "Under 8 Years Old"
       },
       "_10y": {
-        "id": "up_to_10y_old",
+        "id": "under_10y_old",
         "short": "<10y",
-        "long": "Up to 10 Years Old"
+        "long": "Under 10 Years Old"
       },
       "_12y": {
-        "id": "up_to_12y_old",
+        "id": "under_12y_old",
         "short": "<12y",
-        "long": "Up to 12 Years Old"
+        "long": "Under 12 Years Old"
       },
       "_15y": {
-        "id": "up_to_15y_old",
+        "id": "under_15y_old",
         "short": "<15y",
-        "long": "Up to 15 Years Old"
+        "long": "Under 15 Years Old"
       }
     }
 
     MIN_AGE_NAMES = {
       "_1d": {
-        "id": "at_least_1d_old",
+        "id": "over_1d_old",
         "short": "1d+",
-        "long": "At Least 1 Day Old"
+        "long": "Over 1 Day Old"
       },
       "_1w": {
-        "id": "at_least_1w_old",
+        "id": "over_1w_old",
         "short": "1w+",
-        "long": "At Least 1 Week Old"
+        "long": "Over 1 Week Old"
       },
       "_1m": {
-        "id": "at_least_1m_old",
+        "id": "over_1m_old",
         "short": "1m+",
-        "long": "At Least 1 Month Old"
+        "long": "Over 1 Month Old"
       },
       "_2m": {
-        "id": "at_least_2m_old",
+        "id": "over_2m_old",
         "short": "2m+",
-        "long": "At Least 2 Months Old"
+        "long": "Over 2 Months Old"
       },
       "_3m": {
-        "id": "at_least_3m_old",
+        "id": "over_3m_old",
         "short": "3m+",
-        "long": "At Least 3 Months Old"
+        "long": "Over 3 Months Old"
       },
       "_4m": {
-        "id": "at_least_4m_old",
+        "id": "over_4m_old",
         "short": "4m+",
-        "long": "At Least 4 Months Old"
+        "long": "Over 4 Months Old"
       },
       "_5m": {
-        "id": "at_least_5m_old",
+        "id": "over_5m_old",
         "short": "5m+",
-        "long": "At Least 5 Months Old"
+        "long": "Over 5 Months Old"
       },
       "_6m": {
-        "id": "at_least_6m_old",
+        "id": "over_6m_old",
         "short": "6m+",
-        "long": "At Least 6 Months Old"
+        "long": "Over 6 Months Old"
       },
       "_1y": {
-        "id": "at_least_1y_old",
+        "id": "over_1y_old",
         "short": "1y+",
-        "long": "At Least 1 Year Old"
+        "long": "Over 1 Year Old"
       },
       "_2y": {
-        "id": "at_least_2y_old",
+        "id": "over_2y_old",
         "short": "2y+",
-        "long": "At Least 2 Years Old"
+        "long": "Over 2 Years Old"
       },
       "_3y": {
-        "id": "at_least_3y_old",
+        "id": "over_3y_old",
         "short": "3y+",
-        "long": "At Least 3 Years Old"
+        "long": "Over 3 Years Old"
       },
       "_4y": {
-        "id": "at_least_4y_old",
+        "id": "over_4y_old",
         "short": "4y+",
-        "long": "At Least 4 Years Old"
+        "long": "Over 4 Years Old"
       },
       "_5y": {
-        "id": "at_least_5y_old",
+        "id": "over_5y_old",
         "short": "5y+",
-        "long": "At Least 5 Years Old"
+        "long": "Over 5 Years Old"
       },
       "_6y": {
-        "id": "at_least_6y_old",
+        "id": "over_6y_old",
         "short": "6y+",
-        "long": "At Least 6 Years Old"
+        "long": "Over 6 Years Old"
       },
       "_7y": {
-        "id": "at_least_7y_old",
+        "id": "over_7y_old",
         "short": "7y+",
-        "long": "At Least 7 Years Old"
+        "long": "Over 7 Years Old"
       },
       "_8y": {
-        "id": "at_least_8y_old",
+        "id": "over_8y_old",
         "short": "8y+",
-        "long": "At Least 8 Years Old"
+        "long": "Over 8 Years Old"
       },
       "_10y": {
-        "id": "at_least_10y_old",
+        "id": "over_10y_old",
         "short": "10y+",
-        "long": "At Least 10 Years Old"
+        "long": "Over 10 Years Old"
       },
       "_12y": {
-        "id": "at_least_12y_old",
+        "id": "over_12y_old",
         "short": "12y+",
-        "long": "At Least 12 Years Old"
+        "long": "Over 12 Years Old"
       }
     }
 
@@ -4589,67 +4712,67 @@ class BrkClient(BrkClientBase):
       "_1sat_to_10sats": {
         "id": "above_1sat_under_10sats",
         "short": "1-10 sats",
-        "long": "1 to 10 Sats"
+        "long": "1-10 Sats"
       },
       "_10sats_to_100sats": {
         "id": "above_10sats_under_100sats",
         "short": "10-100 sats",
-        "long": "10 to 100 Sats"
+        "long": "10-100 Sats"
       },
       "_100sats_to_1k_sats": {
         "id": "above_100sats_under_1k_sats",
         "short": "100-1k sats",
-        "long": "100 to 1K Sats"
+        "long": "100-1K Sats"
       },
       "_1k_sats_to_10k_sats": {
         "id": "above_1k_sats_under_10k_sats",
         "short": "1k-10k sats",
-        "long": "1K to 10K Sats"
+        "long": "1K-10K Sats"
       },
       "_10k_sats_to_100k_sats": {
         "id": "above_10k_sats_under_100k_sats",
         "short": "10k-100k sats",
-        "long": "10K to 100K Sats"
+        "long": "10K-100K Sats"
       },
       "_100k_sats_to_1m_sats": {
         "id": "above_100k_sats_under_1m_sats",
         "short": "100k-1M sats",
-        "long": "100K to 1M Sats"
+        "long": "100K-1M Sats"
       },
       "_1m_sats_to_10m_sats": {
         "id": "above_1m_sats_under_10m_sats",
         "short": "1M-10M sats",
-        "long": "1M to 10M Sats"
+        "long": "1M-10M Sats"
       },
       "_10m_sats_to_1btc": {
         "id": "above_10m_sats_under_1btc",
         "short": "0.1-1 BTC",
-        "long": "0.1 to 1 BTC"
+        "long": "0.1-1 BTC"
       },
       "_1btc_to_10btc": {
         "id": "above_1btc_under_10btc",
         "short": "1-10 BTC",
-        "long": "1 to 10 BTC"
+        "long": "1-10 BTC"
       },
       "_10btc_to_100btc": {
         "id": "above_10btc_under_100btc",
         "short": "10-100 BTC",
-        "long": "10 to 100 BTC"
+        "long": "10-100 BTC"
       },
       "_100btc_to_1k_btc": {
         "id": "above_100btc_under_1k_btc",
         "short": "100-1k BTC",
-        "long": "100 to 1K BTC"
+        "long": "100-1K BTC"
       },
       "_1k_btc_to_10k_btc": {
         "id": "above_1k_btc_under_10k_btc",
         "short": "1k-10k BTC",
-        "long": "1K to 10K BTC"
+        "long": "1K-10K BTC"
       },
       "_10k_btc_to_100k_btc": {
         "id": "above_10k_btc_under_100k_btc",
         "short": "10k-100k BTC",
-        "long": "10K to 100K BTC"
+        "long": "10K-100K BTC"
       },
       "_100k_btc_or_more": {
         "id": "above_100k_btc",
@@ -4660,69 +4783,69 @@ class BrkClient(BrkClientBase):
 
     GE_AMOUNT_NAMES = {
       "_1sat": {
-        "id": "above_1sat",
+        "id": "over_1sat",
         "short": "1+ sats",
-        "long": "Above 1 Sat"
+        "long": "Over 1 Sat"
       },
       "_10sats": {
-        "id": "above_10sats",
+        "id": "over_10sats",
         "short": "10+ sats",
-        "long": "Above 10 Sats"
+        "long": "Over 10 Sats"
       },
       "_100sats": {
-        "id": "above_100sats",
+        "id": "over_100sats",
         "short": "100+ sats",
-        "long": "Above 100 Sats"
+        "long": "Over 100 Sats"
       },
       "_1k_sats": {
-        "id": "above_1k_sats",
+        "id": "over_1k_sats",
         "short": "1k+ sats",
-        "long": "Above 1K Sats"
+        "long": "Over 1K Sats"
       },
       "_10k_sats": {
-        "id": "above_10k_sats",
+        "id": "over_10k_sats",
         "short": "10k+ sats",
-        "long": "Above 10K Sats"
+        "long": "Over 10K Sats"
       },
       "_100k_sats": {
-        "id": "above_100k_sats",
+        "id": "over_100k_sats",
         "short": "100k+ sats",
-        "long": "Above 100K Sats"
+        "long": "Over 100K Sats"
       },
       "_1m_sats": {
-        "id": "above_1m_sats",
+        "id": "over_1m_sats",
         "short": "1M+ sats",
-        "long": "Above 1M Sats"
+        "long": "Over 1M Sats"
       },
       "_10m_sats": {
-        "id": "above_10m_sats",
+        "id": "over_10m_sats",
         "short": "0.1+ BTC",
-        "long": "Above 0.1 BTC"
+        "long": "Over 0.1 BTC"
       },
       "_1btc": {
-        "id": "above_1btc",
+        "id": "over_1btc",
         "short": "1+ BTC",
-        "long": "Above 1 BTC"
+        "long": "Over 1 BTC"
       },
       "_10btc": {
-        "id": "above_10btc",
+        "id": "over_10btc",
         "short": "10+ BTC",
-        "long": "Above 10 BTC"
+        "long": "Over 10 BTC"
       },
       "_100btc": {
-        "id": "above_100btc",
+        "id": "over_100btc",
         "short": "100+ BTC",
-        "long": "Above 100 BTC"
+        "long": "Over 100 BTC"
       },
       "_1k_btc": {
-        "id": "above_1k_btc",
+        "id": "over_1k_btc",
         "short": "1k+ BTC",
-        "long": "Above 1K BTC"
+        "long": "Over 1K BTC"
       },
       "_10k_btc": {
-        "id": "above_10k_btc",
+        "id": "over_10k_btc",
         "short": "10k+ BTC",
-        "long": "Above 10K BTC"
+        "long": "Over 10K BTC"
       }
     }