I'm not proud of this code

Author: thewhaleking

bittensor_cli/cli.py

@@ -12,7 +12,7 @@
 import warnings
 from dataclasses import fields
 from pathlib import Path
-from typing import Coroutine, Optional
+from typing import Coroutine, Optional, Union
 
 import numpy as np
 import rich
@@ -1639,15 +1639,17 @@ def wallet_ask(
         wallet_hotkey: Optional[str],
         ask_for: Optional[list[str]] = None,
         validate: WV = WV.WALLET,
-    ) -> Wallet:
+        return_wallet_and_hotkey: bool = False,
+    ) -> Union[Wallet, tuple[Wallet, str]]:
         """
         Generates a wallet object based on supplied values, validating the wallet is valid if flag is set
         :param wallet_name: name of the wallet
         :param wallet_path: root path of the wallets
         :param wallet_hotkey: name of the wallet hotkey file
         :param validate: flag whether to check for the wallet's validity
         :param ask_for: aspect of the wallet (name, path, hotkey) to prompt the user for
-        :return: created Wallet object
+        :param return_wallet_and_hotkey: if specified, will return both the wallet object, and the hotkey SS58
+        :return: created Wallet object (or wallet, hotkey ss58)
         """
         ask_for = ask_for or []
         # Prompt for missing attributes specified in ask_for
@@ -1672,8 +1674,9 @@ def wallet_ask(
                 )
             else:
                 wallet_hotkey = Prompt.ask(
-                    "Enter the [blue]wallet hotkey[/blue]"
-                    + " [dark_sea_green3 italic](Hint: You can set this with `btcli config set --wallet-hotkey`)[/dark_sea_green3 italic]",
+                    "Enter the [blue]wallet hotkey[/blue][dark_sea_green3 italic]"
+                    "(Hint: You can set this with `btcli config set --wallet-hotkey`)"
+                    "[/dark_sea_green3 italic]",
                     default=defaults.wallet.hotkey,
                 )
         if wallet_path:
@@ -1691,7 +1694,8 @@ def wallet_ask(
         if WO.PATH in ask_for and not wallet_path:
             wallet_path = Prompt.ask(
                 "Enter the [blue]wallet path[/blue]"
-                + " [dark_sea_green3 italic](Hint: You can set this with `btcli config set --wallet-path`)[/dark_sea_green3 italic]",
+                "[dark_sea_green3 italic](Hint: You can set this with `btcli config set --wallet-path`)"
+                "[/dark_sea_green3 italic]",
                 default=defaults.wallet.path,
             )
         # Create the Wallet object
@@ -1715,7 +1719,25 @@ def wallet_ask(
                     f"Please verify your wallet information: {wallet}[/red]"
                 )
                 raise typer.Exit()
-        return wallet
+        if return_wallet_and_hotkey:
+            valid = utils.is_valid_wallet(wallet)
+            if valid[1]:
+                return wallet, wallet.hotkey.ss58_address
+            else:
+                hotkey = (
+                    Prompt.ask(
+                        "Enter the SS58 of the hotkey to use for this transaction."
+                    )
+                ).strip()
+                if not is_valid_ss58_address(hotkey):
+                    err_console.print(
+                        f"[red]Error: {hotkey} is not valid SS58 address."
+                    )
+                    raise typer.Exit(1)
+                else:
+                    return wallet, hotkey
+        else:
+            return wallet
 
     def wallet_list(
         self,
@@ -5834,18 +5856,13 @@ def liquidity_add(
                 show_default=False,
             )
 
-        if not wallet_name:
-            wallet_name = Prompt.ask(
-                "Enter the [blue]wallet name[/blue]",
-                default=self.config.get("wallet_name") or defaults.wallet.name,
-            )
-
-        wallet = self.wallet_ask(
+        wallet, hotkey = self.wallet_ask(
             wallet_name=wallet_name,
             wallet_path=wallet_path,
             wallet_hotkey=wallet_hotkey,
             ask_for=[WO.NAME, WO.HOTKEY, WO.PATH],
-            validate=WV.WALLET_AND_HOTKEY,
+            validate=WV.WALLET,
+            return_wallet_and_hotkey=True,
         )
         # Determine the liquidity amount.
         if liquidity_:
@@ -5874,6 +5891,7 @@ def liquidity_add(
             liquidity.add_liquidity(
                 subtensor=self.initialize_chain(network),
                 wallet=wallet,
+                hotkey_ss58=hotkey,
                 netuid=netuid,
                 liquidity=liquidity_,
                 price_low=price_low,
@@ -5908,7 +5926,7 @@ def liquidity_list(
             wallet_path=wallet_path,
             wallet_hotkey=wallet_hotkey,
             ask_for=[WO.NAME, WO.HOTKEY, WO.PATH],
-            validate=WV.WALLET_AND_HOTKEY,
+            validate=WV.WALLET,
         )
         self._run_command(
             liquidity.show_liquidity_list(
@@ -5961,17 +5979,19 @@ def liquidity_remove(
                 show_default=False,
             )
 
-        wallet = self.wallet_ask(
+        wallet, hotkey = self.wallet_ask(
             wallet_name=wallet_name,
             wallet_path=wallet_path,
             wallet_hotkey=wallet_hotkey,
             ask_for=[WO.NAME, WO.HOTKEY, WO.PATH],
-            validate=WV.WALLET_AND_HOTKEY,
+            validate=WV.WALLET,
+            return_wallet_and_hotkey=True,
         )
         return self._run_command(
             liquidity.remove_liquidity(
                 subtensor=self.initialize_chain(network),
                 wallet=wallet,
+                hotkey_ss58=hotkey,
                 netuid=netuid,
                 position_id=position_id,
                 prompt=prompt,
@@ -6011,12 +6031,13 @@ def liquidity_modify(
                 f"Enter the [{COLORS.G.SUBHEAD_MAIN}]netuid[/{COLORS.G.SUBHEAD_MAIN}] to use",
             )
 
-        wallet = self.wallet_ask(
+        wallet, hotkey = self.wallet_ask(
             wallet_name=wallet_name,
             wallet_path=wallet_path,
             wallet_hotkey=wallet_hotkey,
             ask_for=[WO.NAME, WO.HOTKEY, WO.PATH],
-            validate=WV.WALLET_AND_HOTKEY,
+            validate=WV.WALLET,
+            return_wallet_and_hotkey=True,
         )
 
         if not position_id:
@@ -6035,6 +6056,7 @@ def liquidity_modify(
             liquidity.modify_liquidity(
                 subtensor=self.initialize_chain(network),
                 wallet=wallet,
+                hotkey_ss58=hotkey,
                 netuid=netuid,
                 position_id=position_id,
                 liquidity_delta=liquidity_delta,

bittensor_cli/src/commands/liquidity/liquidity.py

@@ -29,6 +29,7 @@
 async def add_liquidity_extrinsic(
     subtensor: "SubtensorInterface",
     wallet: "Wallet",
+    hotkey_ss58: str,
     netuid: int,
     liquidity: Balance,
     price_low: Balance,
@@ -42,6 +43,7 @@ async def add_liquidity_extrinsic(
     Arguments:
         subtensor: The Subtensor client instance used for blockchain interaction.
         wallet: The wallet used to sign the extrinsic (must be unlocked).
+        hotkey_ss58: the SS58 of the hotkey to use for this transaction.
         netuid: The UID of the target subnet for which the call is being initiated.
         liquidity: The amount of liquidity to be added.
         price_low: The lower bound of the price tick range.
@@ -67,7 +69,7 @@ async def add_liquidity_extrinsic(
         call_module="Swap",
         call_function="add_liquidity",
         call_params={
-            "hotkey": wallet.hotkey.ss58_address,
+            "hotkey": hotkey_ss58,
             "netuid": netuid,
             "tick_low": tick_low,
             "tick_high": tick_high,
@@ -86,6 +88,7 @@ async def add_liquidity_extrinsic(
 async def modify_liquidity_extrinsic(
     subtensor: "SubtensorInterface",
     wallet: "Wallet",
+    hotkey_ss58: str,
     netuid: int,
     position_id: int,
     liquidity_delta: Balance,
@@ -97,6 +100,7 @@ async def modify_liquidity_extrinsic(
     Arguments:
         subtensor: The Subtensor client instance used for blockchain interaction.
         wallet: The wallet used to sign the extrinsic (must be unlocked).
+        hotkey_ss58: the SS58 of the hotkey to use for this transaction.
         netuid: The UID of the target subnet for which the call is being initiated.
         position_id: The id of the position record in the pool.
         liquidity_delta: The amount of liquidity to be added or removed (add if positive or remove if negative).
@@ -118,7 +122,7 @@ async def modify_liquidity_extrinsic(
         call_module="Swap",
         call_function="modify_position",
         call_params={
-            "hotkey": wallet.hotkey.ss58_address,
+            "hotkey": hotkey_ss58,
             "netuid": netuid,
             "position_id": position_id,
             "liquidity_delta": liquidity_delta.rao,
@@ -136,6 +140,7 @@ async def modify_liquidity_extrinsic(
 async def remove_liquidity_extrinsic(
     subtensor: "SubtensorInterface",
     wallet: "Wallet",
+    hotkey_ss58: str,
     netuid: int,
     position_id: int,
     wait_for_inclusion: bool = True,
@@ -146,6 +151,7 @@ async def remove_liquidity_extrinsic(
     Arguments:
         subtensor: The Subtensor client instance used for blockchain interaction.
         wallet: The wallet used to sign the extrinsic (must be unlocked).
+        hotkey_ss58: the SS58 of the hotkey to use for this transaction.
         netuid: The UID of the target subnet for which the call is being initiated.
         position_id: The id of the position record in the pool.
         wait_for_inclusion: Whether to wait for the extrinsic to be included in a block. Defaults to True.
@@ -166,7 +172,7 @@ async def remove_liquidity_extrinsic(
         call_module="Swap",
         call_function="remove_liquidity",
         call_params={
-            "hotkey": wallet.hotkey.ss58_address,
+            "hotkey": hotkey_ss58,
             "netuid": netuid,
             "position_id": position_id,
         },
@@ -224,6 +230,7 @@ async def toggle_user_liquidity_extrinsic(
 async def add_liquidity(
     subtensor: "SubtensorInterface",
     wallet: "Wallet",
+    hotkey_ss58: str,
     netuid: Optional[int],
     liquidity: Optional[float],
     price_low: Optional[float],
@@ -512,6 +519,7 @@ async def show_liquidity_list(
 async def remove_liquidity(
     subtensor: "SubtensorInterface",
     wallet: "Wallet",
+    hotkey_ss58: str,
     netuid: int,
     position_id: Optional[int] = None,
     prompt: Optional[bool] = None,
@@ -551,6 +559,7 @@ async def remove_liquidity(
             remove_liquidity_extrinsic(
                 subtensor=subtensor,
                 wallet=wallet,
+                hotkey_ss58=hotkey_ss58,
                 netuid=netuid,
                 position_id=pos_id,
             )
@@ -573,6 +582,7 @@ async def remove_liquidity(
 async def modify_liquidity(
     subtensor: "SubtensorInterface",
     wallet: "Wallet",
+    hotkey_ss58: str,
     netuid: int,
     position_id: int,
     liquidity_delta: Optional[float],
@@ -603,6 +613,7 @@ async def modify_liquidity(
     success, msg = await modify_liquidity_extrinsic(
         subtensor=subtensor,
         wallet=wallet,
+        hotkey_ss58=hotkey_ss58,
         netuid=netuid,
         position_id=position_id,
         liquidity_delta=liquidity_delta,