Merge pull request #1515 from opentensor/sam-fix-hotfix-merge-conflict-4-7-2025

fix merge conflict from v2.0.10 hotfix

Author: sam0x17

Diff for: .github/workflows/try-runtime.yml

@@ -9,6 +9,7 @@ env:
 jobs:
   check-devnet:
     name: check devnet
+    if: github.base_ref != 'main'
     runs-on: SubtensorCI
     steps:
       - name: Checkout sources
@@ -29,7 +30,7 @@ jobs:
 
   check-testnet:
     name: check testnet
-    # if: github.base_ref == 'testnet' || github.base_ref == 'devnet' || github.base_ref == 'main'
+    if: github.base_ref != 'main'
     runs-on: SubtensorCI
     steps:
       - name: Checkout sources

Diff for: pallets/subtensor/src/staking/stake_utils.rs

@@ -68,10 +68,6 @@ impl<T: Config> Pallet<T> {
             Self::get_current_block_as_u64().saturating_sub(start_call_block)
         });
 
-        // Use halving time hyperparameter. The meaning of this parameter can be best explained under
-        // the assumption of a constant price and SubnetMovingAlpha == 0.5: It is how many blocks it
-        // will take in order for the distance between current EMA of price and current price to shorten
-        // by half.
         let halving_time = EMAPriceHalvingBlocks::<T>::get(netuid);
         let current_ma_unsigned = U96F32::saturating_from_num(SubnetMovingAlpha::<T>::get());
         let alpha: U96F32 = current_ma_unsigned.saturating_mul(blocks_since_start_call.safe_div(