Authorship works again (#50)

* provide through inherent-data when authoring * remove unneeded codec round-trip in proposer * refactor polkadot-consensus service architecture * integrate block authorship into polkadot service * remove unused extern substrate-network crate in service * write wrapper for unifying errors in consensus proposer * extend wrapper further * switch temporarily to macro-changing branch * runtime compiles * implement `inherent_extrinsics` for runtime * block authorship works * add GRANDPA to polkadot runtime * get everything compiling * use substrate master branch again * remove some unneeded params * update WASM * parse only extrinsics when pruning availability store * update recent deps * runtime almost compiles * need to expose trait type in build : I had to put phantomdata manually. * finish updating authorship to latest GRANDPA and Aura * fix tests * update wasm
2026-05-30 14:01:02 +00:00 · 2018-12-11 17:55:04 +01:00
parent f17258c14d
commit 19095168ce
20 changed files with 1223 additions and 926 deletions
@@ -12,6 +12,7 @@ slog = "^2"
 tokio = "0.1.7"
 hex-literal = "0.1"
 polkadot-availability-store = { path = "../availability-store" }
+polkadot-consensus = { path = "../consensus" }
 polkadot-primitives = { path = "../primitives" }
 polkadot-runtime = { path = "../runtime" }
 polkadot-executor = { path = "../executor" }
@@ -19,9 +20,9 @@ polkadot-network = { path = "../network"  }
 sr-io = { git = "https://github.com/paritytech/substrate" }
 sr-primitives = { git = "https://github.com/paritytech/substrate" }
 substrate-primitives = { git = "https://github.com/paritytech/substrate" }
-substrate-network = { git = "https://github.com/paritytech/substrate" }
 substrate-client = { git = "https://github.com/paritytech/substrate" }
 substrate-consensus-aura = { git = "https://github.com/paritytech/substrate" }
+substrate-finality-grandpa = { git = "https://github.com/paritytech/substrate" }
 substrate-service = { git = "https://github.com/paritytech/substrate" }
 substrate-telemetry = { git = "https://github.com/paritytech/substrate" }
 substrate-transaction-pool = { git = "https://github.com/paritytech/substrate" }
@@ -17,8 +17,10 @@
 //! Polkadot chain configurations.

 use primitives::{AuthorityId, ed25519};
-use polkadot_runtime::{GenesisConfig, ConsensusConfig, CouncilSeatsConfig, DemocracyConfig,
-	SessionConfig, StakingConfig, TimestampConfig, BalancesConfig, Perbill, CouncilVotingConfig};
+use polkadot_runtime::{
+	GenesisConfig, ConsensusConfig, CouncilSeatsConfig, DemocracyConfig,
+	SessionConfig, StakingConfig, TimestampConfig, BalancesConfig, Perbill, CouncilVotingConfig, GrandpaConfig
+};

 const STAGING_TELEMETRY_URL: &str = "wss://telemetry.polkadot.io/submit/";
 const DEFAULT_PROTOCOL_ID: &str = "dot";
@@ -44,7 +46,6 @@ fn staging_testnet_config_genesis() -> GenesisConfig {
 		consensus: Some(ConsensusConfig {
 			code: include_bytes!("../../runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm").to_vec(),	// TODO change
 			authorities: initial_authorities.clone(),
-			_genesis_phantom_data: Default::default(),
 		}),
 		system: None,
 		balances: Some(BalancesConfig {
@@ -55,12 +56,10 @@ fn staging_testnet_config_genesis() -> GenesisConfig {
 			creation_fee: 0,
 			reclaim_rebate: 0,
 			balances: endowed_accounts.iter().map(|&k|(k, 1u128 << 60)).collect(),
-			_genesis_phantom_data: Default::default(),
 		}),
 		session: Some(SessionConfig {
 			validators: initial_authorities.iter().cloned().map(Into::into).collect(),
 			session_length: 60,	// that's 5 minutes per session.
-			_genesis_phantom_data: Default::default(),
 		}),
 		staking: Some(StakingConfig {
 			current_era: 0,
@@ -74,13 +73,15 @@ fn staging_testnet_config_genesis() -> GenesisConfig {
 			bonding_duration: 24 * 60 * 12,	// 1 day per bond.
 			offline_slash_grace: 4,
 			minimum_validator_count: 4,
-			_genesis_phantom_data: Default::default(),
 		}),
 		democracy: Some(DemocracyConfig {
 			launch_period: 12 * 60 * 24,	// 1 day per public referendum
 			voting_period: 12 * 60 * 24 * 3,	// 3 days to discuss & vote on an active referendum
 			minimum_deposit: 5000,	// 12000 as the minimum deposit for a referendum
-			_genesis_phantom_data: Default::default(),
+			public_delay: 0,
+		}),
+		grandpa: Some(GrandpaConfig {
+			authorities: initial_authorities.clone().into_iter().map(|k| (k, 1)).collect(),
 		}),
 		council_seats: Some(CouncilSeatsConfig {
 			active_council: vec![],
@@ -93,17 +94,15 @@ fn staging_testnet_config_genesis() -> GenesisConfig {
 			term_duration: 12 * 60 * 24 * 24,	// 24 day term duration for the council.
 			desired_seats: 0, // start with no council: we'll raise this once the stake has been dispersed a bit.
 			inactive_grace_period: 1,	// one addition vote should go by before an inactive voter can be reaped.
-			_genesis_phantom_data: Default::default(),
 		}),
 		council_voting: Some(CouncilVotingConfig {
 			cooloff_period: 75,
 			voting_period: 20,
-			_genesis_phantom_data: Default::default(),
+			enact_delay_period: 0,
 		}),
 		parachains: Some(Default::default()),
 		timestamp: Some(TimestampConfig {
-			period: 5,					// 5 second block time.
-			_genesis_phantom_data: Default::default(),
+			period: 2,					// 2*2=4 second block time.
 		}),
 		treasury: Some(Default::default()),
 	}
@@ -137,7 +136,6 @@ fn testnet_genesis(initial_authorities: Vec<AuthorityId>) -> GenesisConfig {
 		consensus: Some(ConsensusConfig {
 			code: include_bytes!("../../runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm").to_vec(),
 			authorities: initial_authorities.clone(),
-			_genesis_phantom_data: Default::default(),
 		}),
 		system: None,
 		balances: Some(BalancesConfig {
@@ -148,12 +146,10 @@ fn testnet_genesis(initial_authorities: Vec<AuthorityId>) -> GenesisConfig {
 			creation_fee: 0,
 			reclaim_rebate: 0,
 			balances: endowed_accounts.iter().map(|&k|(k, (1u128 << 60))).collect(),
-			_genesis_phantom_data: Default::default(),
 		}),
 		session: Some(SessionConfig {
 			validators: initial_authorities.iter().cloned().map(Into::into).collect(),
 			session_length: 10,
-			_genesis_phantom_data: Default::default(),
 		}),
 		staking: Some(StakingConfig {
 			current_era: 0,
@@ -167,13 +163,15 @@ fn testnet_genesis(initial_authorities: Vec<AuthorityId>) -> GenesisConfig {
 			current_offline_slash: 0,
 			current_session_reward: 0,
 			offline_slash_grace: 0,
-			_genesis_phantom_data: Default::default(),
 		}),
 		democracy: Some(DemocracyConfig {
 			launch_period: 9,
 			voting_period: 18,
 			minimum_deposit: 10,
-			_genesis_phantom_data: Default::default(),
+			public_delay: 0,
+		}),
+		grandpa: Some(GrandpaConfig {
+			authorities: initial_authorities.clone().into_iter().map(|k| (k, 1)).collect(),
 		}),
 		council_seats: Some(CouncilSeatsConfig {
 			active_council: endowed_accounts.iter().filter(|a| initial_authorities.iter().find(|&b| a[..] == b.0).is_none()).map(|a| (a.clone(), 1000000)).collect(),
@@ -186,17 +184,15 @@ fn testnet_genesis(initial_authorities: Vec<AuthorityId>) -> GenesisConfig {
 			term_duration: 1000000,
 			desired_seats: (endowed_accounts.len() - initial_authorities.len()) as u32,
 			inactive_grace_period: 1,
-			_genesis_phantom_data: Default::default(),
 		}),
 		council_voting: Some(CouncilVotingConfig {
 			cooloff_period: 75,
 			voting_period: 20,
-			_genesis_phantom_data: Default::default(),
+			enact_delay_period: 0,
 		}),
 		parachains: Some(Default::default()),
 		timestamp: Some(TimestampConfig {
-			period: 5,					// 5 second block time.
-			_genesis_phantom_data: Default::default(),
+			period: 2,					// 2*2=4 second block time.
 		}),
 		treasury: Some(Default::default()),
 	}
@@ -19,18 +19,18 @@
 //! Polkadot service. Specialized wrapper over substrate service.

 extern crate polkadot_availability_store as av_store;
+extern crate polkadot_consensus as consensus;
 extern crate polkadot_primitives;
 extern crate polkadot_runtime;
 extern crate polkadot_executor;
 extern crate polkadot_network;
 extern crate sr_primitives;
 extern crate substrate_primitives as primitives;
-#[macro_use]
-extern crate substrate_network as network;
 extern crate substrate_client as client;
 #[macro_use]
 extern crate substrate_service as service;
-extern crate substrate_consensus_aura as consensus;
+extern crate substrate_consensus_aura as aura;
+extern crate substrate_finality_grandpa as grandpa;
 extern crate substrate_transaction_pool as transaction_pool;
 extern crate tokio;

@@ -42,12 +42,14 @@ extern crate hex_literal;
 pub mod chain_spec;

 use std::sync::Arc;
-use polkadot_primitives::{parachain, AccountId, Block};
-use polkadot_runtime::{GenesisConfig, ClientWithApi};
+use std::time::Duration;
+use polkadot_primitives::{parachain, AccountId, Block, InherentData};
+use polkadot_runtime::{GenesisConfig, RuntimeApi};
+use primitives::ed25519;
 use tokio::runtime::TaskExecutor;
 use service::{FactoryFullConfiguration, FullBackend, LightBackend, FullExecutor, LightExecutor};
 use transaction_pool::txpool::{Pool as TransactionPool};
-use consensus::{import_queue, start_aura, Config as AuraConfig, AuraImportQueue, NothingExtra};
+use aura::{import_queue, start_aura, AuraImportQueue, SlotDuration, NothingExtra, InherentProducingFn};

 pub use service::{
 	Roles, PruningMode, TransactionPoolOptions, ComponentClient,
@@ -62,7 +64,7 @@ pub use primitives::{Blake2Hasher};
 pub use sr_primitives::traits::ProvideRuntimeApi;
 pub use chain_spec::ChainSpec;

-const AURA_SLOT_DURATION: u64 = 6;
+const PARACHAIN_EMPTY_DURATION: Duration = Duration::from_secs(4);

 /// All configuration for the polkadot node.
 pub type Configuration = FactoryFullConfiguration<Factory>;
@@ -73,11 +75,19 @@ pub struct CustomConfiguration {
 	/// Set to `Some` with a collator `AccountId` and desired parachain
 	/// if the network protocol should be started in collator mode.
 	pub collating_for: Option<(AccountId, parachain::Id)>,
+
+	/// Intermediate state during setup. Will be removed in future. Set to `None`.
+	// FIXME: rather than putting this on the config, let's have an actual intermediate setup state
+	// https://github.com/paritytech/substrate/issues/1134
+	pub grandpa_import_setup: Option<(
+		Arc<grandpa::BlockImportForService<Factory>>,
+		grandpa::LinkHalfForService<Factory>
+	)>,
 }

 /// Chain API type for the transaction pool.
 pub type TxChainApi<Backend, Executor> = transaction_pool::ChainApi<
-	client::Client<Backend, Executor, Block, ClientWithApi>,
+	client::Client<Backend, Executor, Block, RuntimeApi>,
 	Block,
 >;

@@ -89,7 +99,7 @@ pub trait PolkadotService {
 	type Executor: 'static + client::CallExecutor<Block, Blake2Hasher> + Send + Sync + Clone;

 	/// Get a handle to the client.
-	fn client(&self) -> Arc<client::Client<Self::Backend, Self::Executor, Block, ClientWithApi>>;
+	fn client(&self) -> Arc<client::Client<Self::Backend, Self::Executor, Block, RuntimeApi>>;

 	/// Get a handle to the network.
 	fn network(&self) -> Arc<NetworkService>;
@@ -102,7 +112,7 @@ impl PolkadotService for Service<FullComponents<Factory>> {
 	type Backend = <FullComponents<Factory> as Components>::Backend;
 	type Executor = <FullComponents<Factory> as Components>::Executor;

-	fn client(&self) -> Arc<client::Client<Self::Backend, Self::Executor, Block, ClientWithApi>> {
+	fn client(&self) -> Arc<client::Client<Self::Backend, Self::Executor, Block, RuntimeApi>> {
 		Service::client(self)
 	}
 	fn network(&self) -> Arc<NetworkService> {
@@ -118,9 +128,10 @@ impl PolkadotService for Service<LightComponents<Factory>> {
 	type Backend = <LightComponents<Factory> as Components>::Backend;
 	type Executor = <LightComponents<Factory> as Components>::Executor;

-	fn client(&self) -> Arc<client::Client<Self::Backend, Self::Executor, Block, ClientWithApi>> {
+	fn client(&self) -> Arc<client::Client<Self::Backend, Self::Executor, Block, RuntimeApi>> {
 		Service::client(self)
 	}
+
 	fn network(&self) -> Arc<NetworkService> {
 		Service::network(self)
 	}
@@ -130,10 +141,18 @@ impl PolkadotService for Service<LightComponents<Factory>> {
 	}
 }

+fn inherent_data_import_queue(timestamp: u64, slot: u64) -> InherentData {
+	InherentData {
+		parachains: Vec::new(),
+		timestamp,
+		aura_expected_slot: slot,
+	}
+}
+
 construct_service_factory! {
 	struct Factory {
 		Block = Block,
-		RuntimeApi = ClientWithApi,
+		RuntimeApi = RuntimeApi,
 		NetworkProtocol = PolkadotProtocol { |config: &Configuration| Ok(PolkadotProtocol::new(config.custom.collating_for)) },
 		RuntimeDispatch = polkadot_executor::Executor,
 		FullTransactionPoolApi = TxChainApi<FullBackend<Self>, FullExecutor<Self>>
@@ -144,54 +163,108 @@ construct_service_factory! {
 		Configuration = CustomConfiguration,
 		FullService = FullComponents<Self>
 			{ |config: FactoryFullConfiguration<Self>, executor: TaskExecutor| {
-				let is_auth = config.roles == Roles::AUTHORITY;
-				FullComponents::<Factory>::new(config, executor.clone()).map(move |service|{
-					if is_auth {
-						if let Ok(Some(Ok(key))) = service.keystore().contents()
-							.map(|keys| keys.get(0).map(|k| service.keystore().load(k, "")))
-						{
-							info!("Using authority key {}", key.public());
-							let task = start_aura(
-								AuraConfig {
-									local_key:  Some(Arc::new(key)),
-									slot_duration: AURA_SLOT_DURATION,
-								},
-								service.client(),
-								service.proposer(),
-								service.network(),
-							);
+				FullComponents::<Factory>::new(config, executor)
+			} },
+		AuthoritySetup = { |mut service: Self::FullService, executor: TaskExecutor, key: Arc<ed25519::Pair>| {
+				use polkadot_network::consensus::ConsensusNetwork;

-							executor.spawn(task);
-						}
-					}
+				let (block_import, link_half) = service.config.custom.grandpa_import_setup.take()
+					.expect("Link Half and Block Import are present for Full Services or setup failed before. qed");

-					service
-				})
-			}
-		},
-		AuthoritySetup = { |service, _, _| Ok(service) },
+				{
+					info!("Running Grandpa session as Authority {}", key.public());
+					let (voter, oracle) = grandpa::run_grandpa(
+						grandpa::Config {
+							gossip_duration: Duration::new(4, 0), // FIXME: make this available through chainspec?
+							local_key: Some(key.clone()),
+							name: Some(service.config.name.clone())
+						},
+						link_half,
+						grandpa::NetworkBridge::new(service.network()),
+					)?;
+
+					executor.spawn(oracle);
+					executor.spawn(voter);
+				}
+
+				let extrinsic_store = {
+					use std::path::PathBuf;
+
+					let mut path = PathBuf::from(service.config.database_path.clone());
+					path.push("availability");
+
+					::av_store::Store::new(::av_store::Config {
+						cache_size: None,
+						path,
+					})?
+				};
+
+				let client = service.client();
+
+				// collator connections and consensus network both fulfilled by this
+				let consensus_network = ConsensusNetwork::new(service.network(), service.client());
+				let proposer_factory = ::consensus::ProposerFactory::new(
+					client.clone(),
+					consensus_network.clone(),
+					consensus_network,
+					service.transaction_pool(),
+					executor.clone(),
+					PARACHAIN_EMPTY_DURATION,
+					key.clone(),
+					extrinsic_store,
+				);
+
+				info!("Using authority key {}", key.public());
+				let task = start_aura(
+					SlotDuration::get_or_compute(&*client)?,
+					key,
+					client.clone(),
+					client,
+					Arc::new(proposer_factory),
+					service.network(),
+				);
+
+				executor.spawn(task);
+				Ok(service)
+			}},
 		LightService = LightComponents<Self>
 			{ |config, executor| <LightComponents<Factory>>::new(config, executor) },
-		FullImportQueue = AuraImportQueue<Self::Block, FullClient<Self>, NothingExtra>
-			{ |config, client| Ok(import_queue(
-				AuraConfig {
-					local_key: None,
-					slot_duration: 5
-				},
-				client,
-				NothingExtra,
-			))
-			},
-		LightImportQueue = AuraImportQueue<Self::Block, LightClient<Self>, NothingExtra>
-			{ |config, client| Ok(import_queue(
-				AuraConfig {
-					local_key: None,
-					slot_duration: 5
-				},
-				client,
-				NothingExtra,
-			))
-			},
+		FullImportQueue = AuraImportQueue<
+			Self::Block,
+			grandpa::BlockImportForService<Self>,
+			NothingExtra,
+			InherentProducingFn<InherentData>,
+		>
+			{ |config: &mut FactoryFullConfiguration<Self>, client: Arc<FullClient<Self>>| {
+				let slot_duration = SlotDuration::get_or_compute(&*client)?;
+
+				let (block_import, link_half) = grandpa::block_import::<_, _, _, RuntimeApi, FullClient<Self>>(client.clone(), client)?;
+				let block_import = Arc::new(block_import);
+
+				config.custom.grandpa_import_setup = Some((block_import.clone(), link_half));
+				Ok(import_queue(
+					slot_duration,
+					block_import,
+					NothingExtra,
+					inherent_data_import_queue as _,
+				))
+			}},
+		LightImportQueue = AuraImportQueue<
+			Self::Block,
+			LightClient<Self>,
+			NothingExtra,
+			InherentProducingFn<InherentData>,
+		>
+			{ |config, client: Arc<LightClient<Self>>| {
+				let slot_duration = SlotDuration::get_or_compute(&*client)?;
+
+				Ok(import_queue(
+					slot_duration,
+					client,
+					NothingExtra,
+					inherent_data_import_queue as _,
+				))
+			}},
 	}
 }