Merge branch 'devnet-ready' into feat/evm-devnet-ready

Author: orriin

.github/workflows/cargo-audit.yml

@@ -0,0 +1,42 @@
+name: cargo audit
+on:
+  pull_request:
+    types:
+      - labeled
+      - unlabeled
+      - synchronize
+concurrency:
+  group: cargo-audit-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  cargo-audit:
+    name: cargo audit
+    runs-on: SubtensorCI
+    if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip-cargo-audit') }}
+    steps:
+      - name: Check-out repositoroy under $GITHUB_WORKSPACE
+        uses: actions/checkout@v4
+
+      - 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 Stable
+        uses: actions-rs/[email protected]
+        with:
+          toolchain: stable
+          components: rustfmt, clippy
+          profile: minimal
+
+      - name: Utilize Shared Rust Cache
+        uses: Swatinem/[email protected]
+        with:
+          key: ubuntu-latest-${{ env.RUST_BIN_DIR }}
+
+      - name: Install cargo-audit
+        run: cargo install cargo-audit
+
+      - name: cargo audit
+        run: cargo audit --ignore RUSTSEC-2024-0336 # rustls issue; wait for upstream to resolve this

.github/workflows/check-devnet.yml

@@ -39,18 +39,3 @@ jobs:
           echo "network spec_version: $spec_version"
           if (( $(echo "$local_spec_version <= $spec_version" | bc -l) )); then echo "$local_spec_version ≯ $spec_version ❌"; exit 1; fi
           echo "$local_spec_version > $spec_version ✅"
-
-  check-devnet-migrations:
-    name: check devnet migrations
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v3
-
-      - name: Run Try Runtime Checks
-        uses: "paritytech/[email protected]"
-        with:
-          runtime-package: "node-subtensor-runtime"
-          node-uri: "wss://dev.chain.opentensor.ai:443"
-          checks: "pre-and-post"
-          extra-args: "--disable-spec-version-check --no-weight-warnings"

.github/workflows/check-finney.yml

@@ -39,17 +39,3 @@ jobs:
           echo "network spec_version: $spec_version"
           if (( $(echo "$local_spec_version <= $spec_version" | bc -l) )); then echo "$local_spec_version ≯ $spec_version ❌"; exit 1; fi
           echo "$local_spec_version > $spec_version ✅"
-
-  check-finney-migrations:
-    name: check finney migrations
-    runs-on: SubtensorCI
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v4
-      - name: Run Try Runtime Checks
-        uses: "paritytech/[email protected]"
-        with:
-          runtime-package: "node-subtensor-runtime"
-          node-uri: "wss://entrypoint-finney.opentensor.ai:443"
-          checks: "pre-and-post"
-          extra-args: "--disable-spec-version-check --no-weight-warnings"

.github/workflows/check-rust.yml

@@ -9,7 +9,6 @@ on:
     branches: [main, devnet-ready, devnet, testnet, finney]
 
   pull_request:
-    types: [labeled, unlabeled, synchronize]
 
   ## Allow running workflow manually from the Actions tab
   workflow_dispatch:
@@ -114,30 +113,33 @@ jobs:
       - name: cargo clippy --workspace --all-targets -- -D warnings
         run: cargo clippy --workspace --all-targets -- -D warnings
 
-  cargo-check-lints:
-    name: check custom lints
+  cargo-clippy-all-features:
+    name: cargo clippy --all-features
     runs-on: SubtensorCI
     strategy:
       matrix:
         rust-branch:
           - stable
         rust-target:
           - x86_64-unknown-linux-gnu
-        # - x86_64-apple-darwin
+          # - 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 }}
-      RUSTFLAGS: -D warnings
       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@v4
+        uses: actions/checkout@v2
 
       - name: Install dependencies
         run: |
@@ -156,14 +158,12 @@ jobs:
         with:
           key: ${{ matrix.os }}-${{ env.RUST_BIN_DIR }}
 
-      - name: check lints
-        run: |
-          set -o pipefail
-          cargo check 2>&1 | sed -r "s/\x1B\[[0-9;]*[mK]//g" | grep "warning:" && exit 1
-          echo "No warnings found."
+      - 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 cargo test --workspace
+  cargo-test:
+    name: cargo test
     runs-on: SubtensorCI
     strategy:
       matrix:
@@ -188,43 +188,6 @@ jobs:
       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/[email protected]
-        with:
-          toolchain: ${{ matrix.rust-branch }}
-          components: rustfmt, clippy
-          profile: minimal
-
-      - name: Utilize Shared Rust Cache
-        uses: Swatinem/[email protected]
-        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-audit:
-    name: cargo audit
-    runs-on: SubtensorCI
-    if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip-cargo-audit') }}
-    strategy:
-      matrix:
-        rust-branch:
-          - stable
-        rust-target:
-          - x86_64-unknown-linux-gnu
-        # - x86_64-apple-darwin
-        os:
-          - ubuntu-latest
-          # - macos-latest
-    steps:
-      - name: Check-out repositoroy under $GITHUB_WORKSPACE
         uses: actions/checkout@v4
 
       - name: Install dependencies
@@ -239,20 +202,17 @@ jobs:
           components: rustfmt, clippy
           profile: minimal
 
-      - name: Utilize Shared Rust Cache
+      - name: Utilize Rust shared cached
         uses: Swatinem/[email protected]
         with:
           key: ${{ matrix.os }}-${{ env.RUST_BIN_DIR }}
 
-      - name: Install cargo-audit
-        run: cargo install cargo-audit
+      - name: cargo test --workspace
+        run: cargo test --workspace
 
-      - name: cargo audit
-        run: cargo audit --ignore RUSTSEC-2024-0336 # rustls issue; wait for upstream to resolve this
-
-  # runs cargo test --workspace
-  cargo-test:
-    name: cargo test
+  # runs cargo test --workspace --features=runtime-benchmarks
+  cargo-test-benchmarks:
+    name: cargo test w/benchmarks
     runs-on: SubtensorCI
     strategy:
       matrix:
@@ -296,8 +256,8 @@ jobs:
         with:
           key: ${{ matrix.os }}-${{ env.RUST_BIN_DIR }}
 
-      - name: cargo test --workspace --all-features
-        run: cargo test --workspace --all-features
+      - name: cargo test --workspace --features=runtime-benchmarks
+        run: cargo test --workspace --features=runtime-benchmarks
 
   # ensures cargo fix has no trivial changes that can be applied
   cargo-fix:
@@ -379,3 +339,4 @@ jobs:
 
       - name: Check features
         run: zepter run check
+

.github/workflows/check-testnet.yml

@@ -39,18 +39,3 @@ jobs:
           echo "network spec_version: $spec_version"
           if (( $(echo "$local_spec_version <= $spec_version" | bc -l) )); then echo "$local_spec_version ≯ $spec_version ❌"; exit 1; fi
           echo "$local_spec_version > $spec_version ✅"
-
-  check-testnet-migrations:
-    name: check testnet migrations
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v3
-
-      - name: Run Try Runtime Checks
-        uses: "paritytech/[email protected]"
-        with:
-          runtime-package: "node-subtensor-runtime"
-          node-uri: "wss://test.chain.opentensor.ai:443"
-          checks: "pre-and-post"
-          extra-args: "--disable-spec-version-check --no-weight-warnings"

.github/workflows/try-runtime.yml

@@ -0,0 +1,54 @@
+name: Try Runtime
+
+on:
+  pull_request:
+    branches: [main, devnet-ready, devnet, testnet, finney]
+    types: [labeled, unlabeled, synchronize]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  check-devnet:
+    name: check devnet
+    runs-on: SubtensorCI
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v3
+
+      - name: Run Try Runtime Checks
+        uses: "paritytech/[email protected]"
+        with:
+          runtime-package: "node-subtensor-runtime"
+          node-uri: "wss://dev.chain.opentensor.ai:443"
+          checks: "all"
+          extra-args: "--disable-spec-version-check --no-weight-warnings"
+
+  check-testnet:
+    name: check testnet
+    runs-on: SubtensorCI
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v3
+
+      - name: Run Try Runtime Checks
+        uses: "paritytech/[email protected]"
+        with:
+          runtime-package: "node-subtensor-runtime"
+          node-uri: "wss://test.chain.opentensor.ai:443"
+          checks: "all"
+          extra-args: "--disable-spec-version-check --no-weight-warnings"
+
+  check-finney:
+    name: check finney
+    runs-on: SubtensorCI
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+      - name: Run Try Runtime Checks
+        uses: "paritytech/[email protected]"
+        with:
+          runtime-package: "node-subtensor-runtime"
+          node-uri: "wss://archive.chain.opentensor.ai:443"
+          checks: "all"
+          extra-args: "--disable-spec-version-check --no-weight-warnings"

build.rs

@@ -59,6 +59,7 @@ fn main() {
             }
         };
 
+        track_lint(ForbidAsPrimitiveConversion::lint(&parsed_file));
         track_lint(RequireFreezeStruct::lint(&parsed_file));
         track_lint(RequireExplicitPalletIndex::lint(&parsed_file));
     });

pallets/admin-utils/src/benchmarking.rs

@@ -228,14 +228,14 @@ mod benchmarks {
     }
 
     #[benchmark]
-    fn sudo_set_commit_reveal_weights_interval() {
+    fn sudo_set_commit_reveal_weights_periods() {
         pallet_subtensor::Pallet::<T>::init_new_network(
             1u16, /*netuid*/
             1u16, /*sudo_tempo*/
         );
 
         #[extrinsic_call]
-		_(RawOrigin::Root, 1u16/*netuid*/, 3u64/*interval*/)/*set_commit_reveal_weights_interval()*/;
+		_(RawOrigin::Root, 1u16/*netuid*/, 3u64/*interval*/)/*set_commit_reveal_weights_periods()*/;
     }
 
     #[benchmark]