Merge branch 'devnet-ready' into cargo-audit

Author: keithtensor

.dockerignore

@@ -1,5 +1,6 @@
 .devcontainer
 .github
 .vscode
-!scripts/init.sh
-target
+target/
+.dockerignore
+Dockerfile

.github/workflows/check-rust.yml

@@ -295,57 +295,8 @@ jobs:
         with:
           key: ${{ matrix.os }}-${{ env.RUST_BIN_DIR }}
 
-      - name: cargo test --workspace
-        run: cargo test --workspace
-
-  # runs cargo test --workspace --features=runtime-benchmarks
-  cargo-test-benchmarks:
-    name: cargo test w/benchmarks
-    runs-on: SubtensorCI
-    strategy:
-      matrix:
-        rust-branch:
-          - stable
-        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@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 ${{ 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:
-          key: ${{ matrix.os }}-${{ env.RUST_BIN_DIR }}
-
-      - name: cargo test --workspace --features=runtime-benchmarks
-        run: cargo test --workspace --features=runtime-benchmarks
+      - name: cargo test --workspace --all-features
+        run: cargo test --workspace --all-features
 
   # ensures cargo fix has no trivial changes that can be applied
   cargo-fix:

.github/workflows/docker.yml

@@ -1,49 +1,42 @@
 name: Publish Docker Image
 
 on:
-  push:
-    branches:
-      - main
-    tags:
-      - '*'
-  pull_request:
-    branches:
-    - main
-  workflow_dispatch:
+  release:
+    types: [published]
 
 permissions:
-    contents: read
-    packages: write
-    actions: read
-    security-events: write
+  contents: read
+  packages: write
+  actions: read
+  security-events: write
 
 jobs:
   publish:
     runs-on: SubtensorCI
-    
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-        
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
-        
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
-        
+
       - name: Login to GHCR
         uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-          
+
       - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@v4
         with:
           images: ghcr.io/${{ github.repository }}
-          
+
       - name: Build and push Docker image
         uses: docker/build-push-action@v4
         with:
@@ -52,4 +45,4 @@ jobs:
           tags: |
             ${{ steps.meta.outputs.tags }}
             ghcr.io/${{ github.repository }}:latest
-          labels: ${{ steps.meta.outputs.labels }}
+          labels: ${{ steps.meta.outputs.labels }}

.gitignore

@@ -6,6 +6,8 @@
 
 **/*.lock
 
+*.ipynb
+
 # Generated by code coverage
 *.profraw
 *.profdata

Cargo.lock

@@ -11,10 +11,7 @@ repository = "https://github.com/opentensor/subtensor"
 
 [dependencies]
 node-subtensor = { path = "node", version = "4.0.0-dev" }
-pallet-commitments = { path = "pallets/commitments", version = "4.0.0-dev" }
-pallet-subtensor = { path = "pallets/subtensor", version = "4.0.0-dev" }
 node-subtensor-runtime = { path = "runtime", version = "4.0.0-dev" }
-subtensor-macros = { path = "support/macros", version = "0.1.0" }
 
 [build-dependencies]
 subtensor-linting = { path = "support/linting", version = "0.1.0" }
@@ -167,3 +164,15 @@ opt-level = 3
 inherits = "release"
 lto = true
 codegen-units = 1
+
+[features]
+default = []
+try-runtime = [
+    "node-subtensor/try-runtime",
+    "node-subtensor-runtime/try-runtime",
+]
+runtime-benchmarks = [
+    "node-subtensor/runtime-benchmarks",
+    "node-subtensor-runtime/runtime-benchmarks",
+]
+metadata-hash = ["node-subtensor-runtime/metadata-hash"]

Cargo.toml

@@ -1,65 +1,44 @@
-
 ARG BASE_IMAGE=ubuntu:20.04
 
-FROM $BASE_IMAGE as builder
+FROM $BASE_IMAGE AS builder
 SHELL ["/bin/bash", "-c"]
 
-# This is being set so that no interactive components are allowed when updating.
+# Set noninteractive mode for apt-get
 ARG DEBIAN_FRONTEND=noninteractive
 
 LABEL ai.opentensor.image.authors="[email protected]" \
   ai.opentensor.image.vendor="Opentensor Foundation" \
   ai.opentensor.image.title="opentensor/subtensor" \
   ai.opentensor.image.description="Opentensor Subtensor Blockchain" \
-  ai.opentensor.image.revision="${VCS_REF}" \
-  ai.opentensor.image.created="${BUILD_DATE}" \
   ai.opentensor.image.documentation="https://docs.bittensor.com"
 
-# show backtraces
-ENV RUST_BACKTRACE 1
-
-# Necessary libraries for Rust execution
+# Set up Rust environment
+ENV RUST_BACKTRACE=1
 RUN apt-get update && \
   apt-get install -y curl build-essential protobuf-compiler clang git && \
   rm -rf /var/lib/apt/lists/*
 
-# Install cargo and Rust
 RUN set -o pipefail && curl https://sh.rustup.rs -sSf | sh -s -- -y
 ENV PATH="/root/.cargo/bin:${PATH}"
+RUN rustup update stable
+RUN rustup target add wasm32-unknown-unknown --toolchain stable
 
-RUN mkdir -p /subtensor && \
-  mkdir /subtensor/scripts
-
-# Scripts
-COPY ./scripts/init.sh /subtensor/scripts/
-
-# Capture dependencies
-COPY Cargo.lock Cargo.toml /subtensor/
+# Copy entire repository
+COPY . /build
+WORKDIR /build
 
-# 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
+# Build the project
+RUN cargo build -p node-subtensor --profile production  --features="runtime-benchmarks metadata-hash" --locked
 
-# Copy our sources
-COPY ./node /subtensor/node
-COPY ./pallets /subtensor/pallets
-COPY ./runtime /subtensor/runtime
-COPY ./support /subtensor/support
+# Verify the binary was produced
+RUN test -e /build/target/production/node-subtensor
 
-# Copy our toolchain
-COPY rust-toolchain.toml /subtensor/
-RUN /subtensor/scripts/init.sh
-
-# Cargo build
-WORKDIR /subtensor
-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/raw_spec_testfinney.json /
-COPY --from=builder /subtensor/raw_spec_finney.json /
-COPY --from=builder /subtensor/target/production/node-subtensor /usr/local/bin
+# Copy all chainspec files
+COPY --from=builder /build/*.json /
+
+# Copy final binary
+COPY --from=builder /build/target/production/node-subtensor /usr/local/bin

Dockerfile

@@ -390,5 +390,19 @@
         "url": "https://cortex.foundation/",
         "description": "Cortex Foundation is committed to advancing the integration of decentralized AI. Our validator is designed for transparency, reliability, and community engagement.",
         "signature": "7a6274ff6b0f7ddca97e37ef4a9b90781012ff3cf7baa3159f6feaafc43c557975aad324ea608d6b8abeb21f8f3ca2595e54b81a7564574d0242b803d969618a"
+    },
+    {
+        "address":"5F27Eqz2PhyMtGMEce898x31DokNqRVxkm5AhDDe6rDGNvoY",
+        "name": "Love",
+        "url": "https://love.cosimo.fund",
+        "description": "Love validator exists to accelerate open source AI and be good stewards of the Bittensorr network",
+        "signature": "c221a3de3be031c149a7be912b3b75e0355605f041dc975153302b23b4d93e45e9cc7453532491e92076ccd333a4c1f95f4a2229aae8f4fcfb88e5dec3f14c87"
+    },
+    {
+        "address": "5Hb63SvXBXqZ8zw6mwW1A39fHdqUrJvohXgepyhp2jgWedSB",
+        "name": "TAO Miner's Union",
+        "url": "https://minersunion.ai",
+        "description": "The first Bittensor validator that empowers you to choose which subnets to incentivize. Committed to transparency and integrity, we ensure fair and honest validation processes that contribute to the growth and strength of the network.",
+        "signature": "e8c68bc766a06f36c633e1f68d5aca4c4090a26e394372f64d5b00cc13621f361ec9df85fc9f0d247dbc1fe452bd53ffc0224dee2bc85c9d82cb250e4ac10984"
     }
 ]

docs/delegate-info.json

@@ -92,7 +92,7 @@ runtime-benchmarks = [
 	"frame-system/runtime-benchmarks",
 	"sc-service/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
-	"pallet-commitments/runtime-benchmarks"
+	"pallet-commitments/runtime-benchmarks",
 ]
 pow-faucet = []
 
@@ -103,5 +103,7 @@ try-runtime = [
 	"frame-system/try-runtime",
 	"pallet-transaction-payment/try-runtime",
 	"sp-runtime/try-runtime",
-	"pallet-commitments/try-runtime"
+	"pallet-commitments/try-runtime",
 ]
+
+metadata-hash = ["node-subtensor-runtime/metadata-hash"]

node/Cargo.toml

@@ -4,6 +4,7 @@ pub use pallet::*;
 pub mod weights;
 pub use weights::WeightInfo;
 
+use frame_system::pallet_prelude::BlockNumberFor;
 use sp_runtime::{traits::Member, RuntimeAppPublic};
 
 mod benchmarking;
@@ -1128,6 +1129,73 @@ pub mod pallet {
 
             Ok(())
         }
+
+        /// Sets the duration of the coldkey swap schedule.
+        ///
+        /// This extrinsic allows the root account to set the duration for the coldkey swap schedule.
+        /// The coldkey swap schedule determines how long it takes for a coldkey swap operation to complete.
+        ///
+        /// # Arguments
+        /// * `origin` - The origin of the call, which must be the root account.
+        /// * `duration` - The new duration for the coldkey swap schedule, in number of blocks.
+        ///
+        /// # Errors
+        /// * `BadOrigin` - If the caller is not the root account.
+        ///
+        /// # Weight
+        /// Weight is handled by the `#[pallet::weight]` attribute.
+        #[pallet::call_index(54)]
+        #[pallet::weight((0, DispatchClass::Operational, Pays::No))]
+        pub fn sudo_set_coldkey_swap_schedule_duration(
+            origin: OriginFor<T>,
+            duration: BlockNumberFor<T>,
+        ) -> DispatchResult {
+            // Ensure the call is made by the root account
+            ensure_root(origin)?;
+
+            // Set the new duration of schedule coldkey swap
+            pallet_subtensor::Pallet::<T>::set_coldkey_swap_schedule_duration(duration);
+
+            // Log the change
+            log::trace!("ColdkeySwapScheduleDurationSet( duration: {:?} )", duration);
+
+            Ok(())
+        }
+
+        /// Sets the duration of the dissolve network schedule.
+        ///
+        /// This extrinsic allows the root account to set the duration for the dissolve network schedule.
+        /// The dissolve network schedule determines how long it takes for a network dissolution operation to complete.
+        ///
+        /// # Arguments
+        /// * `origin` - The origin of the call, which must be the root account.
+        /// * `duration` - The new duration for the dissolve network schedule, in number of blocks.
+        ///
+        /// # Errors
+        /// * `BadOrigin` - If the caller is not the root account.
+        ///
+        /// # Weight
+        /// Weight is handled by the `#[pallet::weight]` attribute.
+        #[pallet::call_index(55)]
+        #[pallet::weight((0, DispatchClass::Operational, Pays::No))]
+        pub fn sudo_set_dissolve_network_schedule_duration(
+            origin: OriginFor<T>,
+            duration: BlockNumberFor<T>,
+        ) -> DispatchResult {
+            // Ensure the call is made by the root account
+            ensure_root(origin)?;
+
+            // Set the duration of schedule dissolve network
+            pallet_subtensor::Pallet::<T>::set_dissolve_network_schedule_duration(duration);
+
+            // Log the change
+            log::trace!(
+                "DissolveNetworkScheduleDurationSet( duration: {:?} )",
+                duration
+            );
+
+            Ok(())
+        }
     }
 }