Merge pull request #1757 from opentensor/hotfix-cooldown

cooldown

Author: sam0x17

pallets/subtensor/src/lib.rs

@@ -1715,6 +1715,17 @@ pub mod pallet {
     #[pallet::storage] // --- Storage for migration run status
     pub type HasMigrationRun<T: Config> = StorageMap<_, Identity, Vec<u8>, bool, ValueQuery>;
 
+    #[pallet::type_value]
+    /// Default value for pending childkey cooldown (settable by root, default 0)
+    pub fn DefaultPendingChildKeyCooldown<T: Config>() -> u64 {
+        0
+    }
+
+    #[pallet::storage]
+    /// Storage value for pending childkey cooldown, settable by root.
+    pub type PendingChildKeyCooldown<T: Config> =
+        StorageValue<_, u64, ValueQuery, DefaultPendingChildKeyCooldown<T>>;
+
     #[pallet::genesis_config]
     pub struct GenesisConfig<T: Config> {
         /// Stakes record in genesis.

pallets/subtensor/src/macros/dispatches.rs

@@ -1786,7 +1786,7 @@ mod dispatches {
         ///
         #[pallet::call_index(88)]
         #[pallet::weight((Weight::from_parts(159_200_000, 0)
-		.saturating_add(T::DbWeight::get().reads(13))
+		.saturating_add(T::DbWeight::get().reads(14))
 		.saturating_add(T::DbWeight::get().writes(10)), DispatchClass::Normal, Pays::No))]
         pub fn add_stake_limit(
             origin: OriginFor<T>,
@@ -2057,6 +2057,18 @@ mod dispatches {
             Self::do_burn_alpha(origin, hotkey, amount, netuid)
         }
 
+        /// Sets the pending childkey cooldown (in blocks). Root only.
+        #[pallet::call_index(109)]
+        #[pallet::weight((Weight::from_parts(10_000, 0), DispatchClass::Operational, Pays::No))]
+        pub fn set_pending_childkey_cooldown(
+            origin: OriginFor<T>,
+            cooldown: u64,
+        ) -> DispatchResult {
+            ensure_root(origin)?;
+            PendingChildKeyCooldown::<T>::put(cooldown);
+            Ok(())
+        }
+
         // /// --- Adds stake to a hotkey on a subnet with a price limit.
         // /// This extrinsic allows to specify the limit price for alpha token
         // /// at which or better (lower) the staking should execute.

pallets/subtensor/src/staking/set_children.rs

@@ -1,5 +1,4 @@
 use super::*;
-use sp_core::Get;
 
 impl<T: Config> Pallet<T> {
     /// ---- The implementation for the extrinsic do_set_child_singular: Sets a single child.
@@ -123,7 +122,7 @@ impl<T: Config> Pallet<T> {
 
         // Calculate cool-down block
         let cooldown_block =
-            Self::get_current_block_as_u64().saturating_add(DefaultPendingCooldown::<T>::get());
+            Self::get_current_block_as_u64().saturating_add(PendingChildKeyCooldown::<T>::get());
 
         // Insert or update PendingChildKeys
         PendingChildKeys::<T>::insert(netuid, hotkey.clone(), (children.clone(), cooldown_block));

pallets/subtensor/src/tests/children.rs

@@ -3949,14 +3949,14 @@ fn test_dividend_distribution_with_children_same_coldkey_owner() {
 }
 
 #[test]
-fn test_pending_cooldown_one_day() {
+fn test_pending_cooldown_as_expected() {
     let curr_block = 1;
-
-    let expected_cooldown = if cfg!(feature = "fast-blocks") {
-        15
-    } else {
-        7_200
-    };
+    // TODO: Fix when CHK splitting patched
+    // let expected_cooldown = if cfg!(feature = "fast-blocks") {
+    //     15
+    // } else {
+    //     7200
+    // };
 
     new_test_ext(curr_block).execute_with(|| {
         let coldkey = U256::from(1);
@@ -3966,6 +3966,7 @@ fn test_pending_cooldown_one_day() {
         let netuid: u16 = 1;
         let proportion1: u64 = 1000;
         let proportion2: u64 = 2000;
+        let expected_cooldown = PendingChildKeyCooldown::<Test>::get();
 
         // Add network and register hotkey
         add_network(netuid, 13, 0);

runtime/src/lib.rs

@@ -209,7 +209,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: 276,
+    spec_version: 277,
     impl_version: 1,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 1,