Merge branch 'devnet-ready' into feat/devnet-companion/check-metadata-hash-extension

Author: camfairchild

pallets/subtensor/src/benchmarks.rs

@@ -80,7 +80,7 @@ benchmarks! {
     // This is a whitelisted caller who can make transaction without weights.
     let caller: T::AccountId = whitelisted_caller::<AccountIdOf<T>>();
     let caller_origin = <T as frame_system::Config>::RuntimeOrigin::from(RawOrigin::Signed(caller.clone()));
-    let netuid: u16 = 1;
+    let netuid: u16 = 0;
     let version_key: u64 = 1;
     let tempo: u16 = 1;
     let modality: u16 = 0;

pallets/subtensor/src/epoch.rs

@@ -188,8 +188,6 @@ impl<T: Config> Pallet<T> {
         // =================================
 
         // Compute emission scores.
-
-        // Compute normalized emission scores. range: I32F32(0, 1)
         // Compute normalized emission scores. range: I32F32(0, 1)
         let combined_emission: Vec<I32F32> = incentive
             .iter()

pallets/subtensor/src/lib.rs

@@ -2045,9 +2045,10 @@ pub mod pallet {
 
         /// Attempt to adjust the senate membership to include a hotkey
         #[pallet::call_index(63)]
-        #[pallet::weight((Weight::from_parts(0, 0)
-		.saturating_add(T::DbWeight::get().reads(0))
-		.saturating_add(T::DbWeight::get().writes(0)), DispatchClass::Normal, Pays::Yes))]
+        #[pallet::weight((Weight::from_parts(50_000_000, 0)
+        .saturating_add(Weight::from_parts(0, 4632))
+        .saturating_add(T::DbWeight::get().reads(5))
+        .saturating_add(T::DbWeight::get().writes(1)), DispatchClass::Normal, Pays::Yes))]
         pub fn adjust_senate(origin: OriginFor<T>, hotkey: T::AccountId) -> DispatchResult {
             Self::do_adjust_senate(origin, hotkey)
         }

pallets/subtensor/src/migration.rs

@@ -37,6 +37,13 @@ pub fn do_migrate_fix_total_coldkey_stake<T: Config>() -> Weight {
     // Initialize the weight with one read operation.
     let mut weight = T::DbWeight::get().reads(1);
 
+    // Clear everything from the map first, no limit (u32::MAX)
+    let removal_results = TotalColdkeyStake::<T>::clear(u32::MAX, None);
+    // 1 read/write per removal
+    let entries_removed: u64 = removal_results.backend.into();
+    weight =
+        weight.saturating_add(T::DbWeight::get().reads_writes(entries_removed, entries_removed));
+
     // Iterate through all staking hotkeys.
     for (coldkey, hotkey_vec) in StakingHotkeys::<T>::iter() {
         // Init the zero value.

pallets/subtensor/tests/migration.rs

@@ -392,6 +392,23 @@ fn test_migrate_fix_total_coldkey_stake_runs_once() {
     })
 }
 
+// SKIP_WASM_BUILD=1 RUST_LOG=info cargo test --test migration -- test_migrate_fix_total_coldkey_stake_starts_with_value_no_stake_map_entries --exact --nocapture
+#[test]
+fn test_migrate_fix_total_coldkey_stake_starts_with_value_no_stake_map_entries() {
+    new_test_ext(1).execute_with(|| {
+        let migration_name = "fix_total_coldkey_stake_v7";
+        let coldkey = U256::from(0);
+        TotalColdkeyStake::<Test>::insert(coldkey, 123_456_789);
+
+        // Notably, coldkey has no stake map or staking_hotkeys map entries
+
+        let weight = run_migration_and_check(migration_name);
+        assert!(weight != Weight::zero());
+        // Therefore 0
+        assert_eq!(TotalColdkeyStake::<Test>::get(coldkey), 0);
+    })
+}
+
 fn run_migration_and_check(migration_name: &'static str) -> frame_support::weights::Weight {
     // Execute the migration and store its weight
     let weight: frame_support::weights::Weight =

pallets/subtensor/tests/mock.rs

@@ -1,12 +1,13 @@
 #![allow(clippy::arithmetic_side_effects, clippy::unwrap_used)]
-use frame_support::derive_impl;
-use frame_support::dispatch::DispatchResultWithPostInfo;
-use frame_support::weights::constants::RocksDbWeight;
+
 // use frame_support::weights::constants::WEIGHT_PER_SECOND;
 use frame_support::weights::Weight;
 use frame_support::{
-    assert_ok, parameter_types,
+    assert_ok, derive_impl,
+    dispatch::DispatchResultWithPostInfo,
+    parameter_types,
     traits::{Everything, Hooks},
+    weights::constants::RocksDbWeight,
 };
 use frame_system as system;
 use frame_system::{limits, EnsureNever, EnsureRoot, RawOrigin};

pallets/subtensor/tests/staking.rs

@@ -4719,3 +4719,35 @@ fn test_do_schedule_coldkey_swap_regular_user_passes_min_balance() {
         );
     });
 }
+
+// SKIP_WASM_BUILD=1 RUST_LOG=info cargo test --test staking -- test_emission_creates_staking_hotkeys_entry --exact --nocapture
+#[test]
+fn test_emission_creates_staking_hotkeys_entry() {
+    new_test_ext(1).execute_with(|| {
+        let hotkey0 = U256::from(1);
+        let hotkey1 = U256::from(2);
+
+        let coldkey = U256::from(3);
+
+        // Add to Owner map
+        Owner::<Test>::insert(hotkey0, coldkey);
+        Owner::<Test>::insert(hotkey1, coldkey);
+        OwnedHotkeys::<Test>::insert(coldkey, vec![hotkey0, hotkey1]);
+
+        // Emit through hotkey
+        SubtensorModule::emit_inflation_through_hotkey_account(&hotkey0, 0, 1_000);
+
+        // Verify StakingHotkeys has an entry
+        assert_eq!(StakingHotkeys::<Test>::get(coldkey).len(), 1);
+        assert!(StakingHotkeys::<Test>::get(coldkey).contains(&hotkey0));
+
+        // Try again with another emission on hotkey1
+        SubtensorModule::emit_inflation_through_hotkey_account(&hotkey1, 0, 2_000);
+
+        // Verify both hotkeys are now in the map
+        assert_eq!(StakingHotkeys::<Test>::get(coldkey).len(), 2);
+        let final_map = StakingHotkeys::<Test>::get(coldkey);
+        assert!(final_map.contains(&hotkey0));
+        assert!(final_map.contains(&hotkey1));
+    })
+}

runtime/src/lib.rs

@@ -139,7 +139,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: 165,
+    spec_version: 195,
     impl_version: 1,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 1,