cartha-cli 1.0.4__py3-none-any.whl → 1.0.7__py3-none-any.whl

cartha_cli/bt.py

@@ -51,92 +51,100 @@ def register_hotkey(
     """Register a hotkey on the target subnet and return the resulting UID."""
 
     subtensor = get_subtensor(network)
-    wallet = get_wallet(wallet_name, hotkey_name)
-    hotkey_ss58 = wallet.hotkey.ss58_address
-
-    if subtensor.is_hotkey_registered(hotkey_ss58, netuid=netuid):
-        neuron = subtensor.get_neuron_for_pubkey_and_subnet(hotkey_ss58, netuid)
-        uid = None if getattr(neuron, "is_null", False) else getattr(neuron, "uid", None)
-        return RegistrationResult(status="already", success=True, uid=uid, hotkey=hotkey_ss58)
+    try:
+        wallet = get_wallet(wallet_name, hotkey_name)
+        hotkey_ss58 = wallet.hotkey.ss58_address
 
-    # Get balance before registration
-    balance_before = None
-    balance_after = None
-    extrinsic = None
+        if subtensor.is_hotkey_registered(hotkey_ss58, netuid=netuid):
+            neuron = subtensor.get_neuron_for_pubkey_and_subnet(hotkey_ss58, netuid)
+            uid = None if getattr(neuron, "is_null", False) else getattr(neuron, "uid", None)
+            return RegistrationResult(status="already", success=True, uid=uid, hotkey=hotkey_ss58)
 
-    try:
-        balance_obj = subtensor.get_balance(wallet.coldkeypub.ss58_address)
-        # Convert Balance object to float using .tao property
-        balance_before = balance_obj.tao if hasattr(balance_obj, "tao") else float(balance_obj)
-    except Exception:
-        pass  # Balance may not be available, continue anyway
-
-    if burned:
-        # burned_register returns (success, block_info) or just success
-        registration_result = subtensor.burned_register(
-            wallet=wallet,
-            netuid=netuid,
-            wait_for_finalization=wait_for_finalization,
-        )
+        # Get balance before registration
+        balance_before = None
+        balance_after = None
+        extrinsic = None
 
-        # Handle both return types: bool or (bool, message)
-        if isinstance(registration_result, tuple):
-            ok, message = registration_result
-            if isinstance(message, str) and message:
-                extrinsic = message
+        try:
+            balance_obj = subtensor.get_balance(wallet.coldkeypub.ss58_address)
+            # Convert Balance object to float using .tao property
+            balance_before = balance_obj.tao if hasattr(balance_obj, "tao") else float(balance_obj)
+        except Exception:
+            pass  # Balance may not be available, continue anyway
+
+        if burned:
+            # burned_register returns (success, block_info) or just success
+            registration_result = subtensor.burned_register(
+                wallet=wallet,
+                netuid=netuid,
+                wait_for_finalization=wait_for_finalization,
+            )
+
+            # Handle both return types: bool or (bool, message)
+            if isinstance(registration_result, tuple):
+                ok, message = registration_result
+                if isinstance(message, str) and message:
+                    extrinsic = message
+            else:
+                ok = registration_result
+
+            status = "burned"
         else:
-            ok = registration_result
-
-        status = "burned"
-    else:
-        ok = subtensor.register(
-            wallet=wallet,
-            netuid=netuid,
-            wait_for_finalization=wait_for_finalization,
-            wait_for_inclusion=wait_for_inclusion,
-            cuda=cuda,
-            dev_id=dev_id,
-            tpb=tpb,
-            num_processes=num_processes,
-            log_verbose=False,
-        )
-        status = "pow"
-        if isinstance(ok, tuple) and len(ok) == 2:
-            ok, message = ok
-            if isinstance(message, str):
-                extrinsic = message
+            ok = subtensor.register(
+                wallet=wallet,
+                netuid=netuid,
+                wait_for_finalization=wait_for_finalization,
+                wait_for_inclusion=wait_for_inclusion,
+                cuda=cuda,
+                dev_id=dev_id,
+                tpb=tpb,
+                num_processes=num_processes,
+                log_verbose=False,
+            )
+            status = "pow"
+            if isinstance(ok, tuple) and len(ok) == 2:
+                ok, message = ok
+                if isinstance(message, str):
+                    extrinsic = message
+
+        if not ok:
+            return RegistrationResult(
+                status=status,
+                success=False,
+                uid=None,
+                hotkey=hotkey_ss58,
+                balance_before=balance_before,
+                balance_after=balance_after,
+                extrinsic=extrinsic,
+            )
+
+        # Get balance after registration
+        try:
+            balance_obj = subtensor.get_balance(wallet.coldkeypub.ss58_address)
+            # Convert Balance object to float using .tao property
+            balance_after = balance_obj.tao if hasattr(balance_obj, "tao") else float(balance_obj)
+        except Exception:
+            pass
+
+        neuron = subtensor.get_neuron_for_pubkey_and_subnet(hotkey_ss58, netuid)
+        uid = None if getattr(neuron, "is_null", False) else getattr(neuron, "uid", None)
 
-    if not ok:
         return RegistrationResult(
             status=status,
-            success=False,
-            uid=None,
+            success=True,
+            uid=uid,
             hotkey=hotkey_ss58,
             balance_before=balance_before,
             balance_after=balance_after,
             extrinsic=extrinsic,
         )
-
-    # Get balance after registration
-    try:
-        balance_obj = subtensor.get_balance(wallet.coldkeypub.ss58_address)
-        # Convert Balance object to float using .tao property
-        balance_after = balance_obj.tao if hasattr(balance_obj, "tao") else float(balance_obj)
-    except Exception:
-        pass
-
-    neuron = subtensor.get_neuron_for_pubkey_and_subnet(hotkey_ss58, netuid)
-    uid = None if getattr(neuron, "is_null", False) else getattr(neuron, "uid", None)
-
-    return RegistrationResult(
-        status=status,
-        success=True,
-        uid=uid,
-        hotkey=hotkey_ss58,
-        balance_before=balance_before,
-        balance_after=balance_after,
-        extrinsic=extrinsic,
-    )
+    finally:
+        # Clean up subtensor connection
+        try:
+            if hasattr(subtensor, "close"):
+                subtensor.close()
+        except Exception:
+            pass  # Silently ignore cleanup errors
 
 
 def get_burn_cost(network: str, netuid: int) -> float | None:

cartha_cli/commands/prove_lock.py

@@ -381,26 +381,31 @@ def prove_lock(
         if chain is None:
             # Try to get chain ID from pool ID first
             auto_chain_id = None
+            # Ensure pool_id is properly formatted (lowercase, with 0x prefix)
+            pool_id_normalized = pool_id.lower().strip()
+            if not pool_id_normalized.startswith("0x"):
+                pool_id_normalized = "0x" + pool_id_normalized
+            
             try:
-                auto_chain_id = pool_id_to_chain_id(pool_id)
-            except (NameError, AttributeError):
+                auto_chain_id = pool_id_to_chain_id(pool_id_normalized)
+            except (NameError, AttributeError, TypeError):
                 # Function not available - this shouldn't happen if imports worked
                 # But handle gracefully by trying to import it
                 try:
                     from ..testnet.pool_ids import pool_id_to_chain_id
-                    auto_chain_id = pool_id_to_chain_id(pool_id)
-                except (ImportError, ModuleNotFoundError):
+                    auto_chain_id = pool_id_to_chain_id(pool_id_normalized)
+                except (ImportError, ModuleNotFoundError, TypeError):
                     pass
             
             if not auto_chain_id:
                 # Fallback: try to get from vault address
                 try:
                     auto_chain_id = vault_address_to_chain_id(vault)
-                except (NameError, AttributeError):
+                except (NameError, AttributeError, TypeError):
                     try:
                         from ..testnet.pool_ids import vault_address_to_chain_id
                         auto_chain_id = vault_address_to_chain_id(vault)
-                    except (ImportError, ModuleNotFoundError):
+                    except (ImportError, ModuleNotFoundError, TypeError):
                         pass
             
             if auto_chain_id:
@@ -410,22 +415,29 @@ def prove_lock(
                     f"[bold green]✓ Auto-matched chain ID[/] - {chain_name} (chain ID: {chain})"
                 )
             else:
-                # Fallback: prompt for chain ID if no mapping found
-                console.print(
-                    "[yellow]⚠ No chain ID mapping found. Please provide chain ID.[/]"
-                )
-                while True:
-                    try:
-                        chain_input = typer.prompt("Chain ID", show_default=False)
-                        chain = int(chain_input)
-                        if chain <= 0:
-                            console.print(
-                                "[bold red]Error:[/] Chain ID must be a positive integer"
-                            )
-                            continue
-                        break
-                    except ValueError:
-                        console.print("[bold red]Error:[/] Chain ID must be a valid integer")
+                # Fallback: if on testnet and we have a vault, default to Base Sepolia (84532)
+                if network == "test" and vault:
+                    chain = 84532
+                    console.print(
+                        f"[bold green]✓ Auto-matched chain ID[/] - Base Sepolia (chain ID: 84532) [dim](testnet default)[/]"
+                    )
+                else:
+                    # Prompt for chain ID if no mapping found
+                    console.print(
+                        "[yellow]⚠ No chain ID mapping found. Please provide chain ID.[/]"
+                    )
+                    while True:
+                        try:
+                            chain_input = typer.prompt("Chain ID", show_default=False)
+                            chain = int(chain_input)
+                            if chain <= 0:
+                                console.print(
+                                    "[bold red]Error:[/] Chain ID must be a positive integer"
+                                )
+                                continue
+                            break
+                        except ValueError:
+                            console.print("[bold red]Error:[/] Chain ID must be a valid integer")
         else:
             # Chain ID was provided, verify it matches vault if possible
             expected_chain_id = None

{cartha_cli-1.0.4.dist-info → cartha_cli-1.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cartha-cli
-Version: 1.0.4
+Version: 1.0.7
 Summary: CLI utilities for Cartha subnet miners.
 Project-URL: Homepage, https://cartha.finance
 Project-URL: Repository, https://github.com/General-Tao-Ventures/cartha-cli
@@ -43,7 +43,7 @@ Cartha CLI makes mining on the Cartha subnet effortless. As the Liquidity Provid
 - **📊 Instant Status Updates** - See all your pools, balances, and expiration dates at a glance
 - **⏰ Smart Expiration Warnings** - Never miss a renewal with color-coded countdowns
 - **💼 Multi-Pool Management** - Track multiple trading pairs in one place
-- **🔑 Secure by Default** - Your password stays hidden until you actually need it
+- **🔒 Secure Authentication** - Session-based authentication with your Bittensor hotkey
 
 ## Installation
 
@@ -64,17 +64,19 @@ cartha miner register --help
 cartha miner status --help
 
 # Check CLI health and connectivity
-cartha health
+cartha utils health
 
 # Or use short aliases
 cartha m status
 cartha v lock
+cartha u health
 ```
 
 ## Requirements
 
 - Python 3.11
-- Bittensor wallet
+- Bittensor wallet within btcli
+    - learn how to create/import one here https://docs.learnbittensor.org/keys/working-with-keys
 
 ## What You Can Do
 
@@ -90,14 +92,12 @@ cartha miner register --wallet-name your-wallet --wallet-hotkey your-hotkey
 cartha miner status --wallet-name your-wallet --wallet-hotkey your-hotkey
 # Or use the short alias: cartha m status
 ```
-
-### Track Your Pools
-
-See all your active trading pairs, balances, and when they expire—all in one command. The CLI shows you:
-- Which pools are active and earning rewards
-- How much you have locked in each pool
-- Days remaining before expiration (with helpful warnings)
-- Which pools are included in the next reward epoch
+> **Track Your Miner Status**
+> See all your active trading pairs, balances, and when they expire—all in one command. The CLI shows you:
+> - Which pools are active and earning rewards
+> - How much you have locked in each pool
+> - Days remaining before expiration (with helpful warnings)
+> - Which pools are included in the next reward epoch
 
 ### View Available Pools
 
@@ -110,14 +110,14 @@ cartha vault pools
 
 This shows you which pools are available, their full pool IDs, vault contract addresses, and chain IDs.
 
-### Lock Your Funds
+### Lock Your Funds to start Mining
 
 Create a new lock position with the streamlined lock flow:
 ```bash
 cartha vault lock \
   --coldkey your-wallet \
   --hotkey your-hotkey \
-  --pool-id "BTCUSD" \
+  --pool-id BTCUSD \
   --amount 1000.0 \
   --lock-days 30 \
   --owner-evm 0xYourEVMAddress \
@@ -136,36 +136,31 @@ The CLI will:
 1. Check your registration on the specified network (subnet 35 for finney, subnet 78 for test)
 2. Authenticate with your Bittensor hotkey
 3. Request a signed LockRequest from the verifier
-4. Automatically open the Cartha Lock UI in your browser with all parameters pre-filled
+4. Automatically open the Cartha Lock UI in your browser with all parameters pre-filled (you can also paste the url into your browser manually)
 5. Guide you through Phase 1 (Approve USDC) and Phase 2 (Lock Position) via the web interface
 6. Automatically detect when approval completes and proceed to Phase 2
 7. The verifier automatically detects your lock and adds you to the upcoming epoch
 
 **Managing Positions**: Visit https://cartha.finance/manage to view all your positions, extend locks, or top up existing positions.
 
-### View Your Password
-
-When you need your password (like for signing transactions):
-```bash
-cartha miner password --wallet-name your-wallet --wallet-hotkey your-hotkey
-```
-
-**Tip:** Use `miner status` for daily checks—it's faster and doesn't require signing. Only use `miner password` when you actually need it.
-
 ### Check Your Setup
 
 Verify your CLI is configured correctly and can reach all services:
 
 ```bash
-cartha health
+cartha utils health
+# Or use the short alias
+cartha u health
 ```
 
 This checks:
 - Verifier connectivity and latency
 - Bittensor network connectivity
 - Configuration validation
+- Subnet metadata
+- Environment variables
 
-Use `cartha health --verbose` for detailed troubleshooting information.
+Use `cartha utils health --verbose` (or `cartha u health --verbose`) for detailed troubleshooting information.
 
 ## Need Help?
 
@@ -179,4 +174,4 @@ We welcome contributions! Please see our [Feedback & Support](docs/FEEDBACK.md)
 
 ---
 
-**Made with ❤ by GTV**
+**Made with ❤ by General Tensor**

{cartha_cli-1.0.4.dist-info → cartha_cli-1.0.7.dist-info}/RECORD

@@ -1,5 +1,5 @@
 cartha_cli/__init__.py,sha256=cSKsPAfHW8_hqJkGMXUh4mFNz9HXsq-UcgRl8G_2KhM,720
-cartha_cli/bt.py,sha256=GGW8QvOgFPFNrIghu7JNygRmTgBeMt2vhEh26ZiPe4Q,6933
+cartha_cli/bt.py,sha256=UC5n0LpLD2YNOL-xsawrzohXpuHaoClraQh3fu4qI90,7467
 cartha_cli/config.py,sha256=MSHNiRow1tzHUJeMOvQRQsTslntV6DecLTQ-Y_CmB4A,2294
 cartha_cli/display.py,sha256=Krim69DLgiCHSYDuWNjnOep25IAHUebRAceePHfsiRA,2040
 cartha_cli/eth712.py,sha256=5NU0MnvOk89mxWnkDHzoOaSHN8TJGRAHVLGXmCq8jhM,241
@@ -17,15 +17,15 @@ cartha_cli/commands/miner_password.py,sha256=7cbcyrJ9KzCyJ68_174U_CXjBUt9BaYhgKA
 cartha_cli/commands/miner_status.py,sha256=tWlCWcuwm9NEd4USuCLp_6qObikX2odc2e7m6Y_vNrU,21873
 cartha_cli/commands/pair_status.py,sha256=LoU-fA1MXuWZGHNmeKPMjwvNw30Yn094ZD1EC0-WXVc,19978
 cartha_cli/commands/pools.py,sha256=P02SEp23a7OdrgNj6AaiJTnQ9K_QrI300DzucA6HH8A,3884
-cartha_cli/commands/prove_lock.py,sha256=Pv41zrQYlHvRt_k1oD4oogPpNSF5ZYpwwpzDtGPBRmQ,60397
+cartha_cli/commands/prove_lock.py,sha256=FkurHtL2i2891ACEV1TejTAgkutIV1grykatx0W-JCI,61168
 cartha_cli/commands/register.py,sha256=sxbYO0V4NucOKLZpaFoVnhFDHLSLDHREoMtN9DjyLsM,10227
 cartha_cli/commands/shared_options.py,sha256=itHzJSgxuKQxUVOh1_jVTcMQXjI3PPzexQyhqIbabxc,5874
 cartha_cli/commands/version.py,sha256=u5oeccQzK0LLcCbgZm0U8-Vslk5vB_lVvW3xT5HPeTg,456
 cartha_cli/testnet/README.md,sha256=kWKaLtq6t_46W-mvXkSaLi2fjXDELLk5ntVGkogiUY0,14511
 cartha_cli/testnet/__init__.py,sha256=xreJMXs-ZKTkPtUQBR5xdY7ImOyUiF7WKG6bv9J9aBM,41
 cartha_cli/testnet/pool_ids.py,sha256=0jvQ6tvc6sL0aGKkl31KXM6ngVpUboYiABY5SDMaRCQ,6747
-cartha_cli-1.0.4.dist-info/METADATA,sha256=hi8-tPSksk3s58HIx3RAwd2M6uFVFtOUlR02DkGExkQ,5794
-cartha_cli-1.0.4.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-cartha_cli-1.0.4.dist-info/entry_points.txt,sha256=sTYVMgb9l0fuJibUtWpGnIoDmgHinne97G4Y_cCwC-U,43
-cartha_cli-1.0.4.dist-info/licenses/LICENSE,sha256=B4UCiDn13m4xYwIl4TMKfbuKw7kh9pg4c81rJecxHSo,1076
-cartha_cli-1.0.4.dist-info/RECORD,,
+cartha_cli-1.0.7.dist-info/METADATA,sha256=E878CuRf8Mc_zua_l8H7wLQoFB_oZNDpIp7fYF8iYN4,5842
+cartha_cli-1.0.7.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+cartha_cli-1.0.7.dist-info/entry_points.txt,sha256=sTYVMgb9l0fuJibUtWpGnIoDmgHinne97G4Y_cCwC-U,43
+cartha_cli-1.0.7.dist-info/licenses/LICENSE,sha256=B4UCiDn13m4xYwIl4TMKfbuKw7kh9pg4c81rJecxHSo,1076
+cartha_cli-1.0.7.dist-info/RECORD,,