Revert "Merge branch 'devnet-ready' into devnet_companion_refactor/ho…

…tkey_swap" This reverts commit 8d198b1, reversing changes made to 64b546d.
opentensor · Jun 24, 2024 · c9efdea · c9efdea
1 parent 8d198b1
commit c9efdea
Show file tree

Hide file tree

Showing 25 changed files with 2,231 additions and 4,204 deletions.
diff --git a/.github/workflows/check-devnet.yml b/.github/workflows/check-devnet.yml
@@ -37,18 +37,3 @@ jobs:
           echo "network spec_version: $spec_version"
           if (( $(echo "$local_spec_version <= $spec_version" | bc -l) )); then echo "$local_spec_version ≯ $spec_version ❌"; exit 1; fi
           echo "$local_spec_version > $spec_version ✅"
-          
-  check-devnet-migrations:
-    name: check devnet migrations
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v3
-
-      - name: Run Try Runtime Checks
-        uses: "paritytech/try-runtime-gha@v0.1.0"
-        with:
-          runtime-package: "node-subtensor-runtime"
-          node-uri: "wss://dev.chain.opentensor.ai:443"
-          checks: "pre-and-post"
-          extra-args: "--disable-spec-version-check --no-weight-warnings"
diff --git a/.github/workflows/check-finney.yml b/.github/workflows/check-finney.yml
@@ -2,7 +2,7 @@ name: Finney Deploy Check
 
 on:
   pull_request:
-    branches: [finney, main]
+    branches: [finney]
 
 env:
   CARGO_TERM_COLOR: always
@@ -37,17 +37,3 @@ jobs:
           echo "network spec_version: $spec_version"
           if (( $(echo "$local_spec_version <= $spec_version" | bc -l) )); then echo "$local_spec_version ≯ $spec_version ❌"; exit 1; fi
           echo "$local_spec_version > $spec_version ✅"
-
-  check-finney-migrations:
-    name: check finney migrations
-    runs-on: SubtensorCI
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v4
-      - name: Run Try Runtime Checks
-        uses: "paritytech/try-runtime-gha@v0.1.0"
-        with:
-          runtime-package: "node-subtensor-runtime"
-          node-uri: "wss://entrypoint-finney.opentensor.ai:443"
-          checks: "pre-and-post"
-          extra-args: "--disable-spec-version-check --no-weight-warnings"
diff --git a/.github/workflows/check-rust.yml b/.github/workflows/check-rust.yml
@@ -339,6 +339,47 @@ jobs:
       - name: Check features
         run: zepter run check
 
+  check-finney-migrations:
+    name: check finney migrations
+    runs-on: SubtensorCI
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
 
+      - name: Run Try Runtime Checks
+        uses: "paritytech/try-runtime-gha@v0.1.0"
+        with:
+          runtime-package: "node-subtensor-runtime"
+          node-uri: "wss://entrypoint-finney.opentensor.ai:443"
+          checks: "pre-and-post"
+          extra-args: "--disable-spec-version-check --no-weight-warnings"
+
+  check-devnet-migrations:
+    name: check devnet migrations
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v3
 
+      - name: Run Try Runtime Checks
+        uses: "paritytech/try-runtime-gha@v0.1.0"
+        with:
+          runtime-package: "node-subtensor-runtime"
+          node-uri: "wss://dev.chain.opentensor.ai:443"
+          checks: "pre-and-post"
+          extra-args: "--disable-spec-version-check --no-weight-warnings"
+
+  check-testnet-migrations:
+    name: check testnet migrations
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v3
 
+      - name: Run Try Runtime Checks
+        uses: "paritytech/try-runtime-gha@v0.1.0"
+        with:
+          runtime-package: "node-subtensor-runtime"
+          node-uri: "wss://test.chain.opentensor.ai:443"
+          checks: "pre-and-post"
+          extra-args: "--disable-spec-version-check --no-weight-warnings"
diff --git a/.github/workflows/check-testnet.yml b/.github/workflows/check-testnet.yml
@@ -37,18 +37,3 @@ jobs:
           echo "network spec_version: $spec_version"
           if (( $(echo "$local_spec_version <= $spec_version" | bc -l) )); then echo "$local_spec_version ≯ $spec_version ❌"; exit 1; fi
           echo "$local_spec_version > $spec_version ✅"
