axis-synome 0.1.0.dev73__tar.gz → 0.1.0.dev76__tar.gz

{axis_synome-0.1.0.dev73/src/axis_synome.egg-info → axis_synome-0.1.0.dev76}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: axis-synome
-Version: 0.1.0.dev73
+Version: 0.1.0.dev76
 Summary: Axis specification modules (entities, formulas, validators)
 Author-email: Archon Tech <hello@archontech.ai>
 License: MIT

{axis_synome-0.1.0.dev73 → axis_synome-0.1.0.dev76}/src/axis_synome/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.1.0.dev73'
-__version_tuple__ = version_tuple = (0, 1, 0, 'dev73')
+__version__ = version = '0.1.0.dev76'
+__version_tuple__ = version_tuple = (0, 1, 0, 'dev76')
 
 __commit_id__ = commit_id = None

{axis_synome-0.1.0.dev73 → axis_synome-0.1.0.dev76}/src/axis_synome/export_entities.py

@@ -6,7 +6,7 @@ import json
 import re
 import subprocess
 from pathlib import Path
-from typing import Any
+from typing import Any, Final
 
 from pydantic import BaseModel, ConfigDict, Field
 
@@ -157,12 +157,75 @@ def _allocation_type(protocol: Protocol) -> AllocationType:
     return AllocationType.ALLOCATION
 
 
+# Centrifuge ERC-7540 vaults are not balanceOf-able: name/symbol/decimals/balanceOf
+# revert on-chain. The proxy holds the vault's share() ERC20, which is what the
+# allocation tracker reads. The Atlas Token Address for these instances is the vault,
+# so the tracked contract address is resolved to the on-chain share() here. Keyed by
+# (chain, vault address) because the same vault address is reused across chains with
+# different share tokens. share() values verified on-chain (cast) on Ethereum and
+# Avalanche.
+_CENTRIFUGE_VAULT_SHARE: Final[dict[tuple[str, str], str]] = {
+    (
+        "mainnet",
+        "0x4880799ee5200fc58da299e965df644fbf46780b",
+    ): "0x5a0f93d040de44e78f251b03c43be9cf317dcf64",
+    (
+        "mainnet",
+        "0xfe6920eb6c421f1179ca8c8d4170530cdbdfd77a",
+    ): "0x8c213ee79581ff4984583c6a801e5263418c4b86",
+    (
+        "avalanche-c",
+        "0x1121f4e21ed8b9bc1bb9a2952cdd8639ac897784",
+    ): "0x58f93d6b1ef2f44ec379cb975657c132cbed3b6b",
+    (
+        "avalanche-c",
+        "0xfe6920eb6c421f1179ca8c8d4170530cdbdfd77a",
+    ): "0xa5d465251fbcc907f5dd6bb2145488dfc6a2627b",
+}
+
+
+def _tracked_contract_address(chain: str, address: str) -> str:
+    """Resolve the balanceOf-able contract address for a position.
+
+    Centrifuge ERC-7540 vault addresses are mapped to their share() ERC20 (the token
+    the proxy actually holds); every other address passes through unchanged.
+    """
+    return _CENTRIFUGE_VAULT_SHARE.get((chain, address.lower()), address.lower())
+
+
 def _version_from_package_metadata() -> str:
     return importlib.metadata.version("axis-synome")
 
 
 def _axis_synome_git_commit() -> str:
