Merge pull request #1290 from opentensor/sam-fix-merge-conflicts

fix merge conflicts / bring in last week of PRs

README.md

@@ -22,9 +22,12 @@ This repository contains Bittensor's substrate-chain. Subtensor contains the tru
 
 * The binaries in ./bin/release are x86_64 binaries to be used with the Linux kernel.
 * Subtensor needs ~286 MiB to run.
-* Architectures other than x86_64 are currently not supported.
+*	Supported Architectures:
+	-	Linux: x86_64
+	-	MacOS: x86_64 and ARM64 (M series Macs)
 * OSs other than Linux and MacOS are currently not supported.
 
+
 ## Architectures
 Subtensor support the following architectures:
 
@@ -34,9 +37,10 @@ Requirements:
 * glibc 2.11+
 A fresh FRAME-based [Substrate](https://www.substrate.io/) node, ready for hacking :rocket:
 
-## MacOS x86_64
+## MacOS x86_64 & arm64 (Apple Silicon)
 Requirements:
-* MacOS 10.7+ (Lion+)
+*	macOS 10.7+ (Lion+) for x86_64
+*	macOS 11+ (Big Sur+) for Apple Silicon (M1, M2, and later) with arm64 architecture support.
 
 ## Network requirements
 * Subtensor needs access to the public internet
@@ -49,7 +53,7 @@ Requirements:
 
 ---
 
-## For Subnet Development 
+## For Subnet Development
 
 If you are developing and testing subnet incentive mechanism, you will need to run a local subtensor node. Follow the detailed step-by-step instructions provided in the [**Subtensor Nodes** section in Bittensor Developer Documentation](https://docs.bittensor.com/subtensor-nodes).
 
@@ -216,7 +220,7 @@ If you want to see the multi-node consensus algorithm in action, refer to our
 A Substrate project such as this consists of a number of components that are spread across a few
 directories.
 
-### Node Capabilities 
+### Node Capabilities
 
 A blockchain node is an application that allows users to participate in a blockchain network.
 Substrate-based blockchain nodes expose a number of capabilities:
@@ -232,7 +236,7 @@ Substrate-based blockchain nodes expose a number of capabilities:
 
 **Directory structure**
 
-There are several files in the [`node`](./node/) directory. Make a note of the following important files: 
+There are several files in the [`node`](./node/) directory. Make a note of the following important files:
 
 - [`chain_spec.rs`](./node/src/chain_spec.rs): A
   [chain specification](https://docs.substrate.io/main-docs/build/chain-spec/) is a

pallets/admin-utils/src/lib.rs

@@ -158,7 +158,7 @@ pub mod pallet {
             netuid: u16,
             min_difficulty: u64,
         ) -> DispatchResult {
-            pallet_subtensor::Pallet::<T>::ensure_subnet_owner_or_root(origin, netuid)?;
+            ensure_root(origin)?;
 
             ensure!(
                 pallet_subtensor::Pallet::<T>::if_subnet_exist(netuid),

pallets/subtensor/src/coinbase/run_coinbase.rs

@@ -87,7 +87,7 @@ impl<T: Config> Pallet<T> {
             let alpha_out_i = alpha_emission_i;
             // Only emit TAO if the subnetwork allows registration.
             if !Self::get_network_registration_allowed(*netuid_i)
-                && Self::get_network_pow_registration_allowed(*netuid_i)
+                && !Self::get_network_pow_registration_allowed(*netuid_i)
             {
                 tao_in_i = asfloat!(0.0);
             }
@@ -249,11 +249,6 @@ impl<T: Config> Pallet<T> {
                 BlocksSinceLastStep::<T>::mutate(netuid, |total| *total = total.saturating_add(1));
             }
         }
-
-        // --- 8. Apply pending childkeys of this subnet for the next epoch
-        for netuid in subnets.iter() {
-            Self::do_set_pending_children(*netuid);
-        }
     }
 
     pub fn drain_pending_emission(