Merge branch 'feat/settable-max-mech-count' of github.com:opentensor/subtensor into feat/settable-max-mech-count

Author: gztensor

.github/workflows/check-bittensor-e2e-tests.yml.yml

@@ -130,17 +130,27 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
+      - name: Move Docker data-root to /mnt/data
+        run: |
+          sudo systemctl stop docker
+          sudo mkdir -p /mnt/data/docker
+          sudo chown -R runner:runner /mnt/data
+          sudo chmod -R 777 /mnt/data
+          echo '{"data-root": "/mnt/data/docker"}' | sudo tee /etc/docker/daemon.json
+          sudo systemctl start docker
+          docker info | grep "Docker Root Dir"
+
       - name: Build Docker Image
         run: docker build -f Dockerfile-localnet -t localnet .
 
       - name: Save Docker Image as Tar
-        run: docker save -o subtensor-localnet.tar localnet
+        run: docker save -o /mnt/data/subtensor-localnet.tar localnet
 
       - name: Upload Docker Image as Artifact
         uses: actions/upload-artifact@v4
         with:
           name: subtensor-localnet
-          path: subtensor-localnet.tar
+          path: /mnt/data/subtensor-localnet.tar
 
   # main btcli job
   run-btcli-e2e-tests:
@@ -181,7 +191,7 @@ jobs:
       - name: Install uv
         uses: astral-sh/setup-uv@v5
         with:
-          enable-cache: 'false'
+          enable-cache: "false"
 
       - name: Create Python virtual environment
         working-directory: ${{ github.workspace }}
@@ -275,7 +285,7 @@ jobs:
       - name: Install uv
         uses: astral-sh/setup-uv@v5
         with:
-          enable-cache: 'false'
+          enable-cache: "false"
 
       - name: Create Python virtual environment
         working-directory: ${{ github.workspace }}

evm-tests/test/staking.precompile.reward.test.ts

