Fix validation for transfer toggle

Author: gztensor

pallets/admin-utils/src/lib.rs

@@ -1307,7 +1307,6 @@ pub mod pallet {
             pallet_subtensor::Pallet::<T>::ensure_subnet_owner_or_root(origin, netuid)?;
             pallet_subtensor::Pallet::<T>::toggle_transfer(netuid, toggle)
         }
-
     }
 }
 

pallets/subtensor/src/coinbase/root.rs

@@ -722,10 +722,14 @@ impl<T: Config> Pallet<T> {
         Self::deposit_event(Event::NetworkLockCostReductionIntervalSet(interval));
     }
     pub fn get_lock_reduction_interval() -> u64 {
-        let interval: I64F64 = I64F64::saturating_from_num( NetworkLockReductionInterval::<T>::get() );
-        let block_emission: I64F64 = I64F64::saturating_from_num( Self::get_block_emission().unwrap_or( 1_000_000_000 ) ); 
-        let halving: I64F64 = block_emission.checked_div( I64F64::saturating_from_num( 1_000_000_000 ) ).unwrap_or( I64F64::saturating_from_num(0.0) );
-        let halved_interval: I64F64 = interval.saturating_mul( halving );
+        let interval: I64F64 =
+            I64F64::saturating_from_num(NetworkLockReductionInterval::<T>::get());
+        let block_emission: I64F64 =
+            I64F64::saturating_from_num(Self::get_block_emission().unwrap_or(1_000_000_000));
+        let halving: I64F64 = block_emission
+            .checked_div(I64F64::saturating_from_num(1_000_000_000))
+            .unwrap_or(I64F64::saturating_from_num(0.0));
+        let halved_interval: I64F64 = interval.saturating_mul(halving);
         halved_interval.saturating_to_num::<u64>()
     }
 }

pallets/subtensor/src/lib.rs

@@ -1595,6 +1595,7 @@ pub enum CustomTransactionError {
     RateLimitExceeded,
     InsufficientLiquidity,
     SlippageTooHigh,
+    TransferDisallowed,
     BadRequest,
 }
 
@@ -1610,6 +1611,7 @@ impl From<CustomTransactionError> for u8 {
             CustomTransactionError::RateLimitExceeded => 6,
             CustomTransactionError::InsufficientLiquidity => 7,
             CustomTransactionError::SlippageTooHigh => 8,
+            CustomTransactionError::TransferDisallowed => 9,
             CustomTransactionError::BadRequest => 255,
         }
     }
@@ -1685,6 +1687,10 @@ where
                     CustomTransactionError::SlippageTooHigh.into(),
                 )
                 .into()),
+                Error::<T>::TransferDisallowed => Err(InvalidTransaction::Custom(
+                    CustomTransactionError::TransferDisallowed.into(),
+                )
+                .into()),
                 _ => Err(
                     InvalidTransaction::Custom(CustomTransactionError::BadRequest.into()).into(),
                 ),
@@ -1909,6 +1915,7 @@ where
                     *alpha_amount,
                     *alpha_amount,
                     None,
+                    false,
                 ))
             }
             Some(Call::transfer_stake {
@@ -1929,6 +1936,7 @@ where
                     *alpha_amount,
                     *alpha_amount,
                     None,
+                    true,
                 ))
             }
             Some(Call::swap_stake {
@@ -1948,6 +1956,7 @@ where
                     *alpha_amount,
                     *alpha_amount,
                     None,
+                    false,
                 ))
             }
             Some(Call::swap_stake_limit {
@@ -1976,6 +1985,7 @@ where
                     *alpha_amount,
                     max_amount,
                     Some(*allow_partial),
+                    false,
                 ))
             }
             Some(Call::register { netuid, .. } | Call::burned_register { netuid, .. }) => {

pallets/subtensor/src/macros/events.rs

@@ -271,6 +271,5 @@ mod events {
         /// Parameters:
         /// (netuid, bool)
         TransferToggle(u16, bool),
-
     }
 }

