Merge remote-tracking branch 'origin/devnet-ready' into feat/root-weights-proxy

Author: Samuel Dare

.dockerignore

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

.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 }}

Cargo.toml

@@ -167,5 +167,12 @@ 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"]
+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"]

Dockerfile

@@ -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

node/Cargo.toml

@@ -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"]

pallets/admin-utils/tests/tests.rs

@@ -1243,7 +1243,7 @@ fn test_sudo_get_set_alpha() {
             DispatchError::BadOrigin
         );
 
-        assert_ok!(SubtensorModule::register_network(signer.clone(), None));
+        assert_ok!(SubtensorModule::register_network(signer.clone()));
 
         assert_ok!(AdminUtils::sudo_set_alpha_values(
             signer.clone(),

pallets/subtensor/rpc/src/lib.rs

@@ -46,6 +46,10 @@ pub trait SubtensorCustomApi<BlockHash> {
     fn get_subnet_info(&self, netuid: u16, at: Option<BlockHash>) -> RpcResult<Vec<u8>>;
     #[method(name = "subnetInfo_getSubnetsInfo")]
     fn get_subnets_info(&self, at: Option<BlockHash>) -> RpcResult<Vec<u8>>;
+    #[method(name = "subnetInfo_getSubnetInfo_v2")]
+    fn get_subnet_info_v2(&self, netuid: u16, at: Option<BlockHash>) -> RpcResult<Vec<u8>>;
+    #[method(name = "subnetInfo_getSubnetsInf_v2")]
+    fn get_subnets_info_v2(&self, at: Option<BlockHash>) -> RpcResult<Vec<u8>>;
     #[method(name = "subnetInfo_getSubnetHyperparams")]
     fn get_subnet_hyperparams(&self, netuid: u16, at: Option<BlockHash>) -> RpcResult<Vec<u8>>;
 
@@ -215,6 +219,26 @@ where
             .map_err(|e| Error::RuntimeError(format!("Unable to get subnets info: {:?}", e)).into())
     }
 
+    fn get_subnet_info_v2(
+        &self,
+        netuid: u16,
+        at: Option<<Block as BlockT>::Hash>,
+    ) -> RpcResult<Vec<u8>> {
+        let api = self.client.runtime_api();
+        let at = at.unwrap_or_else(|| self.client.info().best_hash);
+
+        api.get_subnet_info_v2(at, netuid)
+            .map_err(|e| Error::RuntimeError(format!("Unable to get subnet info: {:?}", e)).into())
+    }
+
+    fn get_subnets_info_v2(&self, at: Option<<Block as BlockT>::Hash>) -> RpcResult<Vec<u8>> {
+        let api = self.client.runtime_api();
+        let at = at.unwrap_or_else(|| self.client.info().best_hash);
+
+        api.get_subnets_info_v2(at)
+            .map_err(|e| Error::RuntimeError(format!("Unable to get subnets info: {:?}", e)).into())
+    }
+
     fn get_network_lock_cost(&self, at: Option<<Block as BlockT>::Hash>) -> RpcResult<u64> {
         let api = self.client.runtime_api();
         let at = at.unwrap_or_else(|| self.client.info().best_hash);

pallets/subtensor/runtime-api/src/lib.rs

@@ -21,6 +21,8 @@ sp_api::decl_runtime_apis! {
     pub trait SubnetInfoRuntimeApi {
         fn get_subnet_info(netuid: u16) -> Vec<u8>;
         fn get_subnets_info() -> Vec<u8>;
+        fn get_subnet_info_v2(netuid: u16) -> Vec<u8>;
+        fn get_subnets_info_v2() -> Vec<u8>;
         fn get_subnet_hyperparams(netuid: u16) -> Vec<u8>;
     }
 

pallets/subtensor/src/benchmarks.rs

@@ -299,7 +299,7 @@ benchmarks! {
     let amount: u64 = 1;
     let amount_to_be_staked = 100_000_000_000_000u64;
     Subtensor::<T>::add_balance_to_coldkey_account(&coldkey.clone(), amount_to_be_staked);
-  }: register_network(RawOrigin::Signed(coldkey), None)
+  }: register_network(RawOrigin::Signed(coldkey))
 
   benchmark_dissolve_network {
     let seed : u32 = 1;
@@ -311,8 +311,8 @@ benchmarks! {
     let amount: u64 = 1;
     let amount_to_be_staked = 100_000_000_000_000u64;
     Subtensor::<T>::add_balance_to_coldkey_account(&coldkey.clone(), amount_to_be_staked);
-    assert_ok!(Subtensor::<T>::register_network(RawOrigin::Signed(coldkey.clone()).into(), None));
-  }: dissolve_network(RawOrigin::Signed(coldkey), 1)
+    assert_ok!(Subtensor::<T>::register_network(RawOrigin::Signed(coldkey.clone()).into()));
+  }: dissolve_network(RawOrigin::Root, coldkey.clone(), 1)
 
 
   // swap_hotkey {
@@ -519,6 +519,6 @@ reveal_weights {
     Identities::<T>::insert(&old_coldkey, identity);
 
     // Benchmark setup complete, now execute the extrinsic
-}: swap_coldkey(RawOrigin::Signed(old_coldkey.clone()), old_coldkey.clone(), new_coldkey.clone())
+}: swap_coldkey(RawOrigin::Root, old_coldkey.clone(), new_coldkey.clone())
 
 }

pallets/subtensor/src/coinbase/root.rs

@@ -891,7 +891,7 @@ impl<T: Config> Pallet<T> {
             .into())
     }
 
