Merge pull request #119 from OriginTrail/devnet-to-testnet-1.6

Testnet v1.6.0 Collators Staking

Author: Mihajlo-Pavlovic

Cargo.lock

@@ -41,6 +41,10 @@ slices = "0.2.0"
 smallvec = "1.10.0"
 serde = { version = "1.0.152", default-features = false }
 serde_json = "1.0.92"
+itertools = { version = "0.11", default-features = false, features = [
+    "use_alloc",
+] }
+rustc-hex = { version = "2.0.1", default-features = false }
 
 # Substrate
 frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.11.0" }
@@ -80,9 +84,11 @@ sp-genesis-builder = { git = "https://github.com/paritytech/polkadot-sdk", defau
 sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.11.0" }
 sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false }
 sp-keystore = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" }
+sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false }
 sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.11.0" }
 sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.11.0" }
 sp-session = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.11.0" }
+sp-staking = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.11.0" }
 sp-std = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.11.0" }
 sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0" }
 sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.11.0" }
@@ -177,6 +183,13 @@ xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-s
 xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.11.0" }
 xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.11.0" }
 
+# Staking
+substrate-fixed = { git = "https://github.com/encointer/substrate-fixed", default-features = false }
+pallet-parachain-staking = { path = "pallets/parachain-staking", default-features = false }
+#pallet-evm-precompile-parachain-staking = { path = "precompiles/parachain-staking", default-features = false }
+# num-integer = { version = "0.1", default-features = false }
+# sp-consensus-slots = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false, branch = "release-polkadot-v1.11.0" }
+
 # Local
 neuroweb-runtime = { path = "./runtime" }
 precompile-utils = { path = "./precompiles/utils", default-features = false }

Cargo.toml

@@ -47,7 +47,6 @@ To run a full network with multiple NeuroWeb nodes (collators and non-collators)
 #### Run A Relay Chain
 
 To start a relay chain we recommend reading and following instructions in [Cumulus Workshop](https://docs.substrate.io/tutorials/build-a-parachain/prepare-a-local-relay-chain/).
-
 NeuroWeb is currently compatible with Polkadot v1.11.0 version.
 
 #### Parachain Nodes (Collators)

README.md

@@ -1,6 +1,6 @@
 [package]
 name = "neuroweb-node"
-version = "1.5.0"
+version = "1.6.0"
 authors = ["TraceLabs"]
 description = "NeuroWeb - Cumulus FRAME-based Substrate Node"
 license = "GPL-3.0-only"
@@ -21,6 +21,7 @@ codec = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true, features = ["arbitrary_precision"] }
 jsonrpsee = { workspace = true }
+itertools = { workspace = true }
 
 # Local
 neuroweb-runtime = { workspace = true }

node/Cargo.toml

@@ -1,19 +1,46 @@
 use cumulus_primitives_core::ParaId;
-use neuroweb_runtime::{AccountId, AuraId,
-	EVMConfig, Signature, EXISTENTIAL_DEPOSIT};
+use neuroweb_runtime::{pallet_parachain_staking::{
+		inflation::{perbill_annual_to_perbill_round, BLOCKS_PER_YEAR},
+		InflationInfo, Range,
+	}, AccountId, AuraId, Balance, EVMConfig, MinCandidateStk, Signature, OTP};
 use sc_chain_spec::{ChainSpecExtension, ChainSpecGroup};
 use sc_service::ChainType;
 use serde::{Deserialize, Serialize};
 use sp_core::{sr25519, Pair, Public, H160, U256};
-use sp_runtime::traits::{IdentifyAccount, Verify};
+use sp_runtime::{Perbill, Percent, traits::{IdentifyAccount, Verify}};
 use std::{collections::BTreeMap, str::FromStr};
+use itertools::Itertools;
 
 /// Specialized `ChainSpec` for the normal parachain runtime.
 pub type ChainSpec =
 	sc_service::GenericChainSpec<neuroweb_runtime::RuntimeGenesisConfig, Extensions>;
 
 /// The default XCM version to set in genesis config.
-const SAFE_XCM_VERSION: u32 = xcm::prelude::XCM_VERSION;
+pub const SAFE_XCM_VERSION: u32 = xcm::prelude::XCM_VERSION;
+pub const COLLATOR_COMMISSION: Perbill = Perbill::from_percent(10);
+pub const PARACHAIN_BOND_RESERVE_PERCENT: Percent = Percent::from_percent(0);
+pub const BLOCKS_PER_ROUND: u32 = 3600; // 6 hours of blocks
+pub const NUM_SELECTED_CANDIDATES: u32 = 1; // For start
+
+pub fn neuroweb_inflation_config() -> InflationInfo<Balance> {
+	fn to_round_inflation(annual: Range<Perbill>) -> Range<Perbill> {
+		perbill_annual_to_perbill_round(
+			annual,
+			// rounds per year
+			BLOCKS_PER_YEAR / BLOCKS_PER_ROUND,
+		)
+	}
+	let annual =
+		Range { min: Perbill::from_percent(2), ideal: Perbill::from_percent(3), max: Perbill::from_percent(3) };
+
+	InflationInfo {
+		// staking expectations
+		expect: Range { min: 100_000 * OTP, ideal: 200_000 * OTP, max: 500_000 * OTP },
+		// annual inflation
+		annual,
+		round: to_round_inflation(annual),
+	}
+}
 
 /// Helper function to generate a crypto pair from seed
 pub fn get_from_seed<TPublic: Public>(seed: &str) -> <TPublic::Pair as Pair>::Public {
@@ -174,13 +201,8 @@ fn testnet_genesis(
 			parachain_id: id,
 			..Default::default()
 		},
-		collator_selection: neuroweb_runtime::CollatorSelectionConfig {
-			invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(),
-			candidacy_bond: EXISTENTIAL_DEPOSIT * 16,
-			..Default::default()
-		},
 		session: neuroweb_runtime::SessionConfig {
-			keys: invulnerables
+			keys: invulnerables.clone()
 				.into_iter()
 				.map(|(acc, aura)| {
 					(
@@ -242,6 +264,15 @@ fn testnet_genesis(
 		council: Default::default(),
 		democracy: Default::default(),
 		transaction_payment: Default::default(),
+		parachain_staking: neuroweb_runtime::ParachainStakingConfig {
+			candidates: invulnerables.clone().into_iter().map(|account| (account.0, MinCandidateStk::get())).collect_vec(),
+			delegations: vec![],
+			blocks_per_round: BLOCKS_PER_ROUND,
+			num_selected_candidates: NUM_SELECTED_CANDIDATES,
+			parachain_bond_reserve_percent: PARACHAIN_BOND_RESERVE_PERCENT,
+			collator_commission: COLLATOR_COMMISSION,
+			inflation_config: neuroweb_inflation_config()
+		}
 	};
 
 	serde_json::to_value(&config).expect("Could not build genesis config.")

node/src/chain_spec.rs

@@ -188,6 +188,7 @@ pub fn run() -> Result<()> {
             match cmd {
                 BenchmarkCmd::Pallet(cmd) => {
                     if cfg!(feature = "runtime-benchmarks") {
+                        #[allow(deprecated)]
                         runner.sync_run(|config| cmd.run::<HashingFor<Block>, ()>(config))
                     } else {
                         Err("Benchmarking wasn't enabled when building the node. \

node/src/command.rs

@@ -0,0 +1,79 @@
+[package]
+name = "pallet-parachain-staking"
+description = "Parachain staking pallet for collator selection and reward distribution"
+authors = { workspace = true }
+edition = "2021"
+version = "1.0.0"
+
+[dependencies]
+serde = { workspace = true }
+log = { workspace = true }
+
+codec = { workspace = true, features = [
+	"derive",
+] }
+scale-info = { workspace = true, features = ["derive"] }
+
+# FRAME
+frame-benchmarking = { workspace = true, optional = true }
+frame-support.workspace = true
+frame-system.workspace = true
+sp-runtime.workspace = true
+sp-std.workspace = true
+sp-core.workspace = true
+substrate-fixed.workspace = true
+sp-staking.workspace = true
+pallet-authorship.workspace = true
+pallet-session.workspace = true
+
+[dev-dependencies]
+pallet-balances.workspace = true
+pallet-aura.workspace = true
+pallet-timestamp.workspace = true
+similar-asserts = "1.1.0"
+sp-io.workspace = true
+sp-consensus-aura.workspace = true
+
+[features]
+default = [ "std" ]
+std = [
+	"frame-benchmarking?/std",
+	"frame-support/std",
+	"frame-system/std",
+	"log/std",
+	"pallet-aura/std",
+	"pallet-authorship/std",
+	"pallet-balances/std",
+	"pallet-session/std",
+	"pallet-timestamp/std",
+	"codec/std",
+	"scale-info/std",
+	"serde/std",
+	"sp-consensus-aura/std",
+	"sp-core/std",
+	"sp-io/std",
+	"sp-runtime/std",
+	"sp-staking/std",
+	"sp-std/std",
+	"substrate-fixed/std",
+]
+runtime-benchmarks = [
+	"frame-benchmarking",
+	"frame-benchmarking?/runtime-benchmarks",
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"pallet-balances/runtime-benchmarks",
+	"pallet-timestamp/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+	"sp-staking/runtime-benchmarks",
+]
+try-runtime = [
+	"frame-support/try-runtime",
+	"frame-system/try-runtime",
+	"pallet-aura/try-runtime",
+	"pallet-authorship/try-runtime",
+	"pallet-balances/try-runtime",
+	"pallet-session/try-runtime",
+	"pallet-timestamp/try-runtime",
+	"sp-runtime/try-runtime",
+]