Merge remote-tracking branch 'origin/devnet' into feat/scheduled_coldkey_swap_back

Author: Samuel Dare

Cargo.lock

@@ -33,6 +33,7 @@ members = [
     "pallets/collective",
     "pallets/registry",
     "runtime",
+    "support/tools",
     "support/macros",
     "support/linting",
 ]

Cargo.toml

@@ -26,8 +26,8 @@ sp-runtime = { workspace = true }
 
 # local packages
 
-subtensor-custom-rpc-runtime-api = { version = "0.0.2", path = "../runtime-api", default-features = false }
-pallet-subtensor = { version = "4.0.0-dev", path = "../../subtensor", default-features = false }
+subtensor-custom-rpc-runtime-api = { path = "../runtime-api", default-features = false }
+pallet-subtensor = { path = "../../subtensor", default-features = false }
 
 [features]
 default = ["std"]

pallets/subtensor/rpc/Cargo.toml

@@ -200,11 +200,12 @@ impl<T: Config> Pallet<T> {
 
         // 8. Swap delegates.
         // Delegates( hotkey ) -> take value -- the hotkey delegate take value.
-        let old_delegate_take = Delegates::<T>::get(old_hotkey);
-        Delegates::<T>::remove(old_hotkey); // Remove the old delegate take.
-        Delegates::<T>::insert(new_hotkey, old_delegate_take); // Insert the new delegate take.
-        weight.saturating_accrue(T::DbWeight::get().reads_writes(1, 2));
-
+        if Delegates::<T>::contains_key(old_hotkey) {
+            let old_delegate_take = Delegates::<T>::get(old_hotkey);
+            Delegates::<T>::remove(old_hotkey);
+            Delegates::<T>::insert(new_hotkey, old_delegate_take);
+            weight.saturating_accrue(T::DbWeight::get().reads_writes(2, 2));
+        }
         // 9. Swap all subnet specific info.
         let all_netuids: Vec<u16> = Self::get_all_subnet_netuids();
         for netuid in all_netuids {

pallets/subtensor/src/swap/swap_hotkey.rs

@@ -21,7 +21,7 @@ path = "src/spec_version.rs"
 
 [dependencies]
 subtensor-macros.workspace = true
-subtensor-custom-rpc-runtime-api = { version = "0.0.2", path = "../pallets/subtensor/runtime-api", default-features = false }
+subtensor-custom-rpc-runtime-api = { path = "../pallets/subtensor/runtime-api", default-features = false }
 smallvec = { workspace = true }
 log = { workspace = true }
 codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = [

runtime/Cargo.toml

@@ -0,0 +1,28 @@
+#!/bin/bash
+set -ex
+cd support/macros
+cargo publish
+cd ../..
+cd pallets/commitments
+cargo publish
+cd ..
+cd collective
+cargo publish
+cd ..
+cd registry
+cargo publish
+cd ..
+cd subtensor
+cargo publish
+cd runtime-api
+cargo publish
+cd ../..
+cd admin-utils
+cargo publish
+cd ../..
+cd runtime
+cargo publish
+cd ..
+cd node
+cargo publish
+echo "published successfully."

scripts/publish.sh

@@ -0,0 +1,19 @@
+[package]
+name = "subtensor-tools"
+version = "0.1.0"
+edition = "2021"
+license = "MIT"
+
+description = "support tools for Subtensor"
+repository = "https://github.com/opentensor/subtensor"
+homepage = "https://bittensor.com"
+
+[[bin]]
+name = "bump-version"
+path = "src/bump_version.rs"
+
+[dependencies]
+anyhow = "1.0"
+clap = { version = "4.5", features = ["derive"] }
+semver = "1.0"
+toml_edit = "0.22"

support/tools/Cargo.toml

@@ -0,0 +1,49 @@
+use clap::Parser;
+use semver::Version;
+use std::{
+    fs,
+    io::{Read, Seek, Write},
+    str::FromStr,
+};
+use toml_edit::{DocumentMut, Item, Value};
+
+const TOML_PATHS: [&str; 9] = [
+    "support/macros",
+    "pallets/commitments",
+    "pallets/collective",
+    "pallets/registry",
+    "pallets/subtensor",
+    "pallets/subtensor/runtime-api",
+    "pallets/admin-utils",
+    "runtime",
+    "node",
+];
+
+#[derive(Parser)]
+struct CliArgs {
+    #[arg(required = true)]
+    version: Version,
+}
+
+fn main() -> anyhow::Result<()> {
+    let args = CliArgs::parse();
+    let version = args.version;
+
+    for path in TOML_PATHS {
+        let cargo_toml_path = format!("{path}/Cargo.toml");
+        let mut toml_file = fs::File::options()
+            .read(true)
+            .write(true)
+            .open(&cargo_toml_path)?;
+        let mut toml_str = String::new();
+        toml_file.read_to_string(&mut toml_str)?;
+        let mut modified_toml_doc = DocumentMut::from_str(&toml_str)?;
+
+        modified_toml_doc["package"]["version"] = Item::Value(Value::from(version.to_string()));
+        toml_file.set_len(0)?;
+        toml_file.rewind()?;
+        toml_file.write_all(modified_toml_doc.to_string().as_bytes())?;
+    }
+
+    Ok(())
+}