Backport from polkadot-sdk with actual master (#2633)

* Backport from `polkadot-sdk`

* lingua stuff

* Fixes

* Fix

* Features?

* Fix - v5 -> v6

* zepter format features

* try zepter with CI

* Fix imports

* Fix

* Fix

* Fix

* Revert zepther pipeline

bridges/bin/millau/node/Cargo.toml

@@ -58,6 +58,4 @@ frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk", b
 
 [features]
 default = []
-runtime-benchmarks = [
-	"millau-runtime/runtime-benchmarks",
-]
+runtime-benchmarks = [ "millau-runtime/runtime-benchmarks" ]

bridges/bin/millau/node/src/service.rs

@@ -181,7 +181,7 @@ pub fn new_partial(
 
 /// Builds a new service for a full client.
 pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
-	use sc_network_common::sync::warp::WarpSyncParams;
+	use sc_service::WarpSyncParams;
 
 	let sc_service::PartialComponents {
 		client,
@@ -242,6 +242,7 @@ pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
 			import_queue,
 			block_announce_validator_builder: None,
 			warp_sync_params: Some(WarpSyncParams::WithProvider(warp_sync)),
+			block_relay: None,
 		})?;
 
 	if config.offchain_worker.enabled {

bridges/bin/millau/runtime/Cargo.toml

@@ -82,16 +82,15 @@ static_assertions = "1.1"
 substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "master" }
 
 [features]
-default = ["std"]
+default = [ "std" ]
 std = [
-	"sp-consensus-beefy/std",
 	"bp-messages/std",
 	"bp-millau/std",
 	"bp-parachains/std",
 	"bp-polkadot-core/std",
 	"bp-relayers/std",
-	"bp-rialto/std",
 	"bp-rialto-parachain/std",
+	"bp-rialto/std",
 	"bp-runtime/std",
 	"bp-westend/std",
 	"bp-xcm-bridge-hub-router/std",
@@ -104,8 +103,8 @@ std = [
 	"pallet-aura/std",
 	"pallet-authorship/std",
 	"pallet-balances/std",
-	"pallet-beefy/std",
 	"pallet-beefy-mmr/std",
+	"pallet-beefy/std",
 	"pallet-bridge-grandpa/std",
 	"pallet-bridge-messages/std",
 	"pallet-bridge-parachains/std",
@@ -120,12 +119,13 @@ std = [
 	"pallet-transaction-payment-rpc-runtime-api/std",
 	"pallet-transaction-payment/std",
 	"pallet-utility/std",
-	"pallet-xcm/std",
 	"pallet-xcm-bridge-hub-router/std",
+	"pallet-xcm/std",
 	"scale-info/std",
 	"sp-api/std",
 	"sp-block-builder/std",
 	"sp-consensus-aura/std",
+	"sp-consensus-beefy/std",
 	"sp-core/std",
 	"sp-inherents/std",
 	"sp-io/std",
@@ -135,20 +135,21 @@ std = [
 	"sp-std/std",
 	"sp-transaction-pool/std",
 	"sp-version/std",
-	"xcm/std",
 	"xcm-builder/std",
 	"xcm-executor/std",
+	"xcm/std",
 ]
 runtime-benchmarks = [
 	"bridge-runtime-common/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
+	"pallet-bridge-grandpa/runtime-benchmarks",
 	"pallet-bridge-messages/runtime-benchmarks",
 	"pallet-bridge-parachains/runtime-benchmarks",
 	"pallet-bridge-relayers/runtime-benchmarks",
-	"pallet-xcm/runtime-benchmarks",
 	"pallet-xcm-bridge-hub-router/runtime-benchmarks",
+	"pallet-xcm/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
 ]

bridges/bin/millau/runtime/src/lib.rs

@@ -55,7 +55,7 @@ use sp_std::prelude::*;
 #[cfg(feature = "std")]
 use sp_version::NativeVersion;
 use sp_version::RuntimeVersion;
-use xcm_builder::NetworkExportTable;
+use xcm_builder::{NetworkExportTable, NetworkExportTableItem};
 
 // to be able to use Millau runtime in `bridge-runtime-common` tests
 pub use bridge_runtime_common;
@@ -583,8 +583,15 @@ impl pallet_utility::Config for Runtime {
 // this config is totally incorrect - the pallet is not actually used at this runtime. We need
 // it only to be able to run benchmarks and make required traits (and default weights for tests).
 parameter_types! {
-	pub BridgeTable: Vec<(xcm::prelude::NetworkId, xcm::prelude::MultiLocation, Option<xcm::prelude::MultiAsset>)>
-		= vec![(xcm_config::RialtoNetwork::get(), xcm_config::TokenLocation::get(), Some((xcm_config::TokenAssetId::get(), 1_000_000_000_u128).into()))];
+	pub BridgeTable: Vec<NetworkExportTableItem>
+		= vec![
+			NetworkExportTableItem::new(
+				xcm_config::RialtoNetwork::get(),
+				None,
+				xcm_config::TokenLocation::get(),
+				Some((xcm_config::TokenAssetId::get(), 1_000_000_000_u128).into())
+			)
+		];
 }
 impl pallet_xcm_bridge_hub_router::Config for Runtime {
 	type WeightInfo = ();