Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Substrate to latest master (rc3) #129

Merged
merged 2 commits into from
Jun 11, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
522 changes: 275 additions & 247 deletions Cargo.lock

Large diffs are not rendered by default.

80 changes: 40 additions & 40 deletions bin/node/node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,107 +19,107 @@ 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]
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"
22 changes: 12 additions & 10 deletions bin/node/node/src/service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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
};
Expand Down Expand Up @@ -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)
Expand Down
Loading