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

Bump substrate in subtree import preparation. (#759)

Browse Source
This commit is contained in:
Tomasz Drwięga
2021-02-24 01:16:35 +01:00
committed by Bastian Köcher
parent 441c95ba2b
commit 82739314a8
8 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bridges/bin/millau/node/src/service.rs
+5 -3
View File
@@ -105,7 +105,7 @@ pub fn new_partial(
Some(Box::new(grandpa_block_import)), Some(Box::new(grandpa_block_import)),
client.clone(), client.clone(),
inherent_data_providers.clone(), inherent_data_providers.clone(),
&task_manager.spawn_handle(), &task_manager.spawn_essential_handle(),
config.prometheus_registry(), config.prometheus_registry(),
sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()), sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()),
)?; )?;
@@ -275,6 +275,7 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
network_status_sinks, network_status_sinks,
system_rpc_tx, system_rpc_tx,
config, config,
telemetry_span: None,
})?; })?;
if role.is_authority() { if role.is_authority() {
@@ -321,7 +322,7 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
name: Some(name), name: Some(name),
observer_enabled: false, observer_enabled: false,
keystore, keystore,
is_authority: role.is_network_authority(), is_authority: role.is_authority(),
}; };
if enable_grandpa { if enable_grandpa {
@@ -384,7 +385,7 @@ pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError>
Some(Box::new(grandpa_block_import)), Some(Box::new(grandpa_block_import)),
client.clone(), client.clone(),
InherentDataProviders::new(), InherentDataProviders::new(),
&task_manager.spawn_handle(), &task_manager.spawn_essential_handle(),
config.prometheus_registry(), config.prometheus_registry(),
sp_consensus::NeverCanAuthor, sp_consensus::NeverCanAuthor,
)?; )?;
@@ -423,6 +424,7 @@ pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError>
network, network,
network_status_sinks, network_status_sinks,
system_rpc_tx, system_rpc_tx,
telemetry_span: None,
})?; })?;
network_starter.start_network(); network_starter.start_network();
bridges/bin/rialto/node/src/service.rs
+5 -3
View File
@@ -105,7 +105,7 @@ pub fn new_partial(
Some(Box::new(grandpa_block_import)), Some(Box::new(grandpa_block_import)),
client.clone(), client.clone(),
inherent_data_providers.clone(), inherent_data_providers.clone(),
&task_manager.spawn_handle(), &task_manager.spawn_essential_handle(),
config.prometheus_registry(), config.prometheus_registry(),
sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()), sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()),
)?; )?;
@@ -275,6 +275,7 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
network_status_sinks, network_status_sinks,
system_rpc_tx, system_rpc_tx,
config, config,
telemetry_span: None,
})?; })?;
if role.is_authority() { if role.is_authority() {
@@ -321,7 +322,7 @@ pub fn new_full(mut config: Configuration) -> Result<TaskManager, ServiceError>
name: Some(name), name: Some(name),
observer_enabled: false, observer_enabled: false,
keystore, keystore,
is_authority: role.is_network_authority(), is_authority: role.is_authority(),
}; };
if enable_grandpa { if enable_grandpa {
@@ -384,7 +385,7 @@ pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError>
Some(Box::new(grandpa_block_import)), Some(Box::new(grandpa_block_import)),
client.clone(), client.clone(),
InherentDataProviders::new(), InherentDataProviders::new(),
&task_manager.spawn_handle(), &task_manager.spawn_essential_handle(),
config.prometheus_registry(), config.prometheus_registry(),
sp_consensus::NeverCanAuthor, sp_consensus::NeverCanAuthor,
)?; )?;
@@ -423,6 +424,7 @@ pub fn new_light(mut config: Configuration) -> Result<TaskManager, ServiceError>
network, network,
network_status_sinks, network_status_sinks,
system_rpc_tx, system_rpc_tx,
telemetry_span: None,
})?; })?;
network_starter.start_network(); network_starter.start_network();
bridges/modules/ethereum-contract/builtin/Cargo.toml
+1 -1
View File
@@ -9,7 +9,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
[dependencies] [dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0" } codec = { package = "parity-scale-codec", version = "2.0.0" }
ethereum-types = "0.11.0" ethereum-types = "0.11.0"
finality-grandpa = "0.13.0" finality-grandpa = "0.14.0"
hex = "0.4" hex = "0.4"
log = "0.4.14" log = "0.4.14"
bridges/modules/finality-verifier/Cargo.toml
+1 -1
View File
@@ -9,7 +9,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
[dependencies] [dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false } codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
finality-grandpa = { version = "0.13.0", default-features = false } finality-grandpa = { version = "0.14.0", default-features = false }
serde = { version = "1.0", optional = true } serde = { version = "1.0", optional = true }
# Bridge Dependencies # Bridge Dependencies
bridges/modules/substrate/Cargo.toml
+1 -1
View File
@@ -9,7 +9,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
[dependencies] [dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false } codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
finality-grandpa = { version = "0.13.0", default-features = false } finality-grandpa = { version = "0.14.0", default-features = false }
hash-db = { version = "0.15.2", default-features = false } hash-db = { version = "0.15.2", default-features = false }
serde = { version = "1.0", optional = true } serde = { version = "1.0", optional = true }
bridges/primitives/header-chain/Cargo.toml
+1 -1
View File
@@ -8,7 +8,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
[dependencies] [dependencies]
codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false } codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
finality-grandpa = { version = "0.13.0", default-features = false } finality-grandpa = { version = "0.14.0", default-features = false }
serde = { version = "1.0", optional = true } serde = { version = "1.0", optional = true }
# Substrate Dependencies # Substrate Dependencies
bridges/primitives/header-chain/src/justification.rs
-4
View File
@@ -180,8 +180,4 @@ where
Ok(route) Ok(route)
} }
fn best_chain_containing(&self, _block: Header::Hash) -> Option<(Header::Hash, Header::Number)> {
unreachable!("is only used during voting; qed")
}
} }
bridges/primitives/test-utils/Cargo.toml
+1 -1
View File
@@ -6,7 +6,7 @@ edition = "2018"
license = "GPL-3.0-or-later WITH Classpath-exception-2.0" license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
[dependencies] [dependencies]
finality-grandpa = { version = "0.13.0" } finality-grandpa = { version = "0.14.0" }
bp-header-chain = { path = "../header-chain" } bp-header-chain = { path = "../header-chain" }
sp-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "master" } sp-finality-grandpa = { git = "https://github.com/paritytech/substrate.git", branch = "master" }
sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "master" } sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "master" }