Merge pull request #987 from opentensor/devnet-ready

devnet deploy 11-15-2024 (evm balance hotfix)
opentensor · Nov 16, 2024 · 804c9fe · 804c9fe
2 parents e28dc9c + 03527fa
commit 804c9fe
Show file tree

Hide file tree

Showing 26 changed files with 1,172 additions and 502 deletions.
diff --git a/.github/workflows/cargo-audit.yml b/.github/workflows/cargo-audit.yml
@@ -23,20 +23,11 @@ jobs:
           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 --version 0.20.1 cargo-audit
+        run: cargo install --version 0.20.1 --force cargo-audit
+
+      - name: Display cargo-audit --version
+        run: cargo audit --version
 
       - name: cargo audit
         run: cargo audit --ignore RUSTSEC-2024-0336 # rustls issue; wait for upstream to resolve this
diff --git a/.github/workflows/check-devnet.yml b/.github/workflows/check-devnet.yml
@@ -20,9 +20,6 @@ jobs:
           sudo apt-get install -y curl clang curl libssl-dev llvm \
                                   libudev-dev protobuf-compiler
 
-      - name: Set up Rust Toolchain
-        run: curl https://sh.rustup.rs -sSf | sh -s -- -y
-
       - name: Install substrate-spec-version
         run: cargo install substrate-spec-version
 

diff --git a/.github/workflows/check-finney.yml b/.github/workflows/check-finney.yml
@@ -20,9 +20,6 @@ jobs:
           sudo apt-get install -y curl clang curl libssl-dev llvm \
                                   libudev-dev protobuf-compiler
 
-      - name: Set up Rust Toolchain
-        run: curl https://sh.rustup.rs -sSf | sh -s -- -y
-
       - name: Install substrate-spec-version
         run: cargo install substrate-spec-version
 

diff --git a/.github/workflows/check-rust.yml b/.github/workflows/check-rust.yml
@@ -43,9 +43,7 @@ jobs:
     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:
@@ -55,10 +53,10 @@ jobs:
       - name: Install dependencies
         run: sudo apt-get update && sudo apt-get install -y build-essential
 
-      - name: Install Rust ${{ matrix.rust-branch }}
+      - name: Install Rust Nightly
         uses: actions-rs/[email protected]
         with:
-          toolchain: ${{ matrix.rust-branch }}
+          toolchain: nightly
           components: rustfmt
           profile: minimal
 
@@ -84,11 +82,10 @@ jobs:
     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 }}
+      RUST_BIN_DIR: target/${{ matrix.rust-target }}
     steps:
       - name: Check-out repository under $GITHUB_WORKSPACE
         uses: actions/checkout@v4
@@ -98,13 +95,6 @@ jobs:
           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:
@@ -128,12 +118,11 @@ jobs:
           # - macos-latest
     env:
       RELEASE_NAME: development
-      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 }}
+      RUST_BIN_DIR: target/${{ matrix.rust-target }}
     steps:
       - name: Check-out repository under $GITHUB_WORKSPACE
         uses: actions/checkout@v4
@@ -166,8 +155,6 @@ jobs:
     runs-on: SubtensorCI
     strategy:
       matrix:
-        rust-branch:
-          - stable
         rust-target:
           - x86_64-unknown-linux-gnu
           # - x86_64-apple-darwin
@@ -180,7 +167,6 @@ jobs:
     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
@@ -194,13 +180,6 @@ jobs:
           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:
@@ -215,8 +194,6 @@ jobs:
     runs-on: SubtensorCI
     strategy:
       matrix:
-        rust-branch:
-          - stable
         rust-target:
           - x86_64-unknown-linux-gnu
           # - x86_64-apple-darwin
@@ -229,7 +206,6 @@ jobs:
     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
@@ -243,13 +219,6 @@ jobs:
           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 Rust shared cached
         uses: Swatinem/[email protected]
         with:
@@ -278,7 +247,6 @@ jobs:
     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
@@ -292,13 +260,6 @@ jobs:
           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 Rust shared cached
         uses: Swatinem/[email protected]
         with:
@@ -322,12 +283,6 @@ jobs:
     runs-on: SubtensorCI
 
     steps:
-      - name: Install stable Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-
       - name: Install Zepter
         run: cargo install --locked -q zepter && zepter --version
 

diff --git a/.github/workflows/check-testnet.yml b/.github/workflows/check-testnet.yml
@@ -20,9 +20,6 @@ jobs:
           sudo apt-get install -y curl clang curl libssl-dev llvm \
                                   libudev-dev protobuf-compiler
 
-      - name: Set up Rust Toolchain
-        run: curl https://sh.rustup.rs -sSf | sh -s -- -y
-
       - name: Install substrate-spec-version
         run: cargo install substrate-spec-version
 

diff --git a/.github/workflows/try-runtime.yml b/.github/workflows/try-runtime.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: SubtensorCI
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Run Try Runtime Checks
         uses: "paritytech/[email protected]"
@@ -29,7 +29,7 @@ jobs:
     runs-on: SubtensorCI
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Run Try Runtime Checks
         uses: "paritytech/[email protected]"

diff --git a/build.rs b/build.rs
@@ -60,6 +60,7 @@ fn main() {
         };
 
         track_lint(ForbidAsPrimitiveConversion::lint(&parsed_file));
+        track_lint(ForbidKeysRemoveCall::lint(&parsed_file));
         track_lint(RequireFreezeStruct::lint(&parsed_file));
         track_lint(RequireExplicitPalletIndex::lint(&parsed_file));
     });

diff --git a/node/src/benchmarking.rs b/node/src/benchmarking.rs
@@ -2,7 +2,7 @@
 //!
 //! Should only be used for benchmarking as it may break in other contexts.
 
-use crate::service::Client;
+use crate::client::FullClient;
 
 use node_subtensor_runtime as runtime;
 use node_subtensor_runtime::check_nonce;
@@ -21,12 +21,12 @@ use std::{sync::Arc, time::Duration};
 //
 // Note: Should only be used for benchmarking.
 pub struct RemarkBuilder {
-    client: Arc<Client>,
+    client: Arc<FullClient>,
 }
 
 impl RemarkBuilder {
     // Creates a new [`Self`] from the given client.
-    pub fn new(client: Arc<Client>) -> Self {
+    pub fn new(client: Arc<FullClient>) -> Self {
         Self { client }
     }
 }
@@ -58,14 +58,14 @@ impl frame_benchmarking_cli::ExtrinsicBuilder for RemarkBuilder {
 //
 // Note: Should only be used for benchmarking.
 pub struct TransferKeepAliveBuilder {
-    client: Arc<Client>,
+    client: Arc<FullClient>,
     dest: AccountId,
     value: Balance,
 }
 
 impl TransferKeepAliveBuilder {
     // Creates a new [`Self`] from the given client.
-    pub fn new(client: Arc<Client>, dest: AccountId, value: Balance) -> Self {
+    pub fn new(client: Arc<FullClient>, dest: AccountId, value: Balance) -> Self {
         Self {
             client,
             dest,
@@ -105,7 +105,7 @@ impl frame_benchmarking_cli::ExtrinsicBuilder for TransferKeepAliveBuilder {
 //
 // Note: Should only be used for benchmarking.
 pub fn create_benchmark_extrinsic(
-    client: &Client,
+    client: &FullClient,
     sender: sp_core::sr25519::Pair,
     call: runtime::RuntimeCall,
     nonce: u32,

diff --git a/node/src/chain_spec/localnet.rs b/node/src/chain_spec/localnet.rs
@@ -3,7 +3,7 @@
 
 use super::*;
 
-pub fn localnet_config() -> Result<ChainSpec, String> {
+pub fn localnet_config(single_authority: bool) -> Result<ChainSpec, String> {
     let wasm_binary = WASM_BINARY.ok_or_else(|| "Development wasm not available".to_string())?;
 
     // Give front-ends necessary data to present to users
@@ -32,11 +32,15 @@ pub fn localnet_config() -> Result<ChainSpec, String> {
     .with_genesis_config_patch(localnet_genesis(
         // Initial PoA authorities (Validators)
         // aura | grandpa
-        vec![
-            // Keys for debug
-            authority_keys_from_seed("Alice"),
-            authority_keys_from_seed("Bob"),
-        ],
+        if single_authority {
+            // single authority allows you to run the network using a single node
+            vec![authority_keys_from_seed("Alice")]
+        } else {
+            vec![
+                authority_keys_from_seed("Alice"),
+                authority_keys_from_seed("Bob"),
+            ]
+        },
         // Pre-funded accounts
         true,
     ))