Merge remote-tracking branch 'origin/main' into fix/add-adjust-senate-call

sam0x17 · sam0x17 · commit 8624c93c42d7 · 2024-06-21T14:33:22.000-04:00
diff --git a/.github/workflows/check-rust.yml b/.github/workflows/check-rust.yml
@@ -71,7 +71,7 @@ jobs:
     strategy:
       matrix:
         rust-branch:
-          - nightly-2024-03-05
+          - stable
         rust-target:
           - x86_64-unknown-linux-gnu
           # - x86_64-apple-darwin
@@ -119,55 +119,7 @@ jobs:
     strategy:
       matrix:
         rust-branch:
-          - nightly-2024-03-05
-        rust-target:
-          - x86_64-unknown-linux-gnu
-          # - x86_64-apple-darwin
-        os:
-          - ubuntu-latest
-          # - macos-latest
-        include:
-          - os: ubuntu-latest
-          # - os: macos-latest
-    env:
-      RELEASE_NAME: development
-      # RUSTFLAGS: -A warnings
-      RUSTV: ${{ matrix.rust-branch }}
-      RUST_BACKTRACE: full
-      RUST_BIN_DIR: target/${{ matrix.rust-target }}
-      SKIP_WASM_BUILD: 1
-      TARGET: ${{ matrix.rust-target }}
-    steps:
-      - name: Check-out repository under $GITHUB_WORKSPACE
-        uses: actions/checkout@v2
-
-      - name: Install dependencies
-        run: |
-          sudo apt-get update &&
-          sudo apt-get install -y clang curl libssl-dev llvm libudev-dev protobuf-compiler
-
-      - name: Install Rust ${{ matrix.rust-branch }}
-        uses: actions-rs/toolchain@v1.0.6
-        with:
-          toolchain: ${{ matrix.rust-branch }}
-          components: rustfmt, clippy
-          profile: minimal
-
-      - name: Utilize Shared Rust Cache
-        uses: Swatinem/rust-cache@v2.2.1
-        with:
-          key: ${{ matrix.os }}-${{ env.RUST_BIN_DIR }}
-
-      - name: cargo clippy --workspace --all-targets --all-features -- -D warnings
-        run: cargo clippy --workspace --all-targets --all-features -- -D warnings
-
-  cargo-clippy-all-features:
-    name: cargo clippy --all-features
-    runs-on: SubtensorCI
-    strategy:
-      matrix:
-        rust-branch:
-          - nightly-2024-03-05
+          - stable
         rust-target:
           - x86_64-unknown-linux-gnu
           # - x86_64-apple-darwin
@@ -208,15 +160,14 @@ jobs:
 
       - name: cargo clippy --workspace --all-targets --all-features -- -D warnings
         run: cargo clippy --workspace --all-targets --all-features -- -D warnings
-
   # runs cargo test --workspace
   cargo-test:
     name: cargo test
     runs-on: SubtensorCI
     strategy:
       matrix:
         rust-branch:
-          - nightly-2024-03-05
+          - stable
         rust-target:
           - x86_64-unknown-linux-gnu
           # - x86_64-apple-darwin
@@ -265,7 +216,7 @@ jobs:
     strategy:
       matrix:
         rust-branch:
-          - nightly-2024-03-05
+          - stable
         rust-target:
           - x86_64-unknown-linux-gnu
           # - x86_64-apple-darwin
@@ -314,7 +265,7 @@ jobs:
     strategy:
       matrix:
         rust-branch:
-          - nightly-2024-03-05
+          - stable
         rust-target:
           - x86_64-unknown-linux-gnu
           # - x86_64-apple-darwin
diff --git a/.github/workflows/devnet-labels.yml b/.github/workflows/devnet-labels.yml
@@ -2,6 +2,7 @@ name: Tested on Devnet
 on:
   pull_request:
     types: [opened, labeled, unlabeled, synchronize]
+    branches: [main]
 jobs:
   check-labels:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/testnet-labels.yml b/.github/workflows/testnet-labels.yml
@@ -2,6 +2,7 @@ name: Tested on Testnet
 on:
   pull_request:
     types: [opened, labeled, unlabeled, synchronize]
+    branches: [main]
 jobs:
   check-labels:
     runs-on: ubuntu-latest
diff --git a/node/src/rpc.rs b/node/src/rpc.rs
@@ -42,7 +42,7 @@ pub struct FullDeps<C, P, B> {
     /// Grandpa block import setup.
     pub grandpa: GrandpaDeps<B>,
     /// Backend used by the node.
-    pub backend: Arc<B>,
+    pub _backend: Arc<B>,
 }
 
 /// Instantiate all full RPC extensions.
@@ -74,7 +74,7 @@ where
         pool,
         deny_unsafe,
         grandpa,
-        backend: _,
+        _backend: _,
     } = deps;
 
     // Custom RPC methods for Paratensor
diff --git a/node/src/service.rs b/node/src/service.rs
@@ -266,7 +266,7 @@ pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
                         subscription_executor: subscription_executor.clone(),
                         finality_provider: finality_proof_provider.clone(),
                     },
-                    backend: rpc_backend.clone(),
+                    _backend: rpc_backend.clone(),
                 };
                 crate::rpc::create_full(deps).map_err(Into::into)
             },
diff --git a/pallets/admin-utils/src/lib.rs b/pallets/admin-utils/src/lib.rs
@@ -7,7 +7,6 @@ pub use weights::WeightInfo;
 use sp_runtime::DispatchError;
 use sp_runtime::{traits::Member, RuntimeAppPublic};
 
-#[cfg(feature = "runtime-benchmarks")]
 mod benchmarking;
 
 #[deny(missing_docs)]
diff --git a/pallets/commitments/src/lib.rs b/pallets/commitments/src/lib.rs
@@ -1,11 +1,9 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
+mod benchmarking;
 #[cfg(test)]
 mod tests;
 
-#[cfg(feature = "runtime-benchmarks")]
-mod benchmarking;
-
 pub mod types;
 pub mod weights;
 
@@ -234,7 +232,7 @@ where
     pub fn get_priority_vanilla() -> u64 {
         // Return high priority so that every extrinsic except set_weights function will
         // have a higher priority than the set_weights call
-        u64::max_value()
+        u64::MAX
     }
 }
 
diff --git a/pallets/registry/src/lib.rs b/pallets/registry/src/lib.rs
@@ -3,7 +3,6 @@
 #[cfg(test)]
 mod tests;
 
-#[cfg(feature = "runtime-benchmarks")]
 mod benchmarking;
 pub mod types;
 pub mod weights;
diff --git a/pallets/subtensor/src/lib.rs b/pallets/subtensor/src/lib.rs
@@ -29,7 +29,6 @@ use sp_std::marker::PhantomData;
 // ============================
 //	==== Benchmark Imports =====
 // ============================
-#[cfg(feature = "runtime-benchmarks")]
 mod benchmarks;
 
 // =========================
@@ -2072,7 +2071,7 @@ pub mod pallet {
                 let current_block_number: u64 = Self::get_current_block_as_u64();
                 let default_priority: u64 =
                     current_block_number - Self::get_last_update_for_uid(netuid, uid);
-                return default_priority + u32::max_value() as u64;
+                return default_priority + u32::MAX as u64;
             }
             0
         }
@@ -2150,7 +2149,7 @@ where
     pub fn get_priority_vanilla() -> u64 {
         // Return high priority so that every extrinsic except set_weights function will
         // have a higher priority than the set_weights call
-        u64::max_value()
+        u64::MAX
     }
 
     pub fn get_priority_set_weights(who: &T::AccountId, netuid: u16) -> u64 {
@@ -2228,9 +2227,9 @@ where
                     Err(InvalidTransaction::Call.into())
                 }
             }
-            Some(Call::set_root_weights { netuid, .. }) => {
-                if Self::check_weights_min_stake(who) {
-                    let priority: u64 = Self::get_priority_set_weights(who, *netuid);
+            Some(Call::set_root_weights { netuid, hotkey, .. }) => {
+                if Self::check_weights_min_stake(hotkey) {
+                    let priority: u64 = Self::get_priority_set_weights(hotkey, *netuid);
                     Ok(ValidTransaction {
                         priority,
                         longevity: 1,
diff --git a/pallets/subtensor/src/root.rs b/pallets/subtensor/src/root.rs
@@ -1112,12 +1112,12 @@ impl<T: Config> Pallet<T> {
         NetworkRegisteredAt::<T>::remove(netuid);
 
         // --- 8. Remove incentive mechanism memory.
-        let _ = Uids::<T>::clear_prefix(netuid, u32::max_value(), None);
-        let _ = Keys::<T>::clear_prefix(netuid, u32::max_value(), None);
-        let _ = Bonds::<T>::clear_prefix(netuid, u32::max_value(), None);
+        let _ = Uids::<T>::clear_prefix(netuid, u32::MAX, None);
+        let _ = Keys::<T>::clear_prefix(netuid, u32::MAX, None);
+        let _ = Bonds::<T>::clear_prefix(netuid, u32::MAX, None);
 
         // --- 8. Removes the weights for this subnet (do not remove).
-        let _ = Weights::<T>::clear_prefix(netuid, u32::max_value(), None);
+        let _ = Weights::<T>::clear_prefix(netuid, u32::MAX, None);
 
         // --- 9. Iterate over stored weights and fill the matrix.
         for (uid_i, weights_i) in
diff --git a/pallets/subtensor/src/weights.rs b/pallets/subtensor/src/weights.rs
@@ -405,7 +405,7 @@ impl<T: Config> Pallet<T> {
             return weights;
         }
         weights.iter_mut().for_each(|x| {
-            *x = (*x as u64 * u16::max_value() as u64 / sum) as u16;
+            *x = (*x as u64 * u16::MAX as u64 / sum) as u16;
         });
         weights
     }
diff --git a/pallets/subtensor/tests/block_step.rs b/pallets/subtensor/tests/block_step.rs
@@ -869,8 +869,9 @@ fn test_emission_based_on_registration_status() {
             n as usize
         );
 
+        let block: u64 = 0;
         // drain the emission tuples for the subnet with registration on
-        SubtensorModule::drain_emission(next_block as u64);
+        SubtensorModule::drain_emission(block);
         // Turn on registration for the subnet with registration off
         SubtensorModule::set_network_registration_allowed(netuid_off, true);
         SubtensorModule::set_network_registration_allowed(netuid_on, false);
diff --git a/pallets/subtensor/tests/epoch.rs b/pallets/subtensor/tests/epoch.rs
@@ -38,7 +38,7 @@ fn normalize_weights(mut weights: Vec<u16>) -> Vec<u16> {
         return weights;
     }
     weights.iter_mut().for_each(|x| {
-        *x = (*x as u64 * u16::max_value() as u64 / sum) as u16;
+        *x = (*x as u64 * u16::MAX as u64 / sum) as u16;
     });
     weights
 }
diff --git a/pallets/subtensor/tests/weights.rs b/pallets/subtensor/tests/weights.rs
diff --git a/runtime/src/check_nonce.rs b/runtime/src/check_nonce.rs
diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
diff --git a/scripts/localnet.sh b/scripts/localnet.sh

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@ use sp_std::marker::PhantomData;`
`29`	`29`	`// ============================`
`30`	`30`	`// ==== Benchmark Imports =====`
`31`	`31`	`// ============================`
`32`		`-#[cfg(feature = "runtime-benchmarks")]`
`33`	`32`	`mod benchmarks;`
`34`	`33`
`35`	`34`	`// =========================`
`@@ -2072,7 +2071,7 @@ pub mod pallet {`
`2072`	`2071`	`let current_block_number: u64 = Self::get_current_block_as_u64();`
`2073`	`2072`	`let default_priority: u64 =`
`2074`	`2073`	`current_block_number - Self::get_last_update_for_uid(netuid, uid);`
`2075`		`- return default_priority + u32::max_value() as u64;`
	`2074`	`+ return default_priority + u32::MAX as u64;`
`2076`	`2075`	`}`
`2077`	`2076`	`0`
`2078`	`2077`	`}`
`@@ -2150,7 +2149,7 @@ where`
`2150`	`2149`	`pub fn get_priority_vanilla() -> u64 {`
`2151`	`2150`	`// Return high priority so that every extrinsic except set_weights function will`
`2152`	`2151`	`// have a higher priority than the set_weights call`
`2153`		`- u64::max_value()`
	`2152`	`+ u64::MAX`
`2154`	`2153`	`}`
`2155`	`2154`
`2156`	`2155`	`pub fn get_priority_set_weights(who: &T::AccountId, netuid: u16) -> u64 {`
`@@ -2228,9 +2227,9 @@ where`
`2228`	`2227`	`Err(InvalidTransaction::Call.into())`
`2229`	`2228`	`}`
`2230`	`2229`	`}`
`2231`		`- Some(Call::set_root_weights { netuid, .. }) => {`
`2232`		`- if Self::check_weights_min_stake(who) {`
`2233`		`- let priority: u64 = Self::get_priority_set_weights(who, *netuid);`
	`2230`	`+ Some(Call::set_root_weights { netuid, hotkey, .. }) => {`
	`2231`	`+ if Self::check_weights_min_stake(hotkey) {`
	`2232`	`+ let priority: u64 = Self::get_priority_set_weights(hotkey, *netuid);`
`2234`	`2233`	`Ok(ValidTransaction {`
`2235`	`2234`	`priority,`
`2236`	`2235`	`longevity: 1,`