merge with devnet ready

Author: open-junius

.github/workflows/benchmark-weights.yml

@@ -1287,6 +1287,26 @@ pub mod pallet {
             ensure_root(origin)?;
             T::Grandpa::schedule_change(next_authorities, in_blocks, forced)
         }
+
+        /// Enables or disables Liquid Alpha for a given subnet.
+        ///
+        /// # Parameters
+        /// - `origin`: The origin of the call, which must be the root account or subnet owner.
+        /// - `netuid`: The unique identifier for the subnet.
+        /// - `enabled`: A boolean flag to enable or disable Liquid Alpha.
+        ///
+        /// # Weight
+        /// This function has a fixed weight of 0 and is classified as an operational transaction that does not incur any fees.
+        #[pallet::call_index(61)]
+        #[pallet::weight((0, DispatchClass::Operational, Pays::No))]
+        pub fn sudo_set_toggle_transfer(
+            origin: OriginFor<T>,
+            netuid: u16,
+            toggle: bool,
+        ) -> DispatchResult {
+            pallet_subtensor::Pallet::<T>::ensure_subnet_owner_or_root(origin, netuid)?;
+            pallet_subtensor::Pallet::<T>::toggle_transfer(netuid, toggle)
+        }
     }
 }
 

Cargo.lock

@@ -100,7 +100,7 @@ parameter_types! {
     pub const InitialTxDelegateTakeRateLimit: u64 = 0; // Disable rate limit for testing
     pub const InitialTxChildKeyTakeRateLimit: u64 = 0; // Disable rate limit for testing
     pub const InitialBurn: u64 = 0;
-    pub const InitialMinBurn: u64 = 0;
+    pub const InitialMinBurn: u64 = 500_000;
     pub const InitialMaxBurn: u64 = 1_000_000_000;
     pub const InitialValidatorPruneLen: u64 = 0;
     pub const InitialScalingLawPower: u16 = 50;

pallets/admin-utils/src/lib.rs

@@ -53,7 +53,7 @@ impl<T: Config> Pallet<T> {
             );
 
             // Scale down tao_in
-            tao_in_emission = alpha_price.saturating_mul(float_alpha_block_emission);
+            // tao_in_emission = alpha_price.saturating_mul(float_alpha_block_emission);
 
             // Set to max alpha_block_emission
             alpha_in_emission = float_alpha_block_emission;

pallets/admin-utils/src/tests/mock.rs

@@ -16,10 +16,8 @@ impl<T: Config + pallet_drand::Config> Pallet<T> {
         log::debug!("Block emission: {:?}", block_emission);
         // --- 3. Run emission through network.
         Self::run_coinbase(block_emission);
-
         // --- 4. Set pending children on the epoch; but only after the coinbase has been run.
         Self::try_set_pending_children(block_number);
-
         // Return ok.
         Ok(())
     }

pallets/subtensor/src/coinbase/block_emission.rs

@@ -479,7 +479,7 @@ impl<T: Config> Pallet<T> {
         );
 
         // --- 4. Remove the subnet identity if it exists.
-        if SubnetIdentities::<T>::take(netuid).is_some() {
+        if SubnetIdentitiesV2::<T>::take(netuid).is_some() {
             Self::deposit_event(Event::SubnetIdentityRemoved(netuid));
         }
 
@@ -590,8 +590,8 @@ impl<T: Config> Pallet<T> {
         SubnetOwner::<T>::remove(netuid);
 
         // --- 13. Remove subnet identity if it exists.
-        if SubnetIdentities::<T>::contains_key(netuid) {
-            SubnetIdentities::<T>::remove(netuid);
+        if SubnetIdentitiesV2::<T>::contains_key(netuid) {
+            SubnetIdentitiesV2::<T>::remove(netuid);
             Self::deposit_event(Event::SubnetIdentityRemoved(netuid));
         }
     }
@@ -722,6 +722,14 @@ impl<T: Config> Pallet<T> {
         Self::deposit_event(Event::NetworkLockCostReductionIntervalSet(interval));
     }
     pub fn get_lock_reduction_interval() -> u64 {
-        NetworkLockReductionInterval::<T>::get()
+        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>()
     }
 }