Set get_preset for BridgeHubRococo

clippy clippy clippy Fix
paritytech · Sep 2, 2024 · 4ae31df · 4ae31df
1 parent 2dc5e24
commit 4ae31df
Show file tree

Hide file tree

Showing 8 changed files with 188 additions and 96 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bridges/modules/messages/src/lib.rs b/bridges/modules/messages/src/lib.rs
@@ -561,8 +561,9 @@ pub mod pallet {
 		pub operating_mode: MessagesOperatingMode,
 		/// Initial pallet owner.
 		pub owner: Option<T::AccountId>,
+		#[serde(skip)]
 		/// Dummy marker.
-		pub phantom: sp_std::marker::PhantomData<I>,
+		pub _config: sp_std::marker::PhantomData<I>,
 	}
 
 	#[pallet::genesis_build]

diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/genesis_config_presets.rs b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/genesis_config_presets.rs
@@ -156,7 +156,7 @@ pub fn get_preset(id: &PresetId) -> Option<Vec<u8>> {
 			ROC * 1_000_000,
 			1000.into(),
 		),
-		Err(_) | Ok(_) => return None,
+		_ => return None,
 	};
 
 	Some(

diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/genesis_config_presets.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/genesis_config_presets.rs
@@ -154,7 +154,7 @@ pub fn get_preset(id: &PresetId) -> Option<Vec<u8>> {
 			WND * 1_000_000,
 			1000.into(),
 		),
-		Err(_) | Ok(_) => return None,
+		_ => return None,
 	};
 
 	Some(

diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/Cargo.toml b/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 }
@@ -192,6 +193,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",

diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/genesis_config_presets.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/genesis_config_presets.rs
@@ -0,0 +1,164 @@
+// 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.
+
+//! # Bridge Hub Rococo Runtime genesis config presets
+
+use crate::*;
+use alloc::{vec, vec::Vec};
+use cumulus_primitives_core::ParaId;
+use parachains_common::{genesis_config_helpers::*, AccountId, AuraId};
+use sp_core::sr25519;
+use sp_genesis_builder::PresetId;
+use testnet_parachains_constants::rococo::xcm_version::SAFE_XCM_VERSION;
+
+const BRIDGE_HUB_ROCOCO_ED: Balance = ExistentialDeposit::get();
+
+fn bridge_hub_rococo_genesis(
+	invulnerables: Vec<(AccountId, AuraId)>,
+	endowed_accounts: Vec<AccountId>,
+	id: ParaId,
+	bridges_pallet_owner: Option<AccountId>,
+	asset_hub_para_id: ParaId,
+) -> serde_json::Value {
+	serde_json::json!({
+		"balances": BalancesConfig {
+			balances: endowed_accounts.iter().cloned().map(|k| (k, 1u128 << 60)).collect::<Vec<_>>(),
+		},
+		"parachainInfo": ParachainInfoConfig {
+			parachain_id: id,
+			..Default::default()
+		},
+		"collatorSelection": CollatorSelectionConfig {
+			invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(),
+			candidacy_bond: BRIDGE_HUB_ROCOCO_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()
+		},
+		"bridgeWestendGrandpa": BridgeWestendGrandpaConfig {
+			owner: bridges_pallet_owner.clone(),
+			..Default::default()
+		},
+		"bridgeWestendMessages": BridgeWestendMessagesConfig {
+			owner: bridges_pallet_owner.clone(),
+			..Default::default()
+		},
+		"ethereumSystem": EthereumSystemConfig {
+			para_id: id,
+			asset_hub_para_id,
+			..Default::default()
+		}
+	})
+}
+
+/// Encapsulates names of predefined presets.
+mod preset_names {
+	pub const PRESET_DEVELOPMENT: &str = "development";
+	pub const PRESET_LOCAL: &str = "local";
+}
+
+/// Provides the JSON representation of predefined genesis config for given `id`.
+pub fn get_preset(id: &sp_genesis_builder::PresetId) -> Option<sp_std::vec::Vec<u8>> {
+	use preset_names::*;
+	let patch = match id.try_into() {
+		Ok(PRESET_LOCAL) => bridge_hub_rococo_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"),
+			],
+			1013.into(),
+			Some(get_account_id_from_seed::<sr25519::Public>("Bob")),
+			rococo_runtime_constants::system_parachain::ASSET_HUB_ID.into(),
+		),
+		Ok(PRESET_DEVELOPMENT) => bridge_hub_rococo_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"),
+			],
+			1013.into(),
+			Some(get_account_id_from_seed::<sr25519::Public>("Bob")),
+			rococo_runtime_constants::system_parachain::ASSET_HUB_ID.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_DEVELOPMENT), PresetId::from(PRESET_LOCAL)]
+}
diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs
@@ -32,6 +32,7 @@ pub mod bridge_common_config;
 pub mod bridge_to_bulletin_config;
 pub mod bridge_to_ethereum_config;
 pub mod bridge_to_westend_config;
+mod genesis_config_presets;
 mod weights;
 pub mod xcm_config;
 
@@ -1569,11 +1570,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()
 		}
 	}
 }