mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-07-04 13:57:23 +00:00
87776e63bb
* Send high-level consensus telemetry by default * Notify telemetry on finalized * Send used authority set to telemetry * Do not send commit message telemetry by default * Fix typo * Allow for notifications on telemetry connect ...and send the current authority set on each connect. * Send authority set to telemetry on change * Revert "Send used authority set to telemetry" This reverts commit 1deceead52bb7443a02879ac8138afad9a6ca5ff. * Merge branch 'master' into 'cmichi-send-high-level-consensus-telemetry-by-default' Squashed commit of the following: commit19d77cbc23Author: Xiliang Chen <xlchen1291@gmail.com> Date: Wed Apr 10 20:26:29 2019 +1200 update authers for rest of the node-template cargo.toml files (#2242) commit0afc357a97Author: Bastian Köcher <bkchr@users.noreply.github.com> Date: Tue Apr 9 10:31:18 2019 +0200 Throw a compile error for `on_finalise` and `on_initialise` (#2236) commite57e54ab9cAuthor: Pierre Krieger <pierre.krieger1708@gmail.com> Date: Tue Apr 9 05:30:43 2019 -0300 Add warning when using default protocol ID (#2234) * Add warning when using default protocol ID * Update core/service/src/lib.rs commitcb766e5f5dAuthor: Xiliang Chen <xlchen1291@gmail.com> Date: Tue Apr 9 17:22:20 2019 +1200 update name and authors to placeholder text for node-template (#2222) * update name and authors to placeholder text * revert package name change commita1e15ae55aAuthor: André Silva <andre.beat@gmail.com> Date: Mon Apr 8 12:50:34 2019 +0100 grandpa: Voter persistence and upgrade to finality-grandpa v0.7 (#2139) * core: grandpa: migrate to grandpa 0.7 * core: grandpa: store current round votes and load them on startup * core: grandpa: resend old persisted votes for the current round * core: grandpa: store base and votes for last completed round * core: grandpa: fix latest grandpa 0.7 changes * core: grandpa: update to grandpa 0.7.1 * core: grandpa: persist votes for last two completed rounds * core: grandpa: simplify VoterSetState usage * core: grandpa: use Environment::update_voter_set_state * core: grandpa: fix aux_schema test * core: grandpa: add docs * core: grandpa: add note about environment assumption * core: grandpa: don't update voter set state on ignored votes * core: grandpa: add test for v1 -> v2 aux_schema migration * core: grandpa: add test for voter vote persistence * core: grandpa: use grandpa 0.7.1 from crates.io * core: grandpa: use try_init in test * core: grandpa: add comment about block_import in test * core: grandpa: avoid cloning HasVoted * core: grandpa: add missing docs * core: grandpa: cleanup up can_propose/prevote/precommit commited3ae4ac39Author: Gregory Terzian <2792687+gterzian@users.noreply.github.com> Date: Mon Apr 8 13:17:00 2019 +0200 remove clone bound on specialization in testnet factory (#2157) commit03f3fb1442Author: Andrew Jones <ascjones@gmail.com> Date: Sat Apr 6 12:23:56 2019 +0100 Contract import/export validation (#2203) * Reject validation of contract with unknown exports * Validate imports eagerly * Increment spec version commitdecddaab0fAuthor: Pierre Krieger <pierre.krieger1708@gmail.com> Date: Fri Apr 5 14:07:09 2019 -0300 Fix state inconsistency between handler and behaviour (#2220) * Fix state inconsistency between handler and behaviour * Fix the error! being in the wrong place commitdce0b4ea49Author: Bastian Köcher <bkchr@users.noreply.github.com> Date: Fri Apr 5 18:50:38 2019 +0200 Use `storage_root` of newly calculated header (#2216) Instead of calculating the `storage_root` a second time, we just can take the `storage_root` from the new header. commitb01136c90dAuthor: Marek Kotewicz <marek.kotewicz@gmail.com> Date: Fri Apr 5 14:44:46 2019 +0200 Peerset::discovered accepts many peer ids (#2213) * Peerset::discovered accepts many peer ids * Improve tracing in peerset commit1142bcde97Author: Marek Kotewicz <marek.kotewicz@gmail.com> Date: Thu Apr 4 19:40:40 2019 +0200 simplification of peerset api (#2123) * Introduction of PeersetHandle * integrate PeersetHandle with the rest of the codebase * fix compilation errors * more tests for peerset, fixed overwriting bug in add_reserved_peer * Slots data structure and bugfixes for peerset * bend to pressure * updated lru-cache to 0.1.2 and updated linked-hash-map to 0.5.2 * peerset discovered list is now a LinkedHashMap * fix review suggestions * split back Peerset and PeersetHandle * test for Peerset::discovered * applied review suggestions * fixes to peerset::incoming * peerset disconnects are all instantaneous * instantaneous drop in peerset finished * Peerset::set_reserved_only can also reconnect nodes * Peerset scores cache uses lru-cache * remove redundant function call and comment from Peerset::on_set_reserved_only * add_peer returns SlotState enum * apply review suggestions * is_reserved -> is_connected_and_reserved commit301844dd56Author: Arkadiy Paronyan <arkady.paronyan@gmail.com> Date: Thu Apr 4 18:01:28 2019 +0200 Disconnect on protocol timeout (#2212) commitcb3c912b1aAuthor: André Silva <andre.beat@gmail.com> Date: Thu Apr 4 15:56:49 2019 +0100 core: grandpa: verify commit target in justification (#2201) commit6920b169cdAuthor: Bastian Köcher <bkchr@users.noreply.github.com> Date: Thu Apr 4 16:56:16 2019 +0200 Introduce `original_storage` and `original_storage_hash` (#2211) Both functions will ignore any overlayed changes and access the backend directly. commitcb7a8161f5Author: Xiliang Chen <xlchen1291@gmail.com> Date: Fri Apr 5 03:55:55 2019 +1300 code cleanup (#2206) commitacaf1fe625Author: Arkadiy Paronyan <arkady.paronyan@gmail.com> Date: Wed Apr 3 15:52:46 2019 +0200 Emberic elm testnet (#2197) * Make telemetry onconnect hoook optional * Merge branch 'master' into 'cmichi-send-high-level-consensus-telemetry-by-default' * Introduce GrandpaParams struct to condense parameters * Remove debug statement * Fix tests * Rename parameter * Fix tests * Rename struct * Do not send verbosity level * Combine imports * Implement comments * Run cargo build --all * Remove noisy telemetry * Add docs for public items * Unbox and support Clone trait * Fix merge * Fix merge * Update core/finality-grandpa/src/lib.rs Co-Authored-By: cmichi <mich@elmueller.net>
241 lines
8.7 KiB
Rust
241 lines
8.7 KiB
Rust
// Copyright 2018-2019 Parity Technologies (UK) Ltd.
|
|
// This file is part of Substrate.
|
|
|
|
// Substrate is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
|
|
// Substrate is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with Substrate. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
#![warn(unused_extern_crates)]
|
|
|
|
//! Service and ServiceFactory implementation. Specialized wrapper over substrate service.
|
|
|
|
use std::sync::Arc;
|
|
use std::time::Duration;
|
|
|
|
use client;
|
|
use consensus::{import_queue, start_aura, AuraImportQueue, SlotDuration, NothingExtra};
|
|
use grandpa;
|
|
use node_executor;
|
|
use primitives::{Pair as PairT, ed25519};
|
|
use node_primitives::Block;
|
|
use node_runtime::{GenesisConfig, RuntimeApi};
|
|
use substrate_service::{
|
|
FactoryFullConfiguration, LightComponents, FullComponents, FullBackend,
|
|
FullClient, LightClient, LightBackend, FullExecutor, LightExecutor, TaskExecutor,
|
|
};
|
|
use transaction_pool::{self, txpool::{Pool as TransactionPool}};
|
|
use inherents::InherentDataProviders;
|
|
use network::construct_simple_protocol;
|
|
use substrate_service::construct_service_factory;
|
|
use log::info;
|
|
use substrate_service::TelemetryOnConnect;
|
|
|
|
construct_simple_protocol! {
|
|
/// Demo protocol attachment for substrate.
|
|
pub struct NodeProtocol where Block = Block { }
|
|
}
|
|
|
|
/// Node specific configuration
|
|
pub struct NodeConfig<F: substrate_service::ServiceFactory> {
|
|
/// grandpa connection to import block
|
|
// FIXME #1134 rather than putting this on the config, let's have an actual intermediate setup state
|
|
pub grandpa_import_setup: Option<(Arc<grandpa::BlockImportForService<F>>, grandpa::LinkHalfForService<F>)>,
|
|
inherent_data_providers: InherentDataProviders,
|
|
}
|
|
|
|
impl<F> Default for NodeConfig<F> where F: substrate_service::ServiceFactory {
|
|
fn default() -> NodeConfig<F> {
|
|
NodeConfig {
|
|
grandpa_import_setup: None,
|
|
inherent_data_providers: InherentDataProviders::new(),
|
|
}
|
|
}
|
|
}
|
|
|
|
construct_service_factory! {
|
|
struct Factory {
|
|
Block = Block,
|
|
RuntimeApi = RuntimeApi,
|
|
NetworkProtocol = NodeProtocol { |config| Ok(NodeProtocol::new()) },
|
|
RuntimeDispatch = node_executor::Executor,
|
|
FullTransactionPoolApi = transaction_pool::ChainApi<client::Client<FullBackend<Self>, FullExecutor<Self>, Block, RuntimeApi>, Block>
|
|
{ |config, client| Ok(TransactionPool::new(config, transaction_pool::ChainApi::new(client))) },
|
|
LightTransactionPoolApi = transaction_pool::ChainApi<client::Client<LightBackend<Self>, LightExecutor<Self>, Block, RuntimeApi>, Block>
|
|
{ |config, client| Ok(TransactionPool::new(config, transaction_pool::ChainApi::new(client))) },
|
|
Genesis = GenesisConfig,
|
|
Configuration = NodeConfig<Self>,
|
|
FullService = FullComponents<Self>
|
|
{ |config: FactoryFullConfiguration<Self>, executor: TaskExecutor|
|
|
FullComponents::<Factory>::new(config, executor) },
|
|
AuthoritySetup = {
|
|
|mut service: Self::FullService, executor: TaskExecutor, local_key: Option<Arc<ed25519::Pair>>| {
|
|
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");
|
|
|
|
if let Some(ref key) = local_key {
|
|
info!("Using authority key {}", key.public());
|
|
let proposer = Arc::new(substrate_basic_authorship::ProposerFactory {
|
|
client: service.client(),
|
|
transaction_pool: service.transaction_pool(),
|
|
inherents_pool: service.inherents_pool(),
|
|
});
|
|
|
|
let client = service.client();
|
|
executor.spawn(start_aura(
|
|
SlotDuration::get_or_compute(&*client)?,
|
|
key.clone(),
|
|
client,
|
|
block_import.clone(),
|
|
proposer,
|
|
service.network(),
|
|
service.on_exit(),
|
|
service.config.custom.inherent_data_providers.clone(),
|
|
service.config.force_authoring,
|
|
)?);
|
|
|
|
info!("Running Grandpa session as Authority {}", key.public());
|
|
}
|
|
|
|
let local_key = if service.config.disable_grandpa {
|
|
None
|
|
} else {
|
|
local_key
|
|
};
|
|
|
|
let config = grandpa::Config {
|
|
local_key,
|
|
// FIXME #1578 make this available through chainspec
|
|
gossip_duration: Duration::from_millis(333),
|
|
justification_period: 4096,
|
|
name: Some(service.config.name.clone())
|
|
};
|
|
|
|
match config.local_key {
|
|
None => {
|
|
executor.spawn(grandpa::run_grandpa_observer(
|
|
config,
|
|
link_half,
|
|
service.network(),
|
|
service.on_exit(),
|
|
)?);
|
|
},
|
|
Some(_) => {
|
|
let telemetry_on_connect = TelemetryOnConnect {
|
|
on_exit: Box::new(service.on_exit()),
|
|
telemetry_connection_sinks: service.telemetry_on_connect_stream(),
|
|
executor: &executor,
|
|
};
|
|
let grandpa_config = grandpa::GrandpaParams {
|
|
config: config,
|
|
link: link_half,
|
|
network: service.network(),
|
|
inherent_data_providers: service.config.custom.inherent_data_providers.clone(),
|
|
on_exit: service.on_exit(),
|
|
telemetry_on_connect: Some(telemetry_on_connect),
|
|
};
|
|
executor.spawn(grandpa::run_grandpa_voter(grandpa_config)?);
|
|
},
|
|
}
|
|
|
|
Ok(service)
|
|
}
|
|
},
|
|
LightService = LightComponents<Self>
|
|
{ |config, executor| <LightComponents<Factory>>::new(config, executor) },
|
|
FullImportQueue = AuraImportQueue<Self::Block>
|
|
{ |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.clone()
|
|
)?;
|
|
let block_import = Arc::new(block_import);
|
|
let justification_import = block_import.clone();
|
|
|
|
config.custom.grandpa_import_setup = Some((block_import.clone(), link_half));
|
|
|
|
import_queue::<_, _, _, ed25519::Pair>(
|
|
slot_duration,
|
|
block_import,
|
|
Some(justification_import),
|
|
client,
|
|
NothingExtra,
|
|
config.custom.inherent_data_providers.clone(),
|
|
).map_err(Into::into)
|
|
}},
|
|
LightImportQueue = AuraImportQueue<Self::Block>
|
|
{ |config: &FactoryFullConfiguration<Self>, client: Arc<LightClient<Self>>| {
|
|
import_queue::<_, _, _, ed25519::Pair>(
|
|
SlotDuration::get_or_compute(&*client)?,
|
|
client.clone(),
|
|
None,
|
|
client,
|
|
NothingExtra,
|
|
config.custom.inherent_data_providers.clone(),
|
|
).map_err(Into::into)
|
|
}
|
|
},
|
|
}
|
|
}
|
|
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
#[cfg(feature = "rhd")]
|
|
fn test_sync() {
|
|
use {service_test, Factory};
|
|
use client::{ImportBlock, BlockOrigin};
|
|
|
|
let alice: Arc<ed25519::Pair> = Arc::new(Keyring::Alice.into());
|
|
let bob: Arc<ed25519::Pair> = Arc::new(Keyring::Bob.into());
|
|
let validators = vec![alice.public().0.into(), bob.public().0.into()];
|
|
let keys: Vec<&ed25519::Pair> = vec![&*alice, &*bob];
|
|
let dummy_runtime = ::tokio::runtime::Runtime::new().unwrap();
|
|
let block_factory = |service: &<Factory as service::ServiceFactory>::FullService| {
|
|
let block_id = BlockId::number(service.client().info().unwrap().chain.best_number);
|
|
let parent_header = service.client().header(&block_id).unwrap().unwrap();
|
|
let consensus_net = ConsensusNetwork::new(service.network(), service.client().clone());
|
|
let proposer_factory = consensus::ProposerFactory {
|
|
client: service.client().clone(),
|
|
transaction_pool: service.transaction_pool().clone(),
|
|
network: consensus_net,
|
|
force_delay: 0,
|
|
handle: dummy_runtime.executor(),
|
|
};
|
|
let (proposer, _, _) = proposer_factory.init(&parent_header, &validators, alice.clone()).unwrap();
|
|
let block = proposer.propose().expect("Error making test block");
|
|
ImportBlock {
|
|
origin: BlockOrigin::File,
|
|
justification: Vec::new(),
|
|
internal_justification: Vec::new(),
|
|
finalized: true,
|
|
body: Some(block.extrinsics),
|
|
header: block.header,
|
|
auxiliary: Vec::new(),
|
|
}
|
|
};
|
|
let extrinsic_factory = |service: &<Factory as service::ServiceFactory>::FullService| {
|
|
let payload = (0, Call::Balances(BalancesCall::transfer(RawAddress::Id(bob.public().0.into()), 69.into())), Era::immortal(), service.client().genesis_hash());
|
|
let signature = alice.sign(&payload.encode()).into();
|
|
let id = alice.public().0.into();
|
|
let xt = UncheckedExtrinsic {
|
|
signature: Some((RawAddress::Id(id), signature, payload.0, Era::immortal())),
|
|
function: payload.1,
|
|
}.encode();
|
|
let v: Vec<u8> = Decode::decode(&mut xt.as_slice()).unwrap();
|
|
OpaqueExtrinsic(v)
|
|
};
|
|
service_test::sync::<Factory, _, _>(chain_spec::integration_test_config(), block_factory, extrinsic_factory);
|
|
}
|
|
|
|
}
|