hypercli-cli 0.8.0__tar.gz → 0.8.1__tar.gz

{hypercli_cli-0.8.0 → hypercli_cli-0.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hypercli-cli
-Version: 0.8.0
+Version: 0.8.1
 Summary: CLI for HyperCLI - GPU orchestration and LLM API
 Project-URL: Homepage, https://hypercli.com
 Project-URL: Documentation, https://docs.hypercli.com
@@ -21,7 +21,7 @@ Requires-Dist: argon2-cffi>=25.0.0; extra == 'all'
 Requires-Dist: eth-account>=0.13.0; extra == 'all'
 Requires-Dist: hypercli-sdk[comfyui]>=0.7.1; extra == 'all'
 Requires-Dist: web3>=7.0.0; extra == 'all'
-Requires-Dist: x402[httpx]>=2.0.0; extra == 'all'
+Requires-Dist: x402[evm,httpx]>=2.0.0; extra == 'all'
 Provides-Extra: comfyui
 Requires-Dist: hypercli-sdk[comfyui]>=0.7.1; extra == 'comfyui'
 Provides-Extra: dev
@@ -32,7 +32,7 @@ Requires-Dist: argon2-cffi>=25.0.0; extra == 'wallet'
 Requires-Dist: eth-account>=0.13.0; extra == 'wallet'
 Requires-Dist: qrcode[pil]>=7.4.0; extra == 'wallet'
 Requires-Dist: web3>=7.0.0; extra == 'wallet'
-Requires-Dist: x402[httpx]>=2.0.0; extra == 'wallet'
+Requires-Dist: x402[evm,httpx]>=2.0.0; extra == 'wallet'
 Description-Content-Type: text/markdown
 
 # HyperCLI CLI

{hypercli_cli-0.8.0 → hypercli_cli-0.8.1}/hypercli_cli/wallet.py

@@ -240,6 +240,175 @@ def balance():
         console.print(f"\n[green]✓[/green] You have [bold]{balance_usdc:.2f} USDC[/bold]")
 
 
+@app.command("topup")
+def topup(
+    amount: str = typer.Argument(help="Amount in USDC to top up (max 6 decimals)"),
+    api_url: str = typer.Option(None, help="API URL override"),
+):
+    """Top up account balance via Orchestra x402 endpoint.
+
+    Flow:
+    1) Resolve user_id via GET /api/user using your existing API key
+    2) POST /api/x402/top_up with {user_id, amount}
+    3) Handle 402 and retry with x402 payment headers
+
+    Examples:
+        hyper wallet topup 10
+        hyper wallet topup 25.50
+    """
+    require_wallet_deps()
+    from decimal import Decimal, InvalidOperation
+    import httpx
+    from hypercli.config import get_api_key, get_api_url
+
+    try:
+        from x402 import x402ClientSync
+        from x402.http import x402HTTPClientSync
+        from x402.mechanisms.evm import EthAccountSigner
+        from x402.mechanisms.evm.exact.register import register_exact_evm_client
+    except ImportError:
+        console.print("[red]❌ x402 payment requires wallet/x402 dependencies[/red]")
+        console.print("\nInstall with:")
+        console.print("  [bold]pip install 'hypercli-cli[wallet]'[/bold]")
+        raise typer.Exit(1)
+
+    try:
+        amount_dec = Decimal(amount)
+    except InvalidOperation:
+        console.print(f"[red]❌ Invalid amount: {amount}[/red]")
+        raise typer.Exit(1)
+
+    if amount_dec <= 0:
+        console.print("[red]❌ Amount must be greater than 0[/red]")
+        raise typer.Exit(1)
+    if amount_dec.as_tuple().exponent < -6:
+        console.print("[red]❌ Amount supports at most 6 decimals[/red]")
+        raise typer.Exit(1)
+
+    amount_atomic = int(amount_dec * Decimal("1000000"))
+
+    # Step 1: Load wallet
+    account = load_wallet()
+    console.print(f"[green]✓[/green] Wallet: {account.address}")
+
+    # Step 2: Check USDC balance
+    w3 = Web3(Web3.HTTPProvider(BASE_RPC))
+    usdc_abi = [
+        {
+            "constant": True,
+            "inputs": [{"name": "_owner", "type": "address"}],
+            "name": "balanceOf",
+            "outputs": [{"name": "balance", "type": "uint256"}],
+            "type": "function",
+        }
+    ]
+    usdc = w3.eth.contract(address=USDC_CONTRACT, abi=usdc_abi)
+    balance_raw = usdc.functions.balanceOf(account.address).call()
+    balance_usdc = Decimal(balance_raw) / Decimal("1000000")
+
+    console.print(f"[green]✓[/green] Balance: {balance_usdc:.6f} USDC")
+
+    if balance_raw < amount_atomic:
+        console.print(
+            f"\n[red]❌ Insufficient balance: {balance_usdc:.6f} < {amount_dec:.6f} USDC[/red]"
+        )
+        console.print(f"Send USDC on Base to: [bold]{account.address}[/bold]")
+        raise typer.Exit(1)
+
+    # Step 3: Set up x402 v2 client
+    api_key = get_api_key()
+    if not api_key:
+        console.print("[red]❌ API key required for top-up[/red]")
+        console.print(
+            "Set it with: [bold]hyper configure[/bold] or [bold]hyper wallet login[/bold]"
+        )
+        raise typer.Exit(1)
+
+    base_url = (api_url or get_api_url()).rstrip("/")
+    user_endpoint = f"{base_url}/api/user"
+    topup_endpoint = f"{base_url}/api/x402/top_up"
+    auth_headers = {
+        "Authorization": f"Bearer {api_key}",
+        "Content-Type": "application/json",
+    }
+
+    signer = EthAccountSigner(account)
+    x402_client = x402ClientSync()
+    register_exact_evm_client(x402_client, signer)
+    http_client = x402HTTPClientSync(x402_client)
+
+    with httpx.Client(timeout=30) as client:
+        # Step 4: Resolve user_id from API key
+        console.print("\n[bold]Resolving user...[/bold]")
+        user_resp = client.get(user_endpoint, headers=auth_headers)
+        if user_resp.status_code != 200:
+            console.print(
+                f"[red]❌ Failed to get user: {user_resp.status_code} {user_resp.text}[/red]"
+            )
+            raise typer.Exit(1)
+
+        user_id = user_resp.json().get("user_id")
+        if not user_id:
+            console.print("[red]❌ /api/user response missing user_id[/red]")
+            raise typer.Exit(1)
+
+        payload = {"user_id": user_id, "amount": float(amount_dec)}
+
+        # Step 5: Request top-up (expect 402 then retry with payment)
+        console.print(f"[bold]Requesting top-up of ${amount_dec:.2f}...[/bold]")
+        resp = client.post(topup_endpoint, headers=auth_headers, json=payload)
+
+        if resp.status_code == 402:
+            console.print("[bold]Signing x402 payment...[/bold]")
+            try:
+                payment_headers, _ = http_client.handle_402_response(
+                    dict(resp.headers), resp.content
+                )
+            except Exception as e:
+                console.print(f"[red]❌ Failed to build payment header: {e}[/red]")
+                raise typer.Exit(1)
+
+            console.print("[bold]Submitting payment...[/bold]")
+            retry_headers = {**auth_headers, **payment_headers}
+            retry_headers["Access-Control-Expose-Headers"] = "PAYMENT-RESPONSE,X-PAYMENT-RESPONSE"
+            resp = client.post(topup_endpoint, headers=retry_headers, json=payload)
+
+    if resp.status_code != 200:
+        console.print(f"[red]❌ Top-up failed: {resp.status_code} {resp.text}[/red]")
+        try:
+            settle = http_client.get_payment_settle_response(lambda name: resp.headers.get(name))
+            if getattr(settle, "error_reason", None):
+                console.print(f"[red]❌ Payment error: {settle.error_reason}[/red]")
+        except Exception:
+            pass
+        raise typer.Exit(1)
+
+    result = resp.json()
+
+    credited = result.get("amount", float(amount_dec))
+    wallet = result.get("wallet", account.address)
+    tx_id = result.get("transaction_id", "")
+    msg = result.get("message", "Top-up successful")
+
+    console.print(f"\n[bold green]✓ Top-up successful![/bold green]\n")
+    console.print(f"  User:      {result.get('user_id', 'N/A')}")
+    console.print(f"  Credited:  ${credited} USDC")
+    console.print(f"  Wallet:    {wallet}")
+    console.print(f"  Tx ID:     {tx_id or 'N/A'}")
+    console.print(f"  Message:   {msg}")
+
+    try:
+        settle = http_client.get_payment_settle_response(lambda name: resp.headers.get(name))
+        if getattr(settle, "transaction", None):
+            console.print(f"  On-chain:  {settle.transaction}")
+        if getattr(settle, "network", None):
+            console.print(f"  Network:   {settle.network}")
+    except Exception:
+        pass
+
+    console.print()
+
+
 @app.command("login")
 def wallet_login(
     name: str = typer.Option("cli", help="Name for the generated API key"),

{hypercli_cli-0.8.0 → hypercli_cli-0.8.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "hypercli-cli"
-version = "0.8.0"
+version = "0.8.1"
 description = "CLI for HyperCLI - GPU orchestration and LLM API"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -28,7 +28,7 @@ comfyui = [
     "hypercli-sdk[comfyui]>=0.7.1",
 ]
 wallet = [
-    "x402[httpx]>=2.0.0",
+    "x402[httpx,evm]>=2.0.0",
     "eth-account>=0.13.0",
     "web3>=7.0.0",
     "argon2-cffi>=25.0.0",
@@ -36,7 +36,7 @@ wallet = [
 ]
 all = [
     "hypercli-sdk[comfyui]>=0.7.1",
-    "x402[httpx]>=2.0.0",
+    "x402[httpx,evm]>=2.0.0",
     "eth-account>=0.13.0",
     "web3>=7.0.0",
     "argon2-cffi>=25.0.0",