Merge branch 'devnet-ready' into l0r1s/crowdloan-contributors-limit

Author: l0r1s

.github/workflows/docker-localnet.yml

@@ -59,7 +59,8 @@ jobs:
 
       - name: Patch non-fast-block node
         run: |
-          sed -i 's|7 \* 24 \* 60 \* 60 / 12 // 7 days|5 // Only 5 blocks for tests|' runtime/src/lib.rs
+          perl -0777 -i -pe 's|7 \* 24 \* 60 \* 60 / 12 // 7 days|5 // Only 5 blocks for tests|' runtime/src/lib.rs
+          perl -0777 -i -pe 's|pub fn DefaultPendingCooldown<T: Config>\(\) -> u64 \{\s*if cfg!\(feature = "fast-blocks"\) \{\s*return 15;\s*\}\s*7_200\s*\}|pub fn DefaultPendingCooldown<T: Config>() -> u64 {\n        15\n    }|g' pallets/subtensor/src/lib.rs
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v6

pallets/subtensor/src/migrations/migrate_reset_bonds_moving_average.rs

@@ -24,14 +24,14 @@ pub fn migrate_reset_bonds_moving_average<T: Config>() -> Weight {
     );
 
     // ------------------------------
-    // Step 1: Reset all subnet's BondsMovingAverage to 975000
+    // Step 1: Reset all subnet's BondsMovingAverage to 975000 if the value exceeds 975000
     // ------------------------------
 
     let mut reset_entries_count = 0u64;
 
     for netuid in BondsMovingAverage::<T>::iter_keys() {
         BondsMovingAverage::<T>::mutate(netuid, |average| {
-            *average = 975000;
+            *average = (*average).min(975000);
         });
         reset_entries_count = reset_entries_count.saturating_add(1);
     }

pallets/subtensor/src/migrations/migrate_reset_max_burn.rs

@@ -39,10 +39,7 @@ pub fn migrate_reset_max_burn<T: Config>() -> Weight {
     weight = weight
         .saturating_add(T::DbWeight::get().reads_writes(reset_entries_count, reset_entries_count));
 
-    log::info!(
-        "Reset {} subnets from BondsMovingAverage.",
-        reset_entries_count
-    );
+    log::info!("Reset {} subnets from MaxBurn.", reset_entries_count);
 
     // ------------------------------
     // Step 2: Mark Migration as Completed

runtime/src/lib.rs

@@ -207,7 +207,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: 266,
+    spec_version: 267,
     impl_version: 1,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 1,