From 7a2c7aa3fee251783660bb98c78ea9fc3167fe25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Mon, 1 Mar 2021 16:15:34 +0100 Subject: [PATCH] Companion for init the `RuntimeLogger` automatically (#2522) * Lol * Add the features * Remove some more runtime logger init calls * Make companion check work * Revert "Make companion check work" This reverts commit a255c798076466c0fa20a4db713fc712772c2b4d. * Update Substrate --- polkadot/Cargo.lock | 322 ++++++++++-------- polkadot/runtime/kusama/Cargo.toml | 11 +- polkadot/runtime/kusama/src/lib.rs | 7 +- polkadot/runtime/parachains/Cargo.toml | 3 +- polkadot/runtime/parachains/src/inclusion.rs | 18 +- .../parachains/src/inclusion_inherent.rs | 3 +- .../parachains/src/runtime_api_impl/v1.rs | 8 +- polkadot/runtime/parachains/src/ump.rs | 4 +- polkadot/runtime/polkadot/Cargo.toml | 11 +- polkadot/runtime/polkadot/src/lib.rs | 5 +- polkadot/runtime/rococo/Cargo.toml | 2 + polkadot/runtime/rococo/src/lib.rs | 4 +- polkadot/runtime/test-runtime/Cargo.toml | 4 +- polkadot/runtime/test-runtime/src/lib.rs | 8 +- polkadot/runtime/westend/Cargo.toml | 4 +- polkadot/runtime/westend/src/lib.rs | 5 +- polkadot/xcm/xcm-executor/Cargo.toml | 2 + polkadot/xcm/xcm-executor/src/lib.rs | 2 +- 18 files changed, 231 insertions(+), 192 deletions(-) diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock index 5f3eefbd27..5e59530a3e 100644 --- a/polkadot/Cargo.lock +++ b/polkadot/Cargo.lock @@ -1,5 +1,7 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "Inflector" version = "0.11.4" @@ -1594,7 +1596,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "parity-scale-codec", ] @@ -1612,11 +1614,12 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "3.1.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "frame-support", "frame-system", "linregress", + "log", "parity-scale-codec", "paste 1.0.4", "sp-api", @@ -1630,7 +1633,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "Inflector", "chrono", @@ -1653,7 +1656,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "frame-support", "frame-system", @@ -1669,7 +1672,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "13.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "parity-scale-codec", "serde", @@ -1680,7 +1683,7 @@ dependencies = [ [[package]] name = "frame-support" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "bitflags", "frame-metadata", @@ -1706,7 +1709,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -1718,7 +1721,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -1730,7 +1733,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "proc-macro2", "quote", @@ -1740,10 +1743,11 @@ dependencies = [ [[package]] name = "frame-system" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "frame-support", "impl-trait-for-tuples", + "log", "parity-scale-codec", "serde", "sp-core", @@ -1756,7 +1760,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "frame-benchmarking", "frame-support", @@ -1770,7 +1774,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "parity-scale-codec", "sp-api", @@ -1779,7 +1783,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "frame-support", "parity-scale-codec", @@ -3452,11 +3456,12 @@ dependencies = [ [[package]] name = "log" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf3805d4480bb5b86070dcfeb9e2cb2ebc148adb753c5cca5f884d1d65a42b2" +checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", + "value-bag", ] [[package]] @@ -4020,7 +4025,7 @@ checksum = "13370dae44474229701bb69b90b4f4dca6404cb0357a2d50d635f1171dc3aa7b" [[package]] name = "pallet-authority-discovery" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "frame-support", "frame-system", @@ -4036,7 +4041,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "frame-support", "frame-system", @@ -4051,11 +4056,12 @@ dependencies = [ [[package]] name = "pallet-babe" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "pallet-authorship", "pallet-session", "pallet-timestamp", @@ -4075,11 +4081,12 @@ dependencies = [ [[package]] name = "pallet-balances" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", "serde", "sp-runtime", @@ -4089,7 +4096,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "frame-benchmarking", "frame-support", @@ -4104,11 +4111,12 @@ dependencies = [ [[package]] name = "pallet-collective" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", "serde", "sp-core", @@ -4120,7 +4128,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "frame-benchmarking", "frame-support", @@ -4135,11 +4143,12 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", "rand 0.7.3", "serde", @@ -4155,11 +4164,12 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", "serde", "sp-npos-elections", @@ -4170,11 +4180,12 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "pallet-authorship", "pallet-session", "parity-scale-codec", @@ -4191,7 +4202,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "enumflags2", "frame-benchmarking", @@ -4207,11 +4218,12 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "pallet-authorship", "parity-scale-codec", "serde", @@ -4226,7 +4238,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "frame-benchmarking", "frame-support", @@ -4243,7 +4255,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "frame-support", "frame-system", @@ -4257,7 +4269,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "frame-benchmarking", "frame-support", @@ -4273,7 +4285,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "frame-support", "frame-system", @@ -4287,10 +4299,11 @@ dependencies = [ [[package]] name = "pallet-offences" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "frame-support", "frame-system", + "log", "pallet-balances", "parity-scale-codec", "serde", @@ -4302,7 +4315,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "frame-benchmarking", "frame-support", @@ -4324,7 +4337,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "frame-benchmarking", "frame-support", @@ -4340,7 +4353,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "frame-support", "frame-system", @@ -4353,7 +4366,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "enumflags2", "frame-support", @@ -4368,11 +4381,12 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", "serde", "sp-io", @@ -4383,7 +4397,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "frame-support", "frame-system", @@ -4403,7 +4417,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "frame-benchmarking", "frame-support", @@ -4419,7 +4433,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "frame-support", "frame-system", @@ -4433,11 +4447,12 @@ dependencies = [ [[package]] name = "pallet-staking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "pallet-authorship", "pallet-session", "parity-scale-codec", @@ -4456,7 +4471,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -4467,7 +4482,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "frame-support", "frame-system", @@ -4481,12 +4496,13 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", "impl-trait-for-tuples", + "log", "parity-scale-codec", "serde", "sp-inherents", @@ -4499,7 +4515,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "frame-benchmarking", "frame-support", @@ -4514,7 +4530,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "frame-support", "frame-system", @@ -4530,7 +4546,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -4547,7 +4563,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -4558,7 +4574,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "frame-benchmarking", "frame-support", @@ -4574,7 +4590,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "frame-benchmarking", "frame-support", @@ -4590,7 +4606,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "enumflags2", "frame-benchmarking", @@ -6752,7 +6768,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "env_logger 0.8.2", "futures 0.3.12", @@ -6826,6 +6842,7 @@ dependencies = [ "frame-system", "frame-system-rpc-runtime-api", "hex-literal", + "log", "pallet-authority-discovery", "pallet-authorship", "pallet-babe", @@ -7003,7 +7020,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "async-trait", "derive_more", @@ -7031,7 +7048,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "futures 0.3.12", "futures-timer 3.0.2", @@ -7054,7 +7071,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -7070,7 +7087,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7091,7 +7108,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -7102,7 +7119,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "chrono", "fdlimit", @@ -7140,7 +7157,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "derive_more", "fnv", @@ -7174,7 +7191,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "blake2-rfc", "hash-db", @@ -7204,7 +7221,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "sc-client-api", "sp-blockchain", @@ -7215,7 +7232,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "derive_more", "fork-tree", @@ -7261,7 +7278,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "derive_more", "futures 0.3.12", @@ -7285,7 +7302,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "fork-tree", "parity-scale-codec", @@ -7298,7 +7315,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "futures 0.3.12", "futures-timer 3.0.2", @@ -7324,7 +7341,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "log", "sc-client-api", @@ -7338,7 +7355,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "derive_more", "lazy_static", @@ -7367,7 +7384,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "derive_more", "parity-scale-codec", @@ -7383,7 +7400,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "log", "parity-scale-codec", @@ -7398,7 +7415,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "log", "parity-scale-codec", @@ -7416,7 +7433,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "derive_more", "dyn-clone", @@ -7455,7 +7472,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "derive_more", "finality-grandpa", @@ -7479,7 +7496,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-warp-sync" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "derive_more", "futures 0.3.12", @@ -7500,7 +7517,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "ansi_term 0.12.1", "futures 0.3.12", @@ -7518,7 +7535,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "async-trait", "derive_more", @@ -7538,7 +7555,7 @@ dependencies = [ [[package]] name = "sc-light" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "hash-db", "lazy_static", @@ -7557,7 +7574,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "async-std", "async-trait", @@ -7610,7 +7627,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "futures 0.3.12", "futures-timer 3.0.2", @@ -7626,7 +7643,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "bytes 0.5.6", "fnv", @@ -7653,7 +7670,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "futures 0.3.12", "libp2p", @@ -7666,7 +7683,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -7675,7 +7692,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "futures 0.3.12", "hash-db", @@ -7709,7 +7726,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "derive_more", "futures 0.3.12", @@ -7733,7 +7750,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "futures 0.1.29", "jsonrpc-core", @@ -7751,7 +7768,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "directories", "exit-future", @@ -7814,7 +7831,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "log", "parity-scale-codec", @@ -7829,7 +7846,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -7849,7 +7866,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "chrono", "futures 0.3.12", @@ -7871,7 +7888,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "ansi_term 0.12.1", "atty", @@ -7899,7 +7916,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -7910,7 +7927,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "derive_more", "futures 0.3.12", @@ -7932,7 +7949,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "futures 0.3.12", "futures-diagnose", @@ -8338,7 +8355,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "log", "sp-core", @@ -8350,9 +8367,10 @@ dependencies = [ [[package]] name = "sp-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "hash-db", + "log", "parity-scale-codec", "sp-api-proc-macro", "sp-core", @@ -8366,7 +8384,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "blake2-rfc", "proc-macro-crate", @@ -8378,7 +8396,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "parity-scale-codec", "serde", @@ -8390,7 +8408,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "integer-sqrt", "num-traits", @@ -8403,7 +8421,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "parity-scale-codec", "sp-api", @@ -8415,7 +8433,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "parity-scale-codec", "sp-inherents", @@ -8426,7 +8444,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "parity-scale-codec", "sp-api", @@ -8438,7 +8456,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "futures 0.3.12", "log", @@ -8456,7 +8474,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "serde", "serde_json", @@ -8465,7 +8483,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "futures 0.3.12", "futures-timer 3.0.2", @@ -8491,7 +8509,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "merlin", "parity-scale-codec", @@ -8511,7 +8529,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "parity-scale-codec", "sp-arithmetic", @@ -8521,7 +8539,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -8533,7 +8551,7 @@ dependencies = [ [[package]] name = "sp-core" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "base58", "blake2-rfc", @@ -8577,7 +8595,7 @@ dependencies = [ [[package]] name = "sp-database" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "kvdb", "parking_lot 0.11.1", @@ -8586,7 +8604,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "proc-macro2", "quote", @@ -8596,7 +8614,7 @@ dependencies = [ [[package]] name = "sp-election-providers" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "parity-scale-codec", "sp-arithmetic", @@ -8607,7 +8625,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "environmental", "parity-scale-codec", @@ -8618,7 +8636,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "finality-grandpa", "log", @@ -8635,7 +8653,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "parity-scale-codec", "parking_lot 0.11.1", @@ -8647,7 +8665,7 @@ dependencies = [ [[package]] name = "sp-io" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "futures 0.3.12", "hash-db", @@ -8671,7 +8689,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "lazy_static", "sp-core", @@ -8682,7 +8700,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "async-trait", "derive_more", @@ -8699,7 +8717,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "parity-scale-codec", "serde", @@ -8712,7 +8730,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -8723,7 +8741,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "sp-api", "sp-core", @@ -8733,7 +8751,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "backtrace", ] @@ -8741,7 +8759,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "serde", "sp-core", @@ -8750,7 +8768,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "either", "hash256-std-hasher", @@ -8771,7 +8789,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -8788,7 +8806,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "Inflector", "proc-macro-crate", @@ -8800,7 +8818,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "serde", "serde_json", @@ -8809,7 +8827,7 @@ dependencies = [ [[package]] name = "sp-session" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "parity-scale-codec", "sp-api", @@ -8822,7 +8840,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -8832,7 +8850,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "hash-db", "log", @@ -8854,12 +8872,12 @@ dependencies = [ [[package]] name = "sp-std" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" [[package]] name = "sp-storage" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8872,7 +8890,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "log", "sp-core", @@ -8885,7 +8903,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -8899,7 +8917,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "log", "parity-scale-codec", @@ -8912,7 +8930,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "derive_more", "futures 0.3.12", @@ -8928,7 +8946,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "hash-db", "memory-db", @@ -8942,7 +8960,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "futures 0.3.12", "futures-core", @@ -8954,7 +8972,7 @@ dependencies = [ [[package]] name = "sp-version" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8966,7 +8984,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -9098,7 +9116,7 @@ dependencies = [ [[package]] name = "substrate-browser-utils" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "chrono", "console_error_panic_hook", @@ -9125,7 +9143,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "platforms", ] @@ -9133,7 +9151,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.12", @@ -9156,7 +9174,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "async-std", "derive_more", @@ -9170,7 +9188,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "futures 0.1.29", "futures 0.3.12", @@ -9197,7 +9215,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "futures 0.3.12", "substrate-test-utils-derive", @@ -9207,7 +9225,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "proc-macro-crate", "quote", @@ -9890,7 +9908,7 @@ checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" [[package]] name = "try-runtime-cli" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate#2dd569a96f54ccea20d0856acd5b41fd18d10324" +source = "git+https://github.com/paritytech/substrate?branch=master#dd295960a0bb80620ca1381978f10bc9dfc07d32" dependencies = [ "frame-try-runtime", "log", @@ -10070,6 +10088,15 @@ dependencies = [ "percent-encoding 2.1.0", ] +[[package]] +name = "value-bag" +version = "1.0.0-alpha.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b676010e055c99033117c2343b33a40a30b91fecd6c49055ac9cd2d6c305ab1" +dependencies = [ + "ctor", +] + [[package]] name = "vcpkg" version = "0.2.10" @@ -10731,6 +10758,7 @@ version = "0.8.22" dependencies = [ "frame-support", "impl-trait-for-tuples", + "log", "parity-scale-codec", "sp-arithmetic", "sp-core", diff --git a/polkadot/runtime/kusama/Cargo.toml b/polkadot/runtime/kusama/Cargo.toml index 5f55e32612..155b8b66f7 100644 --- a/polkadot/runtime/kusama/Cargo.toml +++ b/polkadot/runtime/kusama/Cargo.toml @@ -8,7 +8,7 @@ build = "build.rs" [dependencies] bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] } -log = { version = "0.4.13", optional = true } +log = { version = "0.4.14", default-features = false } rustc-hex = { version = "2.1.0", default-features = false } serde = { version = "1.0.123", default-features = false } serde_derive = { version = "1.0.117", optional = true } @@ -145,7 +145,7 @@ std = [ "pallet-vesting/std", "serde_derive", "serde/std", - "log", + "log/std", "pallet-babe/std", "babe-primitives/std", "sp-session/std", @@ -194,3 +194,10 @@ try-runtime = [ # runtime without clashing with the runtime api exported functions # in WASM. disable-runtime-api = [] + +# A feature that should be enabled when the runtime should be build for on-chain +# deployment. This will disable stuff that shouldn't be part of the on-chain wasm +# to make it smaller like logging for example. +on-chain-release-build = [ + "sp-api/disable-logging", +] diff --git a/polkadot/runtime/kusama/src/lib.rs b/polkadot/runtime/kusama/src/lib.rs index e213624def..96373855af 100644 --- a/polkadot/runtime/kusama/src/lib.rs +++ b/polkadot/runtime/kusama/src/lib.rs @@ -56,7 +56,7 @@ use sp_version::NativeVersion; use sp_core::OpaqueMetadata; use sp_staking::SessionIndex; use frame_support::{ - parameter_types, construct_runtime, debug, RuntimeDebug, + parameter_types, construct_runtime, RuntimeDebug, traits::{KeyOwnerProofSystem, Randomness, LockIdentifier, Filter, InstanceFilter}, weights::Weight, }; @@ -64,7 +64,7 @@ use frame_system::{EnsureRoot, EnsureOneOf}; use pallet_im_online::sr25519::AuthorityId as ImOnlineId; use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId; use pallet_transaction_payment::{FeeDetails, RuntimeDispatchInfo}; -use pallet_session::{historical as session_historical}; +use pallet_session::historical as session_historical; use static_assertions::const_assert; #[cfg(feature = "std")] @@ -696,7 +696,7 @@ impl frame_system::offchain::CreateSignedTransaction for R pallet_transaction_payment::ChargeTransactionPayment::::from(tip), ); let raw_payload = SignedPayload::new(call, extra).map_err(|e| { - debug::warn!("Unable to create signed payload: {:?}", e); + log::warn!("Unable to create signed payload: {:?}", e); }).ok()?; let signature = raw_payload.using_encoded(|payload| { C::sign(payload, public) @@ -1318,7 +1318,6 @@ sp_api::impl_runtime_apis! { #[cfg(feature = "try-runtime")] impl frame_try_runtime::TryRuntime for Runtime { fn on_runtime_upgrade() -> Result<(Weight, Weight), sp_runtime::RuntimeString> { - frame_support::debug::RuntimeLogger::init(); let weight = Executive::try_runtime_upgrade()?; Ok((weight, BlockWeights::get().max_block)) } diff --git a/polkadot/runtime/parachains/Cargo.toml b/polkadot/runtime/parachains/Cargo.toml index a830546777..3423fbd0c3 100644 --- a/polkadot/runtime/parachains/Cargo.toml +++ b/polkadot/runtime/parachains/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" [dependencies] bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] } -log = "0.4.13" +log = { version = "0.4.14", default-features = false } rustc-hex = { version = "2.1.0", default-features = false } serde = { version = "1.0.123", features = [ "derive" ], optional = true } derive_more = "0.99.11" @@ -86,6 +86,7 @@ std = [ "pallet-vesting/std", "xcm/std", "xcm-executor/std", + "log/std", ] runtime-benchmarks = [ "libsecp256k1/hmac", diff --git a/polkadot/runtime/parachains/src/inclusion.rs b/polkadot/runtime/parachains/src/inclusion.rs index 364705a2c3..275d6cf3d7 100644 --- a/polkadot/runtime/parachains/src/inclusion.rs +++ b/polkadot/runtime/parachains/src/inclusion.rs @@ -28,8 +28,8 @@ use primitives::v1::{ CandidateReceipt, HeadData, CandidateHash, Hash, }; use frame_support::{ - decl_storage, decl_module, decl_error, decl_event, ensure, debug, - dispatch::DispatchResult, IterableStorageMap, weights::Weight, traits::Get, + decl_storage, decl_module, decl_error, decl_event, ensure, dispatch::DispatchResult, IterableStorageMap, + weights::Weight, traits::Get, }; use parity_scale_codec::{Encode, Decode}; use bitvec::{order::Lsb0 as BitOrderLsb0, vec::BitVec}; @@ -213,7 +213,7 @@ decl_module! { } } -const LOG_TARGET: &str = "parachains_runtime_inclusion"; +const LOG_TARGET: &str = "runtime::inclusion"; impl Module { /// Block initialization logic, called by initializer. @@ -343,11 +343,11 @@ impl Module { let commitments = match PendingAvailabilityCommitments::take(¶_id) { Some(commitments) => commitments, None => { - debug::warn!(r#" - Inclusion::process_bitfields: - PendingAvailability and PendingAvailabilityCommitments - are out of sync, did someone mess with the storage? - "#); + log::warn!( + target: LOG_TARGET, + "Inclusion::process_bitfields: PendingAvailability and PendingAvailabilityCommitments + are out of sync, did someone mess with the storage?", + ); continue; } }; @@ -460,7 +460,6 @@ impl Module { &candidate.candidate.commitments.horizontal_messages, ) { - frame_support::debug::RuntimeLogger::init(); log::debug!( target: LOG_TARGET, "Validation outputs checking during inclusion of a candidate {} for parachain `{}` failed: {:?}", @@ -631,7 +630,6 @@ impl Module { T::BlockNumber::from(validation_outputs.hrmp_watermark), &validation_outputs.horizontal_messages, ) { - frame_support::debug::RuntimeLogger::init(); log::debug!( target: LOG_TARGET, "Validation outputs checking for parachain `{}` failed: {:?}", diff --git a/polkadot/runtime/parachains/src/inclusion_inherent.rs b/polkadot/runtime/parachains/src/inclusion_inherent.rs index e2ed15c42b..2770ca3385 100644 --- a/polkadot/runtime/parachains/src/inclusion_inherent.rs +++ b/polkadot/runtime/parachains/src/inclusion_inherent.rs @@ -227,8 +227,7 @@ impl ProvideInherent for Module { ) { Ok(_) => (signed_bitfields, backed_candidates), Err(err) => { - frame_support::debug::RuntimeLogger::init(); - frame_support::debug::warn!( + log::warn!( target: "runtime_inclusion_inherent", "dropping signed_bitfields and backed_candidates because they produced \ an invalid inclusion inherent: {:?}", diff --git a/polkadot/runtime/parachains/src/runtime_api_impl/v1.rs b/polkadot/runtime/parachains/src/runtime_api_impl/v1.rs index 3898f9f27d..ed5f787242 100644 --- a/polkadot/runtime/parachains/src/runtime_api_impl/v1.rs +++ b/polkadot/runtime/parachains/src/runtime_api_impl/v1.rs @@ -27,7 +27,6 @@ use primitives::v1::{ GroupIndex, CandidateEvent, PersistedValidationData, SessionInfo, InboundDownwardMessage, InboundHrmpMessage, Hash, AuthorityDiscoveryId }; -use frame_support::debug; use crate::{initializer, inclusion, scheduler, configuration, paras, session_info, dmp, hrmp, shared}; @@ -85,8 +84,11 @@ pub fn availability_cores() -> Vec>::group_assigned_to_core(core_index, backed_in_number) { Some(g) => g, None => { - debug::warn!("Could not determine the group responsible for core extracted \ - from list of cores for some prior block in same session"); + log::warn!( + target: "runtime::polkadot-api::v1", + "Could not determine the group responsible for core extracted \ + from list of cores for some prior block in same session", + ); GroupIndex(0) } diff --git a/polkadot/runtime/parachains/src/ump.rs b/polkadot/runtime/parachains/src/ump.rs index 645971dc31..6245e14b3c 100644 --- a/polkadot/runtime/parachains/src/ump.rs +++ b/polkadot/runtime/parachains/src/ump.rs @@ -75,8 +75,8 @@ impl UmpSink for XcmSink { } } } else { - frame_support::debug::error!( - target: "xcm", + log::error!( + target: "runtime::ump-sink", "Failed to decode versioned XCM from upward message.", ); } diff --git a/polkadot/runtime/polkadot/Cargo.toml b/polkadot/runtime/polkadot/Cargo.toml index a0ac0a3b7a..60e53e30ad 100644 --- a/polkadot/runtime/polkadot/Cargo.toml +++ b/polkadot/runtime/polkadot/Cargo.toml @@ -8,7 +8,7 @@ build = "build.rs" [dependencies] bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] } -log = { version = "0.4.13", optional = true } +log = { version = "0.4.14", default-features = false } rustc-hex = { version = "2.1.0", default-features = false } serde = { version = "1.0.123", default-features = false } serde_derive = { version = "1.0.117", optional = true } @@ -139,7 +139,7 @@ std = [ "sp-version/std", "serde_derive", "serde/std", - "log", + "log/std", "pallet-babe/std", "babe-primitives/std", "sp-session/std", @@ -189,3 +189,10 @@ try-runtime = [ # runtime without clashing with the runtime api exported functions # in WASM. disable-runtime-api = [] + +# A feature that should be enabled when the runtime should be build for on-chain +# deployment. This will disable stuff that shouldn't be part of the on-chain wasm +# to make it smaller like logging for example. +on-chain-release-build = [ + "sp-api/disable-logging", +] diff --git a/polkadot/runtime/polkadot/src/lib.rs b/polkadot/runtime/polkadot/src/lib.rs index 6a86390eb0..29bba24b6e 100644 --- a/polkadot/runtime/polkadot/src/lib.rs +++ b/polkadot/runtime/polkadot/src/lib.rs @@ -56,7 +56,7 @@ use sp_version::NativeVersion; use sp_core::OpaqueMetadata; use sp_staking::SessionIndex; use frame_support::{ - parameter_types, construct_runtime, debug, RuntimeDebug, + parameter_types, construct_runtime, RuntimeDebug, traits::{KeyOwnerProofSystem, Randomness, LockIdentifier, Filter}, weights::Weight, }; @@ -742,7 +742,7 @@ impl frame_system::offchain::CreateSignedTransaction for R claims::PrevalidateAttests::::new(), ); let raw_payload = SignedPayload::new(call, extra).map_err(|e| { - debug::warn!("Unable to create signed payload: {:?}", e); + log::warn!("Unable to create signed payload: {:?}", e); }).ok()?; let signature = raw_payload.using_encoded(|payload| { C::sign(payload, public) @@ -1314,7 +1314,6 @@ sp_api::impl_runtime_apis! { #[cfg(feature = "try-runtime")] impl frame_try_runtime::TryRuntime for Runtime { fn on_runtime_upgrade() -> Result<(Weight, Weight), sp_runtime::RuntimeString> { - frame_support::debug::RuntimeLogger::init(); let weight = Executive::try_runtime_upgrade()?; Ok((weight, BlockWeights::get().max_block)) } diff --git a/polkadot/runtime/rococo/Cargo.toml b/polkadot/runtime/rococo/Cargo.toml index 3915f531e6..29e471ea68 100644 --- a/polkadot/runtime/rococo/Cargo.toml +++ b/polkadot/runtime/rococo/Cargo.toml @@ -11,6 +11,7 @@ serde = { version = "1.0.123", default-features = false } serde_derive = { version = "1.0.117", optional = true } smallvec = "1.6.1" hex-literal = "0.3.1" +log = { version = "0.4.14", default-features = false } frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } @@ -107,6 +108,7 @@ std = [ "xcm/std", "xcm-executor/std", "xcm-builder/std", + "log/std", ] # When enabled, the runtime api will not be build. # diff --git a/polkadot/runtime/rococo/src/lib.rs b/polkadot/runtime/rococo/src/lib.rs index ce42fdc71c..b58ca4c0fa 100644 --- a/polkadot/runtime/rococo/src/lib.rs +++ b/polkadot/runtime/rococo/src/lib.rs @@ -39,7 +39,7 @@ use runtime_parachains::{ runtime_api_impl::v1 as runtime_api_impl, }; use frame_support::{ - parameter_types, construct_runtime, debug, traits::{KeyOwnerProofSystem, Filter, EnsureOrigin}, weights::Weight, + parameter_types, construct_runtime, traits::{KeyOwnerProofSystem, Filter, EnsureOrigin}, weights::Weight, }; use sp_runtime::{ create_runtime_str, generic, impl_opaque_keys, @@ -289,7 +289,7 @@ impl frame_system::offchain::CreateSignedTransaction for R pallet_transaction_payment::ChargeTransactionPayment::::from(tip), ); let raw_payload = SignedPayload::new(call, extra).map_err(|e| { - debug::warn!("Unable to create signed payload: {:?}", e); + log::warn!("Unable to create signed payload: {:?}", e); }).ok()?; let signature = raw_payload.using_encoded(|payload| { C::sign(payload, public) diff --git a/polkadot/runtime/test-runtime/Cargo.toml b/polkadot/runtime/test-runtime/Cargo.toml index 52c79c44e4..b2e737831f 100644 --- a/polkadot/runtime/test-runtime/Cargo.toml +++ b/polkadot/runtime/test-runtime/Cargo.toml @@ -8,7 +8,7 @@ build = "build.rs" [dependencies] bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] } -log = { version = "0.4.13", optional = true } +log = { version = "0.4.14", default-features = false } rustc-hex = { version = "2.1.0", default-features = false } serde = { version = "1.0.123", default-features = false } serde_derive = { version = "1.0.117", optional = true } @@ -109,11 +109,11 @@ std = [ "pallet-vesting/std", "serde_derive", "serde/std", - "log", "pallet-babe/std", "babe-primitives/std", "sp-session/std", "pallet-randomness-collective-flip/std", "runtime-common/std", + "log/std", "sp-election-providers/std", ] diff --git a/polkadot/runtime/test-runtime/src/lib.rs b/polkadot/runtime/test-runtime/src/lib.rs index cf522e7422..7cef325736 100644 --- a/polkadot/runtime/test-runtime/src/lib.rs +++ b/polkadot/runtime/test-runtime/src/lib.rs @@ -66,11 +66,7 @@ use pallet_grandpa::{AuthorityId as GrandpaId, fg_primitives}; use sp_version::NativeVersion; use sp_core::OpaqueMetadata; use sp_staking::SessionIndex; -use frame_support::{ - parameter_types, construct_runtime, debug, - traits::{KeyOwnerProofSystem, Randomness}, - weights::Weight, -}; +use frame_support::{parameter_types, construct_runtime, traits::{KeyOwnerProofSystem, Randomness}, weights::Weight}; use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId; use pallet_transaction_payment::{FeeDetails, RuntimeDispatchInfo}; use pallet_session::historical as session_historical; @@ -392,7 +388,7 @@ impl frame_system::offchain::CreateSignedTransaction for R pallet_transaction_payment::ChargeTransactionPayment::::from(tip), ); let raw_payload = SignedPayload::new(call, extra).map_err(|e| { - debug::warn!("Unable to create signed payload: {:?}", e); + log::warn!("Unable to create signed payload: {:?}", e); }).ok()?; let signature = raw_payload.using_encoded(|payload| { C::sign(payload, public) diff --git a/polkadot/runtime/westend/Cargo.toml b/polkadot/runtime/westend/Cargo.toml index 7ddfbdb334..4cbdee4db0 100644 --- a/polkadot/runtime/westend/Cargo.toml +++ b/polkadot/runtime/westend/Cargo.toml @@ -8,7 +8,7 @@ build = "build.rs" [dependencies] bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] } parity-scale-codec = { version = "2.0.0", default-features = false, features = ["derive"] } -log = { version = "0.4.13", optional = true } +log = { version = "0.4.14", default-features = false } rustc-hex = { version = "2.1.0", default-features = false } serde = { version = "1.0.123", default-features = false } serde_derive = { version = "1.0.117", optional = true } @@ -144,7 +144,7 @@ std = [ "pallet-vesting/std", "serde_derive", "serde/std", - "log", + "log/std", "pallet-babe/std", "babe-primitives/std", "sp-session/std", diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs index b914d2c819..8d00619495 100644 --- a/polkadot/runtime/westend/src/lib.rs +++ b/polkadot/runtime/westend/src/lib.rs @@ -54,7 +54,7 @@ use sp_version::NativeVersion; use sp_core::OpaqueMetadata; use sp_staking::SessionIndex; use frame_support::{ - parameter_types, construct_runtime, debug, RuntimeDebug, + parameter_types, construct_runtime, RuntimeDebug, traits::{KeyOwnerProofSystem, Randomness, Filter, InstanceFilter}, weights::Weight, }; @@ -476,7 +476,7 @@ impl frame_system::offchain::CreateSignedTransaction for R pallet_transaction_payment::ChargeTransactionPayment::::from(tip), ); let raw_payload = SignedPayload::new(call, extra).map_err(|e| { - debug::warn!("Unable to create signed payload: {:?}", e); + log::warn!("Unable to create signed payload: {:?}", e); }).ok()?; let signature = raw_payload.using_encoded(|payload| { C::sign(payload, public) @@ -1033,7 +1033,6 @@ sp_api::impl_runtime_apis! { #[cfg(feature = "try-runtime")] impl frame_try_runtime::TryRuntime for Runtime { fn on_runtime_upgrade() -> Result<(Weight, Weight), sp_runtime::RuntimeString> { - frame_support::debug::RuntimeLogger::init(); let weight = Executive::try_runtime_upgrade()?; Ok((weight, BlockWeights::get().max_block)) } diff --git a/polkadot/xcm/xcm-executor/Cargo.toml b/polkadot/xcm/xcm-executor/Cargo.toml index bd60b2b67c..2dfacf0c22 100644 --- a/polkadot/xcm/xcm-executor/Cargo.toml +++ b/polkadot/xcm/xcm-executor/Cargo.toml @@ -15,6 +15,7 @@ sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "mas sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +log = { version = "0.4.14", default-features = false } [features] default = ["std"] @@ -27,4 +28,5 @@ std = [ "sp-core/std", "sp-runtime/std", "frame-support/std", + "log/std", ] diff --git a/polkadot/xcm/xcm-executor/src/lib.rs b/polkadot/xcm/xcm-executor/src/lib.rs index 5bef32bf1e..2c10a44796 100644 --- a/polkadot/xcm/xcm-executor/src/lib.rs +++ b/polkadot/xcm/xcm-executor/src/lib.rs @@ -71,7 +71,7 @@ impl ExecuteXcm for XcmExecutor { (origin, Xcm::TeleportAsset { assets, effects }) => { // check whether we trust origin to teleport this asset to us via config trait. // TODO: should de-wildcard `assets` before passing in. - frame_support::debug::print!("Teleport from {:?}", origin); + log::debug!(target: "runtime::xcm-executor", "Teleport from {:?}", origin); if assets.iter().all(|asset| Config::IsTeleporter::filter_asset_location(asset, &origin)) { // We only trust the origin to send us assets that they identify as their // sovereign assets.