Skip to content

Fixed genesis config presets for bridge tests #9185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bkontur merged 12 commits into from
Jul 17, 2025
Merged

Fixed genesis config presets for bridge tests #9185

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
edacd39
Fixed genesis config presets for bridge tests
antkve Jul 13, 2025
4eed3eb
Apply suggestions from code review
bkontur Jul 16, 2025
4a9403d
IMports
bkontur Jul 16, 2025
cc0f2e3
Update from github-actions[bot] running command 'fmt'
github-actions[bot] Jul 16, 2025
545ba44
Remove force_create_foreign_asset
bkontur Jul 17, 2025
7fd97fa
Nits
bkontur Jul 17, 2025
3b35c5b
Merge branch 'master' into pool-test-fix-genesis
bkontur Jul 17, 2025
b0e013c
Apply suggestions from code review
bkontur Jul 17, 2025
b896465
Apply suggestions from code review
bkontur Jul 17, 2025
e691f88
Merge branch 'master' into pool-test-fix-genesis
bkontur Jul 17, 2025
9c9626e
wait for both
bkontur Jul 17, 2025
6751723
Merge branch 'master' into pool-test-fix-genesis
bkontur Jul 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 67 additions & 2 deletions cumulus/parachains/runtimes/assets/asset-hub-rococo/src/genesis_config_presets.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,54 @@

//! # Asset Hub Rococo Runtime genesis config presets

use crate::*;
use alloc::{vec, vec::Vec};
use crate::{*, xcm_config::UniversalLocation};
use alloc::{vec, vec::Vec, format};
use cumulus_primitives_core::ParaId;
use frame_support::build_struct_json_patch;
use hex_literal::hex;
use parachains_common::{AccountId, AuraId};
use bp_asset_hub_westend::AccountPublic;
use sp_runtime::traits::IdentifyAccount;
use sp_core::crypto::UncheckedInto;
use sp_genesis_builder::PresetId;
use sp_keyring::Sr25519Keyring;
use testnet_parachains_constants::rococo::{currency::UNITS as ROC, xcm_version::SAFE_XCM_VERSION};
use xcm::latest::{prelude::*, WESTEND_GENESIS_HASH};
use xcm_builder::GlobalConsensusConvertsFor;
use xcm_executor::traits::ConvertLocation;
use sp_core::{Pair, Public};

const ASSET_HUB_ROCOCO_ED: Balance = ExistentialDeposit::get();

parameter_types!{
pub const WestendNetwork: NetworkId = NetworkId::ByGenesis(WESTEND_GENESIS_HASH);
pub AssetHubWestend: Location = Location::new(2, [
GlobalConsensus(WestendNetwork::get()),
Parachain(bp_asset_hub_westend::ASSET_HUB_WESTEND_PARACHAIN_ID)
]);
}
/// Helper function to generate a crypto pair from seed
fn get_from_seed<TPublic: Public>(seed: &str) -> <TPublic::Pair as Pair>::Public {
TPublic::Pair::from_string(&format!("//{}", seed), None)
.expect("static values are valid; qed")
.public()
}

/// Helper function to generate an account ID from seed
fn get_account_id_from_seed<TPublic: Public>(seed: &str) -> AccountId
where
AccountPublic: From<<TPublic::Pair as Pair>::Public>,
{
AccountPublic::from(get_from_seed::<TPublic>(seed)).into_account()
}

fn asset_hub_rococo_genesis(
invulnerables: Vec<(AccountId, AuraId)>,
endowed_accounts: Vec<AccountId>,
endowment: Balance,
id: ParaId,
foreign_assets: Vec<(Location, AccountId, Balance)>,
foreign_assets_endowed_accounts: Vec<(Location, AccountId, Balance)>,
) -> serde_json::Value {
build_struct_json_patch!(RuntimeGenesisConfig {
balances: BalancesConfig {
Expand All @@ -56,6 +86,17 @@ fn asset_hub_rococo_genesis(
.collect(),
},
polkadot_xcm: PolkadotXcmConfig { safe_xcm_version: Some(SAFE_XCM_VERSION) },
foreign_assets: ForeignAssetsConfig {
assets: foreign_assets
.into_iter()
.map(|asset| (asset.0.try_into().unwrap(), asset.1, false, asset.2))
.collect(),
accounts: foreign_assets_endowed_accounts
.into_iter()
.map(|asset| (asset.0.try_into().unwrap(), asset.1, asset.2))
.collect(),
..Default::default()
},
})
}

Expand Down Expand Up @@ -99,6 +140,8 @@ pub fn get_preset(id: &PresetId) -> Option<Vec<u8>> {
Vec::new(),
ASSET_HUB_ROCOCO_ED * 524_288,
1000.into(),
vec![],
vec![],
),
sp_genesis_builder::LOCAL_TESTNET_RUNTIME_PRESET => asset_hub_rococo_genesis(
// initial collators.
Expand All @@ -109,6 +152,26 @@ pub fn get_preset(id: &PresetId) -> Option<Vec<u8>> {
Sr25519Keyring::well_known().map(|x| x.to_account_id()).collect(),
testnet_parachains_constants::rococo::currency::UNITS * 1_000_000,
1000.into(),

vec![
// bridged DOT
(
Location::new(2, [GlobalConsensus(WestendNetwork::get())]),
GlobalConsensusConvertsFor::<UniversalLocation, AccountId>::convert_location(
&Location { parents: 2, interior: [GlobalConsensus(WestendNetwork::get())].into() },
)
.unwrap(),
10000000,
),
],
vec![
// bridged DOT to Bob
(
Location::new(2, [GlobalConsensus(WestendNetwork::get())]),
get_account_id_from_seed::<sp_core::sr25519::Public>("Bob"),
10000000 * 4096 * 4096,
),
],
),
sp_genesis_builder::DEV_RUNTIME_PRESET => asset_hub_rococo_genesis(
// initial collators.
Expand All @@ -121,6 +184,8 @@ pub fn get_preset(id: &PresetId) -> Option<Vec<u8>> {
],
ROC * 1_000_000,
1000.into(),
vec![],
vec![],
),
_ => return None,
};
Expand Down
70 changes: 68 additions & 2 deletions cumulus/parachains/runtimes/assets/asset-hub-westend/src/genesis_config_presets.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,59 @@

//! # Asset Hub Westend Runtime genesis config presets

use crate::*;
use alloc::{vec, vec::Vec};
use crate::{*, xcm_config::UniversalLocation};
use alloc::{vec, vec::Vec, format};
use cumulus_primitives_core::ParaId;
use frame_support::build_struct_json_patch;
use hex_literal::hex;
use parachains_common::{AccountId, AuraId};
use bp_asset_hub_rococo::AccountPublic;
use sp_runtime::traits::IdentifyAccount;
use sp_core::crypto::UncheckedInto;
use sp_genesis_builder::PresetId;
use sp_keyring::Sr25519Keyring;
use testnet_parachains_constants::westend::{
currency::UNITS as WND, xcm_version::SAFE_XCM_VERSION,
};
use xcm::latest::{prelude::*, ROCOCO_GENESIS_HASH};
use xcm_builder::GlobalConsensusConvertsFor;
use xcm_executor::traits::ConvertLocation;
use sp_core::{Pair, Public};

const ASSET_HUB_WESTEND_ED: Balance = ExistentialDeposit::get();

parameter_types!{
pub const RococoNetwork: NetworkId = NetworkId::ByGenesis(ROCOCO_GENESIS_HASH);
pub AssetHubRococo: Location = Location::new(2, [
GlobalConsensus(RococoNetwork::get()),
Parachain(bp_asset_hub_rococo::ASSET_HUB_ROCOCO_PARACHAIN_ID)
]);
}

/// Helper function to generate a crypto pair from seed
fn get_from_seed<TPublic: Public>(seed: &str) -> <TPublic::Pair as Pair>::Public {
TPublic::Pair::from_string(&format!("//{}", seed), None)
.expect("static values are valid; qed")
.public()
}

/// Helper function to generate an account ID from seed
fn get_account_id_from_seed<TPublic: Public>(seed: &str) -> AccountId
where
AccountPublic: From<<TPublic::Pair as Pair>::Public>,
{
AccountPublic::from(get_from_seed::<TPublic>(seed)).into_account()
}


fn asset_hub_westend_genesis(
invulnerables: Vec<(AccountId, AuraId)>,
endowed_accounts: Vec<AccountId>,
endowment: Balance,
dev_stakers: Option<(u32, u32)>,
id: ParaId,
foreign_assets: Vec<(Location, AccountId, Balance)>,
foreign_assets_endowed_accounts: Vec<(Location, AccountId, Balance)>,
) -> serde_json::Value {
build_struct_json_patch!(RuntimeGenesisConfig {
balances: BalancesConfig {
Expand Down Expand Up @@ -74,6 +106,17 @@ fn asset_hub_westend_genesis(
],
dev_stakers,
..Default::default()
},
foreign_assets: ForeignAssetsConfig {
assets: foreign_assets
.into_iter()
.map(|asset| (asset.0.try_into().unwrap(), asset.1, false, asset.2))
.collect(),
accounts: foreign_assets_endowed_accounts
.into_iter()
.map(|asset| (asset.0.try_into().unwrap(), asset.1, asset.2))
.collect(),
..Default::default()
}
})
}
Expand Down Expand Up @@ -116,6 +159,8 @@ pub fn get_preset(id: &PresetId) -> Option<Vec<u8>> {
ASSET_HUB_WESTEND_ED * 4096,
None,
1000.into(),
vec![],
vec![],
),
sp_genesis_builder::LOCAL_TESTNET_RUNTIME_PRESET => asset_hub_westend_genesis(
// initial collators.
Expand All @@ -127,6 +172,25 @@ pub fn get_preset(id: &PresetId) -> Option<Vec<u8>> {
WND * 1_000_000,
dev_stakers,
1000.into(),
vec![
// bridged DOT
(
Location::new(2, [GlobalConsensus(RococoNetwork::get())]),
GlobalConsensusConvertsFor::<UniversalLocation, AccountId>::convert_location(
&Location { parents: 2, interior: [GlobalConsensus(RococoNetwork::get())].into() },
)
.unwrap(),
10000000,
),
],
vec![
// bridged DOT to Bob
(
Location::new(2, [GlobalConsensus(RococoNetwork::get())]),
get_account_id_from_seed::<sp_core::sr25519::Public>("Bob"),
10000000 * 4096 * 4096,
),
],
),
sp_genesis_builder::DEV_RUNTIME_PRESET => asset_hub_westend_genesis(
// initial collators.
Expand All @@ -140,6 +204,8 @@ pub fn get_preset(id: &PresetId) -> Option<Vec<u8>> {
WND * 1_000_000,
dev_stakers,
1000.into(),
vec![],
vec![],
),
_ => return None,
};
Expand Down
Loading