pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-18 06:01:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Companion for paritytech/substrate#14080 (#7184)

Browse Source 
* Companion for paritytech/substrate#14080

* update lockfile for {"substrate"}

---------

Co-authored-by: parity-processbot <>
This commit is contained in:
Aaro Altonen
2023-05-11 14:08:04 +03:00
committed by GitHub
parent c1952fcc62
commit f86c9fcc44
2 changed files with 202 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/Cargo.lock
Generated
+184 -184
View File
File diff suppressed because it is too large Load Diff
polkadot/node/service/src/lib.rs
+18 -19
View File
@@ -791,6 +791,7 @@ where
let shared_voter_state = rpc_setup; let shared_voter_state = rpc_setup;
let auth_disc_publish_non_global_ips = config.network.allow_non_globals_in_dht; let auth_disc_publish_non_global_ips = config.network.allow_non_globals_in_dht;
let mut net_config = sc_network::config::FullNetworkConfiguration::new(&config.network);
let genesis_hash = client.block_hash(0).ok().flatten().expect("Genesis block exists; qed"); let genesis_hash = client.block_hash(0).ok().flatten().expect("Genesis block exists; qed");
@@ -798,10 +799,9 @@ where
// anything in terms of behaviour, but makes the logs more consistent with the other // anything in terms of behaviour, but makes the logs more consistent with the other
// Substrate nodes. // Substrate nodes.
let grandpa_protocol_name = grandpa::protocol_standard_name(&genesis_hash, &config.chain_spec); let grandpa_protocol_name = grandpa::protocol_standard_name(&genesis_hash, &config.chain_spec);
config net_config.add_notification_protocol(grandpa::grandpa_peers_set_config(
.network grandpa_protocol_name.clone(),
.extra_sets ));
.push(grandpa::grandpa_peers_set_config(grandpa_protocol_name.clone()));
let beefy_gossip_proto_name = let beefy_gossip_proto_name =
beefy::gossip_protocol_name(&genesis_hash, config.chain_spec.fork_id()); beefy::gossip_protocol_name(&genesis_hash, config.chain_spec.fork_id());
@@ -815,11 +815,10 @@ where
prometheus_registry.clone(), prometheus_registry.clone(),
); );
if enable_beefy { if enable_beefy {
config net_config.add_notification_protocol(beefy::communication::beefy_peers_set_config(
.network beefy_gossip_proto_name.clone(),
.extra_sets ));
.push(beefy::communication::beefy_peers_set_config(beefy_gossip_proto_name.clone())); net_config.add_request_response_protocol(beefy_req_resp_cfg);
config.network.request_response_protocols.push(beefy_req_resp_cfg);
} }
let peerset_protocol_names = let peerset_protocol_names =
@@ -828,27 +827,26 @@ where
{ {
use polkadot_network_bridge::{peer_sets_info, IsAuthority}; use polkadot_network_bridge::{peer_sets_info, IsAuthority};
let is_authority = if role.is_authority() { IsAuthority::Yes } else { IsAuthority::No }; let is_authority = if role.is_authority() { IsAuthority::Yes } else { IsAuthority::No };
config for config in peer_sets_info(is_authority, &peerset_protocol_names) {
.network net_config.add_notification_protocol(config);
.extra_sets }
.extend(peer_sets_info(is_authority, &peerset_protocol_names));
} }
let req_protocol_names = ReqProtocolNames::new(&genesis_hash, config.chain_spec.fork_id()); let req_protocol_names = ReqProtocolNames::new(&genesis_hash, config.chain_spec.fork_id());
let (pov_req_receiver, cfg) = IncomingRequest::get_config_receiver(&req_protocol_names); let (pov_req_receiver, cfg) = IncomingRequest::get_config_receiver(&req_protocol_names);
config.network.request_response_protocols.push(cfg); net_config.add_request_response_protocol(cfg);
let (chunk_req_receiver, cfg) = IncomingRequest::get_config_receiver(&req_protocol_names); let (chunk_req_receiver, cfg) = IncomingRequest::get_config_receiver(&req_protocol_names);
config.network.request_response_protocols.push(cfg); net_config.add_request_response_protocol(cfg);
let (collation_req_receiver, cfg) = IncomingRequest::get_config_receiver(&req_protocol_names); let (collation_req_receiver, cfg) = IncomingRequest::get_config_receiver(&req_protocol_names);
config.network.request_response_protocols.push(cfg); net_config.add_request_response_protocol(cfg);
let (available_data_req_receiver, cfg) = let (available_data_req_receiver, cfg) =
IncomingRequest::get_config_receiver(&req_protocol_names); IncomingRequest::get_config_receiver(&req_protocol_names);
config.network.request_response_protocols.push(cfg); net_config.add_request_response_protocol(cfg);
let (statement_req_receiver, cfg) = IncomingRequest::get_config_receiver(&req_protocol_names); let (statement_req_receiver, cfg) = IncomingRequest::get_config_receiver(&req_protocol_names);
config.network.request_response_protocols.push(cfg); net_config.add_request_response_protocol(cfg);
let (dispute_req_receiver, cfg) = IncomingRequest::get_config_receiver(&req_protocol_names); let (dispute_req_receiver, cfg) = IncomingRequest::get_config_receiver(&req_protocol_names);
config.network.request_response_protocols.push(cfg); net_config.add_request_response_protocol(cfg);
let grandpa_hard_forks = if config.chain_spec.is_kusama() { let grandpa_hard_forks = if config.chain_spec.is_kusama() {
grandpa_support::kusama_hard_forks() grandpa_support::kusama_hard_forks()
@@ -865,6 +863,7 @@ where
let (network, system_rpc_tx, tx_handler_controller, network_starter, sync_service) = let (network, system_rpc_tx, tx_handler_controller, network_starter, sync_service) =
service::build_network(service::BuildNetworkParams { service::build_network(service::BuildNetworkParams {
config: &config, config: &config,
net_config,
client: client.clone(), client: client.clone(),
transaction_pool: transaction_pool.clone(), transaction_pool: transaction_pool.clone(),
spawn_handle: task_manager.spawn_handle(), spawn_handle: task_manager.spawn_handle(),