-
-  check-testnet-migrations:
-    name: check testnet migrations
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v3
-
-      - name: Run Try Runtime Checks
-        uses: "paritytech/try-runtime-gha@v0.1.0"
-        with:
-          runtime-package: "node-subtensor-runtime"
-          node-uri: "wss://test.chain.opentensor.ai:443"
-          checks: "pre-and-post"
-          extra-args: "--disable-spec-version-check --no-weight-warnings"
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/docs/running-subtensor-locally.md b/docs/running-subtensor-locally.md
@@ -174,33 +174,32 @@ 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.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
+./target/release/node-subtensor --chain raw_spec.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 
 ```
 
 ### 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.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
+./target/release/node-subtensor --chain raw_spec.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 
 ```
 
 ### 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_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
+./target/release/node-subtensor --chain raw_testspec.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 
 ```
 
 ### 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_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
+./target/release/node-subtensor --chain raw_testspec.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 
 ```
 
 ## Running on cloud
-
 We have not tested these installation scripts on any cloud service. In addition, if you are using Runpod cloud service, then note that this service is already [containerized](https://docs.runpod.io/pods/overview). Hence, the only option available to you is to compile from the source, as described in the above [Method 2: Using Source Code](#method-2-using-source-code) section. Note that these scripts have not been tested on Runpod.
diff --git a/justfile b/justfile
@@ -25,25 +25,16 @@ benchmarks:
 
 clippy:
   @echo "Running cargo clippy..."
-  cargo +{{RUSTV}}  clippy --workspace --all-targets -- \
+  cargo +{{RUSTV}} clippy -- -D clippy::panic \
                             -D clippy::todo \
                             -D clippy::unimplemented
 
 clippy-fix:
   @echo "Running cargo clippy with automatic fixes on potentially dirty code..."
-  cargo +{{RUSTV}} clippy --workspace --all-targets --fix --allow-dirty --  \
+  cargo +{{RUSTV}} clippy --fix --allow-dirty -- -A clippy::panic \
                                                       -A clippy::todo \
-                                                      -A clippy::unimplemented \
-                                                      -A clippy::indexing_slicing
+                                                      -A clippy::unimplemented
 fix:
   @echo "Running cargo fix..."
   cargo +{{RUSTV}} fix --workspace
-  git diff --exit-code || (echo "There are local changes after running 'cargo fix --workspace' ❌" && exit 1)
-
-lint:
-  @echo "Running cargo fmt..."
-  just fmt
-  @echo "Running cargo clippy with automatic fixes on potentially dirty code..."
-  just clippy-fix
-  @echo "Running cargo clippy..."
-  just clippy
+  git diff --exit-code || (echo "There are local changes after running 'cargo fix --workspace' ❌" && exit 1)
diff --git a/node/src/command.rs b/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::{Configuration, PartialComponents};
+use sc_service::PartialComponents;
 
 impl SubstrateCli for Cli {
     fn impl_name() -> String {
@@ -209,56 +209,8 @@ 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,
-    }
-}
diff --git a/pallets/admin-utils/Cargo.toml b/pallets/admin-utils/Cargo.toml
@@ -28,7 +28,6 @@ sp-runtime = { workspace = true }
 log = { workspace = true }
 pallet-subtensor = { version = "4.0.0-dev", default-features = false, path = "../subtensor" }
 sp-weights = { workspace = true }
-substrate-fixed = { workspace = true }
 
 
 [dev-dependencies]
@@ -55,8 +54,7 @@ std = [
 	"sp-weights/std",
 	"log/std",
 	"sp-core/std",
-	"sp-io/std",
-	"substrate-fixed/std",
+	"sp-io/std"
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",

diff --git a/pallets/admin-utils/src/lib.rs b/pallets/admin-utils/src/lib.rs
@@ -996,45 +996,6 @@ pub mod pallet {
             log::info!("ToggleSetWeightsCommitReveal( netuid: {:?} ) ", netuid);
             Ok(())
         }
-
-        /// Enables or disables Liquid Alpha for a given subnet.
-        ///
-        /// # Parameters
-        /// - `origin`: The origin of the call, which must be the root account or subnet owner.
-        /// - `netuid`: The unique identifier for the subnet.
-        /// - `enabled`: A boolean flag to enable or disable Liquid Alpha.
-        ///
-        /// # Weight
-        /// This function has a fixed weight of 0 and is classified as an operational transaction that does not incur any fees.
-        #[pallet::call_index(50)]
-        #[pallet::weight((0, DispatchClass::Operational, Pays::No))]
-        pub fn sudo_set_liquid_alpha_enabled(
-            origin: OriginFor<T>,
-            netuid: u16,
-            enabled: bool,
-        ) -> DispatchResult {
-            T::Subtensor::ensure_subnet_owner_or_root(origin, netuid)?;
-            T::Subtensor::set_liquid_alpha_enabled(netuid, enabled);
-            log::info!(
-                "LiquidAlphaEnableToggled( netuid: {:?}, Enabled: {:?} ) ",
-                netuid,
-                enabled
-            );
-            Ok(())
-        }
-
-        /// Sets values for liquid alpha
-        #[pallet::call_index(51)]
-        #[pallet::weight((0, DispatchClass::Operational, Pays::No))]
-        pub fn sudo_set_alpha_values(
-            origin: OriginFor<T>,
-            netuid: u16,
-            alpha_low: u16,
-            alpha_high: u16,
-        ) -> DispatchResult {
-            T::Subtensor::ensure_subnet_owner_or_root(origin.clone(), netuid)?;
-            T::Subtensor::do_set_alpha_values(origin, netuid, alpha_low, alpha_high)
-        }
     }
 }
 