-    repo_root = Path(__file__).resolve().parents[2]
+    """Resolve the axis-synome commit for the exported contract's provenance.
+
+    Prefer the commit baked into ``_version.py`` at build time. Otherwise fall
+    back to ``git rev-parse`` only when running from the axis-synome source tree.
+    An installed wheel lives under ``site-packages`` (often nested inside a
+    consumer's git repository), and walking up from there would resolve that
+    consumer's HEAD, which is not our commit; return ``"unknown"`` instead.
+    """
+    embedded = _build_embedded_commit()
+    if embedded:
+        return embedded
+    return _git_commit_from_checkout(Path(__file__).resolve().parents[2])
+
+
+def _build_embedded_commit() -> str | None:
+    try:
+        from axis_synome._version import commit_id
+    except ImportError:
+        return None
+    return commit_id
+
+
+def _git_commit_from_checkout(repo_root: Path) -> str:
+    # Only trust git inside the axis-synome source tree. When installed as a
+    # wheel, repo_root points into site-packages, so a surrounding consumer
+    # repository's HEAD must never be mistaken for our commit.
+    if not (repo_root / "src" / "axis_synome").is_dir():
+        return "unknown"
     try:
         return subprocess.check_output(
             ["git", "rev-parse", "HEAD"], cwd=repo_root, text=True
@@ -233,7 +296,7 @@ def build_axis_synome_contract(
                 missing_proxy_keys.add((star, chain))
                 continue
 
-            contract_address = str(asset.address).lower()
+            contract_address = _tracked_contract_address(chain, str(asset.address))
             entry_key = (chain, contract_address, wallet)
             if entry_key in seen_entry_keys:
                 raise ValueError(
@@ -278,7 +341,7 @@ def build_axis_synome_contract(
                     missing_proxy_keys.add((star, chain))
                     continue
 
-            contract_address = str(missing.address).lower()
+            contract_address = _tracked_contract_address(chain, str(missing.address))
             entry_key = (chain, contract_address, wallet)
             if entry_key in seen_entry_keys:
                 raise ValueError(

{axis_synome-0.1.0.dev73 → axis_synome-0.1.0.dev76}/src/axis_synome/spec/asc/entities/assets_missing_from_atlas.py

@@ -381,17 +381,6 @@ SPARK_ARBITRUM_ASSET_USDC: Final[MissingAtlasAsset] = MissingAtlasAsset(
 
 # --- Grove ---
 
-GROVE_MAINNET_JANUS_HENDERSON: Final[MissingAtlasAsset] = MissingAtlasAsset(
-    network=Network.ETHEREUM_MAINNET,
-    address=EvmAddress("0x5a0F93D040De44e78F251b03c43be9CF317Dcf64"),
-    protocol=Protocol.JANUS_HENDERSON,
-    allocation_type=AllocationType.ALLOCATION,
-    token_type=TokenType.ERC20,
-    underlying_asset_address=USDC_MAINNET,
-)
-"""Mainnet Janus Henderson. Absent (no Janus/Henderson docs in the Atlas)."""
-
-
 GROVE_MAINNET_CURVE_AUSD_USDC: Final[MissingAtlasAsset] = MissingAtlasAsset(
     network=Network.ETHEREUM_MAINNET,
     address=EvmAddress("0xE79C1C7E24755574438A26D5e062Ad2626C04662"),
@@ -416,16 +405,6 @@ GROVE_MAINNET_UNISWAP_AUSD_USDC: Final[MissingAtlasAsset] = MissingAtlasAsset(
 Address" (A.6.1.1.2.2.6.1.3.1.12.2 / 12.3), not a Token Address."""
 
 
-GROVE_AVALANCHE_JANUS_HENDERSON: Final[MissingAtlasAsset] = MissingAtlasAsset(
-    network=Network.AVALANCHE,
-    address=EvmAddress("0x58F93d6b1EF2F44eC379Cb975657C132CBeD3B6b"),
-    protocol=Protocol.JANUS_HENDERSON,
-    allocation_type=AllocationType.ALLOCATION,
-    token_type=TokenType.ERC20,
-)
-"""Avalanche Janus Henderson. Absent (no Janus/Henderson docs)."""
-
-
 GROVE_PLUME_CENTRIFUGE_FEEDER: Final[MissingAtlasAsset] = MissingAtlasAsset(
     network=Network.PLUME,
     address=EvmAddress("0xa5d465251fBCc907f5Dd6bB2145488DFC6a2627b"),
@@ -449,17 +428,6 @@ GROVE_PLUME_ASSET_USDC: Final[MissingAtlasAsset] = MissingAtlasAsset(
 of the ACRDX feeder, not a tracked position of its own."""
 
 
-GROVE_MAINNET_JANUS_HENDERSON_2: Final[MissingAtlasAsset] = MissingAtlasAsset(
-    network=Network.ETHEREUM_MAINNET,
-    address=EvmAddress("0x8c213ee79581Ff4984583C6a801e5263418C4b86"),
-    protocol=Protocol.JANUS_HENDERSON,
-    allocation_type=AllocationType.ALLOCATION,
-    token_type=TokenType.ERC20,
-    underlying_asset_address=USDC_MAINNET,
-)
-"""Mainnet Janus Henderson (second feeder, distinct from 0x5a0F93D0…)."""
-
-
 GROVE_MAINNET_ASSET_DAI: Final[MissingAtlasAsset] = MissingAtlasAsset(
     network=Network.ETHEREUM_MAINNET,
     address=EvmAddress("0x6B175474E89094C44Da98b954EedeAC495271d0F"),
@@ -535,13 +503,14 @@ MISSING_FROM_ATLAS_BY_PRIME: Final[dict[PrimeName, list[MissingAtlasAsset]]] = {
         SPARK_ARBITRUM_ASSET_USDC,
     ],
     PrimeName.GROVE: [
-        GROVE_MAINNET_JANUS_HENDERSON,
+        # Grove's Centrifuge JAAA/JTRSY share holdings are emitted from the
+        # Centrifuge instances in assets_by_prime.py (the ERC-7540 vault's share()
+        # is resolved at export time), so the former Janus-Henderson workaround
+        # entries for those share tokens are no longer listed here.
         GROVE_MAINNET_CURVE_AUSD_USDC,
         GROVE_MAINNET_UNISWAP_AUSD_USDC,
-        GROVE_AVALANCHE_JANUS_HENDERSON,
         GROVE_PLUME_CENTRIFUGE_FEEDER,
         GROVE_PLUME_ASSET_USDC,
-        GROVE_MAINNET_JANUS_HENDERSON_2,
         GROVE_MAINNET_ASSET_DAI,
         GROVE_MAINNET_POL_USDS,
         GROVE_MAINNET_RISK_CAPITAL_USDS,

{axis_synome-0.1.0.dev73 → axis_synome-0.1.0.dev76/src/axis_synome.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: axis-synome
-Version: 0.1.0.dev73
+Version: 0.1.0.dev76
 Summary: Axis specification modules (entities, formulas, validators)
 Author-email: Archon Tech <hello@archontech.ai>
 License: MIT

{axis_synome-0.1.0.dev73 → axis_synome-0.1.0.dev76}/tests/axis_synome/scripts/test_export_entities.py

@@ -4,7 +4,13 @@ import sys
 from pathlib import Path
 from typing import cast
 
-from axis_synome.export_entities import _prime_to_star, build_axis_synome_contract
+from axis_synome import export_entities
+from axis_synome.export_entities import (
+    _axis_synome_git_commit,
+    _git_commit_from_checkout,
+    _prime_to_star,
+    build_axis_synome_contract,
+)
 from axis_synome.spec.asc.entities.assets_by_prime import ASSETS_BY_PRIME, PrimeName
 from axis_synome.spec.asc.entities.assets_missing_from_atlas import (
     MISSING_FROM_ATLAS_BY_PRIME,
@@ -193,14 +199,22 @@ def test_export_covers_every_spec_position():
     drops, duplicates, or invents. The downstream contract values are validated
     end-to-end by the STL sentinel compatibility gates in CI.
     """
+    # Centrifuge ERC-7540 vault addresses are resolved to their share() ERC20 on
+    # export, so apply the same resolution when deriving the expectation.
     expected_contracts: list[str] = []
     for prime in (PrimeName.SPARK, PrimeName.GROVE):
         for asset in ASSETS_BY_PRIME.get(prime, []):
-            if STL_CHAIN_BY_NETWORK.get(asset.network):
-                expected_contracts.append(str(asset.address).lower())
+            chain = STL_CHAIN_BY_NETWORK.get(asset.network)
+            if chain:
+                expected_contracts.append(
+                    export_entities._tracked_contract_address(chain, str(asset.address))
+                )
         for missing in MISSING_FROM_ATLAS_BY_PRIME.get(prime, []):
-            if STL_CHAIN_BY_NETWORK.get(missing.network):
-                expected_contracts.append(str(missing.address).lower())
+            chain = STL_CHAIN_BY_NETWORK.get(missing.network)
+            if chain:
+                expected_contracts.append(
+                    export_entities._tracked_contract_address(chain, str(missing.address))
+                )
 
     exported_contracts = [e["contract_address"] for e in _exported_token_entries()]
     assert sorted(exported_contracts) == sorted(expected_contracts)
@@ -232,3 +246,42 @@ def test_prime_to_star_round_trips_known_primes():
     """Sanity: the prime->star slug used to key the export is stable."""
     assert _prime_to_star(PrimeName.SPARK) == "spark"
     assert _prime_to_star(PrimeName.GROVE) == "grove"
+
+
+def test_git_commit_from_checkout_ignores_foreign_repo(tmp_path):
+    """A repo_root without src/axis_synome (e.g. an installed wheel nested in a
+    consumer repo) must not shell out to git and report that repo's HEAD."""
+    assert _git_commit_from_checkout(tmp_path) == "unknown"
+
+
+def test_git_commit_prefers_build_embedded(monkeypatch):
+    """When _version.py carries a build-time commit, it wins over any git probe."""
+    monkeypatch.setattr(export_entities, "_build_embedded_commit", lambda: "abc123")
+    assert _axis_synome_git_commit() == "abc123"
+
+
+def test_git_commit_unknown_when_unembedded_and_not_in_checkout(monkeypatch):
+    """No embedded commit and not in the source tree resolves to "unknown"."""
+    monkeypatch.setattr(export_entities, "_build_embedded_commit", lambda: None)
+    monkeypatch.setattr(export_entities, "_git_commit_from_checkout", lambda _root: "unknown")
+    assert _axis_synome_git_commit() == "unknown"
+
+
+def test_tracked_contract_address_resolves_centrifuge_vault_to_share():
+    """Centrifuge ERC-7540 vaults resolve to their share() ERC20, keyed by chain
+    (the same vault address is reused across chains with different shares)."""
+    resolve = export_entities._tracked_contract_address
+    assert (
+        resolve("mainnet", "0xFE6920eB6C421f1179cA8c8d4170530CDBdfd77A")
+        == "0x8c213ee79581ff4984583c6a801e5263418c4b86"
+    )
+    assert (
+        resolve("avalanche-c", "0xFE6920eB6C421f1179cA8c8d4170530CDBdfd77A")
+        == "0xa5d465251fbcc907f5dd6bb2145488dfc6a2627b"
+    )
+
+
+def test_tracked_contract_address_passes_through_non_vault():
+    """A non-vault address (e.g. Spark's direct JTRSY ERC20) is returned lowercased."""
+    addr = "0x8c213ee79581Ff4984583C6a801e5263418C4b86"
+    assert export_entities._tracked_contract_address("mainnet", addr) == addr.lower()