diff --git a/pallets/subtensor/src/lib.rs b/pallets/subtensor/src/lib.rs index d4a3559d1..98063957a 100644 --- a/pallets/subtensor/src/lib.rs +++ b/pallets/subtensor/src/lib.rs @@ -192,7 +192,7 @@ pub mod pallet { T::InitialSenateRequiredStakePercentage::get() } - #[pallet::storage] // --- ITEM ( tx_rate_limit ) + #[pallet::storage] pub(super) type SenateRequiredStakePercentage = StorageValue<_, u64, ValueQuery, DefaultSenateRequiredStakePercentage>; @@ -397,7 +397,7 @@ pub mod pallet { T::InitialNetworkRateLimit::get() } - #[pallet::storage] // --- ITEM( total_number_of_existing_networks ) + #[pallet::storage] // --- ITEM( maximum_number_of_networks ) pub type SubnetLimit = StorageValue<_, u16, ValueQuery, DefaultSubnetLimit>; #[pallet::storage] // --- ITEM( total_number_of_existing_networks ) pub type TotalNetworks = StorageValue<_, u16, ValueQuery>; @@ -490,16 +490,16 @@ pub mod pallet { #[pallet::storage] // --- MAP ( netuid ) --> pending_emission pub type PendingEmission = StorageMap<_, Identity, u16, u64, ValueQuery, DefaultPendingEmission>; - #[pallet::storage] // --- MAP ( netuid ) --> blocks_since_last_step. + #[pallet::storage] // --- MAP ( netuid ) --> blocks_since_last_step pub type BlocksSinceLastStep = StorageMap<_, Identity, u16, u64, ValueQuery, DefaultBlocksSinceLastStep>; #[pallet::storage] // --- MAP ( netuid ) --> last_mechanism_step_block pub type LastMechansimStepBlock = StorageMap<_, Identity, u16, u64, ValueQuery, DefaultLastMechansimStepBlock>; - #[pallet::storage] + #[pallet::storage] // --- MAP ( netuid ) --> subnet_owner pub type SubnetOwner = StorageMap<_, Identity, u16, T::AccountId, ValueQuery, DefaultSubnetOwner>; - #[pallet::storage] + #[pallet::storage] // --- MAP ( netuid ) --> subnet_locked pub type SubnetLocked = StorageMap<_, Identity, u16, u64, ValueQuery, DefaultSubnetLocked>; @@ -519,7 +519,7 @@ pub mod pallet { pub ip_type: u8, // --- Axon ip type, 4 for ipv4 and 6 for ipv6. pub protocol: u8, // --- Axon protocol. TCP, UDP, other. pub placeholder1: u8, // --- Axon proto placeholder 1. - pub placeholder2: u8, // --- Axon proto placeholder 1. + pub placeholder2: u8, // --- Axon proto placeholder 2. } // --- Struct for Prometheus. diff --git a/pallets/subtensor/src/registration.rs b/pallets/subtensor/src/registration.rs index 3b85292ec..a2dfc384a 100644 --- a/pallets/subtensor/src/registration.rs +++ b/pallets/subtensor/src/registration.rs @@ -432,15 +432,19 @@ impl Pallet { let mut min_score_in_immunity_period = u16::MAX; let mut uid_with_min_score = 0; let mut uid_with_min_score_in_immunity_period: u16 = 0; - if Self::get_subnetwork_n(netuid) == 0 { - return 0; - } // If there are no neurons in this network. - for neuron_uid_i in 0..Self::get_subnetwork_n(netuid) { + + let neurons_n = Self::get_subnetwork_n(netuid); + if neurons_n == 0 { + return 0; // If there are no neurons in this network. + } + + let current_block: u64 = Self::get_current_block_as_u64(); + let immunity_period: u64 = Self::get_immunity_period(netuid) as u64; + for neuron_uid_i in 0..neurons_n { let pruning_score: u16 = Self::get_pruning_score_for_uid(netuid, neuron_uid_i); let block_at_registration: u64 = Self::get_neuron_block_at_registration(netuid, neuron_uid_i); - let current_block: u64 = Self::get_current_block_as_u64(); - let immunity_period: u64 = Self::get_immunity_period(netuid) as u64; + if min_score == pruning_score { if current_block - block_at_registration < immunity_period { //neuron is in immunity period @@ -449,7 +453,6 @@ impl Pallet { uid_with_min_score_in_immunity_period = neuron_uid_i; } } else { - min_score = pruning_score; uid_with_min_score = neuron_uid_i; } }