pos wip

Author: orriin

node/src/chain_spec/localnet.rs

@@ -42,8 +42,10 @@ pub fn localnet_config() -> Result<ChainSpec, String> {
         // aura | grandpa
         vec![
             // Keys for debug
-            authority_keys_from_seed("Alice"),
+            // authority_keys_from_seed("Alice"),
             authority_keys_from_seed("Bob"),
+            authority_keys_from_seed("Charlie"),
+            authority_keys_from_seed("Dave"),
         ],
         // Pre-funded accounts
         true,
@@ -83,9 +85,8 @@ fn localnet_genesis(
         ),
     ];
 
-    const STASH: u64 = 100 * UNITS;
     for a in initial_authorities.iter() {
-        balances.push((a.0.clone(), STASH.into()));
+        balances.push((a.0.clone(), 2000000000000u128));
     }
 
     // Check if the environment variable is set
@@ -109,6 +110,7 @@ fn localnet_genesis(
         get_account_id_from_seed::<sr25519::Public>("Ferdie"),
     ];
 
+    const STAKE: u64 = 1000 * UNITS;
     serde_json::json!({
         "balances": { "balances": balances },
         "session": {
@@ -132,7 +134,7 @@ fn localnet_genesis(
             "validatorCount": initial_authorities.len() as u32,
             "stakers": initial_authorities
                 .iter()
-                .map(|x| (x.0.clone(), x.0.clone(), STASH, StakerStatus::<AccountId>::Validator))
+                .map(|x| (x.0.clone(), x.0.clone(), STAKE, StakerStatus::<AccountId>::Validator))
                 .collect::<Vec<_>>(),
             "invulnerables": initial_authorities.iter().map(|x| x.0.clone()).collect::<Vec<_>>(),
             "forceEra": Forcing::NotForcing,

pallets/subtensor/src/coinbase/root.rs

@@ -332,29 +332,41 @@ impl<T: Config> Pallet<T> {
         if blocks_until_next_epoch != 0 {
             // Not the block to update emission values.
             log::debug!("blocks_until_next_epoch: {:?}", blocks_until_next_epoch);
-            return Err("");
+            // return Err("");
         }
 
         // --- 2. Retrieves the number of root validators on subnets.
         let n: u16 = Self::get_num_root_validators();
         log::debug!("n:\n{:?}\n", n);
         if n == 0 {
             // No validators.
-            return Err("No validators to validate emission values.");
+            // return Err("No validators to validate emission values.");
         }
 
         // --- 3. Obtains the number of registered subnets.
         let k: u16 = Self::get_all_subnet_netuids().len() as u16;
         log::debug!("k:\n{:?}\n", k);
         if k == 0 {
             // No networks to validate.
-            return Err("No networks to validate emission values.");
+            // return Err("No networks to validate emission values.");
         }
 
-        // --- 4. Determines the total block emission across all the subnetworks. This is the
-        // value which will be distributed based on the computation below.
-        let block_emission: I64F64 = I64F64::from_num(Self::get_block_emission()?);
-        log::debug!("block_emission:\n{:?}\n", block_emission);
+        // --- 4. Determines the total block emission across all the subnetworks, node
+		// validators and node validator nominators. This is the value which will be
+		// distributed based on the computation below.
+		//
+		// The node validator emission is set aside in a seperate tracked storage for later
+		// distribution.
+        let total_block_emission: I64F64 = I64F64::from_num(Self::get_block_emission()?);
+        let subnetwork_block_emission = total_block_emission.saturating_mul(I64F64::from_num(0.2));
+        let node_validator_block_emission = total_block_emission.saturating_mul(I64F64::from_num(0.8));
+		PendingNodeValidatorEmissions::<T>::mutate(|cur| {
+			cur.saturating_accrue(node_validator_block_emission.to_num::<u64>());
+		});
+
+        log::debug!("total_block_emission:\n{:?}\n", total_block_emission);
+        log::debug!("node_validator_block_emission:\n{:?}\n", node_validator_block_emission);
+        log::debug!("subnetwork_block_emission:\n{:?}\n", subnetwork_block_emission);
 
         // --- 5. A collection of all registered hotkeys on the root network. Hotkeys
         // pairs with network UIDs and stake values.
@@ -449,7 +461,7 @@ impl<T: Config> Pallet<T> {
         // -- 11. Converts the normalized 64-bit fixed point rank values to u64 for the final emission calculation.
         let emission_as_tao: Vec<I64F64> = weighted_emission
             .iter()
-            .map(|v: &I64F64| v.saturating_mul(block_emission))
+            .map(|v: &I64F64| v.saturating_mul(subnetwork_block_emission))
             .collect();
 
         // --- 12. Converts the normalized 64-bit fixed point rank values to u64 for the final emission calculation.

pallets/subtensor/src/lib.rs

@@ -885,6 +885,9 @@ pub mod pallet {
     /// ITEM( nominator_min_required_stake )
     pub type NominatorMinRequiredStake<T> =
         StorageValue<_, u64, ValueQuery, DefaultNominatorMinRequiredStake<T>>;
+    #[pallet::storage]
+    /// ITEM ( pending_node_validator_emission )
+    pub type PendingNodeValidatorEmissions<T> = StorageValue<_, u64, ValueQuery>;
 
     /// ============================
     /// ==== Subnet Parameters =====

runtime/Cargo.toml

@@ -127,7 +127,7 @@ substrate-wasm-builder = { workspace = true, optional = true }
 [features]
 default = ["std"]
 pow-faucet = ["pallet-subtensor/pow-faucet"]
-fast-blocks = []
+fast-runtime = []
 std = [
 	"frame-try-runtime?/std",
 	"frame-system-benchmarking?/std",

runtime/src/lib.rs

@@ -44,7 +44,6 @@ use scale_info::TypeInfo;
 use smallvec::smallvec;
 use sp_api::impl_runtime_apis;
 use sp_core::{crypto::KeyTypeId, OpaqueMetadata, RuntimeDebug};
-use sp_runtime::curve::PiecewiseLinear;
 use sp_runtime::traits::OpaqueKeys;
 use sp_runtime::transaction_validity::TransactionPriority;
 use sp_runtime::Percent;
@@ -215,12 +214,7 @@ pub const BABE_GENESIS_EPOCH_CONFIG: babe_primitives::BabeEpochConfiguration =
 /// up by `pallet_aura` to implement `fn slot_duration()`.
 ///
 /// Change this to adjust the block time.
-#[cfg(not(feature = "fast-blocks"))]
-pub const MILLISECS_PER_BLOCK: u64 = 12000;
-
-/// Fast blocks for development
-#[cfg(feature = "fast-blocks")]
-pub const MILLISECS_PER_BLOCK: u64 = 250;
+pub const MILLISECS_PER_BLOCK: u64 = prod_or_fast!(12_000, 1000);
 
 // NOTE: Currently it is not possible to change the slot duration after the chain has started.
 //       Attempting to do so will brick block production.
@@ -1343,17 +1337,9 @@ impl pallet_commitments::Config for Runtime {
     type RateLimit = CommitmentRateLimit;
 }
 
-#[cfg(not(feature = "fast-blocks"))]
-pub const INITIAL_SUBNET_TEMPO: u16 = 99;
-
-#[cfg(feature = "fast-blocks")]
-pub const INITIAL_SUBNET_TEMPO: u16 = 10;
-
-#[cfg(not(feature = "fast-blocks"))]
-pub const INITIAL_CHILDKEY_TAKE_RATELIMIT: u64 = 216000; // 30 days at 12 seconds per block
+pub const INITIAL_SUBNET_TEMPO: u16 = prod_or_fast!(99, 10);
 
-#[cfg(feature = "fast-blocks")]
-pub const INITIAL_CHILDKEY_TAKE_RATELIMIT: u64 = 5;
+pub const INITIAL_CHILDKEY_TAKE_RATELIMIT: u64 = prod_or_fast!(216000, 5); // 30 days at 12 seconds per block
 
 // Configure the pallet subtensor.
 parameter_types! {
@@ -2006,9 +1992,6 @@ impl_runtime_apis! {
     }
 }
 
-// #[cfg(test)]
-// mod tests {
-
 #[test]
 fn check_whitelist() {
     use crate::*;
@@ -2031,4 +2014,3 @@ fn check_whitelist() {
     // System Events
     assert!(whitelist.contains("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7"));
 }
-// }

scripts/localnet.sh

@@ -31,7 +31,7 @@ else
   echo "fast_runtime is On"
   : "${CHAIN:=local}"
   : "${BUILD_BINARY:=1}"
-  : "${FEATURES:="pow-faucet fast-blocks"}"
+  : "${FEATURES:="pow-faucet fast-runtime"}"
 fi
 
 SPEC_PATH="${SCRIPT_DIR}/specs/"
@@ -54,14 +54,16 @@ fi
 
 echo "*** Building chainspec..."
 "$BASE_DIR/target/release/node-subtensor" build-spec --disable-default-bootnode --raw --chain $CHAIN >$FULL_PATH
-echo "*** Chainspec built and output to file"
+echo "*** Chainspec built and output to $FULL_PATH"
 
 if [ $NO_PURGE -eq 1 ]; then
   echo "*** Purging previous state skipped..."
 else
   echo "*** Purging previous state..."
   "$BASE_DIR/target/release/node-subtensor" purge-chain -y --base-path /tmp/bob --chain="$FULL_PATH" >/dev/null 2>&1
   "$BASE_DIR/target/release/node-subtensor" purge-chain -y --base-path /tmp/alice --chain="$FULL_PATH" >/dev/null 2>&1
+  "$BASE_DIR/target/release/node-subtensor" purge-chain -y --base-path /tmp/charlie --chain="$FULL_PATH" >/dev/null 2>&1
+  "$BASE_DIR/target/release/node-subtensor" purge-chain -y --base-path /tmp/dave --chain="$FULL_PATH" >/dev/null 2>&1
   echo "*** Previous chainstate purged"
 fi
 
@@ -94,10 +96,40 @@ bob_start=(
   --unsafe-force-node-key-generation
 )
 
+charlie_start=(
+  "$BASE_DIR"/target/release/node-subtensor
+  --base-path /tmp/charlie
+  --chain="$FULL_PATH"
+  --charlie
+  --port 30335
+  --rpc-port 9944
+  --validator
+  --rpc-cors=all
+  --allow-private-ipv4
+  --discover-local
+  --unsafe-force-node-key-generation
+)
+
+dave_start=(
+  "$BASE_DIR"/target/release/node-subtensor
+  --base-path /tmp/dave
+  --chain="$FULL_PATH"
+  --dave
+  --port 30335
+  --rpc-port 9943
+  --validator
+  --rpc-cors=all
+  --allow-private-ipv4
+  --discover-local
+  --unsafe-force-node-key-generation
+)
+
 trap 'pkill -P $$' EXIT SIGINT SIGTERM
 
 (
-  ("${alice_start[@]}" 2>&1) &
-  ("${bob_start[@]}" 2>&1)
+  # ("${alice_start[@]}" 2>&1) &
+  ("${bob_start[@]}" 2>&1) &
+  ("${charlie_start[@]}" 2>&1) &
+  ("${dave_start[@]}" 2>&1)
   wait
 )