-    /// Facilitates user registration of a new subnetwork.
+    /// Facilitates user registration of a new subnetwork with subnet identity.
     ///
     /// # Args:
     /// * `origin` (`T::RuntimeOrigin`): The calling origin. Must be signed.
@@ -1126,20 +1126,19 @@ impl<T: Config> Pallet<T> {
     /// Removes a network (identified by netuid) and all associated parameters.
     ///
     /// This function is responsible for cleaning up all the data associated with a network.
-    /// It ensures that all the storage values related to the network are removed, and any
-    /// reserved balance is returned to the network owner.
+    /// It ensures that all the storage values related to the network are removed, any
+    /// reserved balance is returned to the network owner, and the subnet identity is removed if it exists.
     ///
     /// # Args:
     ///  * 'netuid': ('u16'): The unique identifier of the network to be removed.
     ///
     /// # Note:
     /// This function does not emit any events, nor does it raise any errors. It silently
     /// returns if any internal checks fail.
-    ///
     pub fn remove_network(netuid: u16) {
         // --- 1. Return balance to subnet owner.
-        let owner_coldkey = SubnetOwner::<T>::get(netuid);
-        let reserved_amount = Self::get_subnet_locked_balance(netuid);
+        let owner_coldkey: T::AccountId = SubnetOwner::<T>::get(netuid);
+        let reserved_amount: u64 = Self::get_subnet_locked_balance(netuid);
 
         // --- 2. Remove network count.
         SubnetworkN::<T>::remove(netuid);
@@ -1150,13 +1149,13 @@ impl<T: Config> Pallet<T> {
         // --- 4. Remove netuid from added networks.
         NetworksAdded::<T>::remove(netuid);
 
-        // --- 6. Decrement the network counter.
-        TotalNetworks::<T>::mutate(|n| *n = n.saturating_sub(1));
+        // --- 5. Decrement the network counter.
+        TotalNetworks::<T>::mutate(|n: &mut u16| *n = n.saturating_sub(1));
 
-        // --- 7. Remove various network-related storages.
+        // --- 6. Remove various network-related storages.
         NetworkRegisteredAt::<T>::remove(netuid);
 
-        // --- 8. Remove incentive mechanism memory.
+        // --- 7. Remove incentive mechanism memory.
         let _ = Uids::<T>::clear_prefix(netuid, u32::MAX, None);
         let _ = Keys::<T>::clear_prefix(netuid, u32::MAX, None);
         let _ = Bonds::<T>::clear_prefix(netuid, u32::MAX, None);
@@ -1171,7 +1170,7 @@ impl<T: Config> Pallet<T> {
             )
         {
             // Create a new vector to hold modified weights.
-            let mut modified_weights = weights_i.clone();
+            let mut modified_weights: Vec<(u16, u16)> = weights_i.clone();
             // Iterate over each weight entry to potentially update it.
             for (subnet_id, weight) in modified_weights.iter_mut() {
                 if subnet_id == &netuid {
@@ -1213,6 +1212,12 @@ impl<T: Config> Pallet<T> {
         Self::add_balance_to_coldkey_account(&owner_coldkey, reserved_amount);
         Self::set_subnet_locked_balance(netuid, 0);
         SubnetOwner::<T>::remove(netuid);
+
+        // --- 13. Remove subnet identity if it exists.
+        if SubnetIdentities::<T>::contains_key(netuid) {
+            SubnetIdentities::<T>::remove(netuid);
+            Self::deposit_event(Event::SubnetIdentityRemoved(netuid));
+        }
     }
 
     #[allow(clippy::arithmetic_side_effects)]