CI short benchmarking with frame-omni-bencher

.github/workflows/check-frame-omni-bencher.yml

@@ -17,8 +17,6 @@ env:
 
 jobs:
   changes:
-    # TODO: remove once migration is complete or this workflow is fully stable
-    if: contains(github.event.label.name, 'GHA-migration')
     permissions:
       pull-requests: read
     uses: ./.github/workflows/reusable-check-changed-files.yml

cumulus/parachains/runtimes/assets/asset-hub-rococo/src/genesis_config_presets.rs

@@ -15,60 +15,54 @@
 
 //! # Asset Hub Rococo Runtime genesis config presets
 
+use crate::*;
 use alloc::{vec, vec::Vec};
 use cumulus_primitives_core::ParaId;
 use hex_literal::hex;
-use parachains_common::{genesis_config_helpers::*, AccountId, AuraId, Balance as AssetHubBalance};
+use parachains_common::{genesis_config_helpers::*, AccountId, AuraId};
 use sp_core::{crypto::UncheckedInto, sr25519};
 use sp_genesis_builder::PresetId;
-use testnet_parachains_constants::rococo::xcm_version::SAFE_XCM_VERSION;
+use testnet_parachains_constants::rococo::{currency::UNITS as ROC, xcm_version::SAFE_XCM_VERSION};
 
-const ASSET_HUB_ROCOCO_ED: AssetHubBalance = crate::ExistentialDeposit::get();
-
-/// Generate the session keys from individual elements.
-///
-/// The input must be a tuple of individual keys (a single arg for now since we have just one key).
-pub fn asset_hub_rococo_session_keys(keys: AuraId) -> crate::SessionKeys {
-	crate::SessionKeys { aura: keys }
-}
+const ASSET_HUB_ROCOCO_ED: Balance = ExistentialDeposit::get();
 
 fn asset_hub_rococo_genesis(
 	invulnerables: Vec<(AccountId, AuraId)>,
 	endowed_accounts: Vec<AccountId>,
-	endowment: AssetHubBalance,
+	endowment: Balance,
 	id: ParaId,
 ) -> serde_json::Value {
 	serde_json::json!({
-		"balances": crate::BalancesConfig {
+		"balances": BalancesConfig {
 			balances: endowed_accounts
 				.iter()
 				.cloned()
 				.map(|k| (k, endowment))
 				.collect(),
 		},
-		"parachainInfo": crate::ParachainInfoConfig {
+		"parachainInfo": ParachainInfoConfig {
 			parachain_id: id,
 			..Default::default()
 		},
-		"collatorSelection": crate::CollatorSelectionConfig {
+		"collatorSelection": CollatorSelectionConfig {
 			invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(),
 			candidacy_bond: ASSET_HUB_ROCOCO_ED * 16,
 			..Default::default()
 		},
-		"session": crate::SessionConfig {
+		"session": SessionConfig {
 			keys: invulnerables
 				.into_iter()
 				.map(|(acc, aura)| {
 					(
 						acc.clone(),                         // account id
 						acc,                                 // validator id
-						asset_hub_rococo_session_keys(aura), // session keys
+						SessionKeys { aura }, 		     // session keys
 					)
 				})
 				.collect(),
 			..Default::default()
 		},
-		"polkadotXcm": crate::PolkadotXcmConfig {
+		"polkadotXcm": PolkadotXcmConfig {
 			safe_xcm_version: Some(SAFE_XCM_VERSION),
 			..Default::default()
 		}
@@ -77,7 +71,6 @@ fn asset_hub_rococo_genesis(
 
 /// Encapsulates names of predefined presets.
 mod preset_names {
-	pub const PRESET_DEVELOPMENT: &str = "development";
 	pub const PRESET_LOCAL: &str = "local";
 	pub const PRESET_GENESIS: &str = "genesis";
 }
@@ -144,10 +137,10 @@ pub fn get_preset(id: &PresetId) -> Option<Vec<u8>> {
 				get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
 				get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
 			],
-			testnet_parachains_constants::rococo::currency::UNITS * 1_000_000,
+			ROC * 1_000_000,
 			1000.into(),
 		),
-		Ok(PRESET_DEVELOPMENT) => asset_hub_rococo_genesis(
+		Ok(sp_genesis_builder::DEV_RUNTIME_PRESET) => asset_hub_rococo_genesis(
 			// initial collators.
 			vec![(
 				get_account_id_from_seed::<sr25519::Public>("Alice"),
@@ -159,10 +152,10 @@ pub fn get_preset(id: &PresetId) -> Option<Vec<u8>> {
 				get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
 				get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
 			],
-			testnet_parachains_constants::rococo::currency::UNITS * 1_000_000,
+			ROC * 1_000_000,
 			1000.into(),
 		),
-		Err(_) | Ok(_) => return None,
+		_ => return None,
 	};
 
 	Some(
@@ -177,7 +170,7 @@ pub fn preset_names() -> Vec<PresetId> {
 	use preset_names::*;
 	vec![
 		PresetId::from(PRESET_GENESIS),
-		PresetId::from(PRESET_DEVELOPMENT),
+		PresetId::from(sp_genesis_builder::DEV_RUNTIME_PRESET),
 		PresetId::from(PRESET_LOCAL),
 	]
 }

cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs

@@ -41,7 +41,6 @@ use cumulus_pallet_parachain_system::RelayNumberMonotonicallyIncreases;
 use cumulus_primitives_core::AggregateMessageOrigin;
 use sp_api::impl_runtime_apis;
 use sp_core::{crypto::KeyTypeId, OpaqueMetadata};
-use sp_genesis_builder::PresetId;
 use sp_runtime::{
 	create_runtime_str, generic, impl_opaque_keys,
 	traits::{AccountIdConversion, BlakeTwo256, Block as BlockT, Saturating, Verify},
@@ -1759,11 +1758,11 @@ impl_runtime_apis! {
 			build_state::<RuntimeGenesisConfig>(config)
 		}
 
-		fn get_preset(id: &Option<PresetId>) -> Option<Vec<u8>> {
+		fn get_preset(id: &Option<sp_genesis_builder::PresetId>) -> Option<Vec<u8>> {
 			get_preset::<RuntimeGenesisConfig>(id, &genesis_config_presets::get_preset)
 		}
 
-		fn preset_names() -> Vec<PresetId> {
+		fn preset_names() -> Vec<sp_genesis_builder::PresetId> {
 			genesis_config_presets::preset_names()
 		}
 	}

cumulus/parachains/runtimes/assets/asset-hub-westend/Cargo.toml

@@ -14,6 +14,7 @@ codec = { features = ["derive", "max-encoded-len"], workspace = true }
 hex-literal = { workspace = true, default-features = true }
 log = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
+serde_json = { features = ["alloc"], workspace = true }
 
 # Substrate
 frame-benchmarking = { optional = true, workspace = true }
@@ -233,6 +234,7 @@ std = [
 	"polkadot-runtime-common/std",
 	"primitive-types/std",
 	"scale-info/std",
+	"serde_json/std",
 	"snowbridge-router-primitives/std",
 	"sp-api/std",
 	"sp-block-builder/std",

cumulus/parachains/runtimes/assets/asset-hub-westend/src/genesis_config_presets.rs

@@ -0,0 +1,174 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! # Asset Hub Westend Runtime genesis config presets
+
+use crate::*;
+use alloc::{vec, vec::Vec};
+use cumulus_primitives_core::ParaId;
+use hex_literal::hex;
+use parachains_common::{genesis_config_helpers::*, AccountId, AuraId};
+use sp_core::{crypto::UncheckedInto, sr25519};
+use sp_genesis_builder::PresetId;
+use testnet_parachains_constants::westend::{
+	currency::UNITS as WND, xcm_version::SAFE_XCM_VERSION,
+};
+
+const ASSET_HUB_WESTEND_ED: Balance = ExistentialDeposit::get();
+
+fn asset_hub_westend_genesis(
+	invulnerables: Vec<(AccountId, AuraId)>,
+	endowed_accounts: Vec<AccountId>,
+	endowment: Balance,
+	id: ParaId,
+) -> serde_json::Value {
+	serde_json::json!({
+		"balances": BalancesConfig {
+			balances: endowed_accounts
+				.iter()
+				.cloned()
+				.map(|k| (k, endowment))
+				.collect(),
+		},
+		"parachainInfo": ParachainInfoConfig {
+			parachain_id: id,
+			..Default::default()
+		},
+		"collatorSelection": CollatorSelectionConfig {
+			invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(),
+			candidacy_bond: ASSET_HUB_WESTEND_ED * 16,
+			..Default::default()
+		},
+		"session": SessionConfig {
+			keys: invulnerables
+				.into_iter()
+				.map(|(acc, aura)| {
+					(
+						acc.clone(),                         // account id
+						acc,                                 // validator id
+						SessionKeys { aura }, 		     // session keys
+					)
+				})
+				.collect(),
+			..Default::default()
+		},
+		"polkadotXcm": PolkadotXcmConfig {
+			safe_xcm_version: Some(SAFE_XCM_VERSION),
+			..Default::default()
+		}
+	})
+}
+
+/// Encapsulates names of predefined presets.
+mod preset_names {
+	pub const PRESET_LOCAL: &str = "local";
+	pub const PRESET_GENESIS: &str = "genesis";
+}
+
+/// Provides the JSON representation of predefined genesis config for given `id`.
+pub fn get_preset(id: &PresetId) -> Option<Vec<u8>> {
+	use preset_names::*;
+	let patch = match id.try_into() {
+		Ok(PRESET_GENESIS) => asset_hub_westend_genesis(
+			// initial collators.
+			vec![
+				(
+					hex!("9cfd429fa002114f33c1d3e211501d62830c9868228eb3b4b8ae15a83de04325").into(),
+					hex!("9cfd429fa002114f33c1d3e211501d62830c9868228eb3b4b8ae15a83de04325")
+						.unchecked_into(),
+				),
+				(
+					hex!("12a03fb4e7bda6c9a07ec0a11d03c24746943e054ff0bb04938970104c783876").into(),
+					hex!("12a03fb4e7bda6c9a07ec0a11d03c24746943e054ff0bb04938970104c783876")
+						.unchecked_into(),
+				),
+				(
+					hex!("1256436307dfde969324e95b8c62cb9101f520a39435e6af0f7ac07b34e1931f").into(),
+					hex!("1256436307dfde969324e95b8c62cb9101f520a39435e6af0f7ac07b34e1931f")
+						.unchecked_into(),
+				),
+				(
+					hex!("98102b7bca3f070f9aa19f58feed2c0a4e107d203396028ec17a47e1ed80e322").into(),
+					hex!("98102b7bca3f070f9aa19f58feed2c0a4e107d203396028ec17a47e1ed80e322")
+						.unchecked_into(),
+				),
+			],
+			Vec::new(),
+			ASSET_HUB_WESTEND_ED * 4096,
+			1000.into(),
+		),
+		Ok(PRESET_LOCAL) => asset_hub_westend_genesis(
+			// initial collators.
+			vec![
+				(
+					get_account_id_from_seed::<sr25519::Public>("Alice"),
+					get_collator_keys_from_seed::<AuraId>("Alice"),
+				),
+				(
+					get_account_id_from_seed::<sr25519::Public>("Bob"),
+					get_collator_keys_from_seed::<AuraId>("Bob"),
+				),
+			],
+			vec![
+				get_account_id_from_seed::<sr25519::Public>("Alice"),
+				get_account_id_from_seed::<sr25519::Public>("Bob"),
+				get_account_id_from_seed::<sr25519::Public>("Charlie"),
+				get_account_id_from_seed::<sr25519::Public>("Dave"),
+				get_account_id_from_seed::<sr25519::Public>("Eve"),
+				get_account_id_from_seed::<sr25519::Public>("Ferdie"),
+				get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
+				get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
+				get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
+				get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
+				get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
+				get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
+			],
+			WND * 1_000_000,
+			1000.into(),
+		),
+		Ok(sp_genesis_builder::DEV_RUNTIME_PRESET) => asset_hub_westend_genesis(
+			// initial collators.
+			vec![(
+				get_account_id_from_seed::<sr25519::Public>("Alice"),
+				get_collator_keys_from_seed::<AuraId>("Alice"),
+			)],
+			vec![
+				get_account_id_from_seed::<sr25519::Public>("Alice"),
+				get_account_id_from_seed::<sr25519::Public>("Bob"),
+				get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
+				get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
+			],
+			WND * 1_000_000,
+			1000.into(),
+		),
+		_ => return None,
+	};
+
+	Some(
+		serde_json::to_string(&patch)
+			.expect("serialization to json is expected to work. qed.")
+			.into_bytes(),
+	)
+}
+
+/// List of supported presets.
+pub fn preset_names() -> Vec<PresetId> {
+	use preset_names::*;
+	vec![
+		PresetId::from(PRESET_GENESIS),
+		PresetId::from(sp_genesis_builder::DEV_RUNTIME_PRESET),
+		PresetId::from(PRESET_LOCAL),
+	]
+}

cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs

@@ -24,6 +24,7 @@
 #[cfg(feature = "std")]
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
+mod genesis_config_presets;
 mod weights;
 pub mod xcm_config;
 
@@ -1854,11 +1855,11 @@ impl_runtime_apis! {
 		}
 
 		fn get_preset(id: &Option<sp_genesis_builder::PresetId>) -> Option<Vec<u8>> {
-			get_preset::<RuntimeGenesisConfig>(id, |_| None)
+			get_preset::<RuntimeGenesisConfig>(id, &genesis_config_presets::get_preset)
 		}
 
 		fn preset_names() -> Vec<sp_genesis_builder::PresetId> {
-			vec![]
+			genesis_config_presets::preset_names()
 		}
 	}
 }

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml

@@ -22,6 +22,7 @@ scale-info = { features = [
 	"derive",
 ], workspace = true }
 serde = { optional = true, features = ["derive"], workspace = true, default-features = true }
+serde_json = { features = ["alloc"], workspace = true }
 
 # Substrate
 frame-benchmarking = { optional = true, workspace = true }
@@ -191,6 +192,7 @@ std = [
 	"rococo-runtime-constants/std",
 	"scale-info/std",
 	"serde",
+	"serde_json/std",
 	"snowbridge-beacon-primitives/std",
 	"snowbridge-core/std",
 	"snowbridge-outbound-queue-runtime-api/std",