Update Substrate to latest master (rc3) (#129)

* Substrate 606c56d2e2f69f68f3947551224be6a3515dff60

* update jsonrpsee
This commit is contained in:
Svyatoslav Nikolsky
2020-06-11 17:44:54 +03:00
committed by Bastian Köcher
parent 643075f7fa
commit b701c2be8d
14 changed files with 189 additions and 187 deletions
+40 -40
View File
@@ -19,100 +19,100 @@ bridge-node-runtime = { version = "0.1.0", path = "../runtime" }
sp-bridge-eth-poa = { version = "0.1.0", path = "../../../primitives/ethereum-poa" }
[dependencies.sc-cli]
version = "0.8.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "0.8.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-rpc]
version = "2.0.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "2.0.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"
[dependencies.sp-core]
version = "2.0.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "2.0.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-executor]
version = "0.8.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "0.8.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-service]
version = "0.8.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "0.8.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"
[dependencies.sp-inherents]
version = "2.0.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "2.0.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-transaction-pool]
version = "2.0.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "2.0.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"
[dependencies.sp-transaction-pool]
version = "2.0.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "2.0.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-network]
version = "0.8.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "0.8.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-consensus-aura]
version = "0.8.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "0.8.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"
[dependencies.sp-consensus-aura]
version = "0.8.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "0.8.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"
[dependencies.sp-consensus]
version = "0.8.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "0.8.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"
[dependencies.grandpa]
package = "sc-finality-grandpa"
version = "0.8.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "0.8.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"
[dependencies.grandpa-primitives]
package = "sp-finality-grandpa"
version = "2.0.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "2.0.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-consensus]
version = "0.8.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "0.8.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-client-api]
version = "2.0.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "2.0.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"
[dependencies.sp-runtime]
version = "2.0.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "2.0.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-basic-authorship]
version = "0.8.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "0.8.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"
[dependencies.substrate-frame-rpc-system]
version = "2.0.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "2.0.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"
[build-dependencies]
@@ -120,6 +120,6 @@ vergen = "3.1.0"
[build-dependencies.build-script-utils]
package = "substrate-build-script-utils"
version = "2.0.0-rc1"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
version = "2.0.0-rc3"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate.git"
+12 -10
View File
@@ -52,12 +52,12 @@ macro_rules! new_full_start {
crate::service::Executor,
>($config)?
.with_select_chain(|_config, backend| Ok(sc_consensus::LongestChain::new(backend.clone())))?
.with_transaction_pool(|config, client, _fetcher, prometheus_registry| {
let pool_api = sc_transaction_pool::FullChainApi::new(client.clone());
.with_transaction_pool(|builder| {
let pool_api = sc_transaction_pool::FullChainApi::new(builder.client().clone());
Ok(sc_transaction_pool::BasicPool::new(
config,
builder.config().transaction_pool.clone(),
std::sync::Arc::new(pool_api),
prometheus_registry,
builder.prometheus_registry(),
))
})?
.with_import_queue(
@@ -158,7 +158,7 @@ pub fn new_full(config: Configuration) -> Result<impl AbstractService, ServiceEr
// if the node isn't actively participating in consensus then it doesn't
// need a keystore, regardless of which protocol we use below.
let keystore = if role.is_authority() {
Some(service.keystore())
Some(service.keystore() as sp_core::traits::BareCryptoStorePtr)
} else {
None
};
@@ -208,14 +208,16 @@ pub fn new_light(config: Configuration) -> Result<impl AbstractService, ServiceE
ServiceBuilder::new_light::<Block, RuntimeApi, Executor>(config)?
.with_select_chain(|_config, backend| Ok(LongestChain::new(backend.clone())))?
.with_transaction_pool(|config, client, fetcher, prometheus_registry| {
let fetcher = fetcher.ok_or_else(|| "Trying to start light transaction pool without active fetcher")?;
.with_transaction_pool(|builder| {
let fetcher = builder
.fetcher()
.ok_or_else(|| "Trying to start light transaction pool without active fetcher")?;
let pool_api = sc_transaction_pool::LightChainApi::new(client.clone(), fetcher.clone());
let pool_api = sc_transaction_pool::LightChainApi::new(builder.client().clone(), fetcher.clone());
let pool = sc_transaction_pool::BasicPool::with_revalidation_type(
config,
builder.config().transaction_pool.clone(),
Arc::new(pool_api),
prometheus_registry,
builder.prometheus_registry(),
sc_transaction_pool::RevalidationType::Light,
);
Ok(pool)
+51 -51
View File
@@ -25,15 +25,15 @@ features = ["derive"]
# Substrate Dependencies
[dependencies.pallet-aura]
version = "2.0.0-rc1"
version = "2.0.0-rc3"
default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.pallet-balances]
version = "2.0.0-rc1"
version = "2.0.0-rc3"
default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.pallet-bridge-eth-poa]
@@ -47,76 +47,76 @@ default-features = false
path = "../../../modules/currency-exchange"
[dependencies.frame-support]
version = "2.0.0-rc1"
version = "2.0.0-rc3"
default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.pallet-grandpa]
version = "2.0.0-rc1"
version = "2.0.0-rc3"
default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.pallet-randomness-collective-flip]
version = "2.0.0-rc1"
version = "2.0.0-rc3"
default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.pallet-sudo]
version = "2.0.0-rc1"
version = "2.0.0-rc3"
default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.pallet-session]
version = "2.0.0-rc1"
version = "2.0.0-rc3"
default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.frame-system]
version = "2.0.0-rc1"
version = "2.0.0-rc3"
default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.frame-system-rpc-runtime-api]
version = "2.0.0-rc1"
version = "2.0.0-rc3"
default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.pallet-timestamp]
version = "2.0.0-rc1"
version = "2.0.0-rc3"
default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.pallet-transaction-payment]
version = "2.0.0-rc1"
version = "2.0.0-rc3"
default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.frame-executive]
version = "2.0.0-rc1"
version = "2.0.0-rc3"
default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
# Substrate Primitives
[dependencies.sp-api]
version = "2.0.0-rc1"
version = "2.0.0-rc3"
default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.sp-block-builder]
version = "2.0.0-rc1"
version = "2.0.0-rc3"
default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.sp-bridge-eth-poa]
@@ -130,75 +130,75 @@ default-features = false
path = "../../../primitives/currency-exchange"
[dependencies.sp-consensus-aura]
version = "0.8.0-rc1"
version = "0.8.0-rc3"
default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.sp-core]
version = "2.0.0-rc1"
version = "2.0.0-rc3"
default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.sp-inherents]
version = "2.0.0-rc1"
version = "2.0.0-rc3"
default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.sp-io]
version = "2.0.0-rc1"
version = "2.0.0-rc3"
default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.sp-offchain]
version = "2.0.0-rc1"
version = "2.0.0-rc3"
default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.sp-runtime]
version = "2.0.0-rc1"
version = "2.0.0-rc3"
default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.sp-session]
version = "2.0.0-rc1"
version = "2.0.0-rc3"
default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.sp-staking]
version = "2.0.0-rc1"
version = "2.0.0-rc3"
default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.sp-std]
version = "2.0.0-rc1"
version = "2.0.0-rc3"
default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.sp-transaction-pool]
version = "2.0.0-rc1"
version = "2.0.0-rc3"
default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[dependencies.sp-version]
version = "2.0.0-rc1"
version = "2.0.0-rc3"
default-features = false
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[build-dependencies.wasm-builder-runner]
version = "1.0.5"
package = "substrate-wasm-builder-runner"
rev = "599ba75bc2b5acd238c21c5c7efe8e2ad8d401ee"
rev = "606c56d2e2f69f68f3947551224be6a3515dff60"
git = "https://github.com/paritytech/substrate/"
[features]
+3 -3
View File
@@ -146,7 +146,7 @@ parameter_types! {
pub const ExtrinsicBaseWeight: Weight = 10_000_000;
pub const AvailableBlockRatio: Perbill = Perbill::from_percent(75);
/// Assume 10% of weight for average on_initialize calls.
pub const MaximumExtrinsicWeight: Weight = AvailableBlockRatio::get()
pub MaximumExtrinsicWeight: Weight = AvailableBlockRatio::get()
.saturating_sub(Perbill::from_percent(10)) * MaximumBlockWeight::get();
pub const MaximumBlockLength: u32 = 5 * 1024 * 1024;
pub const Version: RuntimeVersion = VERSION;
@@ -217,8 +217,8 @@ impl pallet_aura::Trait for Runtime {
parameter_types! {
pub const FinalityVotesCachingInterval: Option<u64> = Some(16);
pub const KovanAuraConfiguration: pallet_bridge_eth_poa::AuraConfiguration = kovan::kovan_aura_configuration();
pub const KovanValidatorsConfiguration: pallet_bridge_eth_poa::ValidatorsConfiguration = kovan::kovan_validators_configuration();
pub KovanAuraConfiguration: pallet_bridge_eth_poa::AuraConfiguration = kovan::kovan_aura_configuration();
pub KovanValidatorsConfiguration: pallet_bridge_eth_poa::ValidatorsConfiguration = kovan::kovan_validators_configuration();
}
impl pallet_bridge_eth_poa::Trait for Runtime {