diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock
index a389dcfc9e98ed4797a8a53f8375aa5f468963da..11588b22f2a323810bdd95c691ffde6142b18686 100644
--- a/polkadot/Cargo.lock
+++ b/polkadot/Cargo.lock
@@ -692,15 +692,17 @@ dependencies = [
[[package]]
name = "chrono"
-version = "0.4.13"
+version = "0.4.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c74d84029116787153e02106bf53e66828452a4b325cc8652b788b5967c0a0b6"
+checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
dependencies = [
"js-sys",
+ "libc",
"num-integer",
"num-traits 0.2.12",
"time",
"wasm-bindgen",
+ "winapi 0.3.9",
]
[[package]]
@@ -802,16 +804,6 @@ dependencies = [
"wasm-bindgen",
]
-[[package]]
-name = "console_log"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501a375961cef1a0d44767200e66e4a559283097e91d0730b1d75dfb2f8a1494"
-dependencies = [
- "log",
- "web-sys",
-]
-
[[package]]
name = "constant_time_eq"
version = "0.1.5"
@@ -1483,7 +1475,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]]
name = "fork-tree"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"parity-scale-codec",
]
@@ -1501,7 +1493,7 @@ dependencies = [
[[package]]
name = "frame-benchmarking"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"frame-support",
"frame-system",
@@ -1519,7 +1511,7 @@ dependencies = [
[[package]]
name = "frame-benchmarking-cli"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"Inflector",
"chrono",
@@ -1542,7 +1534,7 @@ dependencies = [
[[package]]
name = "frame-executive"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"frame-support",
"frame-system",
@@ -1558,7 +1550,7 @@ dependencies = [
[[package]]
name = "frame-metadata"
version = "12.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"parity-scale-codec",
"serde",
@@ -1569,7 +1561,7 @@ dependencies = [
[[package]]
name = "frame-support"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"bitflags",
"frame-metadata",
@@ -1594,7 +1586,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"Inflector",
"frame-support-procedural-tools",
@@ -1606,7 +1598,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural-tools"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"frame-support-procedural-tools-derive",
"proc-macro-crate",
@@ -1618,7 +1610,7 @@ dependencies = [
[[package]]
name = "frame-support-procedural-tools-derive"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"proc-macro2 1.0.24",
"quote 1.0.7",
@@ -1628,7 +1620,7 @@ dependencies = [
[[package]]
name = "frame-system"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"frame-support",
"impl-trait-for-tuples 0.2.0",
@@ -1644,7 +1636,7 @@ dependencies = [
[[package]]
name = "frame-system-benchmarking"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -1658,7 +1650,7 @@ dependencies = [
[[package]]
name = "frame-system-rpc-runtime-api"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -3896,7 +3888,7 @@ checksum = "13370dae44474229701bb69b90b4f4dca6404cb0357a2d50d635f1171dc3aa7b"
[[package]]
name = "pallet-authority-discovery"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"frame-support",
"frame-system",
@@ -3912,7 +3904,7 @@ dependencies = [
[[package]]
name = "pallet-authorship"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"frame-support",
"frame-system",
@@ -3927,7 +3919,7 @@ dependencies = [
[[package]]
name = "pallet-babe"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -3952,7 +3944,7 @@ dependencies = [
[[package]]
name = "pallet-balances"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -3966,7 +3958,7 @@ dependencies = [
[[package]]
name = "pallet-bounties"
version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -3981,7 +3973,7 @@ dependencies = [
[[package]]
name = "pallet-collective"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -3997,7 +3989,7 @@ dependencies = [
[[package]]
name = "pallet-democracy"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4012,7 +4004,7 @@ dependencies = [
[[package]]
name = "pallet-elections-phragmen"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4027,7 +4019,7 @@ dependencies = [
[[package]]
name = "pallet-grandpa"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4048,7 +4040,7 @@ dependencies = [
[[package]]
name = "pallet-identity"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"enumflags2",
"frame-benchmarking",
@@ -4064,7 +4056,7 @@ dependencies = [
[[package]]
name = "pallet-im-online"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4084,7 +4076,7 @@ dependencies = [
[[package]]
name = "pallet-indices"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4101,7 +4093,7 @@ dependencies = [
[[package]]
name = "pallet-membership"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"frame-support",
"frame-system",
@@ -4115,7 +4107,7 @@ dependencies = [
[[package]]
name = "pallet-multisig"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4131,7 +4123,7 @@ dependencies = [
[[package]]
name = "pallet-nicks"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"frame-support",
"frame-system",
@@ -4145,7 +4137,7 @@ dependencies = [
[[package]]
name = "pallet-offences"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"frame-support",
"frame-system",
@@ -4160,7 +4152,7 @@ dependencies = [
[[package]]
name = "pallet-offences-benchmarking"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4181,7 +4173,7 @@ dependencies = [
[[package]]
name = "pallet-proxy"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4197,7 +4189,7 @@ dependencies = [
[[package]]
name = "pallet-randomness-collective-flip"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"frame-support",
"frame-system",
@@ -4210,7 +4202,7 @@ dependencies = [
[[package]]
name = "pallet-recovery"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"enumflags2",
"frame-support",
@@ -4225,7 +4217,7 @@ dependencies = [
[[package]]
name = "pallet-scheduler"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4240,7 +4232,7 @@ dependencies = [
[[package]]
name = "pallet-session"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"frame-support",
"frame-system",
@@ -4260,7 +4252,7 @@ dependencies = [
[[package]]
name = "pallet-session-benchmarking"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4276,7 +4268,7 @@ dependencies = [
[[package]]
name = "pallet-society"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"frame-support",
"frame-system",
@@ -4290,7 +4282,7 @@ dependencies = [
[[package]]
name = "pallet-staking"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4312,7 +4304,7 @@ dependencies = [
[[package]]
name = "pallet-staking-reward-curve"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"proc-macro-crate",
"proc-macro2 1.0.24",
@@ -4323,7 +4315,7 @@ dependencies = [
[[package]]
name = "pallet-sudo"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"frame-support",
"frame-system",
@@ -4337,7 +4329,7 @@ dependencies = [
[[package]]
name = "pallet-timestamp"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4355,7 +4347,7 @@ dependencies = [
[[package]]
name = "pallet-tips"
version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4370,7 +4362,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"frame-support",
"frame-system",
@@ -4386,7 +4378,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment-rpc"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"jsonrpc-core",
"jsonrpc-core-client",
@@ -4403,7 +4395,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment-rpc-runtime-api"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"pallet-transaction-payment",
"parity-scale-codec",
@@ -4414,7 +4406,7 @@ dependencies = [
[[package]]
name = "pallet-treasury"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4430,7 +4422,7 @@ dependencies = [
[[package]]
name = "pallet-utility"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -4446,7 +4438,7 @@ dependencies = [
[[package]]
name = "pallet-vesting"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"enumflags2",
"frame-benchmarking",
@@ -5896,6 +5888,7 @@ dependencies = [
"sc-finality-grandpa",
"sc-network",
"sc-service",
+ "sc-tracing",
"sc-transaction-pool",
"serde_json",
"sp-arithmetic",
@@ -6718,7 +6711,7 @@ dependencies = [
[[package]]
name = "sc-authority-discovery"
version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"async-trait",
"derive_more",
@@ -6746,7 +6739,7 @@ dependencies = [
[[package]]
name = "sc-basic-authorship"
version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"futures 0.3.12",
"futures-timer 3.0.2",
@@ -6769,7 +6762,7 @@ dependencies = [
[[package]]
name = "sc-block-builder"
version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"parity-scale-codec",
"sc-client-api",
@@ -6786,7 +6779,7 @@ dependencies = [
[[package]]
name = "sc-chain-spec"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"impl-trait-for-tuples 0.2.0",
"parity-scale-codec",
@@ -6807,7 +6800,7 @@ dependencies = [
[[package]]
name = "sc-chain-spec-derive"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"proc-macro-crate",
"proc-macro2 1.0.24",
@@ -6818,9 +6811,8 @@ dependencies = [
[[package]]
name = "sc-cli"
version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
- "atty",
"chrono",
"fdlimit",
"futures 0.3.12",
@@ -6832,7 +6824,6 @@ dependencies = [
"rand 0.7.3",
"regex",
"rpassword",
- "sc-cli-proc-macro",
"sc-client-api",
"sc-keystore",
"sc-network",
@@ -6853,26 +6844,12 @@ dependencies = [
"thiserror",
"tiny-bip39",
"tokio 0.2.21",
- "tracing",
- "tracing-log",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "sc-cli-proc-macro"
-version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2 1.0.24",
- "quote 1.0.7",
- "syn 1.0.58",
]
[[package]]
name = "sc-client-api"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"derive_more",
"fnv",
@@ -6906,7 +6883,7 @@ dependencies = [
[[package]]
name = "sc-client-db"
version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"blake2-rfc",
"hash-db",
@@ -6936,7 +6913,7 @@ dependencies = [
[[package]]
name = "sc-consensus"
version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"sc-client-api",
"sp-blockchain",
@@ -6947,7 +6924,7 @@ dependencies = [
[[package]]
name = "sc-consensus-babe"
version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"derive_more",
"fork-tree",
@@ -6992,7 +6969,7 @@ dependencies = [
[[package]]
name = "sc-consensus-babe-rpc"
version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"derive_more",
"futures 0.3.12",
@@ -7016,7 +6993,7 @@ dependencies = [
[[package]]
name = "sc-consensus-epochs"
version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"fork-tree",
"parity-scale-codec",
@@ -7029,7 +7006,7 @@ dependencies = [
[[package]]
name = "sc-consensus-slots"
version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"futures 0.3.12",
"futures-timer 3.0.2",
@@ -7055,7 +7032,7 @@ dependencies = [
[[package]]
name = "sc-consensus-uncles"
version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"log",
"sc-client-api",
@@ -7069,7 +7046,7 @@ dependencies = [
[[package]]
name = "sc-executor"
version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"derive_more",
"lazy_static",
@@ -7098,7 +7075,7 @@ dependencies = [
[[package]]
name = "sc-executor-common"
version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"derive_more",
"parity-scale-codec",
@@ -7114,7 +7091,7 @@ dependencies = [
[[package]]
name = "sc-executor-wasmi"
version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"log",
"parity-scale-codec",
@@ -7129,7 +7106,7 @@ dependencies = [
[[package]]
name = "sc-executor-wasmtime"
version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"log",
"parity-scale-codec",
@@ -7147,7 +7124,7 @@ dependencies = [
[[package]]
name = "sc-finality-grandpa"
version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"derive_more",
"finality-grandpa",
@@ -7184,7 +7161,7 @@ dependencies = [
[[package]]
name = "sc-finality-grandpa-rpc"
version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"derive_more",
"finality-grandpa",
@@ -7208,7 +7185,7 @@ dependencies = [
[[package]]
name = "sc-informant"
version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"ansi_term 0.12.1",
"futures 0.3.12",
@@ -7226,7 +7203,7 @@ dependencies = [
[[package]]
name = "sc-keystore"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"async-trait",
"derive_more",
@@ -7246,7 +7223,7 @@ dependencies = [
[[package]]
name = "sc-light"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"hash-db",
"lazy_static",
@@ -7265,7 +7242,7 @@ dependencies = [
[[package]]
name = "sc-network"
version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"async-std",
"async-trait",
@@ -7286,6 +7263,7 @@ dependencies = [
"linked-hash-map",
"linked_hash_set",
"log",
+ "lru",
"nohash-hasher",
"parity-scale-codec",
"parking_lot 0.11.1",
@@ -7298,8 +7276,6 @@ dependencies = [
"sc-peerset",
"serde",
"serde_json",
- "slog",
- "slog_derive",
"smallvec 1.6.1",
"sp-arithmetic",
"sp-blockchain",
@@ -7318,7 +7294,7 @@ dependencies = [
[[package]]
name = "sc-network-gossip"
version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"futures 0.3.12",
"futures-timer 3.0.2",
@@ -7334,7 +7310,7 @@ dependencies = [
[[package]]
name = "sc-offchain"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"bytes 0.5.6",
"fnv",
@@ -7361,7 +7337,7 @@ dependencies = [
[[package]]
name = "sc-peerset"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"futures 0.3.12",
"libp2p",
@@ -7374,7 +7350,7 @@ dependencies = [
[[package]]
name = "sc-proposer-metrics"
version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"log",
"substrate-prometheus-endpoint",
@@ -7383,7 +7359,7 @@ dependencies = [
[[package]]
name = "sc-rpc"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"futures 0.3.12",
"hash-db",
@@ -7417,7 +7393,7 @@ dependencies = [
[[package]]
name = "sc-rpc-api"
version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"derive_more",
"futures 0.3.12",
@@ -7441,7 +7417,7 @@ dependencies = [
[[package]]
name = "sc-rpc-server"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"futures 0.1.29",
"jsonrpc-core",
@@ -7459,7 +7435,7 @@ dependencies = [
[[package]]
name = "sc-service"
version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"directories 3.0.1",
"exit-future",
@@ -7493,7 +7469,6 @@ dependencies = [
"sc-transaction-pool",
"serde",
"serde_json",
- "slog",
"sp-api",
"sp-application-crypto",
"sp-block-builder",
@@ -7523,7 +7498,7 @@ dependencies = [
[[package]]
name = "sc-state-db"
version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"log",
"parity-scale-codec",
@@ -7538,7 +7513,7 @@ dependencies = [
[[package]]
name = "sc-sync-state-rpc"
version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"jsonrpc-core",
"jsonrpc-core-client",
@@ -7558,20 +7533,21 @@ dependencies = [
[[package]]
name = "sc-telemetry"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
+ "chrono",
"futures 0.3.12",
- "futures-timer 3.0.2",
"libp2p",
"log",
"parking_lot 0.11.1",
"pin-project 0.4.23",
"rand 0.7.3",
"serde",
- "slog",
- "slog-json",
- "slog-scope",
+ "serde_json",
+ "sp-utils",
"take_mut",
+ "tracing",
+ "tracing-subscriber",
"void",
"wasm-timer",
]
@@ -7579,9 +7555,10 @@ dependencies = [
[[package]]
name = "sc-tracing"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"ansi_term 0.12.1",
+ "atty",
"erased-serde",
"lazy_static",
"log",
@@ -7590,20 +7567,34 @@ dependencies = [
"regex",
"rustc-hash",
"sc-telemetry",
+ "sc-tracing-proc-macro",
"serde",
"serde_json",
- "slog",
"sp-tracing",
+ "thiserror",
"tracing",
"tracing-core",
"tracing-log",
"tracing-subscriber",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "sc-tracing-proc-macro"
+version = "2.0.0"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2 1.0.24",
+ "quote 1.0.7",
+ "syn 1.0.58",
]
[[package]]
name = "sc-transaction-graph"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"derive_more",
"futures 0.3.12",
@@ -7625,7 +7616,7 @@ dependencies = [
[[package]]
name = "sc-transaction-pool"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"futures 0.3.12",
"futures-diagnose",
@@ -7983,50 +7974,6 @@ version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
-[[package]]
-name = "slog"
-version = "2.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cc9c640a4adbfbcc11ffb95efe5aa7af7309e002adab54b185507dbf2377b99"
-dependencies = [
- "erased-serde",
-]
-
-[[package]]
-name = "slog-json"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddc0d2aff1f8f325ef660d9a0eb6e6dcd20b30b3f581a5897f58bf42d061c37a"
-dependencies = [
- "chrono",
- "erased-serde",
- "serde",
- "serde_json",
- "slog",
-]
-
-[[package]]
-name = "slog-scope"
-version = "4.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c44c89dd8b0ae4537d1ae318353eaf7840b4869c536e31c41e963d1ea523ee6"
-dependencies = [
- "arc-swap",
- "lazy_static",
- "slog",
-]
-
-[[package]]
-name = "slog_derive"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a945ec7f7ce853e89ffa36be1e27dce9a43e82ff9093bf3461c30d5da74ed11b"
-dependencies = [
- "proc-macro2 1.0.24",
- "quote 1.0.7",
- "syn 1.0.58",
-]
-
[[package]]
name = "smallvec"
version = "0.6.13"
@@ -8091,7 +8038,7 @@ dependencies = [
[[package]]
name = "sp-allocator"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"log",
"sp-core",
@@ -8103,7 +8050,7 @@ dependencies = [
[[package]]
name = "sp-api"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"hash-db",
"parity-scale-codec",
@@ -8119,7 +8066,7 @@ dependencies = [
[[package]]
name = "sp-api-proc-macro"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"blake2-rfc",
"proc-macro-crate",
@@ -8131,7 +8078,7 @@ dependencies = [
[[package]]
name = "sp-application-crypto"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"parity-scale-codec",
"serde",
@@ -8143,7 +8090,7 @@ dependencies = [
[[package]]
name = "sp-arithmetic"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"integer-sqrt",
"num-traits 0.2.12",
@@ -8156,7 +8103,7 @@ dependencies = [
[[package]]
name = "sp-authority-discovery"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -8168,7 +8115,7 @@ dependencies = [
[[package]]
name = "sp-authorship"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"parity-scale-codec",
"sp-inherents",
@@ -8179,7 +8126,7 @@ dependencies = [
[[package]]
name = "sp-block-builder"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -8191,7 +8138,7 @@ dependencies = [
[[package]]
name = "sp-blockchain"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"futures 0.3.12",
"log",
@@ -8209,7 +8156,7 @@ dependencies = [
[[package]]
name = "sp-chain-spec"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"serde",
"serde_json",
@@ -8218,7 +8165,7 @@ dependencies = [
[[package]]
name = "sp-consensus"
version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"futures 0.3.12",
"futures-timer 3.0.2",
@@ -8244,7 +8191,7 @@ dependencies = [
[[package]]
name = "sp-consensus-babe"
version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"merlin",
"parity-scale-codec",
@@ -8264,7 +8211,7 @@ dependencies = [
[[package]]
name = "sp-consensus-slots"
version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"parity-scale-codec",
"sp-runtime",
@@ -8273,7 +8220,7 @@ dependencies = [
[[package]]
name = "sp-consensus-vrf"
version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"parity-scale-codec",
"schnorrkel",
@@ -8285,7 +8232,7 @@ dependencies = [
[[package]]
name = "sp-core"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"base58",
"blake2-rfc",
@@ -8329,7 +8276,7 @@ dependencies = [
[[package]]
name = "sp-database"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"kvdb",
"parking_lot 0.11.1",
@@ -8338,7 +8285,7 @@ dependencies = [
[[package]]
name = "sp-debug-derive"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"proc-macro2 1.0.24",
"quote 1.0.7",
@@ -8348,7 +8295,7 @@ dependencies = [
[[package]]
name = "sp-externalities"
version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"environmental",
"parity-scale-codec",
@@ -8359,7 +8306,7 @@ dependencies = [
[[package]]
name = "sp-finality-grandpa"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"finality-grandpa",
"log",
@@ -8376,7 +8323,7 @@ dependencies = [
[[package]]
name = "sp-inherents"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"parity-scale-codec",
"parking_lot 0.11.1",
@@ -8388,7 +8335,7 @@ dependencies = [
[[package]]
name = "sp-io"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"futures 0.3.12",
"hash-db",
@@ -8412,7 +8359,7 @@ dependencies = [
[[package]]
name = "sp-keyring"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"lazy_static",
"sp-core",
@@ -8423,7 +8370,7 @@ dependencies = [
[[package]]
name = "sp-keystore"
version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"async-trait",
"derive_more",
@@ -8440,7 +8387,7 @@ dependencies = [
[[package]]
name = "sp-npos-elections"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"parity-scale-codec",
"serde",
@@ -8453,7 +8400,7 @@ dependencies = [
[[package]]
name = "sp-npos-elections-compact"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"proc-macro-crate",
"proc-macro2 1.0.24",
@@ -8464,7 +8411,7 @@ dependencies = [
[[package]]
name = "sp-offchain"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"sp-api",
"sp-core",
@@ -8474,7 +8421,7 @@ dependencies = [
[[package]]
name = "sp-panic-handler"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"backtrace",
]
@@ -8482,7 +8429,7 @@ dependencies = [
[[package]]
name = "sp-rpc"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"serde",
"sp-core",
@@ -8491,7 +8438,7 @@ dependencies = [
[[package]]
name = "sp-runtime"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"either",
"hash256-std-hasher",
@@ -8512,7 +8459,7 @@ dependencies = [
[[package]]
name = "sp-runtime-interface"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"impl-trait-for-tuples 0.2.0",
"parity-scale-codec",
@@ -8529,7 +8476,7 @@ dependencies = [
[[package]]
name = "sp-runtime-interface-proc-macro"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"Inflector",
"proc-macro-crate",
@@ -8541,7 +8488,7 @@ dependencies = [
[[package]]
name = "sp-serializer"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"serde",
"serde_json",
@@ -8550,7 +8497,7 @@ dependencies = [
[[package]]
name = "sp-session"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -8563,7 +8510,7 @@ dependencies = [
[[package]]
name = "sp-staking"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"parity-scale-codec",
"sp-runtime",
@@ -8573,7 +8520,7 @@ dependencies = [
[[package]]
name = "sp-state-machine"
version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"hash-db",
"log",
@@ -8595,12 +8542,12 @@ dependencies = [
[[package]]
name = "sp-std"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
[[package]]
name = "sp-storage"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"impl-serde",
"parity-scale-codec",
@@ -8613,7 +8560,7 @@ dependencies = [
[[package]]
name = "sp-tasks"
version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"log",
"sp-core",
@@ -8626,7 +8573,7 @@ dependencies = [
[[package]]
name = "sp-timestamp"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"impl-trait-for-tuples 0.2.0",
"parity-scale-codec",
@@ -8640,7 +8587,7 @@ dependencies = [
[[package]]
name = "sp-tracing"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"log",
"parity-scale-codec",
@@ -8653,7 +8600,7 @@ dependencies = [
[[package]]
name = "sp-transaction-pool"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"derive_more",
"futures 0.3.12",
@@ -8669,7 +8616,7 @@ dependencies = [
[[package]]
name = "sp-trie"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"hash-db",
"memory-db",
@@ -8683,7 +8630,7 @@ dependencies = [
[[package]]
name = "sp-utils"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"futures 0.3.12",
"futures-core",
@@ -8695,7 +8642,7 @@ dependencies = [
[[package]]
name = "sp-version"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"impl-serde",
"parity-scale-codec",
@@ -8707,7 +8654,7 @@ dependencies = [
[[package]]
name = "sp-wasm-interface"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"impl-trait-for-tuples 0.2.0",
"parity-scale-codec",
@@ -8860,11 +8807,10 @@ dependencies = [
[[package]]
name = "substrate-browser-utils"
version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"chrono",
"console_error_panic_hook",
- "console_log",
"futures 0.1.29",
"futures 0.3.12",
"futures-timer 3.0.2",
@@ -8878,6 +8824,8 @@ dependencies = [
"sc-informant",
"sc-network",
"sc-service",
+ "sc-telemetry",
+ "sc-tracing",
"sp-database",
"wasm-bindgen",
"wasm-bindgen-futures",
@@ -8886,7 +8834,7 @@ dependencies = [
[[package]]
name = "substrate-build-script-utils"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"platforms",
]
@@ -8894,7 +8842,7 @@ dependencies = [
[[package]]
name = "substrate-frame-rpc-system"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"frame-system-rpc-runtime-api",
"futures 0.3.12",
@@ -8917,7 +8865,7 @@ dependencies = [
[[package]]
name = "substrate-prometheus-endpoint"
version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"async-std",
"derive_more",
@@ -8931,7 +8879,7 @@ dependencies = [
[[package]]
name = "substrate-test-client"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"futures 0.1.29",
"futures 0.3.12",
@@ -8958,7 +8906,7 @@ dependencies = [
[[package]]
name = "substrate-test-utils"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"futures 0.3.12",
"substrate-test-utils-derive",
@@ -8968,7 +8916,7 @@ dependencies = [
[[package]]
name = "substrate-test-utils-derive"
version = "0.8.1"
-source = "git+https://github.com/paritytech/substrate#b64ec19641fea539d56b81466e77552157afe716"
+source = "git+https://github.com/paritytech/substrate#2a5e10a8e53faae2ed41d820c08fb8dfb066d09f"
dependencies = [
"proc-macro-crate",
"quote 1.0.7",
diff --git a/polkadot/cli/src/browser.rs b/polkadot/cli/src/browser.rs
index 5b0255430cd68addcf936928bf59dc00553715a3..f4645b64b7827e78def1e68245294c4b31c14f38 100644
--- a/polkadot/cli/src/browser.rs
+++ b/polkadot/cli/src/browser.rs
@@ -18,7 +18,7 @@ use log::info;
use wasm_bindgen::prelude::*;
use browser_utils::{
Client,
- browser_configuration, set_console_error_panic_hook, init_console_log,
+ browser_configuration, init_logging_and_telemetry, set_console_error_panic_hook,
};
/// Starts the client.
@@ -29,13 +29,14 @@ pub async fn start_client(chain_spec: String, log_level: String) -> Result<Clien
.map_err(|err| JsValue::from_str(&err.to_string()))
}
-async fn start_inner(chain_spec: String, log_level: String) -> Result<Client, Box<dyn std::error::Error>> {
+async fn start_inner(chain_spec: String, log_directives: String) -> Result<Client, Box<dyn std::error::Error>> {
set_console_error_panic_hook();
- init_console_log(log_level.parse()?)?;
+ let telemetry_worker = init_logging_and_telemetry(&log_directives)?;
let chain_spec = service::PolkadotChainSpec::from_json_bytes(chain_spec.as_bytes().to_vec())
.map_err(|e| format!("{:?}", e))?;
- let config = browser_configuration(chain_spec).await?;
+ let telemetry_handle = telemetry_worker.handle();
+ let config = browser_configuration(chain_spec, Some(telemetry_handle)).await?;
info!("Polkadot browser node");
info!(" version {}", config.impl_version);
@@ -45,7 +46,9 @@ async fn start_inner(chain_spec: String, log_level: String) -> Result<Client, Bo
info!("👤 Role: {}", config.display_role());
// Create the service. This is the most heavy initialization step.
- let (task_manager, rpc_handlers) = service::build_light(config).map_err(|e| format!("{:?}", e))?;
+ let (task_manager, rpc_handlers, _) = service::build_light(config).map_err(|e| format!("{:?}", e))?;
+
+ task_manager.spawn_handle().spawn("telemetry", telemetry_worker.run());
Ok(browser_utils::start_client(task_manager, rpc_handlers))
}
diff --git a/polkadot/cli/src/command.rs b/polkadot/cli/src/command.rs
index a0fc04c4715a1c75d191ba0ebf67b7c48b3f025e..4a3a7de93a2b867d3ffdd6e5a03f73a6778cb5f2 100644
--- a/polkadot/cli/src/command.rs
+++ b/polkadot/cli/src/command.rs
@@ -170,7 +170,7 @@ pub fn run() -> Result<()> {
let role = config.role.clone();
let task_manager = match role {
- Role::Light => service::build_light(config).map(|(task_manager, _)| task_manager),
+ Role::Light => service::build_light(config).map(|(task_manager, _, _)| task_manager),
_ => service::build_full(
config,
service::IsCollator::No,
@@ -249,15 +249,9 @@ pub fn run() -> Result<()> {
})?)
},
Some(Subcommand::ValidationWorker(cmd)) => {
- let _ = sc_cli::init_logger(
- sc_cli::InitLoggerParams {
- pattern: "".into(),
- tracing_receiver: Default::default(),
- tracing_targets: None,
- disable_log_reloading: false,
- disable_log_color: true,
- },
- );
+ let mut builder = sc_cli::GlobalLoggerBuilder::new("");
+ builder.with_colors(false);
+ let _ = builder.init();
if cfg!(feature = "browser") || cfg!(target_os = "android") {
Err(sc_cli::Error::Input("Cannot run validation worker in browser".into()).into())
diff --git a/polkadot/node/service/src/lib.rs b/polkadot/node/service/src/lib.rs
index c8ac57e38790f8534fc1cee0eedff3142f7c540d..ffc6beff51026380c28299e5222172ce1778fdd8 100644
--- a/polkadot/node/service/src/lib.rs
+++ b/polkadot/node/service/src/lib.rs
@@ -50,6 +50,7 @@ use std::sync::Arc;
use prometheus_endpoint::Registry;
use sc_executor::native_executor_instance;
use service::RpcHandlers;
+use telemetry::TelemetryConnectionNotifier;
pub use self::client::{AbstractClient, Client, ClientHandle, ExecuteWithClient, RuntimeApiCollection};
pub use chain_spec::{PolkadotChainSpec, KusamaChainSpec, WestendChainSpec, RococoChainSpec};
@@ -215,6 +216,7 @@ fn new_partial<RuntimeApi, Executor>(config: &mut Configuration, jaeger_agent: O
babe::BabeLink<Block>
),
grandpa::SharedVoterState,
+ Option<telemetry::TelemetrySpan>,
)
>,
Error
@@ -230,7 +232,7 @@ fn new_partial<RuntimeApi, Executor>(config: &mut Configuration, jaeger_agent: O
let inherent_data_providers = inherents::InherentDataProviders::new();
- let (client, backend, keystore_container, task_manager) =
+ let (client, backend, keystore_container, task_manager, telemetry_span) =
service::new_full_parts::<Block, RuntimeApi, Executor>(&config)?;
let client = Arc::new(client);
@@ -332,7 +334,7 @@ fn new_partial<RuntimeApi, Executor>(config: &mut Configuration, jaeger_agent: O
import_queue,
transaction_pool,
inherent_data_providers,
- other: (rpc_extensions_builder, import_setup, rpc_setup)
+ other: (rpc_extensions_builder, import_setup, rpc_setup, telemetry_span)
})
}
@@ -558,7 +560,7 @@ pub fn new_full<RuntimeApi, Executor>(
import_queue,
transaction_pool,
inherent_data_providers,
- other: (rpc_extensions_builder, import_setup, rpc_setup)
+ other: (rpc_extensions_builder, import_setup, rpc_setup, telemetry_span)
} = new_partial::<RuntimeApi, Executor>(&mut config, jaeger_agent)?;
let prometheus_registry = config.prometheus_registry().cloned();
@@ -604,11 +606,9 @@ pub fn new_full<RuntimeApi, Executor>(
);
}
- let telemetry_connection_sinks = service::TelemetryConnectionSinks::default();
-
let availability_config = config.database.clone().try_into().map_err(Error::Availability)?;
- let rpc_handlers = service::spawn_tasks(service::SpawnTasksParams {
+ let (rpc_handlers, telemetry_connection_notifier) = service::spawn_tasks(service::SpawnTasksParams {
config,
backend: backend.clone(),
client: client.clone(),
@@ -619,9 +619,9 @@ pub fn new_full<RuntimeApi, Executor>(
task_manager: &mut task_manager,
on_demand: None,
remote_blockchain: None,
- telemetry_connection_sinks: telemetry_connection_sinks.clone(),
network_status_sinks: network_status_sinks.clone(),
system_rpc_tx,
+ telemetry_span,
})?;
let (block_import, link_half, babe_link) = import_setup;
@@ -794,7 +794,7 @@ pub fn new_full<RuntimeApi, Executor>(
config,
link: link_half,
network: network.clone(),
- telemetry_on_connect: Some(telemetry_connection_sinks.on_connect_stream()),
+ telemetry_on_connect: telemetry_connection_notifier.map(|x| x.on_connect_stream()),
voting_rule,
prometheus_registry: prometheus_registry.clone(),
shared_voter_state,
@@ -820,7 +820,11 @@ pub fn new_full<RuntimeApi, Executor>(
}
/// Builds a new service for a light client.
-fn new_light<Runtime, Dispatch>(mut config: Configuration) -> Result<(TaskManager, RpcHandlers), Error>
+fn new_light<Runtime, Dispatch>(mut config: Configuration) -> Result<(
+ TaskManager,
+ RpcHandlers,
+ Option<TelemetryConnectionNotifier>,
+), Error>
where
Runtime: 'static + Send + Sync + ConstructRuntimeApi<Block, LightClient<Runtime, Dispatch>>,
<Runtime as ConstructRuntimeApi<Block, LightClient<Runtime, Dispatch>>>::RuntimeApi:
@@ -830,7 +834,7 @@ fn new_light<Runtime, Dispatch>(mut config: Configuration) -> Result<(TaskManage
set_prometheus_registry(&mut config)?;
use sc_client_api::backend::RemoteBackend;
- let (client, backend, keystore_container, mut task_manager, on_demand) =
+ let (client, backend, keystore_container, mut task_manager, on_demand, telemetry_span) =
service::new_light_parts::<Block, Runtime, Dispatch>(&config)?;
let select_chain = sc_consensus::LongestChain::new(backend.clone());
@@ -901,12 +905,11 @@ fn new_light<Runtime, Dispatch>(mut config: Configuration) -> Result<(TaskManage
let rpc_extensions = polkadot_rpc::create_light(light_deps);
- let rpc_handlers = service::spawn_tasks(service::SpawnTasksParams {
+ let (rpc_handlers, telemetry_connection_notifier) = service::spawn_tasks(service::SpawnTasksParams {
on_demand: Some(on_demand),
remote_blockchain: Some(backend.remote_blockchain()),
rpc_extensions_builder: Box::new(service::NoopRpcExtensionBuilder(rpc_extensions)),
task_manager: &mut task_manager,
- telemetry_connection_sinks: service::TelemetryConnectionSinks::default(),
config,
keystore: keystore_container.sync_keystore(),
backend,
@@ -915,11 +918,12 @@ fn new_light<Runtime, Dispatch>(mut config: Configuration) -> Result<(TaskManage
network,
network_status_sinks,
system_rpc_tx,
+ telemetry_span,
})?;
network_starter.start_network();
- Ok((task_manager, rpc_handlers))
+ Ok((task_manager, rpc_handlers, telemetry_connection_notifier))
}
/// Builds a new object suitable for chain operations.
@@ -955,7 +959,11 @@ pub fn new_chain_ops(mut config: &mut Configuration, jaeger_agent: Option<std::n
}
/// Build a new light node.
-pub fn build_light(config: Configuration) -> Result<(TaskManager, RpcHandlers), Error> {
+pub fn build_light(config: Configuration) -> Result<(
+ TaskManager,
+ RpcHandlers,
+ Option<TelemetryConnectionNotifier>,
+), Error> {
if config.chain_spec.is_rococo() {
new_light::<rococo_runtime::RuntimeApi, RococoExecutor>(config)
} else if config.chain_spec.is_kusama() {
diff --git a/polkadot/node/test/service/Cargo.toml b/polkadot/node/test/service/Cargo.toml
index 141121f483ecbc188555954d5ef46cd48c39b690..5aa641f548749125cd42ecdd8c0acb0eb30b0556 100644
--- a/polkadot/node/test/service/Cargo.toml
+++ b/polkadot/node/test/service/Cargo.toml
@@ -45,6 +45,7 @@ sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "mas
sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "master" }
service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "master" }
diff --git a/polkadot/node/test/service/src/lib.rs b/polkadot/node/test/service/src/lib.rs
index 6c5212ef4b8d124ff10f38cb205a04563af0ef61..aa2f47b93c5df9c22bf86f3ffc7d943bd0f70f4d 100644
--- a/polkadot/node/test/service/src/lib.rs
+++ b/polkadot/node/test/service/src/lib.rs
@@ -69,7 +69,7 @@ pub type Client = FullClient<polkadot_test_runtime::RuntimeApi, PolkadotTestExec
pub use polkadot_service::FullBackend;
/// Create a new full node.
-#[sc_cli::prefix_logs_with(config.network.node_name.as_str())]
+#[sc_tracing::logging::prefix_logs_with(config.network.node_name.as_str())]
pub fn new_full(
config: Configuration,
is_collator: IsCollator,
@@ -198,6 +198,7 @@ pub fn node_config(
base_path: Some(base_path),
informant_output_format: Default::default(),
disable_log_reloading: false,
+ telemetry_handle: None,
}
}
diff --git a/polkadot/node/test/service/tests/build-blocks.rs b/polkadot/node/test/service/tests/build-blocks.rs
index 0cf55e38584033bfb14d3c1e8e52f2fe3ebe58a8..212df8be8adbbfa7a0b835a643395cf7850fdc83 100644
--- a/polkadot/node/test/service/tests/build-blocks.rs
+++ b/polkadot/node/test/service/tests/build-blocks.rs
@@ -21,15 +21,9 @@ use sp_keyring::Sr25519Keyring;
#[substrate_test_utils::test]
async fn ensure_test_service_build_blocks(task_executor: TaskExecutor) {
- sc_cli::init_logger(
- sc_cli::InitLoggerParams {
- pattern: "".into(),
- tracing_receiver: Default::default(),
- tracing_targets: None,
- disable_log_reloading: false,
- disable_log_color: true,
- },
- ).expect("Sets up logger");
+ let mut builder = sc_cli::GlobalLoggerBuilder::new("");
+ builder.with_colors(false);
+ builder.init().expect("Sets up logger");
let mut alice = run_validator_node(
task_executor.clone(),
diff --git a/polkadot/parachain/test-parachains/adder/collator/tests/integration.rs b/polkadot/parachain/test-parachains/adder/collator/tests/integration.rs
index 3be0f906ccf44d364ce905f7f8723a7e43e69c39..955937e4fdfa9b0c5776e9422c33c11a6db96b10 100644
--- a/polkadot/parachain/test-parachains/adder/collator/tests/integration.rs
+++ b/polkadot/parachain/test-parachains/adder/collator/tests/integration.rs
@@ -25,15 +25,9 @@ async fn collating_using_adder_collator(task_executor: sc_service::TaskExecutor)
use futures::join;
use polkadot_primitives::v1::Id as ParaId;
- sc_cli::init_logger(
- sc_cli::InitLoggerParams {
- pattern: "".into(),
- tracing_receiver: Default::default(),
- tracing_targets: None,
- disable_log_reloading: false,
- disable_log_color: true,
- },
- ).expect("Sets up logger");
+ let mut builder = sc_cli::GlobalLoggerBuilder::new("");
+ builder.with_colors(false);
+ builder.init().expect("Set up logger");
let para_id = ParaId::from(100);
diff --git a/polkadot/runtime/kusama/src/weights/pallet_staking.rs b/polkadot/runtime/kusama/src/weights/pallet_staking.rs
index 7f19219ac50224926f22c270f594531bac3e6cfe..844c37ea10a3203ca0d3dd1ddc5f6fc9d61b5528 100644
--- a/polkadot/runtime/kusama/src/weights/pallet_staking.rs
+++ b/polkadot/runtime/kusama/src/weights/pallet_staking.rs
@@ -205,4 +205,7 @@ impl<T: frame_system::Config> pallet_staking::WeightInfo for WeightInfo<T> {
.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(w as Weight)))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
}
+ fn kick(w: u32, ) -> Weight {
+ w as Weight
+ }
}
diff --git a/polkadot/runtime/polkadot/src/weights/pallet_staking.rs b/polkadot/runtime/polkadot/src/weights/pallet_staking.rs
index 134f87b140bba4335c4e38f52da1ec7a01c19686..c2492cd4c3844f7ebddc6caa50fe4dc529543265 100644
--- a/polkadot/runtime/polkadot/src/weights/pallet_staking.rs
+++ b/polkadot/runtime/polkadot/src/weights/pallet_staking.rs
@@ -205,4 +205,7 @@ impl<T: frame_system::Config> pallet_staking::WeightInfo for WeightInfo<T> {
.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(w as Weight)))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
}
+ fn kick(w: u32, ) -> Weight {
+ w as Weight
+ }
}
diff --git a/polkadot/runtime/westend/src/weights/pallet_staking.rs b/polkadot/runtime/westend/src/weights/pallet_staking.rs
index 680fe3dac8ec1baec6ef6bf6c7fbab71bfa304d6..aeb29090efb3eafe3f775c6a4c415d2888222826 100644
--- a/polkadot/runtime/westend/src/weights/pallet_staking.rs
+++ b/polkadot/runtime/westend/src/weights/pallet_staking.rs
@@ -205,4 +205,7 @@ impl<T: frame_system::Config> pallet_staking::WeightInfo for WeightInfo<T> {
.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(w as Weight)))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
}
+ fn kick(w: u32, ) -> Weight {
+ w as Weight
+ }
}