From 15e0f34cd6db843dd54f110ba898c597fa8bddef Mon Sep 17 00:00:00 2001 From: unconst Date: Mon, 11 Mar 2024 09:51:41 -0500 Subject: [PATCH 1/3] add more power to subnet owners and allow setting default take --- pallets/admin-utils/src/lib.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pallets/admin-utils/src/lib.rs b/pallets/admin-utils/src/lib.rs index 459d0aa99..22a03dbea 100644 --- a/pallets/admin-utils/src/lib.rs +++ b/pallets/admin-utils/src/lib.rs @@ -228,7 +228,7 @@ pub mod pallet { ))] pub fn sudo_set_adjustment_alpha(origin: OriginFor, netuid: u16, adjustment_alpha: u64) -> DispatchResult { - ensure_root(origin)?; + T::Subtensor::ensure_subnet_owner_or_root(origin, netuid)?; ensure!( T::Subtensor::if_subnet_exist(netuid), @@ -324,7 +324,7 @@ pub mod pallet { #[pallet::weight(T::WeightInfo::sudo_set_kappa())] pub fn sudo_set_kappa(origin: OriginFor, netuid: u16, kappa: u16) -> DispatchResult { - ensure_root(origin)?; + T::Subtensor::ensure_subnet_owner_or_root(origin, netuid)?; ensure!( T::Subtensor::if_subnet_exist(netuid), @@ -339,7 +339,7 @@ pub mod pallet { #[pallet::weight(T::WeightInfo::sudo_set_rho())] pub fn sudo_set_rho(origin: OriginFor, netuid: u16, rho: u16) -> DispatchResult { - ensure_root(origin)?; + T::Subtensor::ensure_subnet_owner_or_root(origin, netuid)?; ensure!( T::Subtensor::if_subnet_exist(netuid), @@ -469,7 +469,7 @@ pub mod pallet { #[pallet::weight(T::WeightInfo::sudo_set_difficulty())] pub fn sudo_set_difficulty(origin: OriginFor, netuid: u16, difficulty: u64) -> DispatchResult { - ensure_root(origin)?; + T::Subtensor::ensure_subnet_owner_or_root(origin, netuid)?; ensure!( T::Subtensor::if_subnet_exist(netuid), Error::::NetworkDoesNotExist @@ -511,7 +511,7 @@ pub mod pallet { #[pallet::weight(T::WeightInfo::sudo_set_bonds_moving_average())] pub fn sudo_set_bonds_moving_average(origin: OriginFor, netuid: u16, bonds_moving_average: u64) -> DispatchResult { - ensure_root(origin)?; + T::Subtensor::ensure_subnet_owner_or_root(origin, netuid)?; ensure!( T::Subtensor::if_subnet_exist(netuid), From a4b2554632ca01c3e21515b89da41addf51fe9b6 Mon Sep 17 00:00:00 2001 From: unconst Date: Mon, 11 Mar 2024 09:56:54 -0500 Subject: [PATCH 2/3] set default registration alpha --- pallets/subtensor/src/root.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pallets/subtensor/src/root.rs b/pallets/subtensor/src/root.rs index e185c3b00..f1a2df268 100644 --- a/pallets/subtensor/src/root.rs +++ b/pallets/subtensor/src/root.rs @@ -724,7 +724,7 @@ impl Pallet { Self::set_max_weight_limit(netuid, u16::MAX); Self::set_adjustment_interval(netuid, 360); Self::set_target_registrations_per_interval(netuid, 1); - Self::set_adjustment_alpha(netuid, 58000); + Self::set_adjustment_alpha(netuid, 17_893_341_751_498_265_066); // 18_446_744_073_709_551_615 * 0.97 = 17_893_341_751_498_265_066 Self::set_immunity_period(netuid, 5000); Self::set_min_burn(netuid, 1); Self::set_min_difficulty(netuid, u64::MAX); From 0cfec4703b773dcc42d1926ad88c8703e4654aef Mon Sep 17 00:00:00 2001 From: unconst Date: Mon, 11 Mar 2024 11:30:34 -0500 Subject: [PATCH 3/3] fix tests --- pallets/admin-utils/tests/tests.rs | 2 +- pallets/subtensor/tests/block_step.rs | 10 ++++++++++ pallets/subtensor/tests/difficulty.rs | 1 + pallets/subtensor/tests/registration.rs | 1 + 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/pallets/admin-utils/tests/tests.rs b/pallets/admin-utils/tests/tests.rs index 1b147a5b6..b7d6f15f0 100644 --- a/pallets/admin-utils/tests/tests.rs +++ b/pallets/admin-utils/tests/tests.rs @@ -621,7 +621,7 @@ fn test_sudo_set_difficulty() { let init_value: u64 = SubtensorModule::get_difficulty_as_u64(netuid); assert_eq!( AdminUtils::sudo_set_difficulty( - <::RuntimeOrigin>::signed(U256::from(0)), + <::RuntimeOrigin>::signed(U256::from(1)), netuid, to_be_set ), diff --git a/pallets/subtensor/tests/block_step.rs b/pallets/subtensor/tests/block_step.rs index 837c9dbf0..eacc2e0c7 100644 --- a/pallets/subtensor/tests/block_step.rs +++ b/pallets/subtensor/tests/block_step.rs @@ -14,6 +14,7 @@ fn test_loaded_emission() { let emission: Vec = vec![1000000000]; add_network(netuid, tempo, 0); SubtensorModule::set_max_allowed_uids(netuid, n); + SubtensorModule::set_adjustment_alpha(netuid, 58000); // Set to old value. SubtensorModule::set_emission_values( &netuids, emission); for i in 0..n { SubtensorModule::append_neuron(netuid, &U256::from(i), 0); @@ -174,6 +175,7 @@ fn test_burn_adjustment() { add_network(netuid, tempo, 0); SubtensorModule::set_burn(netuid, burn_cost); SubtensorModule::set_adjustment_interval(netuid, adjustment_interval); + SubtensorModule::set_adjustment_alpha(netuid, 58000); // Set to old value. SubtensorModule::set_target_registrations_per_interval( netuid, target_registrations_per_interval, @@ -220,6 +222,7 @@ fn test_burn_adjustment_with_moving_average() { add_network(netuid, tempo, 0); SubtensorModule::set_burn(netuid, burn_cost); SubtensorModule::set_adjustment_interval(netuid, adjustment_interval); + SubtensorModule::set_adjustment_alpha(netuid, 58000); // Set to old value. SubtensorModule::set_target_registrations_per_interval( netuid, target_registrations_per_interval, @@ -277,6 +280,7 @@ fn test_burn_adjustment_case_a() { SubtensorModule::set_difficulty(netuid, start_diff); SubtensorModule::set_min_difficulty(netuid, start_diff); SubtensorModule::set_adjustment_interval(netuid, adjustment_interval); + SubtensorModule::set_adjustment_alpha(netuid, 58000); // Set to old value. SubtensorModule::set_target_registrations_per_interval( netuid, target_registrations_per_interval, @@ -368,6 +372,7 @@ fn test_burn_adjustment_case_b() { SubtensorModule::set_burn(netuid, burn_cost); SubtensorModule::set_difficulty(netuid, start_diff); SubtensorModule::set_adjustment_interval(netuid, adjustment_interval); + SubtensorModule::set_adjustment_alpha(netuid, 58000); // Set to old value. SubtensorModule::set_target_registrations_per_interval( netuid, target_registrations_per_interval, @@ -449,6 +454,7 @@ fn test_burn_adjustment_case_c() { SubtensorModule::set_burn(netuid, burn_cost); SubtensorModule::set_difficulty(netuid, start_diff); SubtensorModule::set_adjustment_interval(netuid, adjustment_interval); + SubtensorModule::set_adjustment_alpha(netuid, 58000); // Set to old value. SubtensorModule::set_target_registrations_per_interval( netuid, target_registrations_per_interval, @@ -541,6 +547,7 @@ fn test_burn_adjustment_case_d() { SubtensorModule::set_difficulty(netuid, start_diff); SubtensorModule::set_min_difficulty(netuid, 1); SubtensorModule::set_adjustment_interval(netuid, adjustment_interval); + SubtensorModule::set_adjustment_alpha(netuid, 58000); // Set to old value. SubtensorModule::set_target_registrations_per_interval( netuid, target_registrations_per_interval, @@ -624,6 +631,7 @@ fn test_burn_adjustment_case_e() { SubtensorModule::set_difficulty(netuid, start_diff); SubtensorModule::set_min_difficulty(netuid, 1); SubtensorModule::set_adjustment_interval(netuid, adjustment_interval); + SubtensorModule::set_adjustment_alpha(netuid, 58000); // Set to old value. SubtensorModule::set_target_registrations_per_interval( netuid, target_registrations_per_interval, @@ -698,6 +706,7 @@ fn test_burn_adjustment_case_f() { SubtensorModule::set_difficulty(netuid, start_diff); SubtensorModule::set_min_difficulty(netuid, start_diff); SubtensorModule::set_adjustment_interval(netuid, adjustment_interval); + SubtensorModule::set_adjustment_alpha(netuid, 58000); // Set to old value. SubtensorModule::set_target_registrations_per_interval( netuid, target_registrations_per_interval, @@ -771,6 +780,7 @@ fn test_burn_adjustment_case_e_zero_registrations() { SubtensorModule::set_difficulty(netuid, start_diff); SubtensorModule::set_min_difficulty(netuid, 1); SubtensorModule::set_adjustment_interval(netuid, adjustment_interval); + SubtensorModule::set_adjustment_alpha(netuid, 58000); // Set to old value. SubtensorModule::set_target_registrations_per_interval( netuid, target_registrations_per_interval, diff --git a/pallets/subtensor/tests/difficulty.rs b/pallets/subtensor/tests/difficulty.rs index 45d3e6a05..5bb08532c 100644 --- a/pallets/subtensor/tests/difficulty.rs +++ b/pallets/subtensor/tests/difficulty.rs @@ -15,6 +15,7 @@ fn test_registration_difficulty_adjustment() { assert_eq!(SubtensorModule::get_difficulty_as_u64(netuid), 10000); // Check initial difficulty. assert_eq!(SubtensorModule::get_last_adjustment_block(netuid), 0); // Last adjustment block starts at 0. assert_eq!(SubtensorModule::get_registrations_this_block(netuid), 0); // No registrations this block. + SubtensorModule::set_adjustment_alpha(netuid, 58000); SubtensorModule::set_target_registrations_per_interval(netuid, 2); SubtensorModule::set_adjustment_interval(netuid,100); assert_eq!( diff --git a/pallets/subtensor/tests/registration.rs b/pallets/subtensor/tests/registration.rs index cd0af594e..04c23a343 100644 --- a/pallets/subtensor/tests/registration.rs +++ b/pallets/subtensor/tests/registration.rs @@ -215,6 +215,7 @@ fn test_burn_adjustment() { add_network(netuid, tempo, 0); SubtensorModule::set_burn(netuid, burn_cost); SubtensorModule::set_adjustment_interval(netuid, adjustment_interval); + SubtensorModule::set_adjustment_alpha(netuid, 58000); // Set to old value. SubtensorModule::set_target_registrations_per_interval( netuid, target_registrations_per_interval,