Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

No reregister wallet #51

Merged
merged 5 commits into from
Nov 1, 2023
Merged

No reregister wallet #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9595671
remove deprecated PoW reregister on miner startup
ifrit98 Oct 26, 2023
b868941
change doc ref to register, wording tweak
ifrit98 Oct 26, 2023
0ea3f43
Merge branch 'staging' into no-reregister-wallet
ifrit98 Oct 26, 2023
42f4ad7
update docs typo
p-ferreira Nov 1, 2023
dbbdd8a
Merge branch 'staging' into no-reregister-wallet
p-ferreira Nov 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/running_a_validator.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ btcli wallet faucet --wallet.name validator --subtensor.network test
Register your UID on the test network:

```sh
btcli wallet recycle_register --subtensor.network test
btcli subnets register --subtensor.network test
```

## 5. Start the Process
Expand Down
3 changes: 1 addition & 2 deletions neurons/miners/bittensorLM/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ usage: miner.py [-h] [--axon.port AXON.PORT] [--subtensor.network SUBTENSOR.NETW
[--miner.blacklist.force_validator_permit] [--miner.blacklist.allow_non_registered] [--miner.blacklist.minimum_stake_requirement MINER.BLACKLIST.MINIMUM_STAKE_REQUIREMENT]
[--miner.blacklist.prompt_cache_block_span MINER.BLACKLIST.PROMPT_CACHE_BLOCK_SPAN] [--miner.blacklist.use_prompt_cache] [--miner.blacklist.min_request_period MINER.BLACKLIST.MIN_REQUEST_PERIOD]
[--miner.priority.default MINER.PRIORITY.DEFAULT] [--miner.priority.time_stake_multiplicate MINER.PRIORITY.TIME_STAKE_MULTIPLICATE]
[--miner.priority.len_request_timestamps MINER.PRIORITY.LEN_REQUEST_TIMESTAMPS] [--miner.no_set_weights] [--miner.no_serve] [--miner.no_start_axon] [--miner.no_register] [--miner.mock_subtensor] [--wandb.on]
[--miner.priority.len_request_timestamps MINER.PRIORITY.LEN_REQUEST_TIMESTAMPS] [--miner.no_set_weights] [--miner.no_serve] [--miner.no_start_axon] [--miner.mock_subtensor] [--wandb.on]
[--wandb.project_name WANDB.PROJECT_NAME] [--wandb.entity WANDB.ENTITY] [--logging.debug] [--logging.trace] [--logging.record_log] [--logging.logging_dir LOGGING.LOGGING_DIR] [--wallet.name WALLET.NAME]
[--wallet.hotkey WALLET.HOTKEY] [--wallet.path WALLET.PATH] [--config CONFIG] [--strict] [--no_version_checking] [--no_prompt]

Expand Down Expand Up @@ -60,7 +60,6 @@ options:
--miner.no_serve If True, the miner doesnt serve the axon.
--miner.no_start_axon
If True, the miner doesnt start the axon.
--miner.no_register If True, the miner doesnt register its wallet.
--miner.mock_subtensor
If True, the miner will allow non-registered hotkeys to mine.
--wandb.on Turn on wandb.
Expand Down
3 changes: 1 addition & 2 deletions neurons/miners/openai/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ usage: miner.py [-h] [--axon.port AXON.PORT] [--subtensor.network SUBTENSOR.NETW
[--miner.blacklist.force_validator_permit] [--miner.blacklist.allow_non_registered] [--miner.blacklist.minimum_stake_requirement MINER.BLACKLIST.MINIMUM_STAKE_REQUIREMENT]
[--miner.blacklist.prompt_cache_block_span MINER.BLACKLIST.PROMPT_CACHE_BLOCK_SPAN] [--miner.blacklist.use_prompt_cache] [--miner.blacklist.min_request_period MINER.BLACKLIST.MIN_REQUEST_PERIOD]
[--miner.priority.default MINER.PRIORITY.DEFAULT] [--miner.priority.time_stake_multiplicate MINER.PRIORITY.TIME_STAKE_MULTIPLICATE]
[--miner.priority.len_request_timestamps MINER.PRIORITY.LEN_REQUEST_TIMESTAMPS] [--miner.no_set_weights] [--miner.no_serve] [--miner.no_start_axon] [--miner.no_register] [--miner.mock_subtensor] [--wandb.on]
[--miner.priority.len_request_timestamps MINER.PRIORITY.LEN_REQUEST_TIMESTAMPS] [--miner.no_set_weights] [--miner.no_serve] [--miner.no_start_axon] [--miner.mock_subtensor] [--wandb.on]
[--wandb.project_name WANDB.PROJECT_NAME] [--wandb.entity WANDB.ENTITY] [--logging.debug] [--logging.trace] [--logging.record_log] [--logging.logging_dir LOGGING.LOGGING_DIR] [--wallet.name WALLET.NAME]
[--wallet.hotkey WALLET.HOTKEY] [--wallet.path WALLET.PATH] [--config CONFIG] [--strict] [--no_version_checking] [--no_prompt]

Expand Down Expand Up @@ -84,7 +84,6 @@ options:
--miner.no_serve If True, the miner doesnt serve the axon.
--miner.no_start_axon
If True, the miner doesnt start the axon.
--miner.no_register If True, the miner doesnt register its wallet.
--miner.mock_subtensor
If True, the miner will allow non-registered hotkeys to mine.
--wandb.on Turn on wandb.
Expand Down
3 changes: 1 addition & 2 deletions neurons/miners/vicuna/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ usage: miner.py [-h] [--axon.port AXON.PORT] [--subtensor.network SUBTENSOR.NETW
[--miner.blacklist.force_validator_permit] [--miner.blacklist.allow_non_registered] [--miner.blacklist.minimum_stake_requirement MINER.BLACKLIST.MINIMUM_STAKE_REQUIREMENT]
[--miner.blacklist.prompt_cache_block_span MINER.BLACKLIST.PROMPT_CACHE_BLOCK_SPAN] [--miner.blacklist.use_prompt_cache] [--miner.blacklist.min_request_period MINER.BLACKLIST.MIN_REQUEST_PERIOD]
[--miner.priority.default MINER.PRIORITY.DEFAULT] [--miner.priority.time_stake_multiplicate MINER.PRIORITY.TIME_STAKE_MULTIPLICATE]
[--miner.priority.len_request_timestamps MINER.PRIORITY.LEN_REQUEST_TIMESTAMPS] [--miner.no_set_weights] [--miner.no_serve] [--miner.no_start_axon] [--miner.no_register] [--miner.mock_subtensor] [--wandb.on]
[--miner.priority.len_request_timestamps MINER.PRIORITY.LEN_REQUEST_TIMESTAMPS] [--miner.no_set_weights] [--miner.no_serve] [--miner.no_start_axon] [--miner.mock_subtensor] [--wandb.on]
[--wandb.project_name WANDB.PROJECT_NAME] [--wandb.entity WANDB.ENTITY] [--logging.debug] [--logging.trace] [--logging.record_log] [--logging.logging_dir LOGGING.LOGGING_DIR] [--wallet.name WALLET.NAME]
[--wallet.hotkey WALLET.HOTKEY] [--wallet.path WALLET.PATH] [--config CONFIG] [--strict] [--no_version_checking] [--no_prompt]

Expand Down Expand Up @@ -115,7 +115,6 @@ options:
--miner.no_serve If True, the miner doesnt serve the axon.
--miner.no_start_axon
If True, the miner doesnt start the axon.
--miner.no_register If True, the miner doesnt register its wallet.
--miner.mock_subtensor
If True, the miner will allow non-registered hotkeys to mine.
--wandb.on Turn on wandb.
Expand Down
6 changes: 0 additions & 6 deletions prompting/baseminer/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,12 +199,6 @@ def get_config() -> "bt.Config":
help="If True, the miner doesnt start the axon.",
default=False,
)
parser.add_argument(
"--miner.no_register",
action="store_true",
help="If True, the miner doesnt register its wallet.",
default=False,
)

# Mocks.
parser.add_argument(
Expand Down
16 changes: 10 additions & 6 deletions prompting/baseminer/run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def run(self):
Initiates and manages the main loop for the miner on the Bittensor network.

This function performs the following primary tasks:
1. Optionally registers the miner's wallet with the network.
1. Check for registration on the Bittensor network.
2. Attaches the miner's forward, blacklist, and priority functions to its axon.
3. Starts the miner's axon, making it active on the network.
4. Regularly updates the metagraph with the latest network state.
Expand All @@ -48,12 +48,16 @@ def run(self):
KeyboardInterrupt: If the miner is stopped by a manual interruption.
Exception: For unforeseen errors during the miner's operation, which are logged for diagnosis.
"""
# --- Optionally register the wallet.
if not self.config.miner.no_register:
bt.logging.info(
f"Registering wallet: {self.wallet} on netuid {self.config.netuid}"
# --- Check for registration.
if not self.subtensor.is_hotkey_registered(
netuid=self.config.netuid,
hotkey=self.wallet.hotkey.ss58_address,
):
bt.logging.error(
f"Wallet: {self.wallet} is not registered on netuid {self.config.netuid}"
f"Please register the hotkey using `btcli subnets register` before trying again"
)
self.subtensor.register(netuid=self.config.netuid, wallet=self.wallet)
exit()

# Serve passes the axon information to the network + netuid we are hosting on.
# This will auto-update if the axon port of external ip have changed.
Expand Down