Merge pull request #251 from opentensor/subnet_hyperparameters_fix

Allow the setting of specific subnet hyperparameters on chain.

Author: shibshib

pallets/subtensor/src/subnet_info.rs

@@ -40,7 +40,6 @@ pub struct SubnetHyperparams {
     weights_version: Compact<u64>,
     weights_rate_limit: Compact<u64>,
     adjustment_interval: Compact<u16>,
-    adjustment_alpha: Compact<u64>,
     activity_cutoff: Compact<u16>,
     registration_allowed: bool,
     target_regs_per_interval: Compact<u16>,
@@ -50,6 +49,8 @@ pub struct SubnetHyperparams {
     max_regs_per_block: Compact<u16>,
     serving_rate_limit: Compact<u64>,
     max_validators: Compact<u16>,
+    adjustment_alpha: Compact<u64>,
+    difficulty: Compact<u64>,
 }
 
 impl<T: Config> Pallet<T> {
@@ -60,7 +61,6 @@ impl<T: Config> Pallet<T> {
 
         let rho = Self::get_rho(netuid);
         let kappa = Self::get_kappa(netuid);
-        let difficulty = Self::get_difficulty_as_u64(netuid);
         let immunity_period = Self::get_immunity_period(netuid);
         let max_allowed_validators = Self::get_max_allowed_validators(netuid);
         let min_allowed_weights = Self::get_min_allowed_weights(netuid);
@@ -73,6 +73,9 @@ impl<T: Config> Pallet<T> {
         let network_modality = <NetworkModality<T>>::get(netuid);
         let emission_values = Self::get_emission_value(netuid);
         let burn: Compact<u64> = Self::get_burn_as_u64(netuid).into();
+        let adjustment_alpha: Compact<u64> = Self::get_adjustment_alpha(netuid).into();
+        let difficulty: Compact<u64> = Self::get_difficulty(netuid).into();
+        let bonds_moving_avg: Compact<u64> = Self::get_bonds_moving_average(netuid).into();
 
         // DEPRECATED
         let network_connect: Vec<[u16; 2]> = Vec::<[u16; 2]>::new();
@@ -83,7 +86,6 @@ impl<T: Config> Pallet<T> {
         return Some(SubnetInfo {
             rho: rho.into(),
             kappa: kappa.into(),
-            difficulty: difficulty.into(),
             immunity_period: immunity_period.into(),
             netuid: netuid.into(),
             max_allowed_validators: max_allowed_validators.into(),
@@ -98,6 +100,10 @@ impl<T: Config> Pallet<T> {
             network_connect,
             emission_values: emission_values.into(),
             burn,
+            difficulty: difficulty.into(),
+            adjustment_alpha: adjustment_alpha.into(),
+            bonds_moving_avg: bonds_moving_avg.into(),
+
             owner: Self::get_subnet_owner(netuid).into(),
         });
     }
@@ -131,7 +137,6 @@ impl<T: Config> Pallet<T> {
 
         let rho = Self::get_rho(netuid);
         let kappa = Self::get_kappa(netuid);
-        let difficulty = Self::get_difficulty_as_u64(netuid);
         let immunity_period = Self::get_immunity_period(netuid);
         let min_allowed_weights = Self::get_min_allowed_weights(netuid);
         let max_weights_limit = Self::get_max_weight_limit(netuid);
@@ -141,7 +146,6 @@ impl<T: Config> Pallet<T> {
         let weights_version = Self::get_weights_version_key(netuid);
         let weights_rate_limit = Self::get_weights_set_rate_limit(netuid);
         let adjustment_interval = Self::get_adjustment_interval(netuid);
-        let adjustment_alpha = Self::get_adjustment_alpha(netuid);
         let activity_cutoff = Self::get_activity_cutoff(netuid);
         let registration_allowed = Self::get_network_registration_allowed(netuid);
         let target_regs_per_interval = Self::get_target_registrations_per_interval(netuid);
@@ -151,6 +155,9 @@ impl<T: Config> Pallet<T> {
         let max_regs_per_block = Self::get_max_registrations_per_block(netuid);
         let serving_rate_limit = Self::get_serving_rate_limit(netuid);
         let max_validators = Self::get_max_allowed_validators(netuid);
+        let adjustment_alpha = Self::get_adjustment_alpha(netuid);
+        let difficulty = Self::get_difficulty_as_u64(netuid);
+
 
         return Some(SubnetHyperparams {
             rho: rho.into(),
@@ -164,7 +171,6 @@ impl<T: Config> Pallet<T> {
             weights_version: weights_version.into(),
             weights_rate_limit: weights_rate_limit.into(),
             adjustment_interval: adjustment_interval.into(),
-            adjustment_alpha: adjustment_alpha.into(),
             activity_cutoff: activity_cutoff.into(),
             registration_allowed,
             target_regs_per_interval: target_regs_per_interval.into(),
@@ -174,6 +180,8 @@ impl<T: Config> Pallet<T> {
             max_regs_per_block: max_regs_per_block.into(),
             serving_rate_limit: serving_rate_limit.into(),
             max_validators: max_validators.into(),
+            adjustment_alpha: adjustment_alpha.into(),
+            difficulty: difficulty.into()
         });
     }
 }

runtime/src/lib.rs

@@ -121,7 +121,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     //   `spec_version`, and `authoring_version` are the same between Wasm and native.
     // This value is set to 100 to notify Polkadot-JS App (https://polkadot.js.org/apps) to use
     //   the compatible custom types.
-    spec_version: 142,
+    spec_version: 143,
     impl_version: 1,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 1,