From 1eb73979bde218427a4c99c6c181b0b731563b64 Mon Sep 17 00:00:00 2001
From: Branislav Kontur <bkontur@gmail.com>
Date: Mon, 4 Dec 2023 17:00:04 +0100
Subject: [PATCH] Backport from `polkadot-sdk` + bump (#2725)
* Backport from `polkadot-sdk`
* Bump `polkadot-sdk`
* revert
* Cargo.lock
---
bridges/README.md | 2 +-
bridges/bin/runtime-common/Cargo.toml | 4 ++--
bridges/modules/grandpa/Cargo.toml | 2 +-
bridges/modules/messages/Cargo.toml | 2 +-
bridges/modules/parachains/Cargo.toml | 2 +-
bridges/modules/relayers/Cargo.toml | 2 +-
bridges/modules/xcm-bridge-hub-router/Cargo.toml | 2 +-
bridges/primitives/chain-asset-hub-rococo/Cargo.toml | 2 +-
bridges/primitives/chain-asset-hub-westend/Cargo.toml | 2 +-
bridges/primitives/chain-bridge-hub-cumulus/Cargo.toml | 2 +-
bridges/primitives/chain-bridge-hub-kusama/Cargo.toml | 2 +-
bridges/primitives/chain-bridge-hub-polkadot/Cargo.toml | 2 +-
bridges/primitives/chain-bridge-hub-rococo/Cargo.toml | 2 +-
bridges/primitives/chain-bridge-hub-westend/Cargo.toml | 2 +-
bridges/primitives/chain-kusama/Cargo.toml | 2 +-
bridges/primitives/chain-polkadot-bulletin/Cargo.toml | 2 +-
bridges/primitives/chain-polkadot/Cargo.toml | 2 +-
bridges/primitives/chain-rococo/Cargo.toml | 2 +-
bridges/primitives/chain-westend/Cargo.toml | 2 +-
bridges/primitives/header-chain/Cargo.toml | 2 +-
bridges/primitives/messages/Cargo.toml | 4 ++--
bridges/primitives/parachains/Cargo.toml | 2 +-
bridges/primitives/polkadot-core/Cargo.toml | 2 +-
bridges/primitives/relayers/Cargo.toml | 4 ++--
bridges/primitives/runtime/Cargo.toml | 2 +-
bridges/primitives/test-utils/Cargo.toml | 6 +++---
bridges/primitives/xcm-bridge-hub-router/Cargo.toml | 6 +++---
27 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/bridges/README.md b/bridges/README.md
index f8191f432ad..a2ce213d254 100644
--- a/bridges/README.md
+++ b/bridges/README.md
@@ -101,7 +101,7 @@ messages between chains.
│ ├── parachains // On-Chain Parachains Light Client
│ ├── relayers // Relayer Rewards Registry
│ ├── xcm-bridge-hub // Multiple Dynamic Bridges Support
-│ ├── xcm-bridge-hub-router // XCM Router that may be used to Connect to XCM Bridge Hub
+│ ├── xcm-bridge-hub-router // XCM Router that may be used to Connect to XCM Bridge Hub
├── primitives // Code shared between modules, runtimes, and relays
│ └── ...
├── relays // Application for sending finality proofs and messages between chains
diff --git a/bridges/bin/runtime-common/Cargo.toml b/bridges/bin/runtime-common/Cargo.toml
index e94d886006e..44799c1b533 100644
--- a/bridges/bin/runtime-common/Cargo.toml
+++ b/bridges/bin/runtime-common/Cargo.toml
@@ -50,7 +50,7 @@ bp-test-utils = { path = "../../primitives/test-utils" }
pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
[features]
-default = [ "std" ]
+default = ["std"]
std = [
"bp-header-chain/std",
"bp-messages/std",
@@ -92,4 +92,4 @@ runtime-benchmarks = [
"sp-runtime/runtime-benchmarks",
"xcm-builder/runtime-benchmarks",
]
-integrity-test = [ "static_assertions" ]
+integrity-test = ["static_assertions"]
diff --git a/bridges/modules/grandpa/Cargo.toml b/bridges/modules/grandpa/Cargo.toml
index 6569fe9c400..4d8a5c07446 100644
--- a/bridges/modules/grandpa/Cargo.toml
+++ b/bridges/modules/grandpa/Cargo.toml
@@ -37,7 +37,7 @@ sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master
sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
[features]
-default = [ "std" ]
+default = ["std"]
std = [
"bp-header-chain/std",
"bp-runtime/std",
diff --git a/bridges/modules/messages/Cargo.toml b/bridges/modules/messages/Cargo.toml
index 05cc60b374b..0c8c0f7b824 100644
--- a/bridges/modules/messages/Cargo.toml
+++ b/bridges/modules/messages/Cargo.toml
@@ -31,7 +31,7 @@ pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch =
sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
[features]
-default = [ "std" ]
+default = ["std"]
std = [
"bp-messages/std",
"bp-runtime/std",
diff --git a/bridges/modules/parachains/Cargo.toml b/bridges/modules/parachains/Cargo.toml
index b9d5c0e6d33..f8160e3c6c8 100644
--- a/bridges/modules/parachains/Cargo.toml
+++ b/bridges/modules/parachains/Cargo.toml
@@ -35,7 +35,7 @@ sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master
sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
[features]
-default = [ "std" ]
+default = ["std"]
std = [
"bp-header-chain/std",
"bp-parachains/std",
diff --git a/bridges/modules/relayers/Cargo.toml b/bridges/modules/relayers/Cargo.toml
index e998177694a..cbaedd4c73e 100644
--- a/bridges/modules/relayers/Cargo.toml
+++ b/bridges/modules/relayers/Cargo.toml
@@ -34,7 +34,7 @@ sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master"
sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
[features]
-default = [ "std" ]
+default = ["std"]
std = [
"bp-messages/std",
"bp-relayers/std",
diff --git a/bridges/modules/xcm-bridge-hub-router/Cargo.toml b/bridges/modules/xcm-bridge-hub-router/Cargo.toml
index 314c7526fc4..e3a559cdc00 100644
--- a/bridges/modules/xcm-bridge-hub-router/Cargo.toml
+++ b/bridges/modules/xcm-bridge-hub-router/Cargo.toml
@@ -34,7 +34,7 @@ sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master"
sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
[features]
-default = [ "std" ]
+default = ["std"]
std = [
"bp-xcm-bridge-hub-router/std",
"codec/std",
diff --git a/bridges/primitives/chain-asset-hub-rococo/Cargo.toml b/bridges/primitives/chain-asset-hub-rococo/Cargo.toml
index de9cd8b0d80..5d86c7ebc6e 100644
--- a/bridges/primitives/chain-asset-hub-rococo/Cargo.toml
+++ b/bridges/primitives/chain-asset-hub-rococo/Cargo.toml
@@ -17,7 +17,7 @@ frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "
bp-xcm-bridge-hub-router = { path = "../xcm-bridge-hub-router", default-features = false }
[features]
-default = [ "std" ]
+default = ["std"]
std = [
"bp-xcm-bridge-hub-router/std",
"codec/std",
diff --git a/bridges/primitives/chain-asset-hub-westend/Cargo.toml b/bridges/primitives/chain-asset-hub-westend/Cargo.toml
index 5ed96876355..59629309e6f 100644
--- a/bridges/primitives/chain-asset-hub-westend/Cargo.toml
+++ b/bridges/primitives/chain-asset-hub-westend/Cargo.toml
@@ -17,7 +17,7 @@ frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "
bp-xcm-bridge-hub-router = { path = "../xcm-bridge-hub-router", default-features = false }
[features]
-default = [ "std" ]
+default = ["std"]
std = [
"bp-xcm-bridge-hub-router/std",
"codec/std",
diff --git a/bridges/primitives/chain-bridge-hub-cumulus/Cargo.toml b/bridges/primitives/chain-bridge-hub-cumulus/Cargo.toml
index 5b86305a9b9..f0c2b5c2a14 100644
--- a/bridges/primitives/chain-bridge-hub-cumulus/Cargo.toml
+++ b/bridges/primitives/chain-bridge-hub-cumulus/Cargo.toml
@@ -24,7 +24,7 @@ sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master"
polkadot-primitives = { git = "https://github.com/paritytech/polkadot-sdk", default-features = false , branch = "master" }
[features]
-default = [ "std" ]
+default = ["std"]
std = [
"bp-messages/std",
"bp-polkadot-core/std",
diff --git a/bridges/primitives/chain-bridge-hub-kusama/Cargo.toml b/bridges/primitives/chain-bridge-hub-kusama/Cargo.toml
index 2d6b5ba424e..1ed02b9b2d5 100644
--- a/bridges/primitives/chain-bridge-hub-kusama/Cargo.toml
+++ b/bridges/primitives/chain-bridge-hub-kusama/Cargo.toml
@@ -21,7 +21,7 @@ sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "mas
sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
[features]
-default = [ "std" ]
+default = ["std"]
std = [
"bp-bridge-hub-cumulus/std",
"bp-messages/std",
diff --git a/bridges/primitives/chain-bridge-hub-polkadot/Cargo.toml b/bridges/primitives/chain-bridge-hub-polkadot/Cargo.toml
index a4a116f0ce9..eebc4dfffd1 100644
--- a/bridges/primitives/chain-bridge-hub-polkadot/Cargo.toml
+++ b/bridges/primitives/chain-bridge-hub-polkadot/Cargo.toml
@@ -22,7 +22,7 @@ sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "mas
sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
[features]
-default = [ "std" ]
+default = ["std"]
std = [
"bp-bridge-hub-cumulus/std",
"bp-messages/std",
diff --git a/bridges/primitives/chain-bridge-hub-rococo/Cargo.toml b/bridges/primitives/chain-bridge-hub-rococo/Cargo.toml
index 9dfedc850c8..a3f2b9c28c9 100644
--- a/bridges/primitives/chain-bridge-hub-rococo/Cargo.toml
+++ b/bridges/primitives/chain-bridge-hub-rococo/Cargo.toml
@@ -21,7 +21,7 @@ sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "mas
sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
[features]
-default = [ "std" ]
+default = ["std"]
std = [
"bp-bridge-hub-cumulus/std",
"bp-messages/std",
diff --git a/bridges/primitives/chain-bridge-hub-westend/Cargo.toml b/bridges/primitives/chain-bridge-hub-westend/Cargo.toml
index f425e7dbdbe..eea808ea2b5 100644
--- a/bridges/primitives/chain-bridge-hub-westend/Cargo.toml
+++ b/bridges/primitives/chain-bridge-hub-westend/Cargo.toml
@@ -22,7 +22,7 @@ sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "mas
sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
[features]
-default = [ "std" ]
+default = ["std"]
std = [
"bp-bridge-hub-cumulus/std",
"bp-messages/std",
diff --git a/bridges/primitives/chain-kusama/Cargo.toml b/bridges/primitives/chain-kusama/Cargo.toml
index 4e27792f717..b08489aea82 100644
--- a/bridges/primitives/chain-kusama/Cargo.toml
+++ b/bridges/primitives/chain-kusama/Cargo.toml
@@ -21,7 +21,7 @@ sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master"
sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
[features]
-default = [ "std" ]
+default = ["std"]
std = [
"bp-header-chain/std",
"bp-polkadot-core/std",
diff --git a/bridges/primitives/chain-polkadot-bulletin/Cargo.toml b/bridges/primitives/chain-polkadot-bulletin/Cargo.toml
index 8b389b9f80e..b610b268d9a 100644
--- a/bridges/primitives/chain-polkadot-bulletin/Cargo.toml
+++ b/bridges/primitives/chain-polkadot-bulletin/Cargo.toml
@@ -26,7 +26,7 @@ sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "mas
sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
[features]
-default = [ "std" ]
+default = ["std"]
std = [
"bp-header-chain/std",
"bp-messages/std",
diff --git a/bridges/primitives/chain-polkadot/Cargo.toml b/bridges/primitives/chain-polkadot/Cargo.toml
index 592498743c8..7ea28bd24b0 100644
--- a/bridges/primitives/chain-polkadot/Cargo.toml
+++ b/bridges/primitives/chain-polkadot/Cargo.toml
@@ -21,7 +21,7 @@ sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master"
sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
[features]
-default = [ "std" ]
+default = ["std"]
std = [
"bp-header-chain/std",
"bp-polkadot-core/std",
diff --git a/bridges/primitives/chain-rococo/Cargo.toml b/bridges/primitives/chain-rococo/Cargo.toml
index 29ac59dd3ed..5e6e9bb73d2 100644
--- a/bridges/primitives/chain-rococo/Cargo.toml
+++ b/bridges/primitives/chain-rococo/Cargo.toml
@@ -21,7 +21,7 @@ sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master"
sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
[features]
-default = [ "std" ]
+default = ["std"]
std = [
"bp-header-chain/std",
"bp-polkadot-core/std",
diff --git a/bridges/primitives/chain-westend/Cargo.toml b/bridges/primitives/chain-westend/Cargo.toml
index f83ad61ed8b..b28e250554e 100644
--- a/bridges/primitives/chain-westend/Cargo.toml
+++ b/bridges/primitives/chain-westend/Cargo.toml
@@ -21,7 +21,7 @@ sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master"
sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
[features]
-default = [ "std" ]
+default = ["std"]
std = [
"bp-header-chain/std",
"bp-polkadot-core/std",
diff --git a/bridges/primitives/header-chain/Cargo.toml b/bridges/primitives/header-chain/Cargo.toml
index 03c99898993..51d9b2f30f5 100644
--- a/bridges/primitives/header-chain/Cargo.toml
+++ b/bridges/primitives/header-chain/Cargo.toml
@@ -30,7 +30,7 @@ hex = "0.4"
hex-literal = "0.4"
[features]
-default = [ "std" ]
+default = ["std"]
std = [
"bp-runtime/std",
"codec/std",
diff --git a/bridges/primitives/messages/Cargo.toml b/bridges/primitives/messages/Cargo.toml
index c608fcf33c2..10369e8c922 100644
--- a/bridges/primitives/messages/Cargo.toml
+++ b/bridges/primitives/messages/Cargo.toml
@@ -7,7 +7,7 @@ edition.workspace = true
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
[dependencies]
-codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "bit-vec"] }
+codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["bit-vec", "derive"] }
scale-info = { version = "2.10.0", default-features = false, features = ["bit-vec", "derive"] }
serde = { version = "1.0", default-features = false, features = ["alloc", "derive"] }
@@ -27,7 +27,7 @@ hex = "0.4"
hex-literal = "0.4"
[features]
-default = [ "std" ]
+default = ["std"]
std = [
"bp-header-chain/std",
"bp-runtime/std",
diff --git a/bridges/primitives/parachains/Cargo.toml b/bridges/primitives/parachains/Cargo.toml
index 95ce8d50f70..569fa535a28 100644
--- a/bridges/primitives/parachains/Cargo.toml
+++ b/bridges/primitives/parachains/Cargo.toml
@@ -25,7 +25,7 @@ sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "mas
sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
[features]
-default = [ "std" ]
+default = ["std"]
std = [
"bp-header-chain/std",
"bp-polkadot-core/std",
diff --git a/bridges/primitives/polkadot-core/Cargo.toml b/bridges/primitives/polkadot-core/Cargo.toml
index 513b46098c6..e9542f6f5b3 100644
--- a/bridges/primitives/polkadot-core/Cargo.toml
+++ b/bridges/primitives/polkadot-core/Cargo.toml
@@ -29,7 +29,7 @@ sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master"
hex = "0.4"
[features]
-default = [ "std" ]
+default = ["std"]
std = [
"bp-messages/std",
"bp-runtime/std",
diff --git a/bridges/primitives/relayers/Cargo.toml b/bridges/primitives/relayers/Cargo.toml
index 927e3e905ba..060e36a5f00 100644
--- a/bridges/primitives/relayers/Cargo.toml
+++ b/bridges/primitives/relayers/Cargo.toml
@@ -7,7 +7,7 @@ edition.workspace = true
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
[dependencies]
-codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "bit-vec"] }
+codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["bit-vec", "derive"] }
scale-info = { version = "2.10.0", default-features = false, features = ["bit-vec", "derive"] }
# Bridge Dependencies
@@ -26,7 +26,7 @@ hex = "0.4"
hex-literal = "0.4"
[features]
-default = [ "std" ]
+default = ["std"]
std = [
"bp-messages/std",
"bp-runtime/std",
diff --git a/bridges/primitives/runtime/Cargo.toml b/bridges/primitives/runtime/Cargo.toml
index dc5793e3aa0..b52d20d6916 100644
--- a/bridges/primitives/runtime/Cargo.toml
+++ b/bridges/primitives/runtime/Cargo.toml
@@ -31,7 +31,7 @@ trie-db = { version = "0.28.0", default-features = false }
hex-literal = "0.4"
[features]
-default = [ "std" ]
+default = ["std"]
std = [
"codec/std",
"frame-support/std",
diff --git a/bridges/primitives/test-utils/Cargo.toml b/bridges/primitives/test-utils/Cargo.toml
index e8c542aefc5..74328417606 100644
--- a/bridges/primitives/test-utils/Cargo.toml
+++ b/bridges/primitives/test-utils/Cargo.toml
@@ -7,9 +7,9 @@ edition.workspace = true
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
[dependencies]
-bp-header-chain = { path = "../header-chain", default-features = false }
+bp-header-chain = { path = "../header-chain", default-features = false }
bp-parachains = { path = "../parachains", default-features = false }
-bp-polkadot-core = { path = "../polkadot-core", default-features = false }
+bp-polkadot-core = { path = "../polkadot-core", default-features = false }
bp-runtime = { path = "../runtime", default-features = false }
codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false }
ed25519-dalek = { version = "2.1", default-features = false }
@@ -22,7 +22,7 @@ sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master"
sp-trie = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
[features]
-default = [ "std" ]
+default = ["std"]
std = [
"bp-header-chain/std",
"bp-parachains/std",
diff --git a/bridges/primitives/xcm-bridge-hub-router/Cargo.toml b/bridges/primitives/xcm-bridge-hub-router/Cargo.toml
index 9454a3efd1c..6cf260ce5e9 100644
--- a/bridges/primitives/xcm-bridge-hub-router/Cargo.toml
+++ b/bridges/primitives/xcm-bridge-hub-router/Cargo.toml
@@ -7,7 +7,7 @@ edition.workspace = true
license = "GPL-3.0-or-later WITH Classpath-exception-2.0"
[dependencies]
-codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["derive", "bit-vec"] }
+codec = { package = "parity-scale-codec", version = "3.1.5", default-features = false, features = ["bit-vec", "derive"] }
scale-info = { version = "2.10.0", default-features = false, features = ["bit-vec", "derive"] }
# Substrate Dependencies
@@ -15,5 +15,5 @@ sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "mas
sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master", default-features = false }
[features]
-default = [ "std" ]
-std = [ "codec/std", "scale-info/std", "sp-core/std", "sp-runtime/std" ]
+default = ["std"]
+std = ["codec/std", "scale-info/std", "sp-core/std", "sp-runtime/std"]
--
GitLab