@@ -74,7 +74,7 @@ describe("Test neuron precompile reward", () => {
 
         let index = 0;
         while (index < 60) {
-            const pending = await api.query.SubtensorModule.ValidatorEmission.getValue(netuid);
+            const pending = await api.query.SubtensorModule.PendingValidatorEmission.getValue(netuid);
             if (pending > 0) {
                 console.log("pending amount is ", pending);
                 break;

pallets/admin-utils/src/lib.rs

@@ -538,7 +538,7 @@ pub mod pallet {
             );
             // Prevent chain bloat: Require max UIDs to be limited
             let mechanism_count = pallet_subtensor::MechanismCountCurrent::<T>::get(netuid);
-            pallet_subtensor::Pallet::<T>::check_max_uids_vs_mechanism_count(
+            pallet_subtensor::Pallet::<T>::ensure_max_uids_over_all_mechanisms(
                 max_allowed_uids,
                 mechanism_count.into(),
             )?;

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

@@ -10,7 +10,10 @@ use pallet_subtensor::{
     TargetRegistrationsPerInterval, Tempo, WeightsVersionKeyRateLimit, *,
 };
 // use pallet_subtensor::{migrations, Event};
-use pallet_subtensor::{Event, utils::rate_limiting::TransactionType};
+use pallet_subtensor::{
+    Event, subnets::mechanism::MAX_MECHANISM_COUNT_PER_SUBNET,
+    utils::rate_limiting::TransactionType,
+};
 use sp_consensus_grandpa::AuthorityId as GrandpaId;
 use sp_core::{Get, Pair, U256, ed25519};
 use substrate_fixed::types::I96F32;
@@ -540,10 +543,10 @@ fn test_sudo_set_max_allowed_uids() {
             Error::<Test>::MaxAllowedUidsGreaterThanDefaultMaxAllowedUids
         );
 
-        // Chain bloat check against mechanism count
-        // Set MechanismCountCurrent to exceed 256 / DefaultMaxAllowedUids (16)
+        // Trying to set max allowed uids that would cause max_allowed_uids * mechanism_count > 256
+        MaxAllowedUids::<Test>::insert(netuid, 8);
         MechanismCountCurrent::<Test>::insert(netuid, MechId::from(32));
-        let large_max_uids = 16_u16;
+        let large_max_uids = 16;
         assert_noop!(
             AdminUtils::sudo_set_max_allowed_uids(
                 <<Test as Config>::RuntimeOrigin>::root(),
@@ -2888,3 +2891,32 @@ fn test_sudo_set_min_allowed_uids() {
         );
     });
 }
+
+#[test]
+fn test_sudo_set_max_mechanism_count() {
+    new_test_ext().execute_with(|| {
+        // Normal case
+        assert_ok!(AdminUtils::sudo_set_max_mechanism_count(
+            <<Test as Config>::RuntimeOrigin>::root(),
+            MechId::from(10)
+        ));
+
+        // Zero fails
+        assert_noop!(
+            AdminUtils::sudo_set_max_mechanism_count(
+                <<Test as Config>::RuntimeOrigin>::root(),
+                MechId::from(0)
+            ),
+            pallet_subtensor::Error::<Test>::InvalidValue
+        );
+
+        // Over max bound fails
+        assert_noop!(
+            AdminUtils::sudo_set_max_mechanism_count(
+                <<Test as Config>::RuntimeOrigin>::root(),
+                MechId::from(MAX_MECHANISM_COUNT_PER_SUBNET + 1)
+            ),
+            pallet_subtensor::Error::<Test>::InvalidValue
+        );
+    });
+}

pallets/subtensor/src/coinbase/block_step.rs

@@ -18,13 +18,18 @@ impl<T: Config + pallet_drand::Config> Pallet<T> {
                 .to_u64(),
         );
         log::debug!("Block emission: {block_emission:?}");
-        // --- 3. Run emission through network.
+
+        // --- 3. Reveal matured weights.
+        Self::reveal_crv3_commits();
+        // --- 4. Run emission through network.
         Self::run_coinbase(block_emission);
-        // --- 4. Set pending children on the epoch; but only after the coinbase has been run.
+        // --- 5. Update moving prices AFTER using them for emissions.
+        Self::update_moving_prices();
+        // --- 6. Set pending children on the epoch; but only after the coinbase has been run.
         Self::try_set_pending_children(block_number);
-        // --- 5. Run auto-claim root divs.
+        // --- 7. Run auto-claim root divs.
         Self::run_auto_claim_root_divs(last_block_hash);
-        // --- 6. Populate root coldkey maps.
+        // --- 8. Populate root coldkey maps.
         Self::populate_root_coldkey_staking_maps();
 
         // Return ok.
@@ -261,4 +266,24 @@ impl<T: Config + pallet_drand::Config> Pallet<T> {
             return next_value.saturating_to_num::<u64>().into();
         }
     }
+
+    pub fn update_moving_prices() {
+        let subnets_to_emit_to: Vec<NetUid> =
+            Self::get_subnets_to_emit_to(&Self::get_all_subnet_netuids());
+        // Only update price EMA for subnets that we emit to.
+        for netuid_i in subnets_to_emit_to.iter() {
+            // Update moving prices after using them above.
+            Self::update_moving_price(*netuid_i);
+        }
+    }
+
+    pub fn reveal_crv3_commits() {
+        let netuids: Vec<NetUid> = Self::get_all_subnet_netuids();
+        for netuid in netuids.into_iter().filter(|netuid| *netuid != NetUid::ROOT) {
+            // Reveal matured weights.
+            if let Err(e) = Self::reveal_crv3_commits_for_subnet(netuid) {
+                log::warn!("Failed to reveal commits for subnet {netuid} due to error: {e:?}");
+            };
+        }
+    }
 }

pallets/subtensor/src/coinbase/reveal_commits.rs

@@ -36,7 +36,7 @@ pub struct LegacyWeightsTlockPayload {
 
 impl<T: Config> Pallet<T> {
     /// The `reveal_crv3_commits` function is run at the very beginning of epoch `n`,
-    pub fn reveal_crv3_commits(netuid: NetUid) -> dispatch::DispatchResult {
+    pub fn reveal_crv3_commits_for_subnet(netuid: NetUid) -> dispatch::DispatchResult {
         let reveal_period = Self::get_reveal_period(netuid);
         let cur_block = Self::get_current_block_as_u64();
         let cur_epoch = Self::get_epoch_index(netuid, cur_block);