@@ -1130,11 +1091,4 @@ pub trait SubtensorInterface<AccountId, Balance, RuntimeOrigin> {
     fn set_target_stakes_per_interval(target_stakes_per_interval: u64);
     fn set_commit_reveal_weights_interval(netuid: u16, interval: u64);
     fn set_commit_reveal_weights_enabled(netuid: u16, enabled: bool);
-    fn set_liquid_alpha_enabled(netuid: u16, enabled: bool);
-    fn do_set_alpha_values(
-        origin: RuntimeOrigin,
-        netuid: u16,
-        alpha_low: u16,
-        alpha_high: u16,
-    ) -> Result<(), DispatchError>;
 }
diff --git a/pallets/admin-utils/tests/mock.rs b/pallets/admin-utils/tests/mock.rs
@@ -24,7 +24,7 @@ frame_support::construct_runtime!(
         System: frame_system,
         Balances: pallet_balances,
         AdminUtils: pallet_admin_utils,
-        SubtensorModule: pallet_subtensor::{Pallet, Call, Storage, Event<T>, Error<T>},
+        SubtensorModule: pallet_subtensor::{Pallet, Call, Storage, Event<T>},
     }
 );
 
@@ -111,9 +111,7 @@ parameter_types! {
     pub const InitialNetworkRateLimit: u64 = 0;
     pub const InitialTargetStakesPerInterval: u16 = 1;
     pub const InitialHotkeySwapCost: u64 = 1_000_000_000;
-    pub const InitialAlphaHigh: u16 = 58982; // Represents 0.9 as per the production default
-    pub const InitialAlphaLow: u16 = 45875; // Represents 0.7 as per the production default
-    pub const InitialLiquidAlphaOn: bool = false; // Default value for LiquidAlphaOn
+
 }
 
 impl pallet_subtensor::Config for Test {
@@ -166,9 +164,6 @@ impl pallet_subtensor::Config for Test {
     type InitialNetworkRateLimit = InitialNetworkRateLimit;
     type InitialTargetStakesPerInterval = InitialTargetStakesPerInterval;
     type HotkeySwapCost = InitialHotkeySwapCost;
-    type AlphaHigh = InitialAlphaHigh;
-    type AlphaLow = InitialAlphaLow;
-    type LiquidAlphaOn = InitialLiquidAlphaOn;
 }
 
 #[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
@@ -471,18 +466,6 @@ impl pallet_admin_utils::SubtensorInterface<AccountId, Balance, RuntimeOrigin> f
     fn set_commit_reveal_weights_enabled(netuid: u16, enabled: bool) {
         SubtensorModule::set_commit_reveal_weights_enabled(netuid, enabled);
     }
-
-    fn set_liquid_alpha_enabled(netuid: u16, enabled: bool) {
-        SubtensorModule::set_liquid_alpha_enabled(netuid, enabled);
-    }
-    fn do_set_alpha_values(
-        origin: RuntimeOrigin,
-        netuid: u16,
-        alpha_low: u16,
-        alpha_high: u16,
-    ) -> Result<(), DispatchError> {
-        SubtensorModule::do_set_alpha_values(origin, netuid, alpha_low, alpha_high)
-    }
 }
 
 impl pallet_admin_utils::Config for Test {