Update to SDK 1.11 - @bkontur

system-parachains/asset-hubs/asset-hub-kusama/src/lib.rs

@@ -59,10 +59,9 @@ use frame_support::{
 	genesis_builder_helper::{build_state, get_preset},
 	ord_parameter_types, parameter_types,
 	traits::{
-		fungible, fungibles,
-		tokens::imbalance::{ResolveAssetTo, ResolveTo},
-		AsEnsureOriginWithArg, ConstBool, ConstU128, ConstU32, ConstU64, ConstU8, EitherOfDiverse,
-		Equals, InstanceFilter, TransformOrigin, WithdrawReasons,
+		fungible, fungibles, tokens::imbalance::ResolveAssetTo, AsEnsureOriginWithArg, ConstBool,
+		ConstU128, ConstU32, ConstU64, ConstU8, EitherOfDiverse, Equals, InstanceFilter,
+		TransformOrigin, WithdrawReasons,
 	},
 	weights::{ConstantMultiplier, Weight},
 	BoundedVec, PalletId,
@@ -71,7 +70,6 @@ use frame_system::{
 	limits::{BlockLength, BlockWeights},
 	EnsureRoot, EnsureSigned, EnsureSignedBy,
 };
-use pallet_collator_selection::StakingPotAccountId;
 use pallet_nfts::PalletFeatures;
 use parachains_common::{
 	message_queue::*, AccountId, AssetIdForTrustBackedAssets, AuraId, Balance, BlockNumber, Hash,
@@ -1518,27 +1516,23 @@ impl_runtime_apis! {
 				fn worst_case_holding(depositable_count: u32) -> xcm::v4::Assets {
 					// A mix of fungible, non-fungible, and concrete assets.
 					let holding_non_fungibles = MaxAssetsIntoHolding::get() / 2 - depositable_count;
-					let holding_fungibles = holding_non_fungibles.saturating_sub(1);
+					let holding_fungibles = holding_non_fungibles.saturating_sub(2); // -2 for two `iter::once` bellow
 					let fungibles_amount: u128 = 100;
-					let mut assets = (0..holding_fungibles)
+					(0..holding_fungibles)
 						.map(|i| {
 							Asset {
 								id: AssetId(GeneralIndex(i as u128).into()),
-								fun: Fungible(fungibles_amount * i as u128),
+								fun: Fungible(fungibles_amount * (i + 1) as u128), // non-zero amount
 							}
 						})
 						.chain(core::iter::once(Asset { id: AssetId(Here.into()), fun: Fungible(u128::MAX) }))
+						.chain(core::iter::once(Asset { id: AssetId(KsmLocation::get()), fun: Fungible(1_000_000 * UNITS) }))
 						.chain((0..holding_non_fungibles).map(|i| Asset {
 							id: AssetId(GeneralIndex(i as u128).into()),
 							fun: NonFungible(asset_instance_from(i)),
 						}))
-						.collect::<Vec<_>>();
-
-					assets.push(Asset {
-						id: AssetId(KsmLocation::get()),
-						fun: Fungible(1_000_000 * UNITS),
-					});
-					assets.into()
+						.collect::<Vec<_>>()
+						.into()
 				}
 			}
 

system-parachains/asset-hubs/asset-hub-polkadot/src/lib.rs

@@ -93,10 +93,9 @@ use frame_support::{
 	genesis_builder_helper::{build_state, get_preset},
 	parameter_types,
 	traits::{
-		fungible, fungibles,
-		tokens::imbalance::{ResolveAssetTo, ResolveTo},
-		AsEnsureOriginWithArg, ConstBool, ConstU32, ConstU64, ConstU8, EitherOfDiverse, Equals,
-		InstanceFilter, NeverEnsureOrigin, TransformOrigin, WithdrawReasons,
+		fungible, fungibles, tokens::imbalance::ResolveAssetTo, AsEnsureOriginWithArg, ConstBool,
+		ConstU32, ConstU64, ConstU8, EitherOfDiverse, Equals, InstanceFilter, NeverEnsureOrigin,
+		TransformOrigin, WithdrawReasons,
 	},
 	weights::{ConstantMultiplier, Weight},
 	PalletId,
@@ -105,7 +104,6 @@ use frame_system::{
 	limits::{BlockLength, BlockWeights},
 	EnsureRoot, EnsureSigned,
 };
-use pallet_collator_selection::StakingPotAccountId;
 use pallet_nfts::PalletFeatures;
 use parachains_common::{
 	message_queue::*, AccountId, AssetHubPolkadotAuraId as AuraId, AssetIdForTrustBackedAssets,
@@ -1510,27 +1508,23 @@ impl_runtime_apis! {
 				fn worst_case_holding(depositable_count: u32) -> xcm::v4::Assets {
 					// A mix of fungible, non-fungible, and concrete assets.
 					let holding_non_fungibles = MaxAssetsIntoHolding::get() / 2 - depositable_count;
-					let holding_fungibles = holding_non_fungibles - 1;
+					let holding_fungibles = holding_non_fungibles.saturating_sub(2); // -2 for two `iter::once` bellow
 					let fungibles_amount: u128 = 100;
-					let mut assets = (0..holding_fungibles)
+					(0..holding_fungibles)
 						.map(|i| {
 							Asset {
 								id: AssetId(GeneralIndex(i as u128).into()),
-								fun: Fungible(fungibles_amount * i as u128),
+								fun: Fungible(fungibles_amount * (i + 1) as u128), // non-zero amount
 							}
 						})
 						.chain(core::iter::once(Asset { id: AssetId(Here.into()), fun: Fungible(u128::MAX) }))
+						.chain(core::iter::once(Asset { id: AssetId(DotLocation::get()), fun: Fungible(1_000_000 * UNITS) }))
 						.chain((0..holding_non_fungibles).map(|i| Asset {
 							id: AssetId(GeneralIndex(i as u128).into()),
 							fun: NonFungible(asset_instance_from(i)),
 						}))
-						.collect::<Vec<_>>();
-
-					assets.push(Asset {
-						id: AssetId(DotLocation::get()),
-						fun: Fungible(1_000_000 * UNITS),
-					});
-					assets.into()
+						.collect::<Vec<_>>()
+						.into()
 				}
 			}
 

system-parachains/asset-hubs/asset-hub-polkadot/src/xcm_config.rs

@@ -34,12 +34,9 @@ use frame_support::{
 use frame_system::EnsureRoot;
 use pallet_collator_selection::StakingPotAccountId;
 use pallet_xcm::XcmPassthrough;
-use parachains_common::{
-	impls::ToStakingPot,
-	xcm_config::{
-		AllSiblingSystemParachains, AssetFeeAsExistentialDepositMultiplier,
-		ConcreteAssetFromSystem, ParentRelayOrSiblingParachains, RelayOrOtherSystemParachains,
-	},
+use parachains_common::xcm_config::{
+	AllSiblingSystemParachains, AssetFeeAsExistentialDepositMultiplier, ConcreteAssetFromSystem,
+	ParentRelayOrSiblingParachains, RelayOrOtherSystemParachains,
 };
 use polkadot_parachain_primitives::primitives::Sibling;
 use polkadot_runtime_constants::system_parachain;
@@ -157,7 +154,7 @@ pub type ForeignAssetsConvertedConcreteId = assets_common::ForeignAssetsConverte
 		StartsWithExplicitGlobalConsensus<UniversalLocationNetworkId>,
 	),
 	Balance,
-	xcm::v3::Location, // FAIL-CI @bkontur good?
+	xcm::v3::Location,
 >;
 
 /// Means for transacting foreign assets from different global consensus.

system-parachains/bridge-hubs/bridge-hub-kusama/primitives/src/lib.rs

@@ -102,11 +102,11 @@ frame_support::parameter_types! {
 
 	/// Transaction fee that is paid at the Kusama BridgeHub for delivering single inbound message.
 	/// (initially was calculated by test `BridgeHubKusama::can_calculate_fee_for_complex_message_delivery_transaction` + `33%`)
-	pub const BridgeHubKusamaBaseDeliveryFeeInKsms: u128 = 56_374_989_788;
+	pub const BridgeHubKusamaBaseDeliveryFeeInKsms: u128 = 56_375_711_123;
 
 	/// Transaction fee that is paid at the Kusama BridgeHub for delivering single outbound message confirmation.
 	/// (initially was calculated by test `BridgeHubKusama::can_calculate_fee_for_complex_message_confirmation_transaction` + `33%`)
-	pub const BridgeHubKusamaBaseConfirmationFeeInKsms: u128 = 53_808_755_240;
+	pub const BridgeHubKusamaBaseConfirmationFeeInKsms: u128 = 53_809_476_575;
 }
 
 /// Compute the total estimated fee that needs to be paid in KSMs by the sender when sending

system-parachains/bridge-hubs/bridge-hub-kusama/src/xcm_config.rs

@@ -28,12 +28,9 @@ use frame_support::{
 use frame_system::EnsureRoot;
 use pallet_collator_selection::StakingPotAccountId;
 use pallet_xcm::XcmPassthrough;
-use parachains_common::{
-	impls::ToStakingPot,
-	xcm_config::{
-		AllSiblingSystemParachains, ConcreteAssetFromSystem, ParentRelayOrSiblingParachains,
-		RelayOrOtherSystemParachains,
-	},
+use parachains_common::xcm_config::{
+	AllSiblingSystemParachains, ConcreteAssetFromSystem, ParentRelayOrSiblingParachains,
+	RelayOrOtherSystemParachains,
 };
 use polkadot_parachain_primitives::primitives::Sibling;
 use snowbridge_runtime_common::XcmExportFeeToSibling;

system-parachains/bridge-hubs/bridge-hub-kusama/tests/tests.rs

@@ -39,7 +39,7 @@ use sp_consensus_aura::SlotDuration;
 use sp_keyring::AccountKeyring::Alice;
 use sp_runtime::{
 	generic::{Era, SignedPayload},
-	AccountId32,
+	AccountId32, Perbill,
 };
 use system_parachains_constants::kusama::{
 	consensus::RELAY_CHAIN_SLOT_DURATION_MILLIS, fee::WeightToFee,
@@ -307,7 +307,7 @@ pub fn complex_relay_extrinsic_works() {
 
 #[test]
 pub fn can_calculate_weight_for_paid_export_message_with_reserve_transfer() {
-	check_sane_fees_values(
+	bridge_hub_test_utils::check_sane_fees_values(
 		"bp_bridge_hub_kusama::BridgeHubKusamaBaseXcmFeeInKsms",
 		bp_bridge_hub_kusama::BridgeHubKusamaBaseXcmFeeInKsms::get(),
 		|| {
@@ -328,7 +328,7 @@ pub fn can_calculate_weight_for_paid_export_message_with_reserve_transfer() {
 
 #[test]
 pub fn can_calculate_fee_for_complex_message_delivery_transaction() {
-	check_sane_fees_values(
+	bridge_hub_test_utils::check_sane_fees_values(
 		"bp_bridge_hub_kusama::BridgeHubKusamaBaseDeliveryFeeInKsms",
 		bp_bridge_hub_kusama::BridgeHubKusamaBaseDeliveryFeeInKsms::get(),
 		|| {
@@ -347,7 +347,7 @@ pub fn can_calculate_fee_for_complex_message_delivery_transaction() {
 
 #[test]
 pub fn can_calculate_fee_for_complex_message_confirmation_transaction() {
-	check_sane_fees_values(
+	bridge_hub_test_utils::check_sane_fees_values(
 		"bp_bridge_hub_kusama::BridgeHubKusamaBaseConfirmationFeeInKsms",
 		bp_bridge_hub_kusama::BridgeHubKusamaBaseConfirmationFeeInKsms::get(),
 		|| {
@@ -371,55 +371,3 @@ fn treasury_pallet_account_not_none() {
 		LocationToAccountId::convert_location(&RelayTreasuryLocation::get()).unwrap()
 	)
 }
-
-use sp_runtime::Perbill;
-
-// TODO:(PR#159): remove when `polkadot-sdk@1.8.0` bump (https://github.com/polkadot-fellows/runtimes/issues/186)
-/// A helper function for comparing the actual value of a fee constant with its estimated value. The
-/// estimated value can be overestimated (`overestimate_in_percent`), and if the difference to the
-/// actual value is below `margin_overestimate_diff_in_percent_for_lowering`, we should lower the
-/// actual value.
-pub fn check_sane_fees_values(
-	const_name: &str,
-	actual: u128,
-	calculate_estimated_fee: fn() -> u128,
-	overestimate_in_percent: Perbill,
-	margin_overestimate_diff_in_percent_for_lowering: Option<i16>,
-	label: &str,
-) {
-	let estimated = calculate_estimated_fee();
-	let estimated_plus_overestimate = estimated + (overestimate_in_percent * estimated);
-	let diff_to_estimated = diff_as_percent(actual, estimated);
-	let diff_to_estimated_plus_overestimate = diff_as_percent(actual, estimated_plus_overestimate);
-
-	log::error!(
-		target: "bridges::estimate",
-		"{label}:\nconstant: {const_name}\n[+] actual: {actual}\n[+] estimated: {estimated} ({diff_to_estimated:.2?})\n[+] estimated(+33%): {estimated_plus_overestimate} ({diff_to_estimated_plus_overestimate:.2?})",
-	);
-
-	// check if estimated value is sane
-	assert!(
-		estimated <= actual,
-		"estimated: {estimated}, actual: {actual}, please adjust `{const_name}` to the value: {estimated_plus_overestimate}",
-	);
-	assert!(
-		estimated_plus_overestimate <= actual,
-		"estimated_plus_overestimate: {estimated_plus_overestimate}, actual: {actual}, please adjust `{const_name}` to the value: {estimated_plus_overestimate}",
-	);
-
-	if let Some(margin_overestimate_diff_in_percent_for_lowering) =
-		margin_overestimate_diff_in_percent_for_lowering
-	{
-		assert!(
-			diff_to_estimated_plus_overestimate > margin_overestimate_diff_in_percent_for_lowering as f64,
-			"diff_to_estimated_plus_overestimate: {diff_to_estimated_plus_overestimate:.2}, overestimate_diff_in_percent_for_lowering: {margin_overestimate_diff_in_percent_for_lowering}, please adjust `{const_name}` to the value: {estimated_plus_overestimate}",
-		);
-	}
-}
-
-// TODO:(PR#159): remove when `polkadot-sdk@1.8.0` bump (https://github.com/polkadot-fellows/runtimes/issues/186)
-pub fn diff_as_percent(left: u128, right: u128) -> f64 {
-	let left = left as f64;
-	let right = right as f64;
-	((left - right).abs() / left) * 100f64 * (if left >= right { -1 } else { 1 }) as f64
-}

system-parachains/bridge-hubs/bridge-hub-polkadot/primitives/src/lib.rs

@@ -93,11 +93,11 @@ frame_support::parameter_types! {
 
 	/// Transaction fee that is paid at the Polkadot BridgeHub for delivering single inbound message.
 	/// (initially was calculated by test `BridgeHubPolkadot::can_calculate_fee_for_complex_message_delivery_transaction` + `33%`)
-	pub const BridgeHubPolkadotBaseDeliveryFeeInDots: Balance = 16_912_512_364;
+	pub const BridgeHubPolkadotBaseDeliveryFeeInDots: Balance = 16_912_728_765;
 
 	/// Transaction fee that is paid at the Polkadot BridgeHub for delivering single outbound message confirmation.
 	/// (initially was calculated by test `BridgeHubPolkadot::can_calculate_fee_for_complex_message_confirmation_transaction` + `33%`)
-	pub const BridgeHubPolkadotBaseConfirmationFeeInDots: Balance = 16_142_641_864;
+	pub const BridgeHubPolkadotBaseConfirmationFeeInDots: Balance = 16_142_858_265;
 }
 
 /// Compute the total estimated fee that needs to be paid in DOTs by the sender when sending

system-parachains/bridge-hubs/bridge-hub-polkadot/src/xcm_config.rs

@@ -27,12 +27,9 @@ use frame_support::{
 use frame_system::EnsureRoot;
 use pallet_collator_selection::StakingPotAccountId;
 use pallet_xcm::XcmPassthrough;
-use parachains_common::{
-	impls::ToStakingPot,
-	xcm_config::{
-		AllSiblingSystemParachains, ConcreteAssetFromSystem, ParentRelayOrSiblingParachains,
-		RelayOrOtherSystemParachains,
-	},
+use parachains_common::xcm_config::{
+	AllSiblingSystemParachains, ConcreteAssetFromSystem, ParentRelayOrSiblingParachains,
+	RelayOrOtherSystemParachains,
 };
 use polkadot_parachain_primitives::primitives::Sibling;
 use polkadot_runtime_constants::system_parachain;

system-parachains/bridge-hubs/bridge-hub-polkadot/tests/tests.rs

@@ -308,7 +308,7 @@ pub fn complex_relay_extrinsic_works() {
 
 #[test]
 pub fn can_calculate_weight_for_paid_export_message_with_reserve_transfer() {
-	check_sane_fees_values(
+	bridge_hub_test_utils::check_sane_fees_values(
 		"bp_bridge_hub_polkadot::BridgeHubPolkadotBaseXcmFeeInDots",
 		bp_bridge_hub_polkadot::BridgeHubPolkadotBaseXcmFeeInDots::get(),
 		|| {
@@ -329,7 +329,7 @@ pub fn can_calculate_weight_for_paid_export_message_with_reserve_transfer() {
 
 #[test]
 pub fn can_calculate_fee_for_complex_message_delivery_transaction() {
-	check_sane_fees_values(
+	bridge_hub_test_utils::check_sane_fees_values(
 		"bp_bridge_hub_polkadot::BridgeHubPolkadotBaseDeliveryFeeInDots",
 		bp_bridge_hub_polkadot::BridgeHubPolkadotBaseDeliveryFeeInDots::get(),
 		|| {
@@ -348,7 +348,7 @@ pub fn can_calculate_fee_for_complex_message_delivery_transaction() {
 
 #[test]
 pub fn can_calculate_fee_for_complex_message_confirmation_transaction() {
-	check_sane_fees_values(
+	bridge_hub_test_utils::check_sane_fees_values(
 		"bp_bridge_hub_polkadot::BridgeHubPolkadotBaseConfirmationFeeInDots",
 		bp_bridge_hub_polkadot::BridgeHubPolkadotBaseConfirmationFeeInDots::get(),
 		|| {
@@ -372,53 +372,3 @@ fn treasury_pallet_account_not_none() {
 		LocationToAccountId::convert_location(&RelayTreasuryLocation::get()).unwrap()
 	)
 }
-
-// TODO:(PR#159): remove when `polkadot-sdk@1.8.0` bump (https://github.com/polkadot-fellows/runtimes/issues/186)
-/// A helper function for comparing the actual value of a fee constant with its estimated value. The
-/// estimated value can be overestimated (`overestimate_in_percent`), and if the difference to the
-/// actual value is below `margin_overestimate_diff_in_percent_for_lowering`, we should lower the
-/// actual value.
-pub fn check_sane_fees_values(
-	const_name: &str,
-	actual: u128,
-	calculate_estimated_fee: fn() -> u128,
-	overestimate_in_percent: Perbill,
-	margin_overestimate_diff_in_percent_for_lowering: Option<i16>,
-	label: &str,
-) {
-	let estimated = calculate_estimated_fee();
-	let estimated_plus_overestimate = estimated + (overestimate_in_percent * estimated);
-	let diff_to_estimated = diff_as_percent(actual, estimated);
-	let diff_to_estimated_plus_overestimate = diff_as_percent(actual, estimated_plus_overestimate);
-
-	log::error!(
-		target: "bridges::estimate",
-		"{label}:\nconstant: {const_name}\n[+] actual: {actual}\n[+] estimated: {estimated} ({diff_to_estimated:.2?})\n[+] estimated(+33%): {estimated_plus_overestimate} ({diff_to_estimated_plus_overestimate:.2?})",
-	);
-
-	// check if estimated value is sane
-	assert!(
-		estimated <= actual,
-		"estimated: {estimated}, actual: {actual}, please adjust `{const_name}` to the value: {estimated_plus_overestimate}",
-	);
-	assert!(
-		estimated_plus_overestimate <= actual,
-		"estimated_plus_overestimate: {estimated_plus_overestimate}, actual: {actual}, please adjust `{const_name}` to the value: {estimated_plus_overestimate}",
-	);
-
-	if let Some(margin_overestimate_diff_in_percent_for_lowering) =
-		margin_overestimate_diff_in_percent_for_lowering
-	{
-		assert!(
-			diff_to_estimated_plus_overestimate > margin_overestimate_diff_in_percent_for_lowering as f64,
-			"diff_to_estimated_plus_overestimate: {diff_to_estimated_plus_overestimate:.2}, overestimate_diff_in_percent_for_lowering: {margin_overestimate_diff_in_percent_for_lowering}, please adjust `{const_name}` to the value: {estimated_plus_overestimate}",
-		);
-	}
-}
-
-// TODO:(PR#159): remove when `polkadot-sdk@1.8.0` bump (https://github.com/polkadot-fellows/runtimes/issues/186)
-pub fn diff_as_percent(left: u128, right: u128) -> f64 {
-	let left = left as f64;
-	let right = right as f64;
-	((left - right).abs() / left) * 100f64 * (if left >= right { -1 } else { 1 }) as f64
-}

system-parachains/collectives/collectives-polkadot/src/xcm_config.rs

@@ -25,12 +25,9 @@ use frame_support::{
 use frame_system::EnsureRoot;
 use pallet_collator_selection::StakingPotAccountId;
 use pallet_xcm::XcmPassthrough;
-use parachains_common::{
-	impls::ToStakingPot,
-	xcm_config::{
-		AllSiblingSystemParachains, ConcreteAssetFromSystem, ParentRelayOrSiblingParachains,
-		RelayOrOtherSystemParachains,
-	},
+use parachains_common::xcm_config::{
+	AllSiblingSystemParachains, ConcreteAssetFromSystem, ParentRelayOrSiblingParachains,
+	RelayOrOtherSystemParachains,
 };
 use polkadot_parachain_primitives::primitives::Sibling;
 use polkadot_runtime_constants::{