Extract wallet

bittensor/__init__.py

@@ -155,8 +155,8 @@ def turn_console_off():
 from bittensor._cli import cli as cli
 from bittensor._axon import axon as axon
 from bittensor._axon import axon_info as axon_info
-from bittensor._wallet import wallet as wallet
-from bittensor._keyfile import keyfile as keyfile
+from bittensor_wallet import wallet as wallet
+from bittensor_wallet import keyfile as keyfile
 from bittensor._metagraph import metagraph as metagraph
 from bittensor._prometheus import prometheus as prometheus
 from bittensor._subtensor import subtensor as subtensor
@@ -171,8 +171,9 @@ def turn_console_off():
 from bittensor._cli.cli_impl import CLI as CLI
 from bittensor_config.config_impl import Config as Config
 from bittensor._subtensor.chain_data import DelegateInfo as DelegateInfo
-from bittensor._wallet.wallet_impl import Wallet as Wallet
-from bittensor._keyfile.keyfile_impl import Keyfile as Keyfile
+from bittensor_wallet import Wallet as Wallet
+from bittensor_wallet import Keyfile as Keyfile
+from bittensor_wallet import Keypair as Keypair
 from bittensor._subtensor.chain_data import NeuronInfo as NeuronInfo
 from bittensor._subtensor.chain_data import NeuronInfoLite as NeuronInfoLite
 from bittensor._subtensor.chain_data import PrometheusInfo as PrometheusInfo
@@ -184,7 +185,7 @@ def turn_console_off():
 from bittensor._ipfs.ipfs_impl import Ipfs as Ipfs
 
 # ---- Errors and Exceptions -----
-from bittensor._keyfile.keyfile_impl import KeyFileError as KeyFileError
+from bittensor_wallet import KeyFileError as KeyFileError
 
 from bittensor._proto.bittensor_pb2 import ForwardTextPromptingRequest
 from bittensor._proto.bittensor_pb2 import ForwardTextPromptingResponse
@@ -210,25 +211,17 @@ def turn_console_off():
 from bittensor._neuron.base_prompting_miner import BasePromptingMiner
 from bittensor._neuron.base_huggingface_miner import HuggingFaceMiner
 
-# ---- Errors and Exceptions -----
-from bittensor._keyfile.keyfile_impl import KeyFileError as KeyFileError
-
-# ---- Errors and Exceptions -----
-from bittensor._keyfile.keyfile_impl import KeyFileError as KeyFileError
-
 # DEFAULTS
 defaults = Config()
 defaults.netuid = 1
 subtensor.add_defaults( defaults )
 axon.add_defaults( defaults )
 prioritythreadpool.add_defaults( defaults )
 prometheus.add_defaults( defaults )
-wallet.add_defaults( defaults )
+wallet.add_defaults( defaults, prefix = 'wallet' )
 dataset.add_defaults( defaults )
 logging.add_defaults( defaults )
 
-from substrateinterface import Keypair as Keypair
-
 # Logging helpers.
 def trace():
     logging.set_trace(True)

bittensor/_cli/commands/inspect.py

@@ -88,7 +88,7 @@ def run (cli):
         for wallet in tqdm( wallets ):
             delegates: List[Tuple(bittensor.DelegateInfo, bittensor.Balance)] = subtensor.get_delegated( coldkey_ss58=wallet.coldkeypub.ss58_address )
             if not wallet.coldkeypub_file.exists_on_device(): continue
-            cold_balance = wallet.get_balance( subtensor = subtensor )
+            cold_balance = subtensor.get_balance( wallet.coldkeypub.ss58_address )
             table.add_row(
                 wallet.name,
                 str(cold_balance),