From 0e300255a9f4c28b9a7ef21cb350e4ef9abaa53c Mon Sep 17 00:00:00 2001 From: Cameron Fairchild Date: Wed, 9 Aug 2023 15:57:41 -0400 Subject: [PATCH 1/5] fix type map --- bittensor/chain_data.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/bittensor/chain_data.py b/bittensor/chain_data.py index bcd36c9c63..0036f20329 100644 --- a/bittensor/chain_data.py +++ b/bittensor/chain_data.py @@ -38,16 +38,10 @@ ["rho", "Compact"], ["kappa", "Compact"], ["difficulty", "Compact"], - ["immunity_period", "Compact"], - ["validator_batch_size", "Compact"], - ["validator_sequence_length", "Compact"], - ["validator_epochs_per_reset", "Compact"], - ["validator_epoch_length", "Compact"], ["max_allowed_validators", "Compact"], ["min_allowed_weights", "Compact"], ["max_weights_limit", "Compact"], ["scaling_law_power", "Compact"], - ["synergy_scaling_law_power", "Compact"], ["subnetwork_n", "Compact"], ["max_allowed_uids", "Compact"], ["blocks_since_last_step", "Compact"], From eaac693c8f3ecb43223fdd3ad4192a17ac1c52aa Mon Sep 17 00:00:00 2001 From: Cameron Fairchild Date: Wed, 9 Aug 2023 16:22:20 -0400 Subject: [PATCH 2/5] fix spec --- bittensor/chain_data.py | 1 + 1 file changed, 1 insertion(+) diff --git a/bittensor/chain_data.py b/bittensor/chain_data.py index 0036f20329..3941928ac5 100644 --- a/bittensor/chain_data.py +++ b/bittensor/chain_data.py @@ -38,6 +38,7 @@ ["rho", "Compact"], ["kappa", "Compact"], ["difficulty", "Compact"], + ["immunity_period", "Compact"], ["max_allowed_validators", "Compact"], ["min_allowed_weights", "Compact"], ["max_weights_limit", "Compact"], From 592163febd00443bf6c8711b5953735f89e20610 Mon Sep 17 00:00:00 2001 From: Cameron Fairchild Date: Wed, 9 Aug 2023 16:23:13 -0400 Subject: [PATCH 3/5] fix construction of subnetinfo --- bittensor/chain_data.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/bittensor/chain_data.py b/bittensor/chain_data.py index 3941928ac5..380fda16b9 100644 --- a/bittensor/chain_data.py +++ b/bittensor/chain_data.py @@ -708,15 +708,10 @@ class SubnetInfo: kappa: int difficulty: int immunity_period: int - validator_batch_size: int - validator_sequence_length: int - validator_epochs_per_reset: int - validator_epoch_length: int max_allowed_validators: int min_allowed_weights: int max_weight_limit: float scaling_law_power: float - synergy_scaling_law_power: float subnetwork_n: int max_n: int blocks_since_epoch: int @@ -763,15 +758,10 @@ def fix_decoded_values(cls, decoded: Dict) -> "SubnetInfo": kappa=decoded["kappa"], difficulty=decoded["difficulty"], immunity_period=decoded["immunity_period"], - validator_batch_size=decoded["validator_batch_size"], - validator_sequence_length=decoded["validator_sequence_length"], - validator_epochs_per_reset=decoded["validator_epochs_per_reset"], - validator_epoch_length=decoded["validator_epoch_length"], max_allowed_validators=decoded["max_allowed_validators"], min_allowed_weights=decoded["min_allowed_weights"], max_weight_limit=decoded["max_weights_limit"], scaling_law_power=decoded["scaling_law_power"], - synergy_scaling_law_power=decoded["synergy_scaling_law_power"], subnetwork_n=decoded["subnetwork_n"], max_n=decoded["max_allowed_uids"], blocks_since_epoch=decoded["blocks_since_last_step"], From 6ab3feb544b9247d9e84c2f994d23a619ef4fe4a Mon Sep 17 00:00:00 2001 From: Cameron Fairchild Date: Wed, 9 Aug 2023 16:24:49 -0400 Subject: [PATCH 4/5] remove print out --- bittensor/commands/metagraph.py | 1 - 1 file changed, 1 deletion(-) diff --git a/bittensor/commands/metagraph.py b/bittensor/commands/metagraph.py index 308e6eef68..ac7e39da1e 100644 --- a/bittensor/commands/metagraph.py +++ b/bittensor/commands/metagraph.py @@ -35,7 +35,6 @@ def run(cli): cli.config.subtensor.network ) ) - print("netuid in metagraphCommand:", cli.config.netuid) metagraph: bittensor.metagraph = subtensor.metagraph(netuid=cli.config.netuid) metagraph.save() difficulty = subtensor.difficulty(cli.config.netuid) From e2a43960a323266da988de0b98762a9cbdedbc40 Mon Sep 17 00:00:00 2001 From: Cameron Fairchild Date: Wed, 9 Aug 2023 16:31:18 -0400 Subject: [PATCH 5/5] run black --- bittensor/extrinsics/registration.py | 45 +++++++++++++++------------- bittensor/subtensor.py | 22 +++++++------- bittensor/utils/registration.py | 4 ++- 3 files changed, 39 insertions(+), 32 deletions(-) diff --git a/bittensor/extrinsics/registration.py b/bittensor/extrinsics/registration.py index 99f3b11df2..17e6214364 100644 --- a/bittensor/extrinsics/registration.py +++ b/bittensor/extrinsics/registration.py @@ -375,12 +375,12 @@ def run_faucet_extrinsic( ) ): return False - + # Unlock coldkey wallet.coldkey # Get previous balance. - old_balance = subtensor.get_balance( wallet.coldkeypub.ss58_address ) + old_balance = subtensor.get_balance(wallet.coldkeypub.ss58_address) # Attempt rolling registration. attempts = 1 @@ -418,31 +418,36 @@ def run_faucet_extrinsic( log_verbose=log_verbose, ) call = subtensor.substrate.compose_call( - call_module="SubtensorModule", - call_function="faucet", - call_params={ - "block_number": pow_result.block_number, - "nonce": pow_result.nonce, - "work": [int(byte_) for byte_ in pow_result.seal], - }, - ) - extrinsic = subtensor.substrate.create_signed_extrinsic( call = call, keypair = wallet.coldkey) - response = subtensor.substrate.submit_extrinsic( + call_module="SubtensorModule", + call_function="faucet", + call_params={ + "block_number": pow_result.block_number, + "nonce": pow_result.nonce, + "work": [int(byte_) for byte_ in pow_result.seal], + }, + ) + extrinsic = subtensor.substrate.create_signed_extrinsic( + call=call, keypair=wallet.coldkey + ) + response = subtensor.substrate.submit_extrinsic( extrinsic, - wait_for_inclusion = wait_for_inclusion, - wait_for_finalization = wait_for_finalization + wait_for_inclusion=wait_for_inclusion, + wait_for_finalization=wait_for_finalization, ) # process if registration successful, try again if pow is still valid response.process_events() if not response.is_success: - bittensor.__console__.print(f":cross_mark: [red]Failed[/red]: Error: {response.error_message}" ) - + bittensor.__console__.print( + f":cross_mark: [red]Failed[/red]: Error: {response.error_message}" + ) + # Successful registration else: - new_balance = subtensor.get_balance( wallet.coldkeypub.ss58_address ) - bittensor.__console__.print( f"Balance: [blue]{old_balance}[/blue] :arrow_right: [green]{new_balance}[/green]" ) + new_balance = subtensor.get_balance(wallet.coldkeypub.ss58_address) + bittensor.__console__.print( + f"Balance: [blue]{old_balance}[/blue] :arrow_right: [green]{new_balance}[/green]" + ) except KeyboardInterrupt: - return True, 'Done' - \ No newline at end of file + return True, "Done" diff --git a/bittensor/subtensor.py b/bittensor/subtensor.py index a2066efc7a..a7f5620644 100644 --- a/bittensor/subtensor.py +++ b/bittensor/subtensor.py @@ -44,7 +44,11 @@ from .extrinsics.staking import add_stake_extrinsic, add_stake_multiple_extrinsic from .extrinsics.unstaking import unstake_extrinsic, unstake_multiple_extrinsic from .extrinsics.serving import serve_extrinsic, serve_axon_extrinsic -from .extrinsics.registration import register_extrinsic, burned_register_extrinsic, run_faucet_extrinsic +from .extrinsics.registration import ( + register_extrinsic, + burned_register_extrinsic, + run_faucet_extrinsic, +) from .extrinsics.transfer import transfer_extrinsic from .extrinsics.set_weights import set_weights_extrinsic from .extrinsics.prometheus import prometheus_extrinsic @@ -401,7 +405,7 @@ def register( update_interval=update_interval, log_verbose=log_verbose, ) - + def run_faucet( self, wallet: "bittensor.wallet", @@ -1924,10 +1928,8 @@ def metagraph( metagraph_.sync(block=block, lite=lite, subtensor=self) return metagraph_ - - def incentive( - self, netuid: int, block: Optional[int] = None - ) -> List[int]: + + def incentive(self, netuid: int, block: Optional[int] = None) -> List[int]: """Returns a list of incentives for the subnet. Args: netuid ( int ): @@ -1936,19 +1938,17 @@ def incentive( block to sync from, or None for latest block. Returns: i_map ( List[int] ): - The list of incentives for the subnet at the block, + The list of incentives for the subnet at the block, indexed by UID. """ i_map = [] - i_map_encoded = self.query_map_subtensor( - name="Incentive", block=block - ) + i_map_encoded = self.query_map_subtensor(name="Incentive", block=block) if i_map_encoded.records: for netuid_, incentives_map in i_map_encoded: if netuid_ == netuid: i_map = incentives_map.serialize() break - + return i_map def weights( diff --git a/bittensor/utils/registration.py b/bittensor/utils/registration.py index 91f08e2fa4..d64306dd06 100644 --- a/bittensor/utils/registration.py +++ b/bittensor/utils/registration.py @@ -505,7 +505,9 @@ def _solve_for_difficulty_fast( finished_queues = [multiprocessing.Queue() for _ in range(num_processes)] check_block = multiprocessing.Lock() - hotkey_bytes = wallet.coldkeypub.public_key if netuid == -1 else wallet.hotkey.public_key + hotkey_bytes = ( + wallet.coldkeypub.public_key if netuid == -1 else wallet.hotkey.public_key + ) # Start consumers solvers = [ _Solver(