Merge branch 'main' into oty-backport-1.1.1

polkadot-fellows · Jan 26, 2024 · fe54813 · fe54813
2 parents d55aaaf + 18a45cc
commit fe54813
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,7 +9,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Added
 
 - Introduce chain spec generator ([polkadot-fellows/runtimes#127](https://github.com/polkadot-fellows/runtimes/pull/127))
-- Add [Encointer](https://encointer.org) system parachain runtime, completing [RFC22](https://github.com/polkadot-fellows/RFCs/blob/main/text/0022-adopt-encointer-runtime.md) ([polkadot-fellows/runtimes#80](https://github.com/polkadot-fellows/runtimes/pull/80))
+- Add [Encointer](https://encointer.org) system parachain runtime, completing [RFC22](https://github.com/polkadot-fellows/RFCs/blob/main/text/
+0022-adopt-encointer-runtime.md) ([polkadot-fellows/runtimes#80](https://github.com/polkadot-fellows/runtimes/pull/80))
+- Feature for enabling debug prints in the Polkadot and Kusama runtime ([polkadot-fellows/runtimes#85](https://github.com/polkadot-fellows/runtimes/pull/85))
 
 ### Changed
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/relay/kusama/Cargo.toml b/relay/kusama/Cargo.toml
@@ -115,6 +115,8 @@ xcm = { package = "staging-xcm", default-features = false , version = "4.0.0" }
 xcm-executor = { package = "staging-xcm-executor", default-features = false , version = "4.0.0" }
 xcm-builder = { package = "staging-xcm-builder", default-features = false , version = "4.0.0" }
 
+sp-debug-derive = { default-features = false, version = "10.0.0" }
+
 [dev-dependencies]
 tiny-keccak = { version = "2.0.2", features = ["keccak"] }
 keyring = { package = "sp-keyring", version = "28.0.0" }
@@ -216,6 +218,7 @@ std = [
 	"sp-application-crypto/std",
 	"sp-arithmetic/std",
 	"sp-core/std",
+	"sp-debug-derive/std",
 	"sp-genesis-builder/std",
 	"sp-io/std",
 	"sp-mmr-primitives/std",
@@ -356,3 +359,5 @@ on-chain-release-build = [ "sp-api/disable-logging" ]
 fast-runtime = []
 
 runtime-metrics = [ "runtime-parachains/runtime-metrics", "sp-io/with-tracing" ]
+
+force-debug = [ "sp-debug-derive/force-debug" ]
diff --git a/relay/polkadot/Cargo.toml b/relay/polkadot/Cargo.toml
@@ -111,6 +111,8 @@ xcm = { package = "staging-xcm", default-features = false , version = "4.0.0" }
 xcm-executor = { package = "staging-xcm-executor", default-features = false , version = "4.0.0" }
 xcm-builder = { package = "staging-xcm-builder", default-features = false , version = "4.0.0" }
 
+sp-debug-derive = { default-features = false, version = "10.0.0" }
+
 [dev-dependencies]
 hex-literal = "0.4.1"
 tiny-keccak = { version = "2.0.2", features = ["keccak"] }
@@ -209,6 +211,7 @@ std = [
 	"sp-application-crypto/std",
 	"sp-arithmetic/std",
 	"sp-core/std",
+	"sp-debug-derive/std",
 	"sp-genesis-builder/std",
 	"sp-io/std",
 	"sp-mmr-primitives/std",
@@ -340,3 +343,5 @@ on-chain-release-build = [ "sp-api/disable-logging" ]
 fast-runtime = []
 
 runtime-metrics = [ "runtime-parachains/runtime-metrics", "sp-io/with-tracing" ]
+
+force-debug = [ "sp-debug-derive/force-debug" ]