Merge pull request #355 from opentensor/modify-stake-rate-limit-devnet

modify stake rate limit

Author: sam0x17

pallets/subtensor/src/lib.rs

@@ -262,10 +262,17 @@ pub mod pallet {
     pub type TotalColdkeyStake<T: Config> =
         StorageMap<_, Identity, T::AccountId, u64, ValueQuery, DefaultAccountTake<T>>;
     #[pallet::storage]
-    // --- MAP (hot) --> stake | Returns a tuple (u64: stakes, u64: block_number)
-    pub type TotalHotkeyStakesThisInterval<T: Config> =
-        StorageMap<_, Identity, T::AccountId, (u64, u64), ValueQuery, DefaultStakesPerInterval<T>>;
-
+    // --- MAP (hot, cold) --> stake | Returns a tuple (u64: stakes, u64: block_number)
+    pub type TotalHotkeyColdkeyStakesThisInterval<T: Config> = StorageDoubleMap<
+        _,
+        Identity,
+        T::AccountId,
+        Identity,
+        T::AccountId,
+        (u64, u64),
+        ValueQuery,
+        DefaultStakesPerInterval<T>,
+    >;
     #[pallet::storage] // --- MAP ( hot ) --> cold | Returns the controlling coldkey for a hotkey.
     pub type Owner<T: Config> =
         StorageMap<_, Blake2_128Concat, T::AccountId, T::AccountId, ValueQuery, DefaultAccount<T>>;
@@ -1848,32 +1855,14 @@ where
                     return Err(InvalidTransaction::Call.into());
                 }
             }
-            Some(Call::add_stake { hotkey, .. }) => {
-                let stakes_this_interval = Pallet::<T>::get_stakes_this_interval_for_hotkey(hotkey);
-                let max_stakes_per_interval = Pallet::<T>::get_target_stakes_per_interval();
-
-                if stakes_this_interval >= max_stakes_per_interval {
-                    return InvalidTransaction::ExhaustsResources.into();
-                }
-
-                Ok(ValidTransaction {
-                    priority: Self::get_priority_vanilla(),
-                    ..Default::default()
-                })
-            }
-            Some(Call::remove_stake { hotkey, .. }) => {
-                let stakes_this_interval = Pallet::<T>::get_stakes_this_interval_for_hotkey(hotkey);
-                let max_stakes_per_interval = Pallet::<T>::get_target_stakes_per_interval();
-
-                if stakes_this_interval >= max_stakes_per_interval {
-                    return InvalidTransaction::ExhaustsResources.into();
-                }
-
-                Ok(ValidTransaction {
-                    priority: Self::get_priority_vanilla(),
-                    ..Default::default()
-                })
-            }
+            Some(Call::add_stake { .. }) => Ok(ValidTransaction {
+                priority: Self::get_priority_vanilla(),
+                ..Default::default()
+            }),
+            Some(Call::remove_stake { .. }) => Ok(ValidTransaction {
+                priority: Self::get_priority_vanilla(),
+                ..Default::default()
+            }),
             Some(Call::register { netuid, .. } | Call::burned_register { netuid, .. }) => {
                 let registrations_this_interval =
                     Pallet::<T>::get_registrations_this_interval(*netuid);

pallets/subtensor/src/staking.rs

@@ -157,15 +157,8 @@ impl<T: Config> Pallet<T> {
             Error::<T>::NonAssociatedColdKey
         );
 
-        // --- 6. Ensure we don't exceed tx rate limit
-        let block: u64 = Self::get_current_block_as_u64();
-        ensure!(
-            !Self::exceeds_tx_rate_limit(Self::get_last_tx_block(&coldkey), block),
-            Error::<T>::TxRateLimitExceeded
-        );
-
-        // --- 7. Ensure we don't exceed stake rate limit
-        let stakes_this_interval = Self::get_stakes_this_interval_for_hotkey(&hotkey);
+        // --- 6. Ensure we don't exceed stake rate limit
+        let stakes_this_interval = Self::get_stakes_this_interval_for_coldkey_hotkey(&coldkey, &hotkey);
         ensure!(
             stakes_this_interval < Self::get_target_stakes_per_interval(),
             Error::<T>::StakeRateLimitExceeded
@@ -181,10 +174,12 @@ impl<T: Config> Pallet<T> {
         Self::increase_stake_on_coldkey_hotkey_account(&coldkey, &hotkey, stake_to_be_added);
 
         // Set last block for rate limiting
+        let block: u64 = Self::get_current_block_as_u64();
         Self::set_last_tx_block(&coldkey, block);
 
-        // --- 10. Emit the staking event.
-        Self::set_stakes_this_interval_for_hotkey(
+        // --- 9. Emit the staking event.
+        Self::set_stakes_this_interval_for_coldkey_hotkey(
+            &coldkey,
             &hotkey,
             stakes_this_interval + 1,
             block,
@@ -196,7 +191,7 @@ impl<T: Config> Pallet<T> {
         );
         Self::deposit_event(Event::StakeAdded(hotkey, stake_to_be_added));
 
-        // --- 11. Ok and return.
+        // --- 10. Ok and return.
         Ok(())
     }
 
@@ -278,31 +273,26 @@ impl<T: Config> Pallet<T> {
             Error::<T>::CouldNotConvertToBalance
         );
 
-        // --- 6. Ensure we don't exceed tx rate limit
-        let block: u64 = Self::get_current_block_as_u64();
-        ensure!(
-            !Self::exceeds_tx_rate_limit(Self::get_last_tx_block(&coldkey), block),
-            Error::<T>::TxRateLimitExceeded
-        );
-
-        // --- 7. Ensure we don't exceed stake rate limit
-        let unstakes_this_interval = Self::get_stakes_this_interval_for_hotkey(&hotkey);
+        // --- 6. Ensure we don't exceed stake rate limit
+        let unstakes_this_interval = Self::get_stakes_this_interval_for_coldkey_hotkey(&coldkey, &hotkey);
         ensure!(
             unstakes_this_interval < Self::get_target_stakes_per_interval(),
             Error::<T>::UnstakeRateLimitExceeded
         );
 
-        // --- 8. We remove the balance from the hotkey.
+        // --- 7. We remove the balance from the hotkey.
         Self::decrease_stake_on_coldkey_hotkey_account(&coldkey, &hotkey, stake_to_be_removed);
 
-        // --- 9. We add the balancer to the coldkey.  If the above fails we will not credit this coldkey.
+        // --- 8. We add the balancer to the coldkey.  If the above fails we will not credit this coldkey.
         Self::add_balance_to_coldkey_account(&coldkey, stake_to_be_added_as_currency.unwrap());
 
         // Set last block for rate limiting
+        let block: u64 = Self::get_current_block_as_u64();
         Self::set_last_tx_block(&coldkey, block);
 
-        // --- 10. Emit the unstaking event.
-        Self::set_stakes_this_interval_for_hotkey(
+        // --- 9. Emit the unstaking event.
+        Self::set_stakes_this_interval_for_coldkey_hotkey(
+            &coldkey,
             &hotkey,
             unstakes_this_interval + 1,
             block,
@@ -314,7 +304,7 @@ impl<T: Config> Pallet<T> {
         );
         Self::deposit_event(Event::StakeRemoved(hotkey, stake_to_be_removed));
 
-        // --- 11. Done and ok.
+        // --- 10. Done and ok.
         Ok(())
     }
 
@@ -367,15 +357,15 @@ impl<T: Config> Pallet<T> {
     }
 
     // Retrieves the total stakes for a given hotkey (account ID) for the current staking interval.
-    pub fn get_stakes_this_interval_for_hotkey(hotkey: &T::AccountId) -> u64 {
+    pub fn get_stakes_this_interval_for_coldkey_hotkey(coldkey: &T::AccountId, hotkey: &T::AccountId) -> u64 {
         // Retrieve the configured stake interval duration from storage.
         let stake_interval = StakeInterval::<T>::get();
 
         // Obtain the current block number as an unsigned 64-bit integer.
         let current_block = Self::get_current_block_as_u64();
 
         // Fetch the total stakes and the last block number when stakes were made for the hotkey.
-        let (stakes, block_last_staked_at) = TotalHotkeyStakesThisInterval::<T>::get(hotkey);
+        let (stakes, block_last_staked_at) = TotalHotkeyColdkeyStakesThisInterval::<T>::get(coldkey, hotkey);
 
         // Calculate the block number after which the stakes for the hotkey should be reset.
         let block_to_reset_after = block_last_staked_at + stake_interval;
@@ -384,7 +374,7 @@ impl<T: Config> Pallet<T> {
         // it indicates the end of the staking interval for the hotkey.
         if block_to_reset_after <= current_block {
             // Reset the stakes for this hotkey for the current interval.
-            Self::set_stakes_this_interval_for_hotkey(hotkey, 0, block_last_staked_at);
+            Self::set_stakes_this_interval_for_coldkey_hotkey(coldkey, hotkey, 0, block_last_staked_at);
             // Return 0 as the stake amount since we've just reset the stakes.
             return 0;
         }

pallets/subtensor/src/utils.rs

@@ -140,8 +140,8 @@ impl<T: Config> Pallet<T> {
     pub fn set_target_stakes_per_interval(target_stakes_per_interval: u64) {
         TargetStakesPerInterval::<T>::set(target_stakes_per_interval)
     }
-    pub fn set_stakes_this_interval_for_hotkey(hotkey: &T::AccountId, stakes_this_interval: u64, last_staked_block_number: u64) {
-        TotalHotkeyStakesThisInterval::<T>::insert(hotkey, (stakes_this_interval, last_staked_block_number));
+    pub fn set_stakes_this_interval_for_coldkey_hotkey(coldkey: &T::AccountId, hotkey: &T::AccountId, stakes_this_interval: u64, last_staked_block_number: u64) {
+        TotalHotkeyColdkeyStakesThisInterval::<T>::insert(coldkey, hotkey, (stakes_this_interval, last_staked_block_number));
     }
     pub fn set_stake_interval(block: u64) {
         StakeInterval::<T>::set(block);