pallets/subtensor/src/staking/move_stake.rs

@@ -47,6 +47,7 @@ impl<T: Config> Pallet<T> {
             alpha_amount,
             None,
             None,
+            false,
         )?;
 
         // Log the event.
@@ -96,20 +97,14 @@ impl<T: Config> Pallet<T> {
     ///
     /// # Events
     /// Emits a `StakeTransferred` event upon successful completion of the transfer.
-    pub fn toggle_transfer( 
-        netuid: u16, 
-        toggle: bool
-    ) -> dispatch::DispatchResult {
-        TransferToggle::<T>::insert( netuid, toggle );
+    pub fn toggle_transfer(netuid: u16, toggle: bool) -> dispatch::DispatchResult {
+        TransferToggle::<T>::insert(netuid, toggle);
         log::debug!(
             "TransferToggle( netuid: {:?}, toggle: {:?} ) ",
             netuid,
             toggle
         );
-        Self::deposit_event(Event::TransferToggle(
-            netuid,
-            toggle
-        ));
+        Self::deposit_event(Event::TransferToggle(netuid, toggle));
         Ok(())
     }
     pub fn do_transfer_stake(
@@ -123,16 +118,6 @@ impl<T: Config> Pallet<T> {
         // Ensure the extrinsic is signed by the origin_coldkey.
         let coldkey = ensure_signed(origin)?;
 
-        // Ensure transfer is toggled.
-        ensure!(
-            TransferToggle::<T>::get( origin_netuid ),
-            Error::<T>::TransferDisallowed
-        );
-        ensure!(
-            TransferToggle::<T>::get( destination_netuid ),
-            Error::<T>::TransferDisallowed
-        );
-
         // Validate input and move stake
         let tao_moved = Self::transition_stake_internal(
             &coldkey,
@@ -144,6 +129,7 @@ impl<T: Config> Pallet<T> {
             alpha_amount,
             None,
             None,
+            true,
         )?;
 
         // 9. Emit an event for logging/monitoring.
@@ -213,6 +199,7 @@ impl<T: Config> Pallet<T> {
             alpha_amount,
             None,
             None,
+            false,
         )?;
 
         // Emit an event for logging.
@@ -284,6 +271,7 @@ impl<T: Config> Pallet<T> {
             alpha_amount,
             Some(limit_price),
             Some(allow_partial),
+            false,
         )?;
 
         // Emit an event for logging.
@@ -319,6 +307,7 @@ impl<T: Config> Pallet<T> {
         alpha_amount: u64,
         maybe_limit_price: Option<u64>,
         maybe_allow_partial: Option<bool>,
+        check_transfer_toggle: bool,
     ) -> Result<u64, Error<T>> {
         // Calculate the maximum amount that can be executed
         let max_amount = if let Some(limit_price) = maybe_limit_price {
@@ -338,6 +327,7 @@ impl<T: Config> Pallet<T> {
             alpha_amount,
             max_amount,
             maybe_allow_partial,
+            check_transfer_toggle,
         )?;
 
         // Unstake from the origin subnet, returning TAO (or a 1:1 equivalent).

pallets/subtensor/src/staking/stake_utils.rs

@@ -845,6 +845,7 @@ impl<T: Config> Pallet<T> {
         alpha_amount: u64,
         max_amount: u64,
         maybe_allow_partial: Option<bool>,
+        check_transfer_toggle: bool,
     ) -> Result<(), Error<T>> {
         // Ensure that both subnets exist.
         ensure!(
@@ -899,6 +900,18 @@ impl<T: Config> Pallet<T> {
             }
         }
 
+        if check_transfer_toggle {
+            // Ensure transfer is toggled.
+            ensure!(
+                TransferToggle::<T>::get(origin_netuid),
+                Error::<T>::TransferDisallowed
+            );
+            ensure!(
+                TransferToggle::<T>::get(destination_netuid),
+                Error::<T>::TransferDisallowed
+            );
+        }
+
         Ok(())
     }
 }