tpluspy 0.3.2__tar.gz → 0.4.0__tar.gz

{tpluspy-0.3.2 → tpluspy-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tpluspy
-Version: 0.3.2
+Version: 0.4.0
 Summary: tpluspy: Client utilities for interacting with tplus
 Home-page: https://github.com/tpluslabs/tpluspy
 Author: TPlus Labs
@@ -29,6 +29,7 @@ Requires-Dist: pycryptodome>=3.17.1
 Requires-Dist: pydantic<3,>=2.10.4
 Requires-Dist: websockets<14,>=13.1
 Provides-Extra: test
+Requires-Dist: eth-account<0.14,>=0.13.0; extra == "test"
 Requires-Dist: pytest>=8.0; extra == "test"
 Requires-Dist: pytest-timeout<3,>=2.2.0; extra == "test"
 Requires-Dist: pytest-mock; extra == "test"
@@ -47,6 +48,7 @@ Provides-Extra: evm
 Requires-Dist: ape-tokens; extra == "evm"
 Requires-Dist: click; extra == "evm"
 Requires-Dist: eip712>=0.3.1; extra == "evm"
+Requires-Dist: eth-account<0.14,>=0.13.0; extra == "evm"
 Requires-Dist: eth-ape<0.9,>=0.8.49; extra == "evm"
 Requires-Dist: hexbytes<2,>=1.3.1; extra == "evm"
 Provides-Extra: docs
@@ -142,6 +144,41 @@ async def run_client():
 asyncio.run(run_client())
 ```
 
+#### Use EVM accounts as T+ accounts
+
+An EVM account can back a T+ account: it signs one fixed message and the T+ identity is derived from that signature, so the same wallet always maps to the same T+ account (the one the T+ frontend derives on wallet login).
+
+Pass the account itself anywhere a `User` is accepted, whether that is `default_user=`, a per-call `user=`, or a `signer=`:
+
+```python
+from ape import accounts
+
+account = accounts.load("me")
+
+async with OrderBookClient(API_BASE_URL, default_user=account) as client:
+    await client.get_user_inventory()                  # signs as the T+ user behind the account
+    await client.create_limit_order(..., user=account) # per-call override
+```
+
+An `eth_account` signer works the same way, with no `[evm]` extra:
+
+```python
+from eth_account import Account
+
+client = OrderBookClient(API_BASE_URL, default_user=Account.from_key("0x..."))
+```
+
+Use `load_user_from_ape_account` to hold the `User` itself, for example to read its public key or to pick a sub-account. `load_user` loads stored keyfiles by name, so Ape aliases and keyfile names occupy separate namespaces and cannot collide:
+
+```python
+from tplus.utils.user import load_user_from_ape_account
+
+user = load_user_from_ape_account("me")        # by Ape alias (needs the `evm` extra)
+user = load_user_from_ape_account(account)     # an already-loaded Ape account
+```
+
+The result is a normal T+ `User` and signs every request the same way.
+
 #### REST API Usage
 
 The client offers async methods for common REST endpoints:
@@ -225,13 +262,15 @@ print(f"Cancel Order Response: {cancel_response}")
 # Replace an Order
 # Original Order ID should be from an existing, open order.
 original_order_id_to_replace = "actual-original-order-id"  # Replace with a real order ID
-replace_response = await client.replace_order(
+replace_response, revision = await client.replace_order(
     original_order_id=original_order_id_to_replace,
     asset_id=example_asset,
-    new_quantity=6,  # Optional: New integer quantity
-    new_price=1050,  # Optional: New integer price
+    new_quantity=6,  # Effective lifetime-total quantity
+    new_price=1050,  # Effective limit price
 )
 print(f"Replace Order Response: {replace_response}")
+# `revision` is the replacement's timestamp_ns; a later amend_order must quote it as
+# expected_authorization_revision.
 ```
 
 See `examples/rest_usage.py` for a runnable demonstration.
@@ -269,6 +308,10 @@ async for trade in client.stream_finalized_trades():
 
 See `examples/websocket_usage.py` for a runnable demonstration using `asyncio.gather` to run multiple streams concurrently.
 
+#### Token Recovery
+
+When a bearer token stops working before it actually expires (e.g. from a service restart), both transports recover on their own. A REST response or WebSocket handshake rejected with `401` or `403` re-authenticates and retries once; a second rejection is raised to the caller. Requests rejected concurrently share a single re-authentication.
+
 ### Contracts
 
 To interact with the contracts or sign T+ settlement messages, ensure you have installed the `evm` extra:

{tpluspy-0.3.2 → tpluspy-0.4.0}/README.md

@@ -71,6 +71,41 @@ async def run_client():
 asyncio.run(run_client())
 ```
 
+#### Use EVM accounts as T+ accounts
+
+An EVM account can back a T+ account: it signs one fixed message and the T+ identity is derived from that signature, so the same wallet always maps to the same T+ account (the one the T+ frontend derives on wallet login).
+
+Pass the account itself anywhere a `User` is accepted, whether that is `default_user=`, a per-call `user=`, or a `signer=`:
+
+```python
+from ape import accounts
+
+account = accounts.load("me")
+
+async with OrderBookClient(API_BASE_URL, default_user=account) as client:
+    await client.get_user_inventory()                  # signs as the T+ user behind the account
+    await client.create_limit_order(..., user=account) # per-call override
+```
+
+An `eth_account` signer works the same way, with no `[evm]` extra:
+
+```python
+from eth_account import Account
+
+client = OrderBookClient(API_BASE_URL, default_user=Account.from_key("0x..."))
+```
+
+Use `load_user_from_ape_account` to hold the `User` itself, for example to read its public key or to pick a sub-account. `load_user` loads stored keyfiles by name, so Ape aliases and keyfile names occupy separate namespaces and cannot collide:
+
+```python
+from tplus.utils.user import load_user_from_ape_account
+
+user = load_user_from_ape_account("me")        # by Ape alias (needs the `evm` extra)
+user = load_user_from_ape_account(account)     # an already-loaded Ape account
+```
+
+The result is a normal T+ `User` and signs every request the same way.
+
 #### REST API Usage
 
 The client offers async methods for common REST endpoints:
@@ -154,13 +189,15 @@ print(f"Cancel Order Response: {cancel_response}")
 # Replace an Order
 # Original Order ID should be from an existing, open order.
 original_order_id_to_replace = "actual-original-order-id"  # Replace with a real order ID
-replace_response = await client.replace_order(
+replace_response, revision = await client.replace_order(
     original_order_id=original_order_id_to_replace,
     asset_id=example_asset,
-    new_quantity=6,  # Optional: New integer quantity
-    new_price=1050,  # Optional: New integer price
+    new_quantity=6,  # Effective lifetime-total quantity
+    new_price=1050,  # Effective limit price
 )
 print(f"Replace Order Response: {replace_response}")
+# `revision` is the replacement's timestamp_ns; a later amend_order must quote it as
+# expected_authorization_revision.
 ```
 
 See `examples/rest_usage.py` for a runnable demonstration.
@@ -198,6 +235,10 @@ async for trade in client.stream_finalized_trades():
 
 See `examples/websocket_usage.py` for a runnable demonstration using `asyncio.gather` to run multiple streams concurrently.
 
+#### Token Recovery
+
+When a bearer token stops working before it actually expires (e.g. from a service restart), both transports recover on their own. A REST response or WebSocket handshake rejected with `401` or `403` re-authenticates and retries once; a second rejection is raised to the caller. Requests rejected concurrently share a single re-authentication.
+
 ### Contracts
 
 To interact with the contracts or sign T+ settlement messages, ensure you have installed the `evm` extra:

{tpluspy-0.3.2 → tpluspy-0.4.0}/setup.py

@@ -8,7 +8,7 @@ long_description = (here / "README.md").read_text(encoding="utf-8")
 
 setup(
     name="tpluspy",
-    version="0.3.2",
+    version="0.4.0",
     description="""tpluspy: Client utilities for interacting with tplus""",
     long_description=long_description,
     long_description_content_type="text/markdown",
@@ -34,6 +34,7 @@ setup(
     python_requires=">=3.10,<4",
     extras_require={
         "test": [
+            "eth-account>=0.13.0,<0.14",
             "pytest>=8.0",
             "pytest-timeout>=2.2.0,<3",
             "pytest-mock",
@@ -55,6 +56,7 @@ setup(
             "ape-tokens",
             "click",
             "eip712>=0.3.1",
+            "eth-account>=0.13.0,<0.14",
             "eth-ape>=0.8.49,<0.9",
             "hexbytes>=1.3.1,<2",
         ],

{tpluspy-0.3.2 → tpluspy-0.4.0}/tplus/_cli/_context.py

@@ -73,6 +73,7 @@ class CLIContext(dict):
                 "Pass --tplus-account, set TPLUS_ACCOUNT, "
                 "or create one with `tplus accounts add`."
             )
+
         return self.user_manager.load(name)
 
     def _resolve_default_account(self) -> str | None:

{tpluspy-0.3.2 → tpluspy-0.4.0}/tplus/_cli/markets.py

@@ -1,6 +1,5 @@
 import asyncio
 import json
-from typing import Any, cast
 
 import click
 
@@ -19,6 +18,23 @@ from tplus.cli_tools import (
     output_format_option,
     render,
 )
+from tplus.model.market import MarketResponse
+
+
+async def _collect_markets(
+    client, page_number: int | None, limit: int | None
+) -> list[MarketResponse]:
+    """The requested page, or every page when the caller did not pick one."""
+    page = await client.get_markets(page=page_number, limit=limit)
+    if page_number is not None:
+        return page.markets
+
+    markets = list(page.markets)
+    while page.next_page is not None:
+        page = await client.get_markets(page=page.next_page, limit=limit)
+        markets.extend(page.markets)
+
+    return markets
 
 
 @click.group()
@@ -60,35 +76,43 @@ def _get(cli_ctx: CLIContext, asset_id: str):
 @tplus_account_option()
 @output_format_option()
 @no_pager_option()
+@click.option("--page", "page_number", type=int)
+@click.option("--limit", type=int)
 @pass_cli_context
-def _list(cli_ctx: CLIContext, output_format: str, no_pager: bool):
-    """List all markets."""
+def _list(
+    cli_ctx: CLIContext,
+    output_format: str,
+    no_pager: bool,
+    page_number: int | None,
+    limit: int | None,
+):
+    """List all markets, following pagination unless `--page` picks one."""
     client = cli_ctx.orderbook_client()
-    response = cast("list[dict[str, Any]]", asyncio.run(client._request("GET", "/markets")))
+    markets = asyncio.run(_collect_markets(client, page_number, limit))
     if output_format == "raw":
-        click.echo(json.dumps(response, indent=2, default=str))
+        raw = [market.model_dump(by_alias=True) for market in markets]
+        click.echo(json.dumps(raw, indent=2, default=str))
         return
 
     records = []
-    for market in response or []:
-        fee_schedule = market.get("fee_schedule") or {}
-        asset_metadata = asset_metadata_dict(market.get("asset_id")) or {}
+    for market in markets:
+        fee_schedule = market.fee_schedule
+        asset_metadata = asset_metadata_dict(str(market.asset_id)) or {}
         records.append(
             {
-                "asset_id": market.get("asset_id"),
+                "asset_id": str(market.asset_id),
                 "symbol": asset_metadata.get("symbol"),
                 "asset_class": asset_metadata.get("asset_class"),
                 "representations": asset_metadata.get("representations"),
-                "price_decimals": market.get("book_price_decimals"),
-                "quantity_decimals": market.get("book_quantity_decimals"),
-                "max_leverage": market.get("max_leverage"),
-                "isolated_only": market.get("isolated_only"),
-                "tick_size": market.get("tick_size"),
-                "min_order_size": market.get("min_order_size"),
-                "fee_account": fee_schedule.get("fee_account"),
+                "price_decimals": market.book_price_decimals,
+                "quantity_decimals": market.book_quantity_decimals,
+                "max_leverage": market.max_leverage,
+                "isolated_only": market.isolated_only,
+                "tick_size": market.tick_size,
+                "min_order_size": market.min_order_size,
+                "fee_account": fee_schedule.fee_account if fee_schedule else None,
                 "fee_tiers": (
-                    f"{len(fee_schedule.get('global') or [])} global / "
-                    f"{len(fee_schedule.get('per_asset') or [])} per-asset"
+                    f"{len(fee_schedule.global_)} global / {len(fee_schedule.per_asset)} per-asset"
                     if fee_schedule
                     else None
                 ),
@@ -97,6 +121,35 @@ def _list(cli_ctx: CLIContext, output_format: str, no_pager: bool):
     render(records, output_format, no_pager=no_pager)
 
 
+@markets.command("symbol-map")
+@orderbook_url_option()
+@ignore_ssl_option()
+@tplus_account_option()
+@output_format_option()
+@no_pager_option()
+@pass_cli_context
+def _symbol_map(cli_ctx: CLIContext, output_format: str, no_pager: bool):
+    """Show the canonical asset table served by the OMS."""
+    client = cli_ctx.orderbook_client()
+    symbol_map = asyncio.run(client.get_markets(include_symbol_map=True)).symbol_map or {}
+    if output_format == "raw":
+        raw = {str(index): asset.model_dump() for index, asset in symbol_map.items()}
+        click.echo(json.dumps(raw, indent=2))
+        return
+
+    records = [
+        {
+            "index": index,
+            "symbol": asset.symbol,
+            "name": asset.name,
+            "asset_class": asset.asset_class,
+            "representations": ", ".join(asset.representations),
+        }
+        for index, asset in sorted(symbol_map.items())
+    ]
+    render(records, output_format, no_pager=no_pager)
+
+
 @markets.command("depth")
 @market_data_url_option()
 @ignore_ssl_option()

{tpluspy-0.3.2 → tpluspy-0.4.0}/tplus/_cli/orders.py

@@ -117,7 +117,7 @@ def _replace(
     from tplus.model.asset_identifier import AssetIdentifier
 
     client = cli_ctx.orderbook_client()
-    response = asyncio.run(
+    response, _revision = asyncio.run(
         client.replace_order(
             original_order_id=order_id,
             asset_id=AssetIdentifier(asset_id),

{tpluspy-0.3.2 → tpluspy-0.4.0}/tplus/_cli/vaults.py

@@ -28,6 +28,7 @@ if TYPE_CHECKING:
 
 
 _EVM_AVAILABLE = importlib.util.find_spec("ape") is not None
+PROFILE_WINDOW_SECONDS = 7 * 24 * 60 * 60
 
 
 @click.group()
@@ -180,6 +181,43 @@ if _EVM_AVAILABLE:
         show_default=True,
         help="Automata verifier contract address.",
     )
+    @click.option(
+        "--attestation-test-mode",
+        is_flag=True,
+        help="Accept unattested credentials. Dev only.",
+    )
+    @click.option(
+        "--council-member",
+        "security_council",
+        multiple=True,
+        help="Security council member address. May be repeated. Required off dev networks.",
+    )
+    @click.option(
+        "--council-threshold",
+        type=int,
+        help="Security council threshold. Defaults to a strict majority of the council.",
+    )
+    @click.option(
+        "--manage-profile-window",
+        type=int,
+        default=PROFILE_WINDOW_SECONDS,
+        show_default=True,
+        help="Seconds a measurement-profile change stays pending.",
+    )
+    @click.option(
+        "--signer-rotation-window",
+        type=int,
+        default=PROFILE_WINDOW_SECONDS,
+        show_default=True,
+        help="Seconds a signer rotation stays pending.",
+    )
+    @click.option(
+        "--withdrawal-quorum",
+        type=int,
+        default=1,
+        show_default=True,
+        help="Approvals required to release a withdrawal.",
+    )
     @click.option(
         "--skip-if-deployed",
         is_flag=True,
@@ -192,9 +230,17 @@ if _EVM_AVAILABLE:
         quorum: int | None,
         measurements: tuple[str, ...],
         automata_verifier: str,
+        attestation_test_mode: bool,
+        security_council: tuple[str, ...],
+        council_threshold: int | None,
+        manage_profile_window: int,
+        signer_rotation_window: int,
+        withdrawal_quorum: int,
         skip_if_deployed: bool,
     ):
         """Deploy a new CredentialManager pointing at REGISTRY_ADDRESS."""
+        from ape import chain
+
         from tplus.evm.contracts import CredentialManager
 
         if skip_if_deployed and (adopted := CredentialManager()._adopt_ce_deployment()):
@@ -204,6 +250,19 @@ if _EVM_AVAILABLE:
         op_list = list(operators) or [account.address]
         threshold = quorum if quorum is not None else len(op_list)
         meas = [bytes.fromhex(m.removeprefix("0x")) for m in measurements]
+
+        council = list(security_council)
+        if not council:
+            # Defaulting the veto council to the operators would collapse the independent
+            # veto, so only a dev chain may fall back to it.
+            if not chain.provider.network.is_dev:
+                raise click.UsageError("--council-member is required off dev networks.")
+
+            council = op_list
+
+        # Strict majority, matching the contract's own 2k>n check.
+        council_threshold = council_threshold or (len(council) // 2 + 1)
+
         instance = CredentialManager.deploy(
             op_list,
             threshold,
@@ -211,6 +270,12 @@ if _EVM_AVAILABLE:
             registry_address,
             meas,
             automata_verifier,
+            attestation_test_mode,
+            council,
+            council_threshold,
+            manage_profile_window,
+            signer_rotation_window,
+            withdrawal_quorum,
             sender=account,
         )
         click.echo(f"deployed: {instance.address}")
@@ -226,18 +291,29 @@ if _EVM_AVAILABLE:
         except click.UsageError:
             ce = None
 
+        # Waiting on vault registration reads the vault list back from the OMS.
+        try:
+            assets = cli_ctx.orderbook_client(anonymous=True).assets
+        except click.UsageError:
+            assets = None
+
         credman = (
             cast("CredentialManager", CredentialManager.at(credential_manager_address))
             if credential_manager_address
             else None
         )
         return CredentialManagerOwner(
-            admin=signer, signers=[signer], credential_manager=credman, clearing_engine=ce
+            admin=signer,
+            signers=[signer],
+            credential_manager=credman,
+            clearing_engine=ce,
+            asset_registry_client=assets,
         )
 
     @vaults.command("register", cls=ConnectedProviderCommand)
     @tplus_network_option()
     @clearing_url_option()
+    @orderbook_url_option()
     @ignore_ssl_option()
     @credential_manager_address_option()
     @tplus_account_option()

{tpluspy-0.3.2 → tpluspy-0.4.0}/tplus/client/api.py

@@ -2,7 +2,7 @@
 
 from typing import Any
 
-from tplus.client.auth import AuthenticatedClient
+from tplus.client.auth import Auth, AuthenticatedClient
 from tplus.client.market_data import MarketDataClient
 from tplus.client.orderbook import OrderBookClient
 
@@ -10,12 +10,11 @@ DEFAULT_BASE_URL = "http://localhost:8080"
 
 
 class TplusApiClient(AuthenticatedClient):
-    """Single-token client for the T+ API gateway.
+    """Client for the T+ API gateway.
 
     The gateway is a reverse proxy exposing both the OMS and the MDS behind one
-    origin and one auth token, so a single nonce/token handshake authenticates
-    every endpoint. This client owns the shared httpx connection and ``Auth``;
-    the two service namespaces are composed off it so they reuse both:
+    origin. OMS and MDS are separate token authorities, so the service namespaces
+    share one HTTP connection but maintain independent auth sessions:
 
     - ``.oms`` — :class:`OrderBookClient` (orders, inventory, positions, margin).
     - ``.mds`` — :class:`MarketDataClient` (klines, depth, tickers, user trades).
@@ -33,7 +32,11 @@ class TplusApiClient(AuthenticatedClient):
     def __init__(self, base_url: str = DEFAULT_BASE_URL, **kwargs) -> None:
         super().__init__(base_url, **kwargs)
         self.oms = OrderBookClient.from_client(self)
-        self.mds = MarketDataClient.from_client(self)
+        self.mds = MarketDataClient.from_client(
+            self,
+            auth=Auth(cache_dir=self._auth.cache_dir),
+            auth_path_prefix="/market-data",
+        )
 
     def __getattr__(self, name: str) -> Any:
         # Only reached when normal lookup fails, so real inherited attributes