From 47ff7a60b7022035baf778e1703ab914ddec3249 Mon Sep 17 00:00:00 2001 From: Scott Piriou Date: Fri, 3 Jul 2020 21:47:54 +0200 Subject: [PATCH 1/3] Add log_rotation_opt --- cli/src/cli.rs | 6 ++++-- cli/src/command.rs | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cli/src/cli.rs b/cli/src/cli.rs index 85e848181949..849682bd6abc 100644 --- a/cli/src/cli.rs +++ b/cli/src/cli.rs @@ -17,6 +17,7 @@ //! Polkadot CLI library. use structopt::StructOpt; +use sc_cli::LogRotationOpt; #[allow(missing_docs)] #[derive(Debug, StructOpt)] @@ -84,11 +85,12 @@ pub struct RunCmd { #[allow(missing_docs)] #[derive(Debug, StructOpt)] pub struct Cli { - #[allow(missing_docs)] #[structopt(subcommand)] pub subcommand: Option, - #[allow(missing_docs)] #[structopt(flatten)] pub run: RunCmd, + + #[structopt(flatten)] + pub log_rotation_opt: LogRotationOpt, } diff --git a/cli/src/command.rs b/cli/src/command.rs index d518b94ccf8d..0e5650e27f93 100644 --- a/cli/src/command.rs +++ b/cli/src/command.rs @@ -198,7 +198,7 @@ pub fn run() -> Result<()> { } }, Some(Subcommand::ValidationWorker(cmd)) => { - sc_cli::init_logger(""); + sc_cli::init_logger("", &cli.log_rotation_opt)?; if cfg!(feature = "browser") { Err(sc_cli::Error::Input("Cannot run validation worker in browser".into())) From 2765b572d06153748aa236258c1ec6f8923e25cd Mon Sep 17 00:00:00 2001 From: Scott Piriou Date: Wed, 8 Jul 2020 13:15:51 +0200 Subject: [PATCH 2/3] Update Cargo lock --- Cargo.lock | 296 ++++++++++++++++++++++++++++------------------------- 1 file changed, 158 insertions(+), 138 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2fb1cab8fc67..c97a1bad55eb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1258,6 +1258,20 @@ dependencies = [ "miniz_oxide", ] +[[package]] +name = "flexi_logger" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33897654c23a50cebab45e18356f69fb771c9949a6928344fb1f01ffccc7c5f3" +dependencies = [ + "chrono", + "glob", + "log 0.4.8", + "regex", + "thiserror", + "yansi", +] + [[package]] name = "fnv" version = "1.0.7" @@ -1267,7 +1281,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "parity-scale-codec", ] @@ -1275,7 +1289,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "frame-support", "frame-system", @@ -1292,7 +1306,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "Inflector", "frame-benchmarking", @@ -1311,7 +1325,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "frame-support", "frame-system", @@ -1326,7 +1340,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "11.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "parity-scale-codec", "serde", @@ -1337,7 +1351,7 @@ dependencies = [ [[package]] name = "frame-support" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "bitmask", "frame-metadata", @@ -1362,7 +1376,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "frame-support-procedural-tools", "proc-macro2 1.0.18", @@ -1373,7 +1387,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1385,7 +1399,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "proc-macro2 1.0.18", "quote 1.0.7", @@ -1395,7 +1409,7 @@ dependencies = [ [[package]] name = "frame-system" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -1411,7 +1425,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "frame-benchmarking", "frame-support", @@ -1425,7 +1439,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "parity-scale-codec", "sp-api", @@ -3391,7 +3405,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "frame-support", "frame-system", @@ -3407,7 +3421,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "frame-support", "frame-system", @@ -3422,7 +3436,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "frame-benchmarking", "frame-support", @@ -3447,7 +3461,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "frame-benchmarking", "frame-support", @@ -3461,7 +3475,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "frame-benchmarking", "frame-support", @@ -3477,7 +3491,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "frame-benchmarking", "frame-support", @@ -3492,7 +3506,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "frame-benchmarking", "frame-support", @@ -3507,7 +3521,7 @@ dependencies = [ [[package]] name = "pallet-finality-tracker" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "frame-support", "frame-system", @@ -3523,7 +3537,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "frame-support", "frame-system", @@ -3543,7 +3557,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "enumflags2", "frame-benchmarking", @@ -3559,7 +3573,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "frame-benchmarking", "frame-support", @@ -3579,7 +3593,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "frame-support", "frame-system", @@ -3595,7 +3609,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "frame-support", "frame-system", @@ -3609,7 +3623,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "frame-support", "frame-system", @@ -3624,7 +3638,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "frame-support", "frame-system", @@ -3638,7 +3652,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "frame-support", "frame-system", @@ -3653,7 +3667,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "frame-benchmarking", "frame-support", @@ -3674,7 +3688,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "frame-support", "frame-system", @@ -3689,7 +3703,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "frame-support", "frame-system", @@ -3702,7 +3716,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "enumflags2", "frame-support", @@ -3717,7 +3731,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "frame-benchmarking", "frame-support", @@ -3732,7 +3746,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "frame-support", "frame-system", @@ -3752,7 +3766,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "frame-benchmarking", "frame-support", @@ -3768,7 +3782,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "frame-support", "frame-system", @@ -3782,7 +3796,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "frame-benchmarking", "frame-support", @@ -3804,7 +3818,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -3815,7 +3829,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "frame-support", "frame-system", @@ -3829,7 +3843,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "frame-benchmarking", "frame-support", @@ -3847,7 +3861,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "frame-support", "frame-system", @@ -3862,7 +3876,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -3880,7 +3894,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "frame-support", "parity-scale-codec", @@ -3893,7 +3907,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "frame-benchmarking", "frame-support", @@ -3908,7 +3922,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "frame-benchmarking", "frame-support", @@ -3924,7 +3938,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5777,7 +5791,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "bytes 0.5.4", "derive_more 0.99.8", @@ -5804,7 +5818,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -5828,7 +5842,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -5845,7 +5859,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "impl-trait-for-tuples", "sc-chain-spec-derive", @@ -5861,7 +5875,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -5872,14 +5886,14 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "ansi_term 0.12.1", "atty", "chrono", "derive_more 0.99.8", - "env_logger", "fdlimit", + "flexi_logger", "futures 0.3.5", "lazy_static", "log 0.4.8", @@ -5913,7 +5927,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "derive_more 0.99.8", "fnv", @@ -5949,7 +5963,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "blake2-rfc", "hash-db", @@ -5978,7 +5992,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "sc-client-api", "sp-blockchain", @@ -5989,7 +6003,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "derive_more 0.99.8", "fork-tree", @@ -6031,7 +6045,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -6055,7 +6069,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "fork-tree", "parity-scale-codec", @@ -6068,7 +6082,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6091,7 +6105,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "log 0.4.8", "sc-client-api", @@ -6105,7 +6119,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "derive_more 0.99.8", "lazy_static", @@ -6133,7 +6147,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "derive_more 0.99.8", "log 0.4.8", @@ -6150,7 +6164,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -6165,7 +6179,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "cranelift-codegen", "cranelift-wasm", @@ -6186,7 +6200,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "assert_matches", "derive_more 0.99.8", @@ -6224,7 +6238,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "derive_more 0.99.8", "finality-grandpa", @@ -6241,7 +6255,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "ansi_term 0.12.1", "futures 0.3.5", @@ -6259,7 +6273,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "derive_more 0.99.8", "hex", @@ -6275,7 +6289,7 @@ dependencies = [ [[package]] name = "sc-light" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "hash-db", "lazy_static", @@ -6294,7 +6308,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "bitflags", "bs58", @@ -6346,7 +6360,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6361,7 +6375,7 @@ dependencies = [ [[package]] name = "sc-network-test" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "env_logger", "futures 0.3.5", @@ -6388,7 +6402,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "bytes 0.5.4", "fnv", @@ -6415,7 +6429,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "futures 0.3.5", "libp2p", @@ -6428,7 +6442,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "log 0.4.8", "substrate-prometheus-endpoint", @@ -6437,7 +6451,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "futures 0.3.5", "hash-db", @@ -6469,7 +6483,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -6493,7 +6507,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "jsonrpc-core", "jsonrpc-http-server", @@ -6509,7 +6523,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "derive_more 0.99.8", "directories", @@ -6572,7 +6586,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "log 0.4.8", "parity-scale-codec", @@ -6586,7 +6600,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "futures 0.3.5", "futures-timer 3.0.2", @@ -6607,7 +6621,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "erased-serde", "log 0.4.8", @@ -6624,7 +6638,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -6644,7 +6658,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -7030,7 +7044,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "derive_more 0.99.8", "log 0.4.8", @@ -7042,7 +7056,7 @@ dependencies = [ [[package]] name = "sp-api" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "hash-db", "parity-scale-codec", @@ -7057,7 +7071,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -7069,7 +7083,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "parity-scale-codec", "serde", @@ -7081,7 +7095,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "integer-sqrt", "num-traits 0.2.12", @@ -7094,7 +7108,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "parity-scale-codec", "sp-api", @@ -7106,7 +7120,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -7117,7 +7131,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "parity-scale-codec", "sp-api", @@ -7129,7 +7143,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "derive_more 0.99.8", "log 0.4.8", @@ -7145,7 +7159,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "serde", "serde_json", @@ -7154,7 +7168,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -7178,7 +7192,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "parity-scale-codec", "sp-api", @@ -7192,7 +7206,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "merlin", "parity-scale-codec", @@ -7211,7 +7225,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -7220,7 +7234,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -7232,7 +7246,7 @@ dependencies = [ [[package]] name = "sp-core" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "base58", "blake2-rfc", @@ -7275,7 +7289,7 @@ dependencies = [ [[package]] name = "sp-database" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "kvdb", "parking_lot 0.10.2", @@ -7284,7 +7298,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "proc-macro2 1.0.18", "quote 1.0.7", @@ -7294,7 +7308,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "environmental", "parity-scale-codec", @@ -7305,7 +7319,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "finality-grandpa", "log 0.4.8", @@ -7321,7 +7335,7 @@ dependencies = [ [[package]] name = "sp-finality-tracker" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -7331,7 +7345,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "derive_more 0.99.8", "parity-scale-codec", @@ -7343,7 +7357,7 @@ dependencies = [ [[package]] name = "sp-io" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "futures 0.3.5", "hash-db", @@ -7364,7 +7378,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "lazy_static", "sp-core", @@ -7375,7 +7389,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "parity-scale-codec", "serde", @@ -7387,7 +7401,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "proc-macro-crate", "proc-macro2 1.0.18", @@ -7398,7 +7412,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "sp-api", "sp-core", @@ -7408,7 +7422,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "backtrace", "log 0.4.8", @@ -7417,7 +7431,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "serde", "sp-core", @@ -7426,7 +7440,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "either", "hash256-std-hasher", @@ -7448,7 +7462,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "parity-scale-codec", "primitive-types", @@ -7463,7 +7477,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "Inflector", "proc-macro-crate", @@ -7475,7 +7489,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "serde", "serde_json", @@ -7484,7 +7498,7 @@ dependencies = [ [[package]] name = "sp-session" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "parity-scale-codec", "sp-api", @@ -7497,7 +7511,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -7507,7 +7521,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "hash-db", "itertools 0.9.0", @@ -7528,12 +7542,12 @@ dependencies = [ [[package]] name = "sp-std" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" [[package]] name = "sp-storage" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "impl-serde 0.2.3", "ref-cast", @@ -7545,7 +7559,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7559,7 +7573,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "log 0.4.8", "rental", @@ -7569,7 +7583,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "derive_more 0.99.8", "futures 0.3.5", @@ -7585,7 +7599,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "hash-db", "memory-db", @@ -7599,7 +7613,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "futures 0.3.5", "futures-core", @@ -7611,7 +7625,7 @@ dependencies = [ [[package]] name = "sp-version" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "impl-serde 0.2.3", "parity-scale-codec", @@ -7623,7 +7637,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7763,7 +7777,7 @@ dependencies = [ [[package]] name = "substrate-browser-utils" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "chrono", "clear_on_drop", @@ -7790,7 +7804,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "platforms", ] @@ -7798,7 +7812,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.5", @@ -7821,7 +7835,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.8.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "async-std", "derive_more 0.99.8", @@ -7835,7 +7849,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "futures 0.1.29", "futures 0.3.5", @@ -7859,7 +7873,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "cfg-if", "frame-executive", @@ -7899,7 +7913,7 @@ dependencies = [ [[package]] name = "substrate-test-runtime-client" version = "2.0.0-rc4" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" dependencies = [ "futures 0.3.5", "parity-scale-codec", @@ -7920,7 +7934,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder-runner" version = "1.0.6" -source = "git+https://github.com/paritytech/substrate#660ca2712a02d7ca6944bb7ee8cd3345b9540eb5" +source = "git+https://github.com/paritytech/substrate#802a0d0b0ade796a3b2d4663212518315923fe8a" [[package]] name = "substrate-wasm-builder-runner" @@ -9283,6 +9297,12 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "yansi" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fc79f4a1e39857fc00c3f662cbf2651c771f00e9c15fe2abc341806bd46bd71" + [[package]] name = "zeroize" version = "1.1.0" From 29edbeea80db70ae1c65c276f205583ecb8b8e5e Mon Sep 17 00:00:00 2001 From: Scott Piriou Date: Wed, 8 Jul 2020 13:46:47 +0200 Subject: [PATCH 3/3] Use SubstrateCli's log-directory instead of re-defining it --- cli/src/cli.rs | 4 ---- cli/src/command.rs | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/cli/src/cli.rs b/cli/src/cli.rs index 849682bd6abc..b3a149c9a37c 100644 --- a/cli/src/cli.rs +++ b/cli/src/cli.rs @@ -17,7 +17,6 @@ //! Polkadot CLI library. use structopt::StructOpt; -use sc_cli::LogRotationOpt; #[allow(missing_docs)] #[derive(Debug, StructOpt)] @@ -90,7 +89,4 @@ pub struct Cli { #[structopt(flatten)] pub run: RunCmd, - - #[structopt(flatten)] - pub log_rotation_opt: LogRotationOpt, } diff --git a/cli/src/command.rs b/cli/src/command.rs index 0e5650e27f93..076ddb86f36a 100644 --- a/cli/src/command.rs +++ b/cli/src/command.rs @@ -19,7 +19,7 @@ use log::info; use service::{IdentifyVariant, self}; #[cfg(feature = "service-rewr")] use service_new::{IdentifyVariant, self as service}; -use sc_cli::{SubstrateCli, Result, RuntimeVersion, Role}; +use sc_cli::{CliConfiguration, SubstrateCli, Result, RuntimeVersion, Role}; use crate::cli::{Cli, Subcommand}; fn get_exec_name() -> Option { @@ -198,7 +198,7 @@ pub fn run() -> Result<()> { } }, Some(Subcommand::ValidationWorker(cmd)) => { - sc_cli::init_logger("", &cli.log_rotation_opt)?; + sc_cli::init_logger("", cli.run.base.log_rotation_opt()?)?; if cfg!(feature = "browser") { Err(sc_cli::Error::Input("Cannot run validation worker in browser".into()))