blockmachine 0.22.0__tar.gz → 0.23.0__tar.gz

{blockmachine-0.22.0 → blockmachine-0.23.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: blockmachine
-Version: 0.22.0
+Version: 0.23.0
 Summary: Blockmachine CLI - Miner and validator operator interface
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/taostat/blockmachine
@@ -8,7 +8,7 @@ Classifier: Development Status :: 3 - Alpha
 Classifier: Environment :: Console
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.10
-Requires-Dist: typer[all]<0.26.0,>=0.9.0
+Requires-Dist: typer<0.26.0,>=0.9.0
 Requires-Dist: rich>=13.7.0
 Requires-Dist: httpx>=0.27.0
 Requires-Dist: websockets>=13.0

{blockmachine-0.22.0 → blockmachine-0.23.0}/blockmachine.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: blockmachine
-Version: 0.22.0
+Version: 0.23.0
 Summary: Blockmachine CLI - Miner and validator operator interface
 License-Expression: MIT
 Project-URL: Homepage, https://github.com/taostat/blockmachine
@@ -8,7 +8,7 @@ Classifier: Development Status :: 3 - Alpha
 Classifier: Environment :: Console
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.10
-Requires-Dist: typer[all]<0.26.0,>=0.9.0
+Requires-Dist: typer<0.26.0,>=0.9.0
 Requires-Dist: rich>=13.7.0
 Requires-Dist: httpx>=0.27.0
 Requires-Dist: websockets>=13.0

{blockmachine-0.22.0 → blockmachine-0.23.0}/blockmachine.egg-info/SOURCES.txt

@@ -31,11 +31,13 @@ commands/miner.py
 commands/validator.py
 tests/test_cli_config.py
 tests/test_cli_endpoints_and_testing.py
+tests/test_cli_help.py
 tests/test_epoch_payout_cli.py
 tests/test_leaderboard_cli.py
 tests/test_miner_add_class.py
 tests/test_miner_ban_line.py
-tests/test_miner_capacity.py
 tests/test_miner_compat_reason.py
 tests/test_miner_eligibility.py
-tests/test_miner_eth_tier.py
+tests/test_miner_eth_tier.py
+tests/test_miner_metrics.py
+tests/test_miner_pricing.py

{blockmachine-0.22.0 → blockmachine-0.23.0}/blockmachine.egg-info/requires.txt

@@ -1,4 +1,4 @@
-typer[all]<0.26.0,>=0.9.0
+typer<0.26.0,>=0.9.0
 rich>=13.7.0
 httpx>=0.27.0
 websockets>=13.0

{blockmachine-0.22.0 → blockmachine-0.23.0}/commands/epoch.py

@@ -84,7 +84,7 @@ def render_payout(body: dict, top: int = TOP_MINERS) -> list[str]:
 
     lines.append(
         f" {'UID':<4} {'alpha':>9} {'USD':>9}   {'share':>5}   "
-        "breakdown (chain/class → α)"
+        "breakdown (chain/request class → α)"
     )
     for m in miners[:top]:
         lines.append(
@@ -103,27 +103,69 @@ def render_payout(body: dict, top: int = TOP_MINERS) -> list[str]:
     return lines
 
 
+def _has_cu_split(miner: dict) -> bool:
+    """Does this body separate served CU from the base-incentive subsidy?
+
+    Registries built before taostat/blockmachine_playground#1529 send one
+    unqualified ``cu`` and nothing else. Printing zero served CU against
+    those would be a new lie, so the old single column is kept for them.
+    """
+    return "cu_served" in miner and "cu_base_incentive" in miner
+
+
 def render_miner(body: dict, miner: dict) -> list[str]:
-    """One miner with every (chain, class) line."""
+    """One miner with every chain and request-class line."""
     header = render_payout(body)
     lines = header[: header.index("")]
+    split = _has_cu_split(miner)
+    cu_total = int(miner.get("cu_total") or 0)
     lines.append("")
     lines.append(
         f"UID {miner.get('uid')}  {miner.get('hotkey')}\n"
         f"  {float(miner.get('alpha') or 0):.1f} α  "
         f"(${_fmt_usd(miner.get('usd'))}, "
-        f"{float(miner.get('share') or 0) * 100:.1f}% of the pool, "
-        f"{int(miner.get('cu_total') or 0):,} CU)"
+        f"{float(miner.get('share') or 0) * 100:.1f}% of the pool"
+        + (")" if split else f", {cu_total:,} CU)")
     )
+    if split:
+        lines.append(
+            f"  {cu_total:,} CU: {int(miner.get('cu_served') or 0):,} served "
+            f"+ {int(miner.get('cu_base_incentive') or 0):,} base incentive"
+        )
     lines.append("")
-    lines.append(f"  {'chain/class':<18} {'CU':>15} {'alpha':>9} {'USD':>9}")
+    if split:
+        lines.append(
+            f"  {'chain/request class':<22} {'served CU':>15} "
+            f"{'base incentive CU':>19} {'alpha':>9} {'USD':>9}"
+        )
+    else:
+        lines.append(
+            f"  {'chain/request class':<22} {'CU':>15} {'alpha':>9} {'USD':>9}"
+        )
     for e in miner.get("breakdown") or []:
         node = f"{e.get('chain')}/{e.get('node_class')}"
+        cu_col = (
+            f"{int(e.get('cu_served') or 0):>15,} "
+            f"{int(e.get('cu_base_incentive') or 0):>19,}"
+            if split
+            else f"{int(e.get('cu') or 0):>15,}"
+        )
         lines.append(
-            f"  {node:<18} {int(e.get('cu') or 0):>15,} "
+            f"  {node:<18} {cu_col} "
             f"{float(e.get('alpha') or 0):>9.1f} {_fmt_usd(e.get('usd')):>9}"
         )
     lines.append("")
+    if split:
+        lines.append(
+            "Served CU is the customer traffic this miner answered. Base incentive "
+            "CU is the"
+        )
+        lines.append(
+            "subnet's own top-up, injected as CU — nobody sent those requests. "
+            "Both count"
+        )
+        lines.append("toward the payout, and together they are the CU total above.")
+        lines.append("")
     lines.append(
         "USD is an estimate at the α price the finalizer recorded; the chain pays in α."
     )
@@ -144,8 +186,12 @@ def payout(
 
     Per UID: alpha, USD (an estimate at the price recorded when the epoch
     was finalized), share of the miner pool, and the alpha split by chain
-    and node class. Available the moment an epoch finalizes; the chain pays
+    and request class. Available the moment an epoch finalizes; the chain pays
     it out over the following epoch.
+
+    With --uid, CU is shown as two columns: the customer traffic the miner
+    answered, and the base-incentive subsidy injected as synthetic CU. Both
+    count toward the payout; only the first is traffic.
     """
     path = "/epochs/latest/payout" if epoch is None else f"/epochs/{epoch}/payout"
     with RegistryClient(load_config()) as client:

{blockmachine-0.22.0 → blockmachine-0.23.0}/commands/leaderboard.py

@@ -238,9 +238,8 @@ def _render_default(
 ) -> None:
     """Render the default leaderboard view (Option B).
 
-    When ``verbose`` is True, ETH node sub-rows include the raw
-    five-flag capability string (``A P T D X``) after the tier label so
-    operators can inspect what the gateway actually probed.
+    When ``verbose`` is True, ETH node sub-rows include the three
+    capability flags (``A P X``) after the tier label.
     """
     miners = data.get("miners", [])
     epoch = data.get("epoch")
@@ -363,8 +362,8 @@ def _render_default(
 def _recompute_shares(miners: list[dict], archive: bool) -> list[dict]:
     """Recompute routing scores and traffic shares for the selected dimension.
 
-    When archive=True, filters to archive-capable nodes only and uses
-    routing_score_archive / price_factor_archive.
+    When archive=True, filters to nodes marked ``is_archive`` or
+    ``serves_proofs`` and uses routing_score_archive / price_factor_archive.
     Adds _score, _share, _price_factor to each miner and _share to each node.
     """
     results = []
@@ -373,7 +372,7 @@ def _recompute_shares(miners: list[dict], archive: bool) -> list[dict]:
     for miner in miners:
         nodes = miner.get("nodes", [])
         if archive:
-            nodes = [n for n in nodes if n.get("is_archive", False)]
+            nodes = [n for n in nodes if n.get("is_archive") or n.get("serves_proofs")]
         miner_score = 0.0
         for node in nodes:
             ns = _node_score_field(node, "routing_score", archive) or 0.0
@@ -503,10 +502,10 @@ def _render_detail(
                 f"{p95_label}{_bottleneck_label(lat)}"
             )
 
-            # Reliability saturates at 7 good epochs (gateway cap, #952);
+            # Reliability saturates at 3 good epochs (gateway cap);
             # more history exists but no longer buys score.
             ep_label = (
-                f"  ({epochs_good} good epochs; score saturates at 7)"
+                f"  ({epochs_good} good epochs; score saturates at 3)"
                 if epochs_good is not None
                 else ""
             )
@@ -560,15 +559,15 @@ def show(
         None,
         "--chain",
         "-c",
-        help="Filter to a single chain (e.g. eth, tao, bsc, base, polygon, optimism, arbitrum, avalanche, scroll, mantle, robinhood, tron). Default: all chains.",
+        help="Filter to a single chain (e.g. eth, tao, bsc, base, polygon, optimism, arbitrum, avalanche, arc, scroll, mantle, robinhood, tron). Default: all chains.",
     ),
     verbose: bool = typer.Option(
         False,
         "--verbose",
         "-v",
         help=(
-            "For ETH nodes, show raw capability flags (A P T D X = "
-            "archive, proof, trace, debug, audit-compatible) alongside "
+            "For ETH nodes, show raw capability flags (A P X = "
+            "archive, proof, audit-compatible) alongside "
             "the tier label."
         ),
     ),