Merge branch 'main' into fix/chainspecs

Author: orriin

Cargo.toml

@@ -8,7 +8,10 @@ members = [
 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 }

Dockerfile

@@ -38,6 +38,8 @@ COPY Cargo.lock Cargo.toml /subtensor/
 
 # Specs
 COPY ./snapshot.json /subtensor/snapshot.json
+COPY ./raw_spec_testfinney.json /subtensor/raw_spec_testfinney.json
+COPY ./raw_spec_finney.json /subtensor/raw_spec_finney.json
 
 # Copy our sources
 COPY ./node /subtensor/node
@@ -50,11 +52,13 @@ RUN /subtensor/scripts/init.sh
 
 # Cargo build
 WORKDIR /subtensor
-RUN cargo build --release --features runtime-benchmarks --locked
+RUN cargo build --profile production --features runtime-benchmarks --locked
 EXPOSE 30333 9933 9944
 
 
 FROM $BASE_IMAGE AS subtensor
 
 COPY --from=builder /subtensor/snapshot.json /
-COPY --from=builder /subtensor/target/release/node-subtensor /usr/local/bin
+COPY --from=builder /subtensor/raw_spec_testfinney.json /
+COPY --from=builder /subtensor/raw_spec_finney.json /
+COPY --from=builder /subtensor/target/production/node-subtensor /usr/local/bin

docs/running-subtensor-locally.md

@@ -162,7 +162,7 @@ rm -rf /tmp/blockchain
 Install subtensor by compiling with `cargo`:
 
 ```bash
-cargo build --release --features=runtime-benchmarks
+cargo build --profile production --features=runtime-benchmarks
 ```
 
 ## Run the subtensor node
@@ -174,31 +174,31 @@ You can now run the public subtensor node either as a lite node or as an archive
 To run a lite node connected to the mainchain, execute the below command (note the `--sync=warp` flag which runs the subtensor node in lite mode):
 
 ```bash title="With --sync=warp setting, for lite node"
-./target/release/node-subtensor --chain raw_spec_finney.json --base-path /tmp/blockchain --sync=warp --execution wasm --wasm-execution compiled --port 30333 --max-runtime-instances 32 --rpc-max-response-size 2048 --rpc-cors all --rpc-port 9944 --bootnodes /ip4/13.58.175.193/tcp/30333/p2p/12D3KooWDe7g2JbNETiKypcKT1KsCEZJbTzEHCn8hpd4PHZ6pdz5 --no-mdns --in-peers 8000 --out-peers 8000 --prometheus-external --rpc-external
+./target/production/node-subtensor --chain raw_spec.json --base-path /tmp/blockchain --sync=warp --port 30333 --max-runtime-instances 32 --rpc-max-response-size 2048 --rpc-cors all --rpc-port 9944 --bootnodes /ip4/13.58.175.193/tcp/30333/p2p/12D3KooWDe7g2JbNETiKypcKT1KsCEZJbTzEHCn8hpd4PHZ6pdz5 --no-mdns --in-peers 8000 --out-peers 8000 --prometheus-external --rpc-external
 ```
 
 ### Archive node on mainchain
 
 To run an archive node connected to the mainchain, execute the below command (note the `--sync=full` which syncs the node to the full chain and `--pruning archive` flags, which disables the node's automatic pruning of older historical data):
 
 ```bash title="With --sync=full and --pruning archive setting, for archive node"
-./target/release/node-subtensor --chain raw_spec_finney.json --base-path /tmp/blockchain --sync=full --pruning archive --execution wasm --wasm-execution compiled --port 30333 --max-runtime-instances 32 --rpc-max-response-size 2048 --rpc-cors all --rpc-port 9944 --bootnodes /ip4/13.58.175.193/tcp/30333/p2p/12D3KooWDe7g2JbNETiKypcKT1KsCEZJbTzEHCn8hpd4PHZ6pdz5 --no-mdns --in-peers 8000 --out-peers 8000 --prometheus-external --rpc-external
+./target/production/node-subtensor --chain raw_spec.json --base-path /tmp/blockchain --sync=full --pruning archive --port 30333 --max-runtime-instances 32 --rpc-max-response-size 2048 --rpc-cors all --rpc-port 9944 --bootnodes /ip4/13.58.175.193/tcp/30333/p2p/12D3KooWDe7g2JbNETiKypcKT1KsCEZJbTzEHCn8hpd4PHZ6pdz5 --no-mdns --in-peers 8000 --out-peers 8000 --prometheus-external --rpc-external
 ```
 
 ### Lite node on testchain
 
 To run a lite node connected to the testchain, execute the below command:
 
 ```bash title="With bootnodes set to testnet and --sync=warp setting, for lite node."
-./target/release/node-subtensor --chain raw_spec_testfinney.json --base-path /tmp/blockchain --sync=warp --execution wasm --wasm-execution compiled --port 30333 --max-runtime-instances 32 --rpc-max-response-size 2048 --rpc-cors all --rpc-port  9944 --bootnodes /dns/bootnode.test.finney.opentensor.ai/tcp/30333/p2p/12D3KooWPM4mLcKJGtyVtkggqdG84zWrd7Rij6PGQDoijh1X86Vr --no-mdns --in-peers 8000 --out-peers 8000 --prometheus-external --rpc-external
+./target/production/node-subtensor --chain raw_testspec.json --base-path /tmp/blockchain --sync=warp --port 30333 --max-runtime-instances 32 --rpc-max-response-size 2048 --rpc-cors all --rpc-port  9944 --bootnodes /dns/bootnode.test.finney.opentensor.ai/tcp/30333/p2p/12D3KooWPM4mLcKJGtyVtkggqdG84zWrd7Rij6PGQDoijh1X86Vr --no-mdns --in-peers 8000 --out-peers 8000 --prometheus-external --rpc-external
 ```
 
 ### Archive node on testchain
 
 To run an archive node connected to the testchain, execute the below command:
 
 ```bash title="With bootnodes set to testnet and --sync=full and --pruning archive setting, for archive node"
-./target/release/node-subtensor --chain raw_spec_testfinney.json --base-path /tmp/blockchain --sync=full --pruning archive --execution wasm --wasm-execution compiled --port 30333 --max-runtime-instances 32 --rpc-max-response-size 2048 --rpc-cors all --rpc-port 9944 --bootnodes /dns/bootnode.test.finney.opentensor.ai/tcp/30333/p2p/12D3KooWPM4mLcKJGtyVtkggqdG84zWrd7Rij6PGQDoijh1X86Vr --no-mdns --in-peers 8000 --out-peers 8000 --prometheus-external --rpc-external
+./target/production/node-subtensor --chain raw_testspec.json --base-path /tmp/blockchain --sync=full --pruning archive --port 30333 --max-runtime-instances 32 --rpc-max-response-size 2048 --rpc-cors all --rpc-port 9944 --bootnodes /dns/bootnode.test.finney.opentensor.ai/tcp/30333/p2p/12D3KooWPM4mLcKJGtyVtkggqdG84zWrd7Rij6PGQDoijh1X86Vr --no-mdns --in-peers 8000 --out-peers 8000 --prometheus-external --rpc-external
 ```
 
 ## Running on cloud

docs/rust-setup.md

@@ -1,8 +1,7 @@
 ---
 title: Installation
 ---
-
-This guide is for reference only, please check the latest information on getting starting with Substrate 
+This guide is for reference only, please check the latest information on getting starting with Substrate
 [here](https://docs.substrate.io/main-docs/install/).
 
 This page will guide you through the **2 steps** needed to prepare a computer for **Substrate** development.
@@ -207,7 +206,7 @@ Use the `WASM_BUILD_TOOLCHAIN` environment variable to specify the Rust nightly
 project should use for Wasm compilation:
 
 ```bash
-WASM_BUILD_TOOLCHAIN=nightly-<yyyy-MM-dd> cargo build --release
+WASM_BUILD_TOOLCHAIN=nightly-<yyyy-MM-dd> cargo build --profile production
 ```
 
 > Note that this only builds _the runtime_ with the specified nightly. The rest of project will be
@@ -223,3 +222,4 @@ rustup uninstall nightly
 rustup install nightly-<yyyy-MM-dd>
 rustup target add wasm32-unknown-unknown --toolchain nightly-<yyyy-MM-dd>
 ```
+

justfile

@@ -4,7 +4,7 @@ export RUST_BACKTRACE := "full"
 export SKIP_WASM_BUILD := "1"
 export RUST_BIN_DIR := "target/x86_64-unknown-linux-gnu"
 export TARGET := "x86_64-unknown-linux-gnu"
-export RUSTV := "nightly-2024-03-05"
+export RUSTV := "stable"
 export RELEASE_NAME := "development"
 
 fmt:
@@ -25,13 +25,13 @@ benchmarks:
 
 clippy:
   @echo "Running cargo clippy..."
-  cargo +{{RUSTV}} clippy -- -D clippy::panic \
+  cargo +{{RUSTV}} clippy  --workspace --all-targets -- -D  \
                             -D clippy::todo \
                             -D clippy::unimplemented
 
 clippy-fix:
   @echo "Running cargo clippy with automatic fixes on potentially dirty code..."
-  cargo +{{RUSTV}} clippy --fix --allow-dirty -- -A clippy::panic \
+  cargo +{{RUSTV}} clippy --fix --allow-dirty  --workspace --all-targets -- -A \
                                                       -A clippy::todo \
                                                       -A clippy::unimplemented
 fix:

node/src/chain_spec/finney.rs

@@ -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,7 +53,9 @@ 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

node/src/chain_spec/testnet.rs

@@ -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,7 +53,9 @@ 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

node/src/command.rs

@@ -17,7 +17,7 @@ use sp_runtime::traits::HashingFor;
 
 use node_subtensor_runtime::Block;
 use sc_cli::SubstrateCli;
-use sc_service::PartialComponents;
+use sc_service::{Configuration, PartialComponents};
 
 impl SubstrateCli for Cli {
     fn impl_name() -> String {
@@ -209,8 +209,56 @@ pub fn run() -> sc_cli::Result<()> {
         None => {
             let runner = cli.create_runner(&cli.run)?;
             runner.run_node_until_exit(|config| async move {
+                let config = override_default_heap_pages(config, 60_000);
                 service::new_full(config).map_err(sc_cli::Error::Service)
             })
         }
     }
 }
+
+/// Override default heap pages
+fn override_default_heap_pages(config: Configuration, pages: u64) -> Configuration {
+    Configuration {
+        default_heap_pages: Some(pages),
+        impl_name: config.impl_name,
+        impl_version: config.impl_version,
+        role: config.role,
+        tokio_handle: config.tokio_handle,
+        transaction_pool: config.transaction_pool,
+        network: config.network,
+        keystore: config.keystore,
+        database: config.database,
+        trie_cache_maximum_size: config.trie_cache_maximum_size,
+        state_pruning: config.state_pruning,
+        blocks_pruning: config.blocks_pruning,
+        chain_spec: config.chain_spec,
+        wasm_method: config.wasm_method,
+        wasm_runtime_overrides: config.wasm_runtime_overrides,
+        rpc_addr: config.rpc_addr,
+        rpc_max_connections: config.rpc_max_connections,
+        rpc_cors: config.rpc_cors,
+        rpc_methods: config.rpc_methods,
+        rpc_max_request_size: config.rpc_max_request_size,
+        rpc_max_response_size: config.rpc_max_response_size,
+        rpc_id_provider: config.rpc_id_provider,
+        rpc_max_subs_per_conn: config.rpc_max_subs_per_conn,
+        rpc_port: config.rpc_port,
+        rpc_message_buffer_capacity: config.rpc_message_buffer_capacity,
+        rpc_batch_config: config.rpc_batch_config,
+        rpc_rate_limit: config.rpc_rate_limit,
+        prometheus_config: config.prometheus_config,
+        telemetry_endpoints: config.telemetry_endpoints,
+        offchain_worker: config.offchain_worker,
+        force_authoring: config.force_authoring,
+        disable_grandpa: config.disable_grandpa,
+        dev_key_seed: config.dev_key_seed,
+        tracing_targets: config.tracing_targets,
+        tracing_receiver: config.tracing_receiver,
+        max_runtime_instances: config.max_runtime_instances,
+        announce_block: config.announce_block,
+        data_path: config.data_path,
+        base_path: config.base_path,
+        informant_output_format: config.informant_output_format,
+        runtime_cache_size: config.runtime_cache_size,
+    }
+}

pallets/admin-utils/scripts/benchmark.sh

@@ -1,11 +1,9 @@
-cargo build --release --features runtime-benchmarks
-./target/release/node-subtensor benchmark pallet \
-    --chain=local \
-    --execution=wasm \
-    --wasm-execution=compiled \
-    --pallet=pallet_admin_utils \
-    --extrinsic="*" \
-    --steps 50 \
-    --repeat 20 \
-    --output=pallets/admin-utils/src/weights.rs \
-    --template=./.maintain/frame-weight-template.hbs
+cargo build --profile production --features runtime-benchmarks
+./target/production/node-subtensor benchmark pallet \
+  --chain=local \
+  --pallet=pallet_admin_utils \
+  --extrinsic="*" \
+  --steps 50 \
+  --repeat 20 \
+  --output=pallets/admin-utils/src/weights.rs \
+  --template=./.maintain/frame-weight-template.hbs

pallets/admin-utils/src/benchmarking.rs

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