Merge branch 'devnet-ready' into fix-add-adjust-senate-call-vune-devnet-companion

Author: Samuel Dare

.cargo-husky/hooks/prepare-commit-msg

@@ -0,0 +1,71 @@
+name: Update Chainspecs
+
+concurrency:
+  group: update-chainspec-${{ github.ref }}
+  cancel-in-progress: true
+
+on:
+  push:
+    branches: [main, testnet, staging, staging-ready]
+
+  workflow_dispatch:
+    inputs:
+      verbose:
+        description: "Output more information when triggered manually"
+        required: false
+        default: ""
+
+env:
+  CARGO_TERM_COLOR: always
+  VERBOSE: ${{ github.events.input.verbose }}
+
+jobs:
+  update-chainspecs:
+    runs-on: SubtensorCI
+    permissions:
+      contents: write
+
+    strategy:
+      matrix:
+        rust-branch:
+          - nightly-2024-03-05
+        rust-target:
+          - x86_64-unknown-linux-gnu
+        os:
+          - ubuntu-latest
+        include:
+          - os: ubuntu-latest
+    env:
+      RELEASE_NAME: development
+      RUSTV: ${{ matrix.rust-branch }}
+      RUST_BACKTRACE: full
+      RUST_BIN_DIR: target/${{ matrix.rust-target }}
+      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: Build chainspecs
+        run: ./scripts/build_all_chainspecs.sh
+
+      - uses: stefanzweifel/git-auto-commit-action@v5
+        name: Commit any updated chainspecs
+        with:
+          commit_message: Update chainspecs

.github/workflows/update-chainspec.yml

@@ -4,11 +4,15 @@ members = [
     "pallets/commitments",
     "pallets/subtensor",
     "runtime",
+    "support/macros",
 ]
 resolver = "2"
 
 [workspace.lints.clippy]
+indexing-slicing = "deny"
+arithmetic-side-effects = "deny"
 type_complexity = "allow"
+unwrap-used = "deny"
 
 [workspace.dependencies]
 cargo-husky = { version = "1", default-features = false }
@@ -33,6 +37,8 @@ serde_with = { version = "=2.0.0", default-features = false }
 smallvec = "1.13.2"
 litep2p = { git = "https://github.com/paritytech/litep2p", branch = "master" }
 
+subtensor-macros = { path = "support/macros" }
+
 frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
 frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0" }
 frame-executive = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }

CITATION.cft

@@ -38,15 +38,14 @@ COPY Cargo.lock Cargo.toml /subtensor/
 
 # Specs
 COPY ./snapshot.json /subtensor/snapshot.json
-COPY ./raw_spec.json /subtensor/raw_spec.json
-COPY ./raw_testspec.json /subtensor/raw_testspec.json
 
 # Copy our sources
 COPY ./node /subtensor/node
 COPY ./pallets /subtensor/pallets
 COPY ./runtime /subtensor/runtime
+COPY ./support /subtensor/support
 
-# Update to nightly toolchain
+# Copy our toolchain
 COPY rust-toolchain.toml /subtensor/
 RUN /subtensor/scripts/init.sh
 
@@ -59,6 +58,4 @@ EXPOSE 30333 9933 9944
 FROM $BASE_IMAGE AS subtensor
 
 COPY --from=builder /subtensor/snapshot.json /
-COPY --from=builder /subtensor/raw_spec.json /
-COPY --from=builder /subtensor/raw_testspec.json /
 COPY --from=builder /subtensor/target/release/node-subtensor /usr/local/bin

Cargo.lock

@@ -5,7 +5,7 @@ use super::*;
 
 pub fn finney_mainnet_config() -> Result<ChainSpec, String> {
     let path: PathBuf = std::path::PathBuf::from("./snapshot.json");
-    let wasm_binary = WASM_BINARY.ok_or_else(|| "Development wasm not available".to_string())?;
+    let wasm_binary = WASM_BINARY.ok_or("Development wasm not available".to_string())?;
 
     // We mmap the file into memory first, as this is *a lot* faster than using
     // `serde_json::from_reader`. See https://github.com/serde-rs/json/issues/160
@@ -53,14 +53,16 @@ pub fn finney_mainnet_config() -> Result<ChainSpec, String> {
         let key_account = sp_runtime::AccountId32::from(key);
 
         processed_balances.push((key_account, *amount));
-        balances_issuance += *amount;
+        balances_issuance = balances_issuance
+            .checked_add(*amount)
+            .ok_or("Balances issuance overflowed".to_string())?;
     }
 
     // Give front-ends necessary data to present to users
     let mut properties = sc_service::Properties::new();
     properties.insert("tokenSymbol".into(), "TAO".into());
     properties.insert("tokenDecimals".into(), 9.into());
-    properties.insert("ss58Format".into(), 13116.into());
+    properties.insert("ss58Format".into(), 42.into());
 
     Ok(ChainSpec::builder(
         wasm_binary,
@@ -70,8 +72,14 @@ pub fn finney_mainnet_config() -> Result<ChainSpec, String> {
         },
     )
     .with_name("Bittensor")
+    .with_protocol_id("bittensor")
     .with_id("bittensor")
     .with_chain_type(ChainType::Live)
+	.with_boot_nodes(vec![
+        "/dns/bootnode.finney.chain.opentensor.ai/tcp/30333/ws/p2p/12D3KooWRwbMb85RWnT8DSXSYMWQtuDwh4LJzndoRrTDotTR5gDC"
+            .parse()
+            .unwrap(),
+    ])
     .with_genesis_config_patch(finney_genesis(
         // Initial PoA authorities (Validators)
         // aura | grandpa
@@ -191,9 +199,9 @@ fn finney_genesis(
                 .collect::<Vec<_>>(),
         },
         "sudo": { "key": Some(<AccountId32 as Ss58Codec>::from_ss58check("5FCM3DBXWiGcwYYQtT8z4ZD93TqYpYxjaAfgv6aMStV1FTCT").unwrap()) },
-        "subtensor_module": {
+        "subtensorModule": {
             "stakes": stakes,
-            "balances_issuance": balances_issuance,
+            "balancesIssuance": balances_issuance,
         }
     })
 }

Cargo.toml

@@ -10,7 +10,7 @@ pub fn localnet_config() -> Result<ChainSpec, String> {
     let mut properties = sc_service::Properties::new();
     properties.insert("tokenSymbol".into(), "TAO".into());
     properties.insert("tokenDecimals".into(), 9.into());
-    properties.insert("ss58Format".into(), 13116.into());
+    properties.insert("ss58Format".into(), 42.into());
 
     Ok(ChainSpec::builder(
         wasm_binary,
@@ -26,6 +26,7 @@ pub fn localnet_config() -> Result<ChainSpec, String> {
         },
     )
     .with_name("Bittensor")
+    .with_protocol_id("bittensor")
     .with_id("bittensor")
     .with_chain_type(ChainType::Development)
     .with_genesis_config_patch(localnet_genesis(

Dockerfile

@@ -20,7 +20,7 @@ pub fn finney_testnet_config() -> Result<ChainSpec, String> {
     };
 
     let old_state: ColdkeyHotkeys =
-        json::from_slice(&bytes).map_err(|e| format!("Error parsing genesis file: {}", e))?;
+        json::from_slice(&bytes).map_err(|e| format!("Error parsing genesis file: {e}"))?;
 
     let mut processed_stakes: Vec<(
         sp_runtime::AccountId32,
@@ -53,14 +53,16 @@ pub fn finney_testnet_config() -> Result<ChainSpec, String> {
         let key_account = sp_runtime::AccountId32::from(key);
 
         processed_balances.push((key_account, *amount));
-        balances_issuance += *amount;
+        balances_issuance = balances_issuance
+            .checked_add(*amount)
+            .ok_or("Balances issuance overflowed".to_string())?;
     }
 
     // Give front-ends necessary data to present to users
     let mut properties = sc_service::Properties::new();
     properties.insert("tokenSymbol".into(), "TAO".into());
     properties.insert("tokenDecimals".into(), 9.into());
-    properties.insert("ss58Format".into(), 13116.into());
+    properties.insert("ss58Format".into(), 42.into());
 
     Ok(ChainSpec::builder(
         wasm_binary,
@@ -70,6 +72,12 @@ pub fn finney_testnet_config() -> Result<ChainSpec, String> {
         },
     )
     .with_name("Bittensor")
+    .with_boot_nodes(vec![
+        "/dns/bootnode.test.chain.opentensor.ai/tcp/30333/p2p/12D3KooWPM4mLcKJGtyVtkggqdG84zWrd7Rij6PGQDoijh1X86Vr"
+            .parse()
+            .unwrap(),
+    ])
+    .with_protocol_id("bittensor")
     .with_id("bittensor")
     .with_chain_type(ChainType::Development)
     .with_genesis_config_patch(testnet_genesis(

finney_plain_spec.json

@@ -16,6 +16,7 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+subtensor-macros.workspace = true
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [
 	"derive",
 ] }

node/src/chain_spec/finney.rs

@@ -1,5 +1,6 @@
 //! Benchmarking setup
 #![cfg(feature = "runtime-benchmarks")]
+#![allow(clippy::arithmetic_side_effects)]
 use super::*;
 
 #[allow(unused)]

node/src/chain_spec/localnet.rs

@@ -1,3 +1,5 @@
+#![allow(clippy::arithmetic_side_effects, clippy::unwrap_used)]
+
 use frame_support::{
     assert_ok, derive_impl, parameter_types,
     traits::{Everything, Hooks},

node/src/chain_spec/testnet.rs

@@ -16,6 +16,7 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+subtensor-macros.workspace = true
 codec = { package = "parity-scale-codec", version = "3.2.2", default-features = false, features = [
 	"derive",
 ] }

pallets/admin-utils/Cargo.toml

@@ -16,6 +16,7 @@
 // limitations under the License.
 
 //! Staking pallet benchmarking.
+#![allow(clippy::arithmetic_side_effects, clippy::indexing_slicing)]
 
 use super::*;
 use crate::Pallet as Collective;
@@ -70,7 +71,7 @@ benchmarks_instance_pallet! {
                 // Proposals should be different so that different proposal hashes are generated
                 let proposal: T::Proposal = SystemCall::<T>::remark { remark: id_to_remark_data(i, length) }.into();
                 Collective::<T, I>::propose(
-                    SystemOrigin::Signed(old_members.last().unwrap().clone()).into(),
+                    SystemOrigin::Signed(old_members.last().expect("m is greater than 0; old_members must have at least 1 element; qed").clone()).into(),
                     Box::new(proposal.clone()),
                     MAX_BYTES,
                     TryInto::<BlockNumberFor<T>>::try_into(3u64).ok().expect("convert u64 to block number.")