Bump Substrate to v2.0.0 (#382)

* Change script to update versions.

* Bump versions.

* Address remainders.

* cargo fmt --all

* Fix tests.

* Whitelist BlueOak license

* Fix benchmarks?
This commit is contained in:
Tomasz Drwięga
2020-09-28 20:23:08 +02:00
committed by Bastian Köcher
parent 3cd8937b38
commit be050bda84
28 changed files with 428 additions and 344 deletions
+47 -47
View File
@@ -10,7 +10,7 @@ license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
[dependencies]
futures = "0.3.5"
jsonrpc-core = "14.2.0"
jsonrpc-core = "15.0.0"
log = "0.4.11"
pallet-message-lane-rpc = { version = "0.1.0", path = "../../modules/message-lane/rpc" }
structopt = "0.3.17"
@@ -30,110 +30,110 @@ default-features = false
features = ["std"]
[dependencies.sc-cli]
version = "0.8.0-rc6"
tag = 'v2.0.0-rc6'
version = "0.8.0"
tag = 'v2.0.0'
git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-rpc]
version = "2.0.0-rc6"
tag = 'v2.0.0-rc6'
version = "2.0.0"
tag = 'v2.0.0'
git = "https://github.com/paritytech/substrate.git"
[dependencies.sp-core]
version = "2.0.0-rc6"
tag = 'v2.0.0-rc6'
version = "2.0.0"
tag = 'v2.0.0'
git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-executor]
version = "0.8.0-rc6"
tag = 'v2.0.0-rc6'
version = "0.8.0"
tag = 'v2.0.0'
git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-service]
version = "0.8.0-rc6"
tag = 'v2.0.0-rc6'
version = "0.8.0"
tag = 'v2.0.0'
git = "https://github.com/paritytech/substrate.git"
[dependencies.sp-inherents]
version = "2.0.0-rc6"
tag = 'v2.0.0-rc6'
version = "2.0.0"
tag = 'v2.0.0'
git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-transaction-pool]
version = "2.0.0-rc6"
tag = 'v2.0.0-rc6'
version = "2.0.0"
tag = 'v2.0.0'
git = "https://github.com/paritytech/substrate.git"
[dependencies.sp-transaction-pool]
version = "2.0.0-rc6"
tag = 'v2.0.0-rc6'
version = "2.0.0"
tag = 'v2.0.0'
git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-network]
version = "0.8.0-rc6"
tag = 'v2.0.0-rc6'
version = "0.8.0"
tag = 'v2.0.0'
git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-consensus-aura]
version = "0.8.0-rc6"
tag = 'v2.0.0-rc6'
version = "0.8.0"
tag = 'v2.0.0'
git = "https://github.com/paritytech/substrate.git"
[dependencies.sp-consensus-aura]
version = "0.8.0-rc6"
tag = 'v2.0.0-rc6'
version = "0.8.0"
tag = 'v2.0.0'
git = "https://github.com/paritytech/substrate.git"
[dependencies.sp-consensus]
version = "0.8.0-rc6"
tag = 'v2.0.0-rc6'
version = "0.8.0"
tag = 'v2.0.0'
git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-finality-grandpa]
package = "sc-finality-grandpa"
version = "0.8.0-rc6"
tag = 'v2.0.0-rc6'
version = "0.8.0"
tag = 'v2.0.0'
git = "https://github.com/paritytech/substrate.git"
[dependencies.grandpa-primitives]
package = "sp-finality-grandpa"
version = "2.0.0-rc6"
tag = 'v2.0.0-rc6'
version = "2.0.0"
tag = 'v2.0.0'
git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-consensus]
version = "0.8.0-rc6"
tag = 'v2.0.0-rc6'
version = "0.8.0"
tag = 'v2.0.0'
git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-client-api]
version = "2.0.0-rc6"
tag = 'v2.0.0-rc6'
version = "2.0.0"
tag = 'v2.0.0'
git = "https://github.com/paritytech/substrate.git"
[dependencies.sp-runtime]
version = "2.0.0-rc6"
tag = 'v2.0.0-rc6'
version = "2.0.0"
tag = 'v2.0.0'
git = "https://github.com/paritytech/substrate.git"
[dependencies.sc-basic-authorship]
version = "0.8.0-rc6"
tag = 'v2.0.0-rc6'
version = "0.8.0"
tag = 'v2.0.0'
git = "https://github.com/paritytech/substrate.git"
[dependencies.substrate-frame-rpc-system]
version = "2.0.0-rc6"
tag = 'v2.0.0-rc6'
version = "2.0.0"
tag = 'v2.0.0'
git = "https://github.com/paritytech/substrate.git"
[dependencies.frame-benchmarking]
version = "2.0.0-rc6"
tag = 'v2.0.0-rc6'
version = "2.0.0"
tag = 'v2.0.0'
git = "https://github.com/paritytech/substrate.git"
[dependencies.frame-benchmarking-cli]
version = "2.0.0-rc6"
tag = 'v2.0.0-rc6'
version = "2.0.0"
tag = 'v2.0.0'
git = "https://github.com/paritytech/substrate.git"
[build-dependencies]
@@ -141,13 +141,13 @@ vergen = "3.1.0"
[build-dependencies.build-script-utils]
package = "substrate-build-script-utils"
version = "2.0.0-rc6"
tag = 'v2.0.0-rc6'
version = "2.0.0"
tag = 'v2.0.0'
git = "https://github.com/paritytech/substrate.git"
[build-dependencies.frame-benchmarking-cli]
version = "2.0.0-rc6"
tag = 'v2.0.0-rc6'
version = "2.0.0"
tag = 'v2.0.0'
git = "https://github.com/paritytech/substrate.git"
[features]
+31 -3
View File
@@ -29,9 +29,37 @@ pub struct Cli {
/// Possible subcommands of the main binary.
#[derive(Debug, StructOpt)]
pub enum Subcommand {
/// A set of base subcommands handled by `sc_cli`.
#[structopt(flatten)]
Base(sc_cli::Subcommand),
/// Key management cli utilities
Key(sc_cli::KeySubcommand),
/// Verify a signature for a message, provided on STDIN, with a given (public or secret) key.
Verify(sc_cli::VerifyCmd),
/// Generate a seed that provides a vanity address.
Vanity(sc_cli::VanityCmd),
/// Sign a message, with a given (secret) key.
Sign(sc_cli::SignCmd),
/// Build a chain specification.
BuildSpec(sc_cli::BuildSpecCmd),
/// Validate blocks.
CheckBlock(sc_cli::CheckBlockCmd),
/// Export blocks.
ExportBlocks(sc_cli::ExportBlocksCmd),
/// Export the state of a given block into a chain spec.
ExportState(sc_cli::ExportStateCmd),
/// Import blocks.
ImportBlocks(sc_cli::ImportBlocksCmd),
/// Remove the whole chain.
PurgeChain(sc_cli::PurgeChainCmd),
/// Revert the chain to a previous state.
Revert(sc_cli::RevertCmd),
/// The custom benchmark subcommmand benchmarking runtime pallets.
#[structopt(name = "benchmark", about = "Benchmark runtime pallets.")]
+58 -5
View File
@@ -100,17 +100,70 @@ pub fn run() -> sc_cli::Result<()> {
Ok(())
}
}
Some(Subcommand::Base(subcommand)) => {
let runner = cli.create_runner(subcommand)?;
runner.run_subcommand(subcommand, |config| {
Some(Subcommand::Key(cmd)) => cmd.run(),
Some(Subcommand::Sign(cmd)) => cmd.run(),
Some(Subcommand::Verify(cmd)) => cmd.run(),
Some(Subcommand::Vanity(cmd)) => cmd.run(),
Some(Subcommand::BuildSpec(cmd)) => {
let runner = cli.create_runner(cmd)?;
runner.sync_run(|config| cmd.run(config.chain_spec, config.network))
}
Some(Subcommand::CheckBlock(cmd)) => {
let runner = cli.create_runner(cmd)?;
runner.async_run(|config| {
let PartialComponents {
client,
backend,
task_manager,
import_queue,
..
} = new_partial(&config)?;
Ok((client, backend, import_queue, task_manager))
Ok((cmd.run(client, import_queue), task_manager))
})
}
Some(Subcommand::ExportBlocks(cmd)) => {
let runner = cli.create_runner(cmd)?;
runner.async_run(|config| {
let PartialComponents {
client, task_manager, ..
} = new_partial(&config)?;
Ok((cmd.run(client, config.database), task_manager))
})
}
Some(Subcommand::ExportState(cmd)) => {
let runner = cli.create_runner(cmd)?;
runner.async_run(|config| {
let PartialComponents {
client, task_manager, ..
} = new_partial(&config)?;
Ok((cmd.run(client, config.chain_spec), task_manager))
})
}
Some(Subcommand::ImportBlocks(cmd)) => {
let runner = cli.create_runner(cmd)?;
runner.async_run(|config| {
let PartialComponents {
client,
task_manager,
import_queue,
..
} = new_partial(&config)?;
Ok((cmd.run(client, import_queue), task_manager))
})
}
Some(Subcommand::PurgeChain(cmd)) => {
let runner = cli.create_runner(cmd)?;
runner.sync_run(|config| cmd.run(config.database))
}
Some(Subcommand::Revert(cmd)) => {
let runner = cli.create_runner(cmd)?;
runner.async_run(|config| {
let PartialComponents {
client,
task_manager,
backend,
..
} = new_partial(&config)?;
Ok((cmd.run(client, backend), task_manager))
})
}
None => {