pezkuwichain/pezkuwi-sdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FAZ 1 Complete: Workspace compile fixes, warning cleanup, version bumps

Browse Source 
- Fixed is_using_frame_crate() macro to check for pezframe/pezkuwi_sdk
- Removed disable_pezframe_system_supertrait_check temporary bypasses
- Feature-gated storage-benchmark and teyrchain-benchmarks code
- Fixed dead_code warnings with underscore prefix (_Header)
- Removed unused imports and shadowing use statements
- Version bumps: procedural-tools 10.0.1, benchmarking-cli 32.0.1,
  docs 0.0.2, minimal-runtime 0.0.1, yet-another-teyrchain 0.6.1, umbrella 0.1.2
- Updated MAINNET_ROADMAP.md with FAZ 1 completion status
This commit is contained in:
Kurdistan Tech Ministry
2026-01-02 11:41:09 +03:00
parent 76ba7dbf2f
commit cf463fe8ee
520 changed files with 4113 additions and 4524 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pezcumulus/teyrchains/runtimes/assets/asset-hub-pezkuwichain/Cargo.toml
+16 -16
View File
@@ -104,7 +104,7 @@ xcm-executor = { workspace = true }
xcm-runtime-pezapis = { workspace = true }
# Pezcumulus
assets-common = { workspace = true }
pez-assets-common = { workspace = true }
pezcumulus-pezpallet-aura-ext = { workspace = true }
pezcumulus-pezpallet-session-benchmarking = { workspace = true }
pezcumulus-pezpallet-teyrchain-system = { workspace = true }
@@ -120,10 +120,10 @@ teyrchain-info = { workspace = true }
teyrchains-common = { workspace = true }
# Bridges
bp-asset-hub-pezkuwichain = { workspace = true }
bp-asset-hub-zagros = { workspace = true }
bp-bridge-hub-pezkuwichain = { workspace = true }
bp-bridge-hub-zagros = { workspace = true }
pezbp-asset-hub-pezkuwichain = { workspace = true }
pezbp-asset-hub-zagros = { workspace = true }
pezbp-bridge-hub-pezkuwichain = { workspace = true }
pezbp-bridge-hub-zagros = { workspace = true }
pezpallet-xcm-bridge-hub-router = { workspace = true }
[dev-dependencies]
@@ -138,12 +138,12 @@ default = ["std"]
fast-runtime = []
runtime-benchmarks = [
"asset-test-pezutils/runtime-benchmarks",
"assets-common/runtime-benchmarks",
"pez-assets-common/runtime-benchmarks",
"bizinikiwi-wasm-builder?/runtime-benchmarks",
"bp-asset-hub-pezkuwichain/runtime-benchmarks",
"bp-asset-hub-zagros/runtime-benchmarks",
"bp-bridge-hub-pezkuwichain/runtime-benchmarks",
"bp-bridge-hub-zagros/runtime-benchmarks",
"pezbp-asset-hub-pezkuwichain/runtime-benchmarks",
"pezbp-asset-hub-zagros/runtime-benchmarks",
"pezbp-bridge-hub-pezkuwichain/runtime-benchmarks",
"pezbp-bridge-hub-zagros/runtime-benchmarks",
"pezcumulus-pezpallet-aura-ext/runtime-benchmarks",
"pezcumulus-pezpallet-session-benchmarking/runtime-benchmarks",
"pezcumulus-pezpallet-teyrchain-system/runtime-benchmarks",
@@ -230,7 +230,7 @@ runtime-benchmarks = [
]
try-runtime = [
"asset-test-pezutils/try-runtime",
"assets-common/try-runtime",
"pez-assets-common/try-runtime",
"pezcumulus-pezpallet-aura-ext/try-runtime",
"pezcumulus-pezpallet-teyrchain-system/try-runtime",
"pezcumulus-pezpallet-weight-reclaim/try-runtime",
@@ -284,12 +284,12 @@ try-runtime = [
"teyrchains-common/try-runtime",
]
std = [
"assets-common/std",
"pez-assets-common/std",
"bizinikiwi-wasm-builder",
"bp-asset-hub-pezkuwichain/std",
"bp-asset-hub-zagros/std",
"bp-bridge-hub-pezkuwichain/std",
"bp-bridge-hub-zagros/std",
"pezbp-asset-hub-pezkuwichain/std",
"pezbp-asset-hub-zagros/std",
"pezbp-bridge-hub-pezkuwichain/std",
"pezbp-bridge-hub-zagros/std",
"codec/std",
"log/std",
"pezcumulus-pezpallet-aura-ext/std",
pezcumulus/teyrchains/runtimes/assets/asset-hub-pezkuwichain/bridge-primitives/Cargo.toml
+10 -10
View File
@@ -1,5 +1,5 @@
[package]
name = "bp-asset-hub-pezkuwichain"
name = "pezbp-asset-hub-pezkuwichain"
description = "Primitives of AssetHubPezkuwichain teyrchain runtime."
version = "0.4.0"
authors.workspace = true
@@ -25,9 +25,9 @@ pezsp-api = { workspace = true }
pezsp-core = { workspace = true }
# Bridge Dependencies
bp-bridge-hub-pezcumulus = { workspace = true }
bp-messages = { workspace = true }
bp-xcm-bridge-hub-router = { workspace = true }
pezbp-bridge-hub-pezcumulus = { workspace = true }
pezbp-messages = { workspace = true }
pezbp-xcm-bridge-hub-router = { workspace = true }
pezbp-runtime = { workspace = true }
testnet-teyrchains-constants = { features = ["pezkuwichain"], workspace = true }
@@ -37,9 +37,9 @@ xcm = { workspace = true }
[features]
default = ["std"]
std = [
"bp-bridge-hub-pezcumulus/std",
"bp-messages/std",
"bp-xcm-bridge-hub-router/std",
"pezbp-bridge-hub-pezcumulus/std",
"pezbp-messages/std",
"pezbp-xcm-bridge-hub-router/std",
"codec/std",
"pezbp-runtime/std",
"pezframe-support/std",
@@ -50,9 +50,9 @@ std = [
"xcm/std",
]
runtime-benchmarks = [
"bp-bridge-hub-pezcumulus/runtime-benchmarks",
"bp-messages/runtime-benchmarks",
"bp-xcm-bridge-hub-router/runtime-benchmarks",
"pezbp-bridge-hub-pezcumulus/runtime-benchmarks",
"pezbp-messages/runtime-benchmarks",
"pezbp-xcm-bridge-hub-router/runtime-benchmarks",
"pezbp-runtime/runtime-benchmarks",
"pezframe-support/runtime-benchmarks",
"pezsp-api/runtime-benchmarks",
pezcumulus/teyrchains/runtimes/assets/asset-hub-pezkuwichain/bridge-primitives/src/lib.rs
+3 -3
View File
@@ -22,9 +22,9 @@ extern crate alloc;
use codec::{Decode, Encode};
use scale_info::TypeInfo;
pub use bp_bridge_hub_pezcumulus::*;
use bp_messages::*;
pub use bp_xcm_bridge_hub_router::XcmBridgeHubRouterCall;
pub use pezbp_bridge_hub_pezcumulus::*;
use pezbp_messages::*;
pub use pezbp_xcm_bridge_hub_router::XcmBridgeHubRouterCall;
use pezbp_runtime::{
decl_bridge_finality_runtime_apis, decl_bridge_messages_runtime_apis, Chain, ChainId, Teyrchain,
};
pezcumulus/teyrchains/runtimes/assets/asset-hub-pezkuwichain/src/lib.rs
+9 -9
View File
@@ -36,13 +36,13 @@ pub use staking::*;
extern crate alloc;
use alloc::{vec, vec::Vec};
use assets_common::{
use pez_assets_common::{
foreign_creators::ForeignCreators,
local_and_foreign_assets::{LocalFromLeft, TargetFromLeft},
matching::{FromNetwork, FromSiblingTeyrchain},
AssetIdForPoolAssets, AssetIdForPoolAssetsConvert, AssetIdForTrustBackedAssetsConvert,
};
use bp_asset_hub_pezkuwichain::CreateForeignAssetDeposit;
use pezbp_asset_hub_pezkuwichain::CreateForeignAssetDeposit;
use pezcumulus_pezpallet_teyrchain_system::{
RelayNumberMonotonicallyIncreases, RelaychainDataProvider,
};
@@ -61,7 +61,7 @@ use testnet_teyrchains_constants::pezkuwichain::snowbridge::EthereumNetwork;
use pezsp_version::NativeVersion;
use pezsp_version::RuntimeVersion;
pub use assets_common::local_and_foreign_assets::ForeignAssetReserveData;
pub use pez_assets_common::local_and_foreign_assets::ForeignAssetReserveData;
use codec::{Decode, DecodeWithMemTracking, Encode, MaxEncodedLen};
use pezcumulus_primitives_core::ParaId;
use pezframe_support::{
@@ -453,7 +453,7 @@ impl pezpallet_asset_conversion::Config for Runtime {
type MintMinLiquidity = ConstU128<100>;
type WeightInfo = weights::pezpallet_asset_conversion::WeightInfo<Runtime>;
#[cfg(feature = "runtime-benchmarks")]
type BenchmarkHelper = assets_common::benchmarks::AssetPairFactory<
type BenchmarkHelper = pez_assets_common::benchmarks::AssetPairFactory<
TokenLocation,
teyrchain_info::Pezpallet<Runtime>,
xcm_config::TrustBackedAssetsPalletIndex,
@@ -518,7 +518,7 @@ impl pezpallet_assets::Config<ForeignAssetsInstance> for Runtime {
type AssetAccountDeposit = ForeignAssetsAssetAccountDeposit;
type RemoveItemsLimit = pezframe_support::traits::ConstU32<1000>;
#[cfg(feature = "runtime-benchmarks")]
type BenchmarkHelper = assets_common::benchmarks::LocationAssetsBenchmarkHelper;
type BenchmarkHelper = pez_assets_common::benchmarks::LocationAssetsBenchmarkHelper;
}
// Allow Freezes for the `ForeignAssets` pezpallet
@@ -1771,13 +1771,13 @@ impl_runtime_apis! {
}
}
impl assets_common::runtime_api::FungiblesApi<
impl pez_assets_common::runtime_api::FungiblesApi<
Block,
AccountId,
> for Runtime
{
fn query_account_balances(account: AccountId) -> Result<xcm::VersionedAssets, assets_common::runtime_api::FungiblesAccessError> {
use assets_common::fungible_conversion::{convert, convert_balance};
fn query_account_balances(account: AccountId) -> Result<xcm::VersionedAssets, pez_assets_common::runtime_api::FungiblesAccessError> {
use pez_assets_common::fungible_conversion::{convert, convert_balance};
Ok([
// collect pezpallet_balance
{
@@ -1818,7 +1818,7 @@ impl_runtime_apis! {
let mut acceptable_assets = vec![AssetId(native_token.clone())];
// We also accept all assets in a pool with the native token.
acceptable_assets.extend(
assets_common::PoolAdapter::<Runtime>::get_assets_in_pool_with(native_token)
pez_assets_common::PoolAdapter::<Runtime>::get_assets_in_pool_with(native_token)
.map_err(|()| XcmPaymentApiError::VersionedConversionFailed)?
);
PezkuwiXcm::query_acceptable_payment_assets(xcm_version, acceptable_assets)
pezcumulus/teyrchains/runtimes/assets/asset-hub-pezkuwichain/src/xcm_config.rs
+12 -12
View File
@@ -19,7 +19,7 @@ use super::{
RuntimeHoldReason, RuntimeOrigin, TeyrchainInfo, TeyrchainSystem, ToZagrosXcmRouter,
TransactionByteFee, Uniques, WeightToFee, XcmpQueue,
};
use assets_common::{
use pez_assets_common::{
matching::{
FromNetwork, IsForeignConcreteAsset, NonTeleportableAssetFromTrustedReserve,
ParentLocation, TeleportableAssetWithTrustedReserve,
@@ -129,7 +129,7 @@ pub type FungibleTransactor = FungibleAdapter<
/// `AssetId`/`Balance` converter for `TrustBackedAssets`.
pub type TrustBackedAssetsConvertedConcreteId =
assets_common::TrustBackedAssetsConvertedConcreteId<TrustBackedAssetsPalletLocation, Balance>;
pez_assets_common::TrustBackedAssetsConvertedConcreteId<TrustBackedAssetsPalletLocation, Balance>;
/// Means for transacting assets besides the native currency on this chain.
pub type FungiblesTransactor = FungiblesAdapter<
@@ -150,7 +150,7 @@ pub type FungiblesTransactor = FungiblesAdapter<
/// Matcher for converting `ClassId`/`InstanceId` into a uniques asset.
pub type UniquesConvertedConcreteId =
assets_common::UniquesConvertedConcreteId<UniquesPalletLocation>;
pez_assets_common::UniquesConvertedConcreteId<UniquesPalletLocation>;
/// Means for transacting unique assets.
pub type UniquesTransactor = UniqueInstancesAdapter<
@@ -161,7 +161,7 @@ pub type UniquesTransactor = UniqueInstancesAdapter<
>;
/// `AssetId`/`Balance` converter for `ForeignAssets`.
pub type ForeignAssetsConvertedConcreteId = assets_common::ForeignAssetsConvertedConcreteId<
pub type ForeignAssetsConvertedConcreteId = pez_assets_common::ForeignAssetsConvertedConcreteId<
(
// Ignore `TrustBackedAssets` explicitly
StartsWith<TrustBackedAssetsPalletLocation>,
@@ -194,7 +194,7 @@ pub type ForeignFungiblesTransactor = FungiblesAdapter<
/// `AssetId`/`Balance` converter for `PoolAssets`.
pub type PoolAssetsConvertedConcreteId =
assets_common::PoolAssetsConvertedConcreteId<PoolAssetsPalletLocation, Balance>;
pez_assets_common::PoolAssetsConvertedConcreteId<PoolAssetsPalletLocation, Balance>;
/// Means for transacting asset conversion pool assets on this chain.
pub type PoolFungiblesTransactor = FungiblesAdapter<
@@ -499,7 +499,7 @@ impl pezcumulus_pezpallet_xcm::Config for Runtime {
pub mod bridging {
use super::*;
use alloc::collections::btree_set::BTreeSet;
use assets_common::matching;
use pez_assets_common::matching;
// common/shared parameters
parameter_types! {
@@ -515,14 +515,14 @@ pub mod bridging {
///
/// 3) the approximate cost of Pezkuwichain -> Zagros message confirmation transaction on Pezkuwichain Bridge Hub.
pub storage XcmBridgeHubRouterBaseFee: Balance =
bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseXcmFeeInRocs::get()
.saturating_add(bp_bridge_hub_zagros::BridgeHubZagrosBaseDeliveryFeeInWnds::get())
.saturating_add(bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseConfirmationFeeInRocs::get());
pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseXcmFeeInRocs::get()
.saturating_add(pezbp_bridge_hub_zagros::BridgeHubZagrosBaseDeliveryFeeInWnds::get())
.saturating_add(pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseConfirmationFeeInRocs::get());
/// Price of every byte of the Pezkuwichain -> Zagros message. Can be adjusted via
/// governance `set_storage` call.
pub storage XcmBridgeHubRouterByteFee: Balance = TransactionByteFee::get();
pub SiblingBridgeHubParaId: u32 = bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID;
pub SiblingBridgeHubParaId: u32 = pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID;
pub SiblingBridgeHub: Location = Location::new(1, [Teyrchain(SiblingBridgeHubParaId::get())]);
/// Router expects payment with this `AssetId`.
/// (`AssetId` has to be aligned with `BridgeTable`)
@@ -551,7 +551,7 @@ pub mod bridging {
1,
[
Teyrchain(SiblingBridgeHubParaId::get()),
PalletInstance(bp_bridge_hub_pezkuwichain::WITH_BRIDGE_PEZKUWICHAIN_TO_ZAGROS_MESSAGES_PALLET_INDEX)
PalletInstance(pezbp_bridge_hub_pezkuwichain::WITH_BRIDGE_PEZKUWICHAIN_TO_ZAGROS_MESSAGES_PALLET_INDEX)
]
);
@@ -562,7 +562,7 @@ pub mod bridging {
pub WndLocation: Location = Location::new(2, [GlobalConsensus(ZagrosNetwork::get())]);
pub AssetHubZagros: Location = Location::new(2, [
GlobalConsensus(ZagrosNetwork::get()),
Teyrchain(bp_asset_hub_zagros::ASSET_HUB_ZAGROS_TEYRCHAIN_ID)
Teyrchain(pezbp_asset_hub_zagros::ASSET_HUB_ZAGROS_TEYRCHAIN_ID)
]);
/// Set up exporters configuration.
pezcumulus/teyrchains/runtimes/assets/asset-hub-pezkuwichain/tests/tests.rs
+11 -11
View File
@@ -66,7 +66,7 @@ parameter_types! {
}
type AssetIdForTrustBackedAssetsConvert =
assets_common::AssetIdForTrustBackedAssetsConvert<TrustBackedAssetsPalletLocation>;
pez_assets_common::AssetIdForTrustBackedAssetsConvert<TrustBackedAssetsPalletLocation>;
type RuntimeHelper = asset_test_pezutils::RuntimeHelper<Runtime, AllPalletsWithoutSystem>;
@@ -465,7 +465,7 @@ fn test_asset_xcm_trader_not_possible_for_non_sufficient_assets() {
#[test]
fn test_assets_balances_api_works() {
use assets_common::runtime_api::runtime_decl_for_fungibles_api::FungiblesApi;
use pez_assets_common::runtime_api::runtime_decl_for_fungibles_api::FungiblesApi;
ExtBuilder::<Runtime>::default()
.with_collators(vec![AccountId::from(ALICE)])
@@ -553,7 +553,7 @@ fn test_assets_balances_api_works() {
// check currency
assert!(result.inner().iter().any(|asset| asset.eq(
&assets_common::fungible_conversion::convert_balance::<TokenLocation, Balance>(
&pez_assets_common::fungible_conversion::convert_balance::<TokenLocation, Balance>(
some_currency
)
.unwrap()
@@ -812,7 +812,7 @@ mod asset_hub_pezkuwichain_tests {
bridging_to_asset_hub_zagros()
},
(
[PalletInstance(bp_bridge_hub_pezkuwichain::WITH_BRIDGE_PEZKUWICHAIN_TO_ZAGROS_MESSAGES_PALLET_INDEX)].into(),
[PalletInstance(pezbp_bridge_hub_pezkuwichain::WITH_BRIDGE_PEZKUWICHAIN_TO_ZAGROS_MESSAGES_PALLET_INDEX)].into(),
GlobalConsensus(ByGenesis(ZAGROS_GENESIS_HASH)),
[Teyrchain(1000)].into()
),
@@ -892,7 +892,7 @@ mod asset_hub_pezkuwichain_tests {
bridging_to_asset_hub_zagros()
},
(
[PalletInstance(bp_bridge_hub_pezkuwichain::WITH_BRIDGE_PEZKUWICHAIN_TO_ZAGROS_MESSAGES_PALLET_INDEX)].into(),
[PalletInstance(pezbp_bridge_hub_pezkuwichain::WITH_BRIDGE_PEZKUWICHAIN_TO_ZAGROS_MESSAGES_PALLET_INDEX)].into(),
GlobalConsensus(ByGenesis(ZAGROS_GENESIS_HASH)),
[Teyrchain(1000)].into()
),
@@ -932,9 +932,9 @@ mod asset_hub_pezkuwichain_tests {
>(
collator_session_keys(),
bridging_to_asset_hub_zagros,
|| bp_asset_hub_pezkuwichain::build_congestion_message(Default::default(), true).into(),
|| pezbp_asset_hub_pezkuwichain::build_congestion_message(Default::default(), true).into(),
|| {
bp_asset_hub_pezkuwichain::build_congestion_message(Default::default(), false)
pezbp_asset_hub_pezkuwichain::build_congestion_message(Default::default(), false)
.into()
},
)
@@ -942,7 +942,7 @@ mod asset_hub_pezkuwichain_tests {
#[test]
fn test_report_bridge_status_call_compatibility() {
// if this test fails, make sure `bp_asset_hub_pezkuwichain` has valid encoding
// if this test fails, make sure `pezbp_asset_hub_pezkuwichain` has valid encoding
assert_eq!(
RuntimeCall::ToZagrosXcmRouter(
pezpallet_xcm_bridge_hub_router::Call::report_bridge_status {
@@ -951,8 +951,8 @@ mod asset_hub_pezkuwichain_tests {
}
)
.encode(),
bp_asset_hub_pezkuwichain::Call::ToZagrosXcmRouter(
bp_asset_hub_pezkuwichain::XcmBridgeHubRouterCall::report_bridge_status {
pezbp_asset_hub_pezkuwichain::Call::ToZagrosXcmRouter(
pezbp_asset_hub_pezkuwichain::XcmBridgeHubRouterCall::report_bridge_status {
bridge_id: Default::default(),
is_congested: true,
}
@@ -967,7 +967,7 @@ mod asset_hub_pezkuwichain_tests {
let actual = <Runtime as pezpallet_xcm_bridge_hub_router::Config<
ToZagrosXcmRouterInstance,
>>::WeightInfo::report_bridge_status();
let max_weight = bp_asset_hub_pezkuwichain::XcmBridgeHubRouterTransactCallMaxWeight::get();
let max_weight = pezbp_asset_hub_pezkuwichain::XcmBridgeHubRouterTransactCallMaxWeight::get();
assert!(
actual.all_lte(max_weight),
"max_weight: {:?} should be adjusted to actual {:?}",
pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/Cargo.toml
+16 -16
View File
@@ -114,7 +114,7 @@ xcm-runtime-pezapis = { workspace = true }
zagros-runtime-constants = { workspace = true }
# Pezcumulus
assets-common = { workspace = true }
pez-assets-common = { workspace = true }
pezcumulus-pezpallet-aura-ext = { workspace = true }
pezcumulus-pezpallet-session-benchmarking = { workspace = true }
pezcumulus-pezpallet-teyrchain-system = { workspace = true }
@@ -131,10 +131,10 @@ teyrchain-info = { workspace = true }
teyrchains-common = { workspace = true }
# Bridges
bp-asset-hub-pezkuwichain = { workspace = true }
bp-asset-hub-zagros = { workspace = true }
bp-bridge-hub-pezkuwichain = { workspace = true }
bp-bridge-hub-zagros = { workspace = true }
pezbp-asset-hub-pezkuwichain = { workspace = true }
pezbp-asset-hub-zagros = { workspace = true }
pezbp-bridge-hub-pezkuwichain = { workspace = true }
pezbp-bridge-hub-zagros = { workspace = true }
pezpallet-xcm-bridge-hub-router = { workspace = true }
pezsnowbridge-outbound-queue-primitives = { workspace = true }
pezsnowbridge-pezpallet-system-frontend = { workspace = true }
@@ -154,12 +154,12 @@ bizinikiwi-wasm-builder = { optional = true, workspace = true, default-features
default = ["std"]
runtime-benchmarks = [
"asset-test-pezutils/runtime-benchmarks",
"assets-common/runtime-benchmarks",
"pez-assets-common/runtime-benchmarks",
"bizinikiwi-wasm-builder?/runtime-benchmarks",
"bp-asset-hub-pezkuwichain/runtime-benchmarks",
"bp-asset-hub-zagros/runtime-benchmarks",
"bp-bridge-hub-pezkuwichain/runtime-benchmarks",
"bp-bridge-hub-zagros/runtime-benchmarks",
"pezbp-asset-hub-pezkuwichain/runtime-benchmarks",
"pezbp-asset-hub-zagros/runtime-benchmarks",
"pezbp-bridge-hub-pezkuwichain/runtime-benchmarks",
"pezbp-bridge-hub-zagros/runtime-benchmarks",
"pezcumulus-pezpallet-aura-ext/runtime-benchmarks",
"pezcumulus-pezpallet-session-benchmarking/runtime-benchmarks",
"pezcumulus-pezpallet-teyrchain-system/runtime-benchmarks",
@@ -260,7 +260,7 @@ runtime-benchmarks = [
]
try-runtime = [
"asset-test-pezutils/try-runtime",
"assets-common/try-runtime",
"pez-assets-common/try-runtime",
"pezcumulus-pezpallet-aura-ext/try-runtime",
"pezcumulus-pezpallet-teyrchain-system/try-runtime",
"pezcumulus-pezpallet-weight-reclaim/try-runtime",
@@ -326,12 +326,12 @@ try-runtime = [
]
std = [
"alloy-core/std",
"assets-common/std",
"pez-assets-common/std",
"bizinikiwi-wasm-builder",
"bp-asset-hub-pezkuwichain/std",
"bp-asset-hub-zagros/std",
"bp-bridge-hub-pezkuwichain/std",
"bp-bridge-hub-zagros/std",
"pezbp-asset-hub-pezkuwichain/std",
"pezbp-asset-hub-zagros/std",
"pezbp-bridge-hub-pezkuwichain/std",
"pezbp-bridge-hub-zagros/std",
"codec/std",
"log/std",
"pezcumulus-pezpallet-aura-ext/std",
pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/bridge-primitives/Cargo.toml
+10 -10
View File
@@ -1,5 +1,5 @@
[package]
name = "bp-asset-hub-zagros"
name = "pezbp-asset-hub-zagros"
description = "Primitives of AssetHubZagros teyrchain runtime."
version = "0.3.0"
authors.workspace = true
@@ -25,9 +25,9 @@ pezsp-api = { workspace = true }
pezsp-core = { workspace = true }
# Bridge Dependencies
bp-bridge-hub-pezcumulus = { workspace = true }
bp-messages = { workspace = true }
bp-xcm-bridge-hub-router = { workspace = true }
pezbp-bridge-hub-pezcumulus = { workspace = true }
pezbp-messages = { workspace = true }
pezbp-xcm-bridge-hub-router = { workspace = true }
pezbp-runtime = { workspace = true }
testnet-teyrchains-constants = { features = ["zagros"], workspace = true }
@@ -37,9 +37,9 @@ xcm = { workspace = true }
[features]
default = ["std"]
std = [
"bp-bridge-hub-pezcumulus/std",
"bp-messages/std",
"bp-xcm-bridge-hub-router/std",
"pezbp-bridge-hub-pezcumulus/std",
"pezbp-messages/std",
"pezbp-xcm-bridge-hub-router/std",
"codec/std",
"pezbp-runtime/std",
"pezframe-support/std",
@@ -50,9 +50,9 @@ std = [
"xcm/std",
]
runtime-benchmarks = [
"bp-bridge-hub-pezcumulus/runtime-benchmarks",
"bp-messages/runtime-benchmarks",
"bp-xcm-bridge-hub-router/runtime-benchmarks",
"pezbp-bridge-hub-pezcumulus/runtime-benchmarks",
"pezbp-messages/runtime-benchmarks",
"pezbp-xcm-bridge-hub-router/runtime-benchmarks",
"pezbp-runtime/runtime-benchmarks",
"pezframe-support/runtime-benchmarks",
"pezsp-api/runtime-benchmarks",
pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/bridge-primitives/src/lib.rs
+3 -3
View File
@@ -19,9 +19,9 @@
extern crate alloc;
pub use bp_bridge_hub_pezcumulus::*;
use bp_messages::*;
pub use bp_xcm_bridge_hub_router::XcmBridgeHubRouterCall;
pub use pezbp_bridge_hub_pezcumulus::*;
use pezbp_messages::*;
pub use pezbp_xcm_bridge_hub_router::XcmBridgeHubRouterCall;
use codec::{Decode, Encode};
use pezbp_runtime::{
decl_bridge_finality_runtime_apis, decl_bridge_messages_runtime_apis, Chain, ChainId, Teyrchain,
pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/src/bridge_to_ethereum_config.rs
+1 -1
View File
@@ -23,7 +23,7 @@ use crate::{
},
AccountId, AssetConversion, Assets, ForeignAssets, Runtime, RuntimeEvent,
};
use assets_common::{matching::FromSiblingTeyrchain, AssetIdForTrustBackedAssetsConvert};
use pez_assets_common::{matching::FromSiblingTeyrchain, AssetIdForTrustBackedAssetsConvert};
use pezframe_support::{parameter_types, traits::EitherOf};
use pezframe_system::EnsureRootWithSuccess;
use pezsnowbridge_runtime_common::{ForeignAssetOwner, LocalAssetOwner};
pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/src/lib.rs
+11 -11
View File
@@ -43,12 +43,12 @@ use governance::{
extern crate alloc;
use alloc::{vec, vec::Vec};
pub use assets_common::local_and_foreign_assets::ForeignAssetReserveData;
use assets_common::{
pub use pez_assets_common::local_and_foreign_assets::ForeignAssetReserveData;
use pez_assets_common::{
local_and_foreign_assets::{LocalFromLeft, TargetFromLeft},
AssetIdForPoolAssets, AssetIdForPoolAssetsConvert, AssetIdForTrustBackedAssetsConvert,
};
use bp_asset_hub_zagros::CreateForeignAssetDeposit;
use pezbp_asset_hub_zagros::CreateForeignAssetDeposit;
use codec::{Decode, DecodeWithMemTracking, Encode, MaxEncodedLen};
use pezcumulus_pezpallet_teyrchain_system::{
RelayNumberMonotonicallyIncreases, RelaychainDataProvider,
@@ -110,7 +110,7 @@ use zagros_runtime_constants::time::DAYS as RC_DAYS;
#[cfg(any(feature = "std", test))]
pub use pezsp_runtime::BuildStorage;
use assets_common::{
use pez_assets_common::{
foreign_creators::ForeignCreators,
matching::{FromNetwork, FromSiblingTeyrchain},
};
@@ -477,7 +477,7 @@ impl pezpallet_asset_conversion::Config for Runtime {
type MintMinLiquidity = ConstU128<100>;
type WeightInfo = weights::pezpallet_asset_conversion::WeightInfo<Runtime>;
#[cfg(feature = "runtime-benchmarks")]
type BenchmarkHelper = assets_common::benchmarks::AssetPairFactory<
type BenchmarkHelper = pez_assets_common::benchmarks::AssetPairFactory<
ZagrosLocation,
teyrchain_info::Pezpallet<Runtime>,
xcm_config::TrustBackedAssetsPalletIndex,
@@ -609,7 +609,7 @@ impl pezpallet_assets::Config<ForeignAssetsInstance> for Runtime {
type AssetAccountDeposit = ForeignAssetsAssetAccountDeposit;
type RemoveItemsLimit = pezframe_support::traits::ConstU32<1000>;
#[cfg(feature = "runtime-benchmarks")]
type BenchmarkHelper = assets_common::benchmarks::LocationAssetsBenchmarkHelper;
type BenchmarkHelper = pez_assets_common::benchmarks::LocationAssetsBenchmarkHelper;
}
// Allow Freezes for the `ForeignAssets` pezpallet
@@ -1231,7 +1231,7 @@ parameter_types! {
type MultiBlockMigrationsType = pezpallet_migrations::mock_helpers::MockedMigrations;
#[cfg(not(feature = "runtime-benchmarks"))]
type MultiBlockMigrationsType = (
assets_common::migrations::foreign_assets_reserves::ForeignAssetsReservesMigration<
pez_assets_common::migrations::foreign_assets_reserves::ForeignAssetsReservesMigration<
Runtime,
ForeignAssetsInstance,
migrations::AssetHubZagrosForeignAssetsReservesProvider,
@@ -1954,7 +1954,7 @@ pezpallet_revive::impl_runtime_apis_plus_revive_traits!(
let mut acceptable_assets = vec![AssetId(native_token.clone())];
// We also accept all assets in a pool with the native token.
acceptable_assets.extend(
assets_common::PoolAdapter::<Runtime>::get_assets_in_pool_with(native_token)
pez_assets_common::PoolAdapter::<Runtime>::get_assets_in_pool_with(native_token)
.map_err(|()| XcmPaymentApiError::VersionedConversionFailed)?
);
PezkuwiXcm::query_acceptable_payment_assets(xcm_version, acceptable_assets)
@@ -2044,13 +2044,13 @@ pezpallet_revive::impl_runtime_apis_plus_revive_traits!(
}
}
impl assets_common::runtime_api::FungiblesApi<
impl pez_assets_common::runtime_api::FungiblesApi<
Block,
AccountId,
> for Runtime
{
fn query_account_balances(account: AccountId) -> Result<xcm::VersionedAssets, assets_common::runtime_api::FungiblesAccessError> {
use assets_common::fungible_conversion::{convert, convert_balance};
fn query_account_balances(account: AccountId) -> Result<xcm::VersionedAssets, pez_assets_common::runtime_api::FungiblesAccessError> {
use pez_assets_common::fungible_conversion::{convert, convert_balance};
Ok([
// collect pezpallet_balance
{
pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/src/migrations.rs
+1 -1
View File
@@ -15,7 +15,7 @@
use crate::xcm_config::bridging::to_pezkuwichain::{AssetHubPezkuwichain, PezkuwichainEcosystem};
use alloc::{vec, vec::Vec};
use assets_common::{
use pez_assets_common::{
local_and_foreign_assets::ForeignAssetReserveData,
migrations::foreign_assets_reserves::ForeignAssetsReservesProvider,
};
pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/src/weights/xcm/mod.rs
+1 -1
View File
@@ -21,7 +21,7 @@ use crate::{
Runtime,
};
use alloc::vec::Vec;
use assets_common::IsLocalAccountKey20;
use pez_assets_common::IsLocalAccountKey20;
use pezframe_support::{traits::Contains, weights::Weight};
use pezpallet_xcm_benchmarks_fungible::WeightInfo as XcmFungibleWeight;
use pezpallet_xcm_benchmarks_generic::WeightInfo as XcmGeneric;
pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/src/xcm_config.rs
+15 -15
View File
@@ -21,7 +21,7 @@ use super::{
ToPezkuwichainXcmRouter, TransactionByteFee, Treasurer, Uniques, WeightToFee, XcmpQueue,
};
use alloc::{collections::BTreeSet, vec, vec::Vec};
use assets_common::{
use pez_assets_common::{
matching::{
IsForeignConcreteAsset, NonTeleportableAssetFromTrustedReserve, ParentLocation,
TeleportableAssetWithTrustedReserve,
@@ -124,7 +124,7 @@ pub type FungibleTransactor = FungibleAdapter<
/// `AssetId`/`Balance` converter for `TrustBackedAssets`.
pub type TrustBackedAssetsConvertedConcreteId =
assets_common::TrustBackedAssetsConvertedConcreteId<TrustBackedAssetsPalletLocation, Balance>;
pez_assets_common::TrustBackedAssetsConvertedConcreteId<TrustBackedAssetsPalletLocation, Balance>;
/// Means for transacting assets besides the native currency on this chain.
pub type FungiblesTransactor = FungiblesAdapter<
@@ -145,7 +145,7 @@ pub type FungiblesTransactor = FungiblesAdapter<
/// Matcher for converting `ClassId`/`InstanceId` into a uniques asset.
pub type UniquesConvertedConcreteId =
assets_common::UniquesConvertedConcreteId<UniquesPalletLocation>;
pez_assets_common::UniquesConvertedConcreteId<UniquesPalletLocation>;
/// Means for transacting unique assets.
pub type UniquesTransactor = UniqueInstancesAdapter<
@@ -156,7 +156,7 @@ pub type UniquesTransactor = UniqueInstancesAdapter<
>;
/// `AssetId`/`Balance` converter for `ForeignAssets`.
pub type ForeignAssetsConvertedConcreteId = assets_common::ForeignAssetsConvertedConcreteId<
pub type ForeignAssetsConvertedConcreteId = pez_assets_common::ForeignAssetsConvertedConcreteId<
(
// Ignore `TrustBackedAssets` explicitly
StartsWith<TrustBackedAssetsPalletLocation>,
@@ -189,7 +189,7 @@ pub type ForeignFungiblesTransactor = FungiblesAdapter<
/// `AssetId`/`Balance` converter for `PoolAssets`.
pub type PoolAssetsConvertedConcreteId =
assets_common::PoolAssetsConvertedConcreteId<PoolAssetsPalletLocation, Balance>;
pez_assets_common::PoolAssetsConvertedConcreteId<PoolAssetsPalletLocation, Balance>;
/// Means for transacting asset conversion pool assets on this chain.
pub type PoolFungiblesTransactor = FungiblesAdapter<
@@ -216,11 +216,11 @@ parameter_types! {
}
/// Transactor for ERC20 tokens.
pub type ERC20Transactor = assets_common::ERC20Transactor<
pub type ERC20Transactor = pez_assets_common::ERC20Transactor<
// We need this for accessing pezpallet-revive.
Runtime,
// The matcher for smart contracts.
assets_common::ERC20Matcher,
pez_assets_common::ERC20Matcher,
// How to convert from a location to an account id.
LocationToAccountId,
// The maximum gas that can be used by a standard ERC20 transfer.
@@ -602,7 +602,7 @@ impl pezcumulus_pezpallet_xcm::Config for Runtime {
/// All configuration related to bridging
pub mod bridging {
use super::*;
use assets_common::matching;
use pez_assets_common::matching;
parameter_types! {
/// Base price of every byte of the Zagros -> Pezkuwichain message. Can be adjusted via
@@ -617,14 +617,14 @@ pub mod bridging {
///
/// 3) the approximate cost of Zagros -> Pezkuwichain message confirmation transaction on Zagros Bridge Hub.
pub storage XcmBridgeHubRouterBaseFee: Balance =
bp_bridge_hub_zagros::BridgeHubZagrosBaseXcmFeeInWnds::get()
.saturating_add(bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseDeliveryFeeInRocs::get())
.saturating_add(bp_bridge_hub_zagros::BridgeHubZagrosBaseConfirmationFeeInWnds::get());
pezbp_bridge_hub_zagros::BridgeHubZagrosBaseXcmFeeInWnds::get()
.saturating_add(pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseDeliveryFeeInRocs::get())
.saturating_add(pezbp_bridge_hub_zagros::BridgeHubZagrosBaseConfirmationFeeInWnds::get());
/// Price of every byte of the Zagros -> Pezkuwichain message. Can be adjusted via
/// governance `set_storage` call.
pub storage XcmBridgeHubRouterByteFee: Balance = TransactionByteFee::get();
pub SiblingBridgeHubParaId: u32 = bp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID;
pub SiblingBridgeHubParaId: u32 = pezbp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID;
pub SiblingBridgeHub: Location = Location::new(1, [Teyrchain(SiblingBridgeHubParaId::get())]);
/// Router expects payment with this `AssetId`.
/// (`AssetId` has to be aligned with `BridgeTable`)
@@ -646,7 +646,7 @@ pub mod bridging {
1,
[
Teyrchain(SiblingBridgeHubParaId::get()),
PalletInstance(bp_bridge_hub_zagros::WITH_BRIDGE_ZAGROS_TO_PEZKUWICHAIN_MESSAGES_PALLET_INDEX)
PalletInstance(pezbp_bridge_hub_zagros::WITH_BRIDGE_ZAGROS_TO_PEZKUWICHAIN_MESSAGES_PALLET_INDEX)
]
);
@@ -655,7 +655,7 @@ pub mod bridging {
pub RocLocation: Location = Location::new(2, [GlobalConsensus(PezkuwichainNetwork::get())]);
pub AssetHubPezkuwichain: Location = Location::new(2, [
GlobalConsensus(PezkuwichainNetwork::get()),
Teyrchain(bp_asset_hub_pezkuwichain::ASSET_HUB_PEZKUWICHAIN_TEYRCHAIN_ID)
Teyrchain(pezbp_asset_hub_pezkuwichain::ASSET_HUB_PEZKUWICHAIN_TEYRCHAIN_ID)
]);
/// Set up exporters configuration.
@@ -699,7 +699,7 @@ pub mod bridging {
pub mod to_ethereum {
use super::*;
use assets_common::matching::FromNetwork;
use pez_assets_common::matching::FromNetwork;
use testnet_teyrchains_constants::zagros::snowbridge::{
EthereumNetwork, INBOUND_QUEUE_PALLET_INDEX_V1, INBOUND_QUEUE_PALLET_INDEX_V2,
};
pezcumulus/teyrchains/runtimes/assets/asset-hub-zagros/tests/tests.rs
+12 -12
View File
@@ -38,7 +38,7 @@ use asset_test_pezutils::{
test_cases_over_bridge::TestBridgingConfig, CollatorSessionKey, CollatorSessionKeys,
ExtBuilder, GovernanceOrigin, SlotDurations,
};
use assets_common::local_and_foreign_assets::ForeignAssetReserveData;
use pez_assets_common::local_and_foreign_assets::ForeignAssetReserveData;
use codec::{Decode, Encode};
use hex_literal::hex;
use pezframe_support::{
@@ -102,7 +102,7 @@ parameter_types! {
}
type AssetIdForTrustBackedAssetsConvert =
assets_common::AssetIdForTrustBackedAssetsConvert<TrustBackedAssetsPalletLocation>;
pez_assets_common::AssetIdForTrustBackedAssetsConvert<TrustBackedAssetsPalletLocation>;
type RuntimeHelper = asset_test_pezutils::RuntimeHelper<Runtime, AllPalletsWithoutSystem>;
@@ -686,7 +686,7 @@ fn test_new_nft_config_works_as_the_old_one() {
#[test]
fn test_assets_balances_api_works() {
use assets_common::runtime_api::runtime_decl_for_fungibles_api::FungiblesApi;
use pez_assets_common::runtime_api::runtime_decl_for_fungibles_api::FungiblesApi;
ExtBuilder::<Runtime>::default()
.with_tracing()
@@ -781,7 +781,7 @@ fn test_assets_balances_api_works() {
// check currency
assert!(result.inner().iter().any(|asset| asset.eq(
&assets_common::fungible_conversion::convert_balance::<ZagrosLocation, Balance>(
&pez_assets_common::fungible_conversion::convert_balance::<ZagrosLocation, Balance>(
some_currency
)
.unwrap()
@@ -1113,7 +1113,7 @@ fn receive_reserve_asset_deposited_roc_from_asset_hub_pezkuwichain_fees_paid_by_
bridging_to_asset_hub_pezkuwichain()
},
(
[PalletInstance(bp_bridge_hub_zagros::WITH_BRIDGE_ZAGROS_TO_PEZKUWICHAIN_MESSAGES_PALLET_INDEX)].into(),
[PalletInstance(pezbp_bridge_hub_zagros::WITH_BRIDGE_ZAGROS_TO_PEZKUWICHAIN_MESSAGES_PALLET_INDEX)].into(),
GlobalConsensus(ByGenesis(PEZKUWICHAIN_GENESIS_HASH)),
[Teyrchain(1000)].into()
),
@@ -1189,7 +1189,7 @@ fn receive_reserve_asset_deposited_roc_from_asset_hub_pezkuwichain_fees_paid_by_
bridging_to_asset_hub_pezkuwichain()
},
(
[PalletInstance(bp_bridge_hub_zagros::WITH_BRIDGE_ZAGROS_TO_PEZKUWICHAIN_MESSAGES_PALLET_INDEX)].into(),
[PalletInstance(pezbp_bridge_hub_zagros::WITH_BRIDGE_ZAGROS_TO_PEZKUWICHAIN_MESSAGES_PALLET_INDEX)].into(),
GlobalConsensus(ByGenesis(PEZKUWICHAIN_GENESIS_HASH)),
[Teyrchain(1000)].into()
),
@@ -1229,14 +1229,14 @@ fn report_bridge_status_from_xcm_bridge_router_for_pezkuwichain_works() {
>(
collator_session_keys(),
bridging_to_asset_hub_pezkuwichain,
|| bp_asset_hub_zagros::build_congestion_message(Default::default(), true).into(),
|| bp_asset_hub_zagros::build_congestion_message(Default::default(), false).into(),
|| pezbp_asset_hub_zagros::build_congestion_message(Default::default(), true).into(),
|| pezbp_asset_hub_zagros::build_congestion_message(Default::default(), false).into(),
)
}
#[test]
fn test_report_bridge_status_call_compatibility() {
// if this test fails, make sure `bp_asset_hub_pezkuwichain` has valid encoding
// if this test fails, make sure `pezbp_asset_hub_pezkuwichain` has valid encoding
assert_eq!(
RuntimeCall::ToPezkuwichainXcmRouter(
pezpallet_xcm_bridge_hub_router::Call::report_bridge_status {
@@ -1245,8 +1245,8 @@ fn test_report_bridge_status_call_compatibility() {
}
)
.encode(),
bp_asset_hub_zagros::Call::ToPezkuwichainXcmRouter(
bp_asset_hub_zagros::XcmBridgeHubRouterCall::report_bridge_status {
pezbp_asset_hub_zagros::Call::ToPezkuwichainXcmRouter(
pezbp_asset_hub_zagros::XcmBridgeHubRouterCall::report_bridge_status {
bridge_id: Default::default(),
is_congested: true,
}
@@ -1261,7 +1261,7 @@ fn check_sane_weight_report_bridge_status() {
let actual = <Runtime as pezpallet_xcm_bridge_hub_router::Config<
ToPezkuwichainXcmRouterInstance,
>>::WeightInfo::report_bridge_status();
let max_weight = bp_asset_hub_zagros::XcmBridgeHubRouterTransactCallMaxWeight::get();
let max_weight = pezbp_asset_hub_zagros::XcmBridgeHubRouterTransactCallMaxWeight::get();
assert!(
actual.all_lte(max_weight),
"max_weight: {:?} should be adjusted to actual {:?}",
pezcumulus/teyrchains/runtimes/assets/common/Cargo.toml
+2 -2
View File
@@ -1,6 +1,6 @@
[package]
name = "assets-common"
version = "0.7.0"
name = "pez-assets-common"
version = "0.7.1"
authors.workspace = true
edition.workspace = true
description = "Assets common utilities"
pezcumulus/teyrchains/runtimes/assets/test-utils/Cargo.toml
+4 -4
View File
@@ -27,7 +27,7 @@ pezsp-io = { workspace = true }
pezsp-runtime = { workspace = true }
# Pezcumulus
assets-common = { workspace = true }
pez-assets-common = { workspace = true }
pezcumulus-pezpallet-teyrchain-system = { workspace = true }
pezcumulus-pezpallet-xcmp-queue = { workspace = true }
pezcumulus-primitives-core = { workspace = true }
@@ -49,7 +49,7 @@ pezpallet-xcm-bridge-hub-router = { workspace = true }
[features]
default = ["std"]
std = [
"assets-common/std",
"pez-assets-common/std",
"codec/std",
"pezcumulus-pezpallet-teyrchain-system/std",
"pezcumulus-pezpallet-xcmp-queue/std",
@@ -75,7 +75,7 @@ std = [
"xcm/std",
]
try-runtime = [
"assets-common/try-runtime",
"pez-assets-common/try-runtime",
"pezcumulus-pezpallet-teyrchain-system/try-runtime",
"pezcumulus-pezpallet-xcmp-queue/try-runtime",
"pezframe-support/try-runtime",
@@ -93,7 +93,7 @@ try-runtime = [
"teyrchains-common/try-runtime",
]
runtime-benchmarks = [
"assets-common/runtime-benchmarks",
"pez-assets-common/runtime-benchmarks",
"pezcumulus-pezpallet-teyrchain-system/runtime-benchmarks",
"pezcumulus-pezpallet-xcmp-queue/runtime-benchmarks",
"pezcumulus-primitives-core/runtime-benchmarks",
pezcumulus/teyrchains/runtimes/assets/test-utils/src/test_cases.rs
+1 -1
View File
@@ -17,7 +17,7 @@
use super::xcm_helpers;
use crate::{assert_matches_reserve_asset_deposited_instructions, get_fungible_delivery_fees};
use assets_common::local_and_foreign_assets::ForeignAssetReserveData;
use pez_assets_common::local_and_foreign_assets::ForeignAssetReserveData;
use codec::Encode;
use core::ops::Mul;
use pezcumulus_primitives_core::{UpwardMessageSender, XcmpMessageSource};
pezcumulus/teyrchains/runtimes/assets/test-utils/src/test_cases_over_bridge.rs
+1 -1
View File
@@ -17,7 +17,7 @@
//! over a bridge.
use crate::{assert_matches_reserve_asset_deposited_instructions, get_fungible_delivery_fees};
use assets_common::local_and_foreign_assets::ForeignAssetReserveData;
use pez_assets_common::local_and_foreign_assets::ForeignAssetReserveData;
use codec::Encode;
use pezcumulus_primitives_core::XcmpMessageSource;
use pezframe_support::{
pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/Cargo.toml
+39 -39
View File
@@ -87,18 +87,18 @@ teyrchain-info = { workspace = true }
teyrchains-common = { workspace = true }
# Bridges
bp-asset-hub-pezkuwichain = { workspace = true }
bp-asset-hub-zagros = { workspace = true }
bp-bridge-hub-pezkuwichain = { workspace = true }
bp-bridge-hub-zagros = { workspace = true }
bp-header-pez-chain = { workspace = true }
bp-messages = { workspace = true }
bp-pezkuwi-bulletin = { workspace = true }
bp-pezkuwi-core = { workspace = true }
bp-relayers = { workspace = true }
bp-teyrchains = { workspace = true }
bp-xcm-bridge-hub-router = { workspace = true }
bp-zagros = { workspace = true }
pezbp-asset-hub-pezkuwichain = { workspace = true }
pezbp-asset-hub-zagros = { workspace = true }
pezbp-bridge-hub-pezkuwichain = { workspace = true }
pezbp-bridge-hub-zagros = { workspace = true }
pezbp-header-pez-chain = { workspace = true }
pezbp-messages = { workspace = true }
pezbp-pezkuwi-bulletin = { workspace = true }
pezbp-pezkuwi-core = { workspace = true }
pezbp-relayers = { workspace = true }
pezbp-teyrchains = { workspace = true }
pezbp-xcm-bridge-hub-router = { workspace = true }
pezbp-zagros = { workspace = true }
pezbp-runtime = { workspace = true }
pezbridge-runtime-common = { workspace = true }
pezpallet-bridge-grandpa = { workspace = true }
@@ -121,7 +121,7 @@ pezsnowbridge-pezpallet-outbound-queue = { workspace = true }
pezsnowbridge-pezpallet-system = { workspace = true }
pezsnowbridge-system-runtime-api = { workspace = true }
bridge-hub-common = { workspace = true }
pezbridge-hub-common = { workspace = true }
[dev-dependencies]
pezbridge-hub-test-utils = { workspace = true, default-features = true }
@@ -136,19 +136,19 @@ teyrchains-runtimes-test-utils = { workspace = true, default-features = true }
default = ["std"]
std = [
"bizinikiwi-wasm-builder",
"bp-asset-hub-pezkuwichain/std",
"bp-asset-hub-zagros/std",
"bp-bridge-hub-pezkuwichain/std",
"bp-bridge-hub-zagros/std",
"bp-header-pez-chain/std",
"bp-messages/std",
"bp-pezkuwi-bulletin/std",
"bp-pezkuwi-core/std",
"bp-relayers/std",
"bp-teyrchains/std",
"bp-xcm-bridge-hub-router/std",
"bp-zagros/std",
"bridge-hub-common/std",
"pezbp-asset-hub-pezkuwichain/std",
"pezbp-asset-hub-zagros/std",
"pezbp-bridge-hub-pezkuwichain/std",
"pezbp-bridge-hub-zagros/std",
"pezbp-header-pez-chain/std",
"pezbp-messages/std",
"pezbp-pezkuwi-bulletin/std",
"pezbp-pezkuwi-core/std",
"pezbp-relayers/std",
"pezbp-teyrchains/std",
"pezbp-xcm-bridge-hub-router/std",
"pezbp-zagros/std",
"pezbridge-hub-common/std",
"codec/std",
"pezbp-runtime/std",
"pezbridge-runtime-common/std",
@@ -231,19 +231,19 @@ std = [
]
runtime-benchmarks = [
"bizinikiwi-wasm-builder?/runtime-benchmarks",
"bp-asset-hub-pezkuwichain/runtime-benchmarks",
"bp-asset-hub-zagros/runtime-benchmarks",
"bp-bridge-hub-pezkuwichain/runtime-benchmarks",
"bp-bridge-hub-zagros/runtime-benchmarks",
"bp-header-pez-chain/runtime-benchmarks",
"bp-messages/runtime-benchmarks",
"bp-pezkuwi-bulletin/runtime-benchmarks",
"bp-pezkuwi-core/runtime-benchmarks",
"bp-relayers/runtime-benchmarks",
"bp-teyrchains/runtime-benchmarks",
"bp-xcm-bridge-hub-router/runtime-benchmarks",
"bp-zagros/runtime-benchmarks",
"bridge-hub-common/runtime-benchmarks",
"pezbp-asset-hub-pezkuwichain/runtime-benchmarks",
"pezbp-asset-hub-zagros/runtime-benchmarks",
"pezbp-bridge-hub-pezkuwichain/runtime-benchmarks",
"pezbp-bridge-hub-zagros/runtime-benchmarks",
"pezbp-header-pez-chain/runtime-benchmarks",
"pezbp-messages/runtime-benchmarks",
"pezbp-pezkuwi-bulletin/runtime-benchmarks",
"pezbp-pezkuwi-core/runtime-benchmarks",
"pezbp-relayers/runtime-benchmarks",
"pezbp-teyrchains/runtime-benchmarks",
"pezbp-xcm-bridge-hub-router/runtime-benchmarks",
"pezbp-zagros/runtime-benchmarks",
"pezbridge-hub-common/runtime-benchmarks",
"pezbp-runtime/runtime-benchmarks",
"pezbridge-hub-test-utils/runtime-benchmarks",
"pezbridge-runtime-common/runtime-benchmarks",
pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/bridge-primitives/Cargo.toml
+10 -10
View File
@@ -1,5 +1,5 @@
[package]
name = "bp-bridge-hub-pezkuwichain"
name = "pezbp-bridge-hub-pezkuwichain"
description = "Primitives of BridgeHubPezkuwichain teyrchain runtime."
version = "0.7.0"
authors.workspace = true
@@ -19,9 +19,9 @@ workspace = true
codec = { features = ["derive"], workspace = true }
# Bridge Dependencies
bp-bridge-hub-pezcumulus = { workspace = true }
bp-messages = { workspace = true }
bp-xcm-bridge-hub = { workspace = true }
pezbp-bridge-hub-pezcumulus = { workspace = true }
pezbp-messages = { workspace = true }
pezbp-xcm-bridge-hub = { workspace = true }
pezbp-runtime = { workspace = true }
# Bizinikiwi Based Dependencies
@@ -33,9 +33,9 @@ pezsp-std = { workspace = true }
[features]
default = ["std"]
std = [
"bp-bridge-hub-pezcumulus/std",
"bp-messages/std",
"bp-xcm-bridge-hub/std",
"pezbp-bridge-hub-pezcumulus/std",
"pezbp-messages/std",
"pezbp-xcm-bridge-hub/std",
"codec/std",
"pezbp-runtime/std",
"pezframe-support/std",
@@ -44,9 +44,9 @@ std = [
"pezsp-std/std",
]
runtime-benchmarks = [
"bp-bridge-hub-pezcumulus/runtime-benchmarks",
"bp-messages/runtime-benchmarks",
"bp-xcm-bridge-hub/runtime-benchmarks",
"pezbp-bridge-hub-pezcumulus/runtime-benchmarks",
"pezbp-messages/runtime-benchmarks",
"pezbp-xcm-bridge-hub/runtime-benchmarks",
"pezbp-runtime/runtime-benchmarks",
"pezframe-support/runtime-benchmarks",
"pezsp-api/runtime-benchmarks",
pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/bridge-primitives/src/lib.rs
+3 -3
View File
@@ -19,8 +19,8 @@
#![warn(missing_docs)]
#![cfg_attr(not(feature = "std"), no_std)]
pub use bp_bridge_hub_pezcumulus::*;
use bp_messages::*;
pub use pezbp_bridge_hub_pezcumulus::*;
use pezbp_messages::*;
use codec::{Decode, Encode};
use pezbp_runtime::{
decl_bridge_finality_runtime_apis, decl_bridge_messages_runtime_apis, Chain, ChainId, Teyrchain,
@@ -121,5 +121,5 @@ pezframe_support::parameter_types! {
pub enum RuntimeCall {
/// Points to the `pezpallet_xcm_bridge_hub` pezpallet instance for `BridgeHubZagros`.
#[codec(index = 52)]
XcmOverBridgeHubZagros(bp_xcm_bridge_hub::XcmBridgeHubCall),
XcmOverBridgeHubZagros(pezbp_xcm_bridge_hub::XcmBridgeHubCall),
}
pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/bridge_common_config.rs
+13 -13
View File
@@ -22,16 +22,16 @@
//! GRANDPA tracking pezpallet only needs to be aware of one chain.
use super::{weights, AccountId, Balance, Balances, BlockNumber, Runtime, RuntimeEvent};
use bp_relayers::RewardsAccountParams;
use bp_teyrchains::SingleParaStoredHeaderDataBuilder;
use pezbp_relayers::RewardsAccountParams;
use pezbp_teyrchains::SingleParaStoredHeaderDataBuilder;
use pezframe_support::{parameter_types, traits::ConstU32};
parameter_types! {
pub const RelayChainHeadersToKeep: u32 = 1024;
pub const TeyrchainHeadsToKeep: u32 = 64;
pub const ZagrosBridgeTeyrchainPalletName: &'static str = bp_zagros::PARAS_PALLET_NAME;
pub const MaxZagrosParaHeadDataSize: u32 = bp_zagros::MAX_NESTED_TEYRCHAIN_HEAD_DATA_SIZE;
pub const ZagrosBridgeTeyrchainPalletName: &'static str = pezbp_zagros::PARAS_PALLET_NAME;
pub const MaxZagrosParaHeadDataSize: u32 = pezbp_zagros::MAX_NESTED_TEYRCHAIN_HEAD_DATA_SIZE;
pub storage RequiredStakeForStakeAndSlash: Balance = 1_000_000;
pub const RelayerStakeLease: u32 = 8;
@@ -44,7 +44,7 @@ parameter_types! {
pub type BridgeGrandpaZagrosInstance = pezpallet_bridge_grandpa::Instance3;
impl pezpallet_bridge_grandpa::Config<BridgeGrandpaZagrosInstance> for Runtime {
type RuntimeEvent = RuntimeEvent;
type BridgedChain = bp_zagros::Zagros;
type BridgedChain = pezbp_zagros::Zagros;
type MaxFreeHeadersPerBlock = ConstU32<4>;
type FreeHeadersInterval = ConstU32<5>;
type HeadersToKeep = RelayChainHeadersToKeep;
@@ -59,7 +59,7 @@ impl pezpallet_bridge_teyrchains::Config<BridgeTeyrchainZagrosInstance> for Runt
type BridgesGrandpaPalletInstance = BridgeGrandpaZagrosInstance;
type ParasPalletName = ZagrosBridgeTeyrchainPalletName;
type ParaStoredHeaderDataBuilder =
SingleParaStoredHeaderDataBuilder<bp_bridge_hub_zagros::BridgeHubZagros>;
SingleParaStoredHeaderDataBuilder<pezbp_bridge_hub_zagros::BridgeHubZagros>;
type HeadsToKeep = TeyrchainHeadsToKeep;
type MaxParaHeadDataSize = MaxZagrosParaHeadDataSize;
type OnNewHead = ();
@@ -70,11 +70,11 @@ pub type RelayersForLegacyLaneIdsMessagesInstance = ();
impl pezpallet_bridge_relayers::Config<RelayersForLegacyLaneIdsMessagesInstance> for Runtime {
type RuntimeEvent = RuntimeEvent;
type RewardBalance = Balance;
type Reward = RewardsAccountParams<bp_messages::LegacyLaneId>;
type PaymentProcedure = bp_relayers::PayRewardFromAccount<
type Reward = RewardsAccountParams<pezbp_messages::LegacyLaneId>;
type PaymentProcedure = pezbp_relayers::PayRewardFromAccount<
pezpallet_balances::Pezpallet<Runtime>,
AccountId,
bp_messages::LegacyLaneId,
pezbp_messages::LegacyLaneId,
Self::RewardBalance,
>;
type StakeAndSlash = pezpallet_bridge_relayers::StakeAndSlashNamed<
@@ -94,11 +94,11 @@ pub type RelayersForPermissionlessLanesInstance = pezpallet_bridge_relayers::Ins
impl pezpallet_bridge_relayers::Config<RelayersForPermissionlessLanesInstance> for Runtime {
type RuntimeEvent = RuntimeEvent;
type RewardBalance = Balance;
type Reward = RewardsAccountParams<bp_messages::HashedLaneId>;
type PaymentProcedure = bp_relayers::PayRewardFromAccount<
type Reward = RewardsAccountParams<pezbp_messages::HashedLaneId>;
type PaymentProcedure = pezbp_relayers::PayRewardFromAccount<
pezpallet_balances::Pezpallet<Runtime>,
AccountId,
bp_messages::HashedLaneId,
pezbp_messages::HashedLaneId,
Self::RewardBalance,
>;
type StakeAndSlash = pezpallet_bridge_relayers::StakeAndSlashNamed<
@@ -117,7 +117,7 @@ impl pezpallet_bridge_relayers::Config<RelayersForPermissionlessLanesInstance> f
pub type BridgeGrandpaPezkuwichainBulletinInstance = pezpallet_bridge_grandpa::Instance4;
impl pezpallet_bridge_grandpa::Config<BridgeGrandpaPezkuwichainBulletinInstance> for Runtime {
type RuntimeEvent = RuntimeEvent;
type BridgedChain = bp_pezkuwi_bulletin::PezkuwiBulletin;
type BridgedChain = pezbp_pezkuwi_bulletin::PezkuwiBulletin;
type MaxFreeHeadersPerBlock = ConstU32<4>;
type FreeHeadersInterval = ConstU32<5>;
type HeadersToKeep = RelayChainHeadersToKeep;
pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/bridge_to_bulletin_config.rs
+12 -12
View File
@@ -25,7 +25,7 @@ use crate::{
BridgePezkuwichainBulletinMessages, Runtime, RuntimeEvent, RuntimeHoldReason,
XcmOverPezkuwichainBulletin, XcmRouter,
};
use bp_messages::{
use pezbp_messages::{
source_chain::FromBridgedChainMessagesDeliveryProof,
target_chain::FromBridgedChainMessagesProof, LegacyLaneId,
};
@@ -80,10 +80,10 @@ parameter_types! {
/// Proof of messages, coming from Pezkuwichain Bulletin chain.
pub type FromPezkuwichainBulletinMessagesProof<MI> =
FromBridgedChainMessagesProof<bp_pezkuwi_bulletin::Hash, LaneIdOf<Runtime, MI>>;
FromBridgedChainMessagesProof<pezbp_pezkuwi_bulletin::Hash, LaneIdOf<Runtime, MI>>;
/// Messages delivery proof for Pezkuwichain Bridge Hub -> Pezkuwichain Bulletin messages.
pub type ToPezkuwichainBulletinMessagesDeliveryProof<MI> =
FromBridgedChainMessagesDeliveryProof<bp_pezkuwi_bulletin::Hash, LaneIdOf<Runtime, MI>>;
FromBridgedChainMessagesDeliveryProof<pezbp_pezkuwi_bulletin::Hash, LaneIdOf<Runtime, MI>>;
/// Dispatches received XCM messages from other bridge.
type FromPezkuwichainBulletinMessageBlobDispatcher = BridgeBlobDispatcher<
@@ -119,8 +119,8 @@ impl pezpallet_bridge_messages::Config<WithPezkuwichainBulletinMessagesInstance>
Runtime,
>;
type ThisChain = bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain;
type BridgedChain = bp_pezkuwi_bulletin::PezkuwiBulletin;
type ThisChain = pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain;
type BridgedChain = pezbp_pezkuwi_bulletin::PezkuwiBulletin;
type BridgedHeaderChain = BridgePezkuwichainBulletinGrandpa;
type OutboundPayload = XcmAsPlainPayload;
@@ -190,13 +190,13 @@ mod tests {
#[test]
fn ensure_bridge_hub_pezkuwichain_message_lane_weights_are_correct() {
check_message_lane_weights::<
bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
Runtime,
WithPezkuwichainBulletinMessagesInstance,
>(
bp_pezkuwi_bulletin::EXTRA_STORAGE_PROOF_SIZE,
bp_bridge_hub_pezkuwichain::MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX,
bp_bridge_hub_pezkuwichain::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX,
pezbp_pezkuwi_bulletin::EXTRA_STORAGE_PROOF_SIZE,
pezbp_bridge_hub_pezkuwichain::MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX,
pezbp_bridge_hub_pezkuwichain::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX,
true,
);
}
@@ -206,8 +206,8 @@ mod tests {
assert_complete_bridge_types!(
runtime: Runtime,
with_bridged_chain_messages_instance: WithPezkuwichainBulletinMessagesInstance,
this_chain: bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
bridged_chain: bp_pezkuwi_bulletin::PezkuwiBulletin,
this_chain: pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
bridged_chain: pezbp_pezkuwi_bulletin::PezkuwiBulletin,
expected_payload_type: XcmAsPlainPayload,
);
@@ -228,7 +228,7 @@ mod tests {
>(FEE_BOOST_PER_MESSAGE);
let expected: InteriorLocation = PalletInstance(
bp_bridge_hub_pezkuwichain::WITH_BRIDGE_PEZKUWICHAIN_TO_BULLETIN_MESSAGES_PALLET_INDEX,
pezbp_bridge_hub_pezkuwichain::WITH_BRIDGE_PEZKUWICHAIN_TO_BULLETIN_MESSAGES_PALLET_INDEX,
)
.into();
pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/bridge_to_ethereum_config.rs
+1 -1
View File
@@ -37,7 +37,7 @@ use testnet_teyrchains_constants::pezkuwichain::{
use crate::xcm_config::RelayNetwork;
#[cfg(feature = "runtime-benchmarks")]
use benchmark_helpers::DoNothingRouter;
use bp_asset_hub_pezkuwichain::CreateForeignAssetDeposit;
use pezbp_asset_hub_pezkuwichain::CreateForeignAssetDeposit;
use hex_literal::hex;
use pezframe_support::{parameter_types, weights::ConstantMultiplier};
use pezpallet_xcm::EnsureXcm;
pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/bridge_to_zagros_config.rs
+26 -26
View File
@@ -26,11 +26,11 @@ use crate::{
AccountId, Balance, Balances, BridgeZagrosMessages, PezkuwiXcm, Runtime, RuntimeEvent,
RuntimeHoldReason, XcmOverBridgeHubZagros, XcmRouter, XcmpQueue,
};
use bp_messages::{
use pezbp_messages::{
source_chain::FromBridgedChainMessagesDeliveryProof,
target_chain::FromBridgedChainMessagesProof, LegacyLaneId,
};
use bridge_hub_common::xcm_version::XcmVersionOfDestAndRemoteBridge;
use pezbridge_hub_common::xcm_version::XcmVersionOfDestAndRemoteBridge;
use pezpallet_xcm_bridge_hub::{BridgeId, XcmAsPlainPayload};
use pezframe_support::{parameter_types, traits::PalletInfoAccess};
@@ -66,7 +66,7 @@ parameter_types! {
2,
[
GlobalConsensus(ZagrosGlobalConsensusNetwork::get()),
Teyrchain(<bp_bridge_hub_zagros::BridgeHubZagros as pezbp_runtime::Teyrchain>::TEYRCHAIN_ID)
Teyrchain(<pezbp_bridge_hub_zagros::BridgeHubZagros as pezbp_runtime::Teyrchain>::TEYRCHAIN_ID)
]
);
@@ -75,10 +75,10 @@ parameter_types! {
/// Proof of messages, coming from Zagros.
pub type FromZagrosBridgeHubMessagesProof<MI> =
FromBridgedChainMessagesProof<bp_bridge_hub_zagros::Hash, LaneIdOf<Runtime, MI>>;
FromBridgedChainMessagesProof<pezbp_bridge_hub_zagros::Hash, LaneIdOf<Runtime, MI>>;
/// Messages delivery proof for Pezkuwichain Bridge Hub -> Zagros Bridge Hub messages.
pub type ToZagrosBridgeHubMessagesDeliveryProof<MI> =
FromBridgedChainMessagesDeliveryProof<bp_bridge_hub_zagros::Hash, LaneIdOf<Runtime, MI>>;
FromBridgedChainMessagesDeliveryProof<pezbp_bridge_hub_zagros::Hash, LaneIdOf<Runtime, MI>>;
/// Dispatches received XCM messages from other bridge
type FromZagrosMessageBlobDispatcher = BridgeBlobDispatcher<
@@ -108,12 +108,12 @@ impl pezpallet_bridge_messages::Config<WithBridgeHubZagrosMessagesInstance> for
type WeightInfo =
weights::pezpallet_bridge_messages_pezkuwichain_to_zagros::WeightInfo<Runtime>;
type ThisChain = bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain;
type BridgedChain = bp_bridge_hub_zagros::BridgeHubZagros;
type ThisChain = pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain;
type BridgedChain = pezbp_bridge_hub_zagros::BridgeHubZagros;
type BridgedHeaderChain = pezpallet_bridge_teyrchains::TeyrchainHeaders<
Runtime,
BridgeTeyrchainZagrosInstance,
bp_bridge_hub_zagros::BridgeHubZagros,
pezbp_bridge_hub_zagros::BridgeHubZagros,
>;
type OutboundPayload = XcmAsPlainPayload;
@@ -164,7 +164,7 @@ impl pezpallet_xcm_bridge_hub::Config<XcmOverBridgeHubZagrosInstance> for Runtim
type BlobDispatcher = FromZagrosMessageBlobDispatcher;
}
/// Implementation of `bp_xcm_bridge_hub::LocalXcmChannelManager` for congestion management.
/// Implementation of `pezbp_xcm_bridge_hub::LocalXcmChannelManager` for congestion management.
pub struct CongestionManager;
impl pezpallet_xcm_bridge_hub::LocalXcmChannelManager for CongestionManager {
type Error = SendError;
@@ -173,7 +173,7 @@ impl pezpallet_xcm_bridge_hub::LocalXcmChannelManager for CongestionManager {
// This is used to check the inbound bridge queue/messages to determine if they can be
// dispatched and sent to the sibling teyrchain. Therefore, checking outbound `XcmpQueue`
// is sufficient here.
use bp_xcm_bridge_hub_router::XcmChannelStatusProvider;
use pezbp_xcm_bridge_hub_router::XcmChannelStatusProvider;
pezcumulus_pezpallet_xcmp_queue::bridging::OutXcmpChannelStatusProvider::<Runtime>::is_congested(
with,
)
@@ -184,7 +184,7 @@ impl pezpallet_xcm_bridge_hub::LocalXcmChannelManager for CongestionManager {
// so `local_origin` is expected to represent only the local AH.
send_xcm::<XcmpQueue>(
local_origin.clone(),
bp_asset_hub_pezkuwichain::build_congestion_message(bridge.inner(), true).into(),
pezbp_asset_hub_pezkuwichain::build_congestion_message(bridge.inner(), true).into(),
)
.map(|_| ())
}
@@ -194,7 +194,7 @@ impl pezpallet_xcm_bridge_hub::LocalXcmChannelManager for CongestionManager {
// so `local_origin` is expected to represent only the local AH.
send_xcm::<XcmpQueue>(
local_origin.clone(),
bp_asset_hub_pezkuwichain::build_congestion_message(bridge.inner(), false).into(),
pezbp_asset_hub_pezkuwichain::build_congestion_message(bridge.inner(), false).into(),
)
.map(|_| ())
}
@@ -280,13 +280,13 @@ mod tests {
#[test]
fn ensure_bridge_hub_pezkuwichain_message_lane_weights_are_correct() {
check_message_lane_weights::<
bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
Runtime,
WithBridgeHubZagrosMessagesInstance,
>(
bp_bridge_hub_zagros::EXTRA_STORAGE_PROOF_SIZE,
bp_bridge_hub_pezkuwichain::MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX,
bp_bridge_hub_pezkuwichain::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX,
pezbp_bridge_hub_zagros::EXTRA_STORAGE_PROOF_SIZE,
pezbp_bridge_hub_pezkuwichain::MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX,
pezbp_bridge_hub_pezkuwichain::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX,
true,
);
}
@@ -296,8 +296,8 @@ mod tests {
assert_complete_bridge_types!(
runtime: Runtime,
with_bridged_chain_messages_instance: WithBridgeHubZagrosMessagesInstance,
this_chain: bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
bridged_chain: bp_bridge_hub_zagros::BridgeHubZagros,
this_chain: pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
bridged_chain: pezbp_bridge_hub_zagros::BridgeHubZagros,
expected_payload_type: XcmAsPlainPayload,
);
@@ -307,8 +307,8 @@ mod tests {
WithBridgeHubZagrosMessagesInstance,
>(AssertCompleteBridgeConstants {
this_chain_constants: AssertChainConstants {
block_length: bp_bridge_hub_pezkuwichain::BlockLength::get(),
block_weights: bp_bridge_hub_pezkuwichain::BlockWeightsForAsyncBacking::get(),
block_length: pezbp_bridge_hub_pezkuwichain::BlockLength::get(),
block_weights: pezbp_bridge_hub_pezkuwichain::BlockWeightsForAsyncBacking::get(),
},
});
@@ -321,7 +321,7 @@ mod tests {
pezpallet_bridge_relayers::extension::per_teyrchain_header::ensure_priority_boost_is_sane::<
Runtime,
WithBridgeHubZagrosMessagesInstance,
bp_bridge_hub_zagros::BridgeHubZagros,
pezbp_bridge_hub_zagros::BridgeHubZagros,
PriorityBoostPerTeyrchainHeader,
>(FEE_BOOST_PER_TEYRCHAIN_HEADER);
@@ -332,7 +332,7 @@ mod tests {
>(FEE_BOOST_PER_MESSAGE);
let expected: InteriorLocation = [PalletInstance(
bp_bridge_hub_pezkuwichain::WITH_BRIDGE_PEZKUWICHAIN_TO_ZAGROS_MESSAGES_PALLET_INDEX,
pezbp_bridge_hub_pezkuwichain::WITH_BRIDGE_PEZKUWICHAIN_TO_ZAGROS_MESSAGES_PALLET_INDEX,
)]
.into();
@@ -347,8 +347,8 @@ pub mod migration {
parameter_types! {
pub AssetHubPezkuwichainToAssetHubZagrosMessagesLane: LegacyLaneId = LegacyLaneId([0, 0, 0, 2]);
pub AssetHubPezkuwichainLocation: Location = Location::new(1, [Teyrchain(bp_asset_hub_pezkuwichain::ASSET_HUB_PEZKUWICHAIN_TEYRCHAIN_ID)]);
pub AssetHubZagrosUniversalLocation: InteriorLocation = [GlobalConsensus(ZagrosGlobalConsensusNetwork::get()), Teyrchain(bp_asset_hub_zagros::ASSET_HUB_ZAGROS_TEYRCHAIN_ID)].into();
pub AssetHubPezkuwichainLocation: Location = Location::new(1, [Teyrchain(pezbp_asset_hub_pezkuwichain::ASSET_HUB_PEZKUWICHAIN_TEYRCHAIN_ID)]);
pub AssetHubZagrosUniversalLocation: InteriorLocation = [GlobalConsensus(ZagrosGlobalConsensusNetwork::get()), Teyrchain(pezbp_asset_hub_zagros::ASSET_HUB_ZAGROS_TEYRCHAIN_ID)].into();
}
/// Ensure that the existing lanes for the AHR<>AHW bridge are correctly configured.
@@ -364,7 +364,7 @@ pub mod migration {
>;
mod v1_wrong {
use bp_messages::{LaneState, MessageNonce, UnrewardedRelayer};
use pezbp_messages::{LaneState, MessageNonce, UnrewardedRelayer};
use codec::{Decode, Encode};
use pezbp_runtime::AccountIdOf;
use pezpallet_bridge_messages::BridgedChainOf;
@@ -390,7 +390,7 @@ pub mod migration {
}
mod v1 {
pub use bp_messages::{InboundLaneData, LaneState, OutboundLaneData};
pub use pezbp_messages::{InboundLaneData, LaneState, OutboundLaneData};
pub use pezpallet_bridge_messages::{InboundLanes, OutboundLanes, StoredInboundLaneData};
}
pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/genesis_config_presets.rs
+3 -3
View File
@@ -33,7 +33,7 @@ fn bridge_hub_pezkuwichain_genesis(
id: ParaId,
bridges_pallet_owner: Option<AccountId>,
asset_hub_para_id: ParaId,
opened_bridges: Vec<(Location, InteriorLocation, Option<bp_messages::LegacyLaneId>)>,
opened_bridges: Vec<(Location, InteriorLocation, Option<pezbp_messages::LegacyLaneId>)>,
) -> serde_json::Value {
build_struct_json_patch!(RuntimeGenesisConfig {
balances: BalancesConfig {
@@ -70,7 +70,7 @@ fn bridge_hub_pezkuwichain_genesis(
opened_bridges: vec![(
Location::new(1, [Teyrchain(1004)]),
Junctions::from([GlobalConsensus(NetworkId::PezkuwiBulletin).into()]),
Some(bp_messages::LegacyLaneId([0, 0, 0, 0])),
Some(pezbp_messages::LegacyLaneId([0, 0, 0, 0])),
)],
},
xcm_over_bridge_hub_zagros: XcmOverBridgeHubZagrosConfig { opened_bridges },
@@ -94,7 +94,7 @@ pub fn get_preset(id: &pezsp_genesis_builder::PresetId) -> Option<pezsp_std::vec
vec![(
Location::new(1, [Teyrchain(1000)]),
Junctions::from([ByGenesis(ZAGROS_GENESIS_HASH).into(), Teyrchain(1000)]),
Some(bp_messages::LegacyLaneId([0, 0, 0, 2])),
Some(pezbp_messages::LegacyLaneId([0, 0, 0, 2])),
)],
),
pezsp_genesis_builder::DEV_RUNTIME_PRESET => bridge_hub_pezkuwichain_genesis(
pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/lib.rs
+53 -53
View File
@@ -75,7 +75,7 @@ use testnet_teyrchains_constants::pezkuwichain::{
consensus::*, currency::*, fee::WeightToFee, time::*,
};
use bridge_hub_common::{
use pezbridge_hub_common::{
message_queue::{NarrowOriginToSibling, ParaIdToSibling},
AggregateMessageOrigin,
};
@@ -188,7 +188,7 @@ pub type Migrations = (
pezpallet_bridge_relayers::migration::v1::MigrationToV1<
Runtime,
bridge_common_config::RelayersForLegacyLaneIdsMessagesInstance,
bp_messages::LegacyLaneId,
pezbp_messages::LegacyLaneId,
>,
pezpallet_session::migrations::v1::MigrateV0ToV1<
Runtime,
@@ -432,7 +432,7 @@ impl pezpallet_message_queue::Config for Runtime {
type MessageProcessor =
pezpallet_message_queue::mock_helpers::NoopMessageProcessor<AggregateMessageOrigin>;
#[cfg(not(all(not(feature = "std"), feature = "runtime-benchmarks")))]
type MessageProcessor = bridge_hub_common::BridgeHubMessageRouter<
type MessageProcessor = pezbridge_hub_common::BridgeHubMessageRouter<
xcm_builder::ProcessXcmMessage<
AggregateMessageOrigin,
xcm_executor::XcmExecutor<xcm_config::XcmConfig>,
@@ -667,7 +667,7 @@ pezbridge_runtime_common::generate_bridge_reject_obsolete_headers_and_messages!
CheckAndBoostBridgeTeyrchainsTransactions<
Runtime,
bridge_common_config::BridgeTeyrchainZagrosInstance,
bp_bridge_hub_zagros::BridgeHubZagros,
pezbp_bridge_hub_zagros::BridgeHubZagros,
bridge_to_zagros_config::PriorityBoostPerTeyrchainHeader,
xcm_config::TreasuryAccount,
>,
@@ -919,39 +919,39 @@ impl_runtime_apis! {
}
}
impl bp_zagros::ZagrosFinalityApi<Block> for Runtime {
fn best_finalized() -> Option<HeaderId<bp_zagros::Hash, bp_zagros::BlockNumber>> {
impl pezbp_zagros::ZagrosFinalityApi<Block> for Runtime {
fn best_finalized() -> Option<HeaderId<pezbp_zagros::Hash, pezbp_zagros::BlockNumber>> {
BridgeZagrosGrandpa::best_finalized()
}
fn free_headers_interval() -> Option<bp_zagros::BlockNumber> {
fn free_headers_interval() -> Option<pezbp_zagros::BlockNumber> {
<Runtime as pezpallet_bridge_grandpa::Config<
bridge_common_config::BridgeGrandpaZagrosInstance
>>::FreeHeadersInterval::get()
}
fn synced_headers_grandpa_info(
) -> Vec<bp_header_pez_chain::StoredHeaderGrandpaInfo<bp_zagros::Header>> {
) -> Vec<pezbp_header_pez_chain::StoredHeaderGrandpaInfo<pezbp_zagros::Header>> {
BridgeZagrosGrandpa::synced_headers_grandpa_info()
}
}
impl bp_bridge_hub_zagros::BridgeHubZagrosFinalityApi<Block> for Runtime {
impl pezbp_bridge_hub_zagros::BridgeHubZagrosFinalityApi<Block> for Runtime {
fn best_finalized() -> Option<HeaderId<Hash, BlockNumber>> {
BridgeZagrosTeyrchains::best_teyrchain_head_id::<
bp_bridge_hub_zagros::BridgeHubZagros
pezbp_bridge_hub_zagros::BridgeHubZagros
>().unwrap_or(None)
}
fn free_headers_interval() -> Option<bp_bridge_hub_zagros::BlockNumber> {
fn free_headers_interval() -> Option<pezbp_bridge_hub_zagros::BlockNumber> {
// "free interval" is not currently used for teyrchains
None
}
}
// This is exposed by BridgeHubPezkuwichain
impl bp_bridge_hub_zagros::FromBridgeHubZagrosInboundLaneApi<Block> for Runtime {
impl pezbp_bridge_hub_zagros::FromBridgeHubZagrosInboundLaneApi<Block> for Runtime {
fn message_details(
lane: LaneIdOf<Runtime, bridge_to_zagros_config::WithBridgeHubZagrosMessagesInstance>,
messages: Vec<(bp_messages::MessagePayload, bp_messages::OutboundMessageDetails)>,
) -> Vec<bp_messages::InboundMessageDetails> {
messages: Vec<(pezbp_messages::MessagePayload, pezbp_messages::OutboundMessageDetails)>,
) -> Vec<pezbp_messages::InboundMessageDetails> {
pezbridge_runtime_common::messages_api::inbound_message_details::<
Runtime,
bridge_to_zagros_config::WithBridgeHubZagrosMessagesInstance,
@@ -960,12 +960,12 @@ impl_runtime_apis! {
}
// This is exposed by BridgeHubPezkuwichain
impl bp_bridge_hub_zagros::ToBridgeHubZagrosOutboundLaneApi<Block> for Runtime {
impl pezbp_bridge_hub_zagros::ToBridgeHubZagrosOutboundLaneApi<Block> for Runtime {
fn message_details(
lane: LaneIdOf<Runtime, bridge_to_zagros_config::WithBridgeHubZagrosMessagesInstance>,
begin: bp_messages::MessageNonce,
end: bp_messages::MessageNonce,
) -> Vec<bp_messages::OutboundMessageDetails> {
begin: pezbp_messages::MessageNonce,
end: pezbp_messages::MessageNonce,
) -> Vec<pezbp_messages::OutboundMessageDetails> {
pezbridge_runtime_common::messages_api::outbound_message_details::<
Runtime,
bridge_to_zagros_config::WithBridgeHubZagrosMessagesInstance,
@@ -973,28 +973,28 @@ impl_runtime_apis! {
}
}
impl bp_pezkuwi_bulletin::PezkuwiBulletinFinalityApi<Block> for Runtime {
fn best_finalized() -> Option<pezbp_runtime::HeaderId<bp_pezkuwi_bulletin::Hash, bp_pezkuwi_bulletin::BlockNumber>> {
impl pezbp_pezkuwi_bulletin::PezkuwiBulletinFinalityApi<Block> for Runtime {
fn best_finalized() -> Option<pezbp_runtime::HeaderId<pezbp_pezkuwi_bulletin::Hash, pezbp_pezkuwi_bulletin::BlockNumber>> {
BridgePezkuwiBulletinGrandpa::best_finalized()
}
fn free_headers_interval() -> Option<bp_pezkuwi_bulletin::BlockNumber> {
fn free_headers_interval() -> Option<pezbp_pezkuwi_bulletin::BlockNumber> {
<Runtime as pezpallet_bridge_grandpa::Config<
bridge_common_config::BridgeGrandpaPezkuwichainBulletinInstance
>>::FreeHeadersInterval::get()
}
fn synced_headers_grandpa_info(
) -> Vec<bp_header_pez_chain::StoredHeaderGrandpaInfo<bp_pezkuwi_bulletin::Header>> {
) -> Vec<pezbp_header_pez_chain::StoredHeaderGrandpaInfo<pezbp_pezkuwi_bulletin::Header>> {
BridgePezkuwiBulletinGrandpa::synced_headers_grandpa_info()
}
}
impl bp_pezkuwi_bulletin::FromPezkuwiBulletinInboundLaneApi<Block> for Runtime {
impl pezbp_pezkuwi_bulletin::FromPezkuwiBulletinInboundLaneApi<Block> for Runtime {
fn message_details(
lane: LaneIdOf<Runtime, bridge_to_bulletin_config::WithPezkuwichainBulletinMessagesInstance>,
messages: Vec<(bp_messages::MessagePayload, bp_messages::OutboundMessageDetails)>,
) -> Vec<bp_messages::InboundMessageDetails> {
messages: Vec<(pezbp_messages::MessagePayload, pezbp_messages::OutboundMessageDetails)>,
) -> Vec<pezbp_messages::InboundMessageDetails> {
pezbridge_runtime_common::messages_api::inbound_message_details::<
Runtime,
bridge_to_bulletin_config::WithPezkuwichainBulletinMessagesInstance,
@@ -1002,12 +1002,12 @@ impl_runtime_apis! {
}
}
impl bp_pezkuwi_bulletin::ToPezkuwiBulletinOutboundLaneApi<Block> for Runtime {
impl pezbp_pezkuwi_bulletin::ToPezkuwiBulletinOutboundLaneApi<Block> for Runtime {
fn message_details(
lane: LaneIdOf<Runtime, bridge_to_bulletin_config::WithPezkuwichainBulletinMessagesInstance>,
begin: bp_messages::MessageNonce,
end: bp_messages::MessageNonce,
) -> Vec<bp_messages::OutboundMessageDetails> {
begin: pezbp_messages::MessageNonce,
end: pezbp_messages::MessageNonce,
) -> Vec<pezbp_messages::OutboundMessageDetails> {
pezbridge_runtime_common::messages_api::outbound_message_details::<
Runtime,
bridge_to_bulletin_config::WithPezkuwichainBulletinMessagesInstance,
@@ -1300,7 +1300,7 @@ impl_runtime_apis! {
)?;
XcmOverBridgeHubZagros::do_open_bridge(
locations,
bp_messages::LegacyLaneId([1, 2, 3, 4]),
pezbp_messages::LegacyLaneId([1, 2, 3, 4]),
true,
).map_err(|e| {
tracing::error!(
@@ -1357,10 +1357,10 @@ impl_runtime_apis! {
let bridged_chain_id =<Self as pezpallet_bridge_messages::Config<bridge_to_zagros_config::WithBridgeHubZagrosMessagesInstance>>::BridgedChain::ID;
pezpallet_bridge_relayers::Pezpallet::<Runtime, bridge_common_config::RelayersForLegacyLaneIdsMessagesInstance>::relayer_reward(
relayer,
bp_relayers::RewardsAccountParams::new(
pezbp_relayers::RewardsAccountParams::new(
bench_lane_id,
bridged_chain_id,
bp_relayers::RewardsAccountOwner::BridgedChain
pezbp_relayers::RewardsAccountOwner::BridgedChain
)
).is_some()
}
@@ -1398,7 +1398,7 @@ impl_runtime_apis! {
>(params)
}
fn is_message_successfully_dispatched(_nonce: bp_messages::MessageNonce) -> bool {
fn is_message_successfully_dispatched(_nonce: pezbp_messages::MessageNonce) -> bool {
use pezcumulus_primitives_core::XcmpMessageSource;
!XcmpQueue::take_outbound_messages(usize::MAX).is_empty()
}
@@ -1443,7 +1443,7 @@ impl_runtime_apis! {
>(params)
}
fn is_message_successfully_dispatched(_nonce: bp_messages::MessageNonce) -> bool {
fn is_message_successfully_dispatched(_nonce: pezbp_messages::MessageNonce) -> bool {
use pezcumulus_primitives_core::XcmpMessageSource;
!XcmpQueue::take_outbound_messages(usize::MAX).is_empty()
}
@@ -1457,20 +1457,20 @@ impl_runtime_apis! {
};
impl BridgeTeyrchainsConfig<bridge_common_config::BridgeTeyrchainZagrosInstance> for Runtime {
fn teyrchains() -> Vec<bp_pezkuwi_core::teyrchains::ParaId> {
fn teyrchains() -> Vec<pezbp_pezkuwi_core::teyrchains::ParaId> {
use pezbp_runtime::Teyrchain;
vec![bp_pezkuwi_core::teyrchains::ParaId(bp_bridge_hub_zagros::BridgeHubZagros::TEYRCHAIN_ID)]
vec![pezbp_pezkuwi_core::teyrchains::ParaId(pezbp_bridge_hub_zagros::BridgeHubZagros::TEYRCHAIN_ID)]
}
fn prepare_teyrchain_heads_proof(
teyrchains: &[bp_pezkuwi_core::teyrchains::ParaId],
teyrchains: &[pezbp_pezkuwi_core::teyrchains::ParaId],
teyrchain_head_size: u32,
proof_params: pezbp_runtime::UnverifiedStorageProofParams,
) -> (
bp_teyrchains::RelayBlockNumber,
bp_teyrchains::RelayBlockHash,
bp_pezkuwi_core::teyrchains::ParaHeadsProof,
Vec<(bp_pezkuwi_core::teyrchains::ParaId, bp_pezkuwi_core::teyrchains::ParaHash)>,
pezbp_teyrchains::RelayBlockNumber,
pezbp_teyrchains::RelayBlockHash,
pezbp_pezkuwi_core::teyrchains::ParaHeadsProof,
Vec<(pezbp_pezkuwi_core::teyrchains::ParaId, pezbp_pezkuwi_core::teyrchains::ParaHash)>,
) {
prepare_teyrchain_heads_proof::<Runtime, bridge_common_config::BridgeTeyrchainZagrosInstance>(
teyrchains,
@@ -1482,10 +1482,10 @@ impl_runtime_apis! {
impl BridgeRelayersConfig<bridge_common_config::RelayersForLegacyLaneIdsMessagesInstance> for Runtime {
fn bench_reward() -> Self::Reward {
bp_relayers::RewardsAccountParams::new(
bp_messages::LegacyLaneId::default(),
pezbp_relayers::RewardsAccountParams::new(
pezbp_messages::LegacyLaneId::default(),
*b"test",
bp_relayers::RewardsAccountOwner::ThisChain
pezbp_relayers::RewardsAccountOwner::ThisChain
)
}
@@ -1493,10 +1493,10 @@ impl_runtime_apis! {
reward_kind: Self::Reward,
reward: Balance,
) -> Option<AccountId> {
let rewards_account = bp_relayers::PayRewardFromAccount::<
let rewards_account = pezbp_relayers::PayRewardFromAccount::<
Balances,
AccountId,
bp_messages::LegacyLaneId,
pezbp_messages::LegacyLaneId,
Balance,
>::rewards_account(reward_kind);
<Runtime as BridgeRelayersConfig<bridge_common_config::RelayersForLegacyLaneIdsMessagesInstance>>::deposit_account(rewards_account, reward);
@@ -1512,10 +1512,10 @@ impl_runtime_apis! {
impl BridgeRelayersConfig<bridge_common_config::RelayersForPermissionlessLanesInstance> for Runtime {
fn bench_reward() -> Self::Reward {
bp_relayers::RewardsAccountParams::new(
bp_messages::HashedLaneId::default(),
pezbp_relayers::RewardsAccountParams::new(
pezbp_messages::HashedLaneId::default(),
*b"test",
bp_relayers::RewardsAccountOwner::ThisChain
pezbp_relayers::RewardsAccountOwner::ThisChain
)
}
@@ -1523,10 +1523,10 @@ impl_runtime_apis! {
reward_kind: Self::Reward,
reward: Balance,
) -> Option<AccountId> {
let rewards_account = bp_relayers::PayRewardFromAccount::<
let rewards_account = pezbp_relayers::PayRewardFromAccount::<
Balances,
AccountId,
bp_messages::HashedLaneId,
pezbp_messages::HashedLaneId,
Balance,
>::rewards_account(reward_kind);
<Runtime as BridgeRelayersConfig<bridge_common_config::RelayersForPermissionlessLanesInstance>>::deposit_account(rewards_account, reward);
@@ -1598,7 +1598,7 @@ mod tests {
#[test]
fn ensure_transaction_extension_definition_is_compatible_with_relay() {
use bp_pezkuwi_core::SuffixedCommonTransactionExtensionExt;
use pezbp_pezkuwi_core::SuffixedCommonTransactionExtensionExt;
pezsp_io::TestExternalities::default().execute_with(|| {
pezframe_system::BlockHash::<Runtime>::insert(BlockNumber::zero(), Hash::default());
@@ -1624,7 +1624,7 @@ mod tests {
// for BridgeHubPezkuwichain
{
let bhr_indirect_payload =
bp_bridge_hub_pezkuwichain::TransactionExtension::from_params(
pezbp_bridge_hub_pezkuwichain::TransactionExtension::from_params(
VERSION.spec_version,
VERSION.transaction_version,
pezbp_runtime::TransactionEra::Immortal,
pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/weights/mod.rs
+3 -3
View File
@@ -76,7 +76,7 @@ impl MessagesWeightInfoExt
for pezpallet_bridge_messages_pezkuwichain_to_pezkuwichain_bulletin::WeightInfo<crate::Runtime>
{
fn expected_extra_storage_proof_size() -> u32 {
bp_pezkuwi_bulletin::EXTRA_STORAGE_PROOF_SIZE
pezbp_pezkuwi_bulletin::EXTRA_STORAGE_PROOF_SIZE
}
fn receive_messages_proof_overhead_from_runtime() -> Weight {
@@ -93,7 +93,7 @@ impl MessagesWeightInfoExt
for pezpallet_bridge_messages_pezkuwichain_to_zagros::WeightInfo<crate::Runtime>
{
fn expected_extra_storage_proof_size() -> u32 {
bp_bridge_hub_zagros::EXTRA_STORAGE_PROOF_SIZE
pezbp_bridge_hub_zagros::EXTRA_STORAGE_PROOF_SIZE
}
fn receive_messages_proof_overhead_from_runtime() -> Weight {
@@ -108,7 +108,7 @@ impl MessagesWeightInfoExt
impl TeyrchainsWeightInfoExt for pezpallet_bridge_teyrchains::WeightInfo<crate::Runtime> {
fn expected_extra_storage_proof_size() -> u32 {
bp_bridge_hub_zagros::EXTRA_STORAGE_PROOF_SIZE
pezbp_bridge_hub_zagros::EXTRA_STORAGE_PROOF_SIZE
}
fn submit_teyrchain_heads_overhead_from_runtime() -> Weight {
pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/src/xcm_config.rs
+1 -1
View File
@@ -73,7 +73,7 @@ parameter_types! {
pub TreasuryAccount: AccountId = TREASURY_PALLET_ID.into_account_truncating();
pub RelayTreasuryLocation: Location = (Parent, PalletInstance(pezkuwichain_runtime_constants::TREASURY_PALLET_ID)).into();
pub SiblingPeople: Location = (Parent, Teyrchain(pezkuwichain_runtime_constants::system_teyrchain::PEOPLE_ID)).into();
pub AssetHubPezkuwichainLocation: Location = Location::new(1, [Teyrchain(bp_asset_hub_pezkuwichain::ASSET_HUB_PEZKUWICHAIN_TEYRCHAIN_ID)]);
pub AssetHubPezkuwichainLocation: Location = Location::new(1, [Teyrchain(pezbp_asset_hub_pezkuwichain::ASSET_HUB_PEZKUWICHAIN_TEYRCHAIN_ID)]);
}
/// Type for specifying how a `Location` can be converted into an `AccountId`. This is used
pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/tests/snowbridge.rs
+1 -1
View File
@@ -16,7 +16,7 @@
#![cfg(test)]
use bp_pezkuwi_core::Signature;
use pezbp_pezkuwi_core::Signature;
use codec::{Decode, Encode};
use pezbridge_hub_pezkuwichain_runtime::{
bridge_to_zagros_config::OnBridgeHubPezkuwichainRefundBridgeHubZagrosMessages,
pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-pezkuwichain/tests/tests.rs
+32 -32
View File
@@ -16,7 +16,7 @@
#![cfg(test)]
use bp_pezkuwi_core::Signature;
use pezbp_pezkuwi_core::Signature;
use codec::{Decode, Encode};
use hex_literal::hex;
use pezbridge_hub_pezkuwichain_runtime::{
@@ -121,12 +121,12 @@ pezbridge_hub_test_utils::test_cases::include_teleports_for_native_asset_works!(
_ => None,
}
}),
bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID
pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID
);
mod bridge_hub_zagros_tests {
use super::*;
use bp_messages::LegacyLaneId;
use pezbp_messages::LegacyLaneId;
use bridge_common_config::{
BridgeGrandpaZagrosInstance, BridgeTeyrchainZagrosInstance, DeliveryRewardInBalance,
RelayersForLegacyLaneIdsMessagesInstance,
@@ -169,7 +169,7 @@ mod bridge_hub_zagros_tests {
BridgeGrandpaZagrosInstance,
>(
collator_session_keys(),
bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
Governance::get(),
)
}
@@ -182,7 +182,7 @@ mod bridge_hub_zagros_tests {
BridgeGrandpaZagrosInstance,
>(
collator_session_keys(),
bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
Governance::get(),
)
}
@@ -195,7 +195,7 @@ mod bridge_hub_zagros_tests {
BridgeTeyrchainZagrosInstance,
>(
collator_session_keys(),
bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
Governance::get(),
)
}
@@ -208,7 +208,7 @@ mod bridge_hub_zagros_tests {
WithBridgeHubZagrosMessagesInstance,
>(
collator_session_keys(),
bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
Governance::get(),
)
}
@@ -221,7 +221,7 @@ mod bridge_hub_zagros_tests {
H160,
>(
collator_session_keys(),
bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
Governance::get(),
|| (EthereumGatewayAddress::key().to_vec(), EthereumGatewayAddress::get()),
|_| [1; 20].into(),
@@ -237,7 +237,7 @@ mod bridge_hub_zagros_tests {
// Reset a single inbound channel
pezbridge_hub_test_utils::test_cases::set_storage_keys_by_governance_works::<Runtime>(
collator_session_keys(),
bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
Governance::get(),
vec![
(
@@ -308,7 +308,7 @@ mod bridge_hub_zagros_tests {
u64,
>(
collator_session_keys(),
bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
Governance::get(),
|| (DeliveryRewardInBalance::key().to_vec(), DeliveryRewardInBalance::get()),
|old_value| old_value.checked_mul(2).unwrap(),
@@ -324,7 +324,7 @@ mod bridge_hub_zagros_tests {
WithBridgeHubZagrosMessagesInstance,
>(
collator_session_keys(),
bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
SIBLING_TEYRCHAIN_ID,
Box::new(|runtime_event_encoded: Vec<u8>| {
match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
@@ -335,7 +335,7 @@ mod bridge_hub_zagros_tests {
|| ExportMessage { network: ZagrosGlobalConsensusNetwork::get(), destination: [Teyrchain(BRIDGED_LOCATION_TEYRCHAIN_ID)].into(), xcm: Xcm(vec![]) },
Some((TokenLocation::get(), ExistentialDeposit::get()).into()),
// value should be >= than value generated by `can_calculate_weight_for_paid_export_message_with_reserve_transfer`
Some((TokenLocation::get(), bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseXcmFeeInRocs::get()).into()),
Some((TokenLocation::get(), pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseXcmFeeInRocs::get()).into()),
|| {
PezkuwiXcm::force_xcm_version(RuntimeOrigin::root(), Box::new(BridgeHubZagrosLocation::get()), XCM_VERSION).expect("version saved!");
@@ -375,7 +375,7 @@ mod bridge_hub_zagros_tests {
>(
collator_session_keys(),
slot_durations(),
bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
SIBLING_TEYRCHAIN_ID,
Box::new(|runtime_event_encoded: Vec<u8>| {
match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
@@ -399,8 +399,8 @@ mod bridge_hub_zagros_tests {
from_teyrchain::relayed_incoming_message_works::<RuntimeTestsAdapter>(
collator_session_keys(),
slot_durations(),
bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
bp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
pezbp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
SIBLING_TEYRCHAIN_ID,
ByGenesis(PEZKUWICHAIN_GENESIS_HASH),
|| {
@@ -434,8 +434,8 @@ mod bridge_hub_zagros_tests {
from_teyrchain::free_relay_extrinsic_works::<RuntimeTestsAdapter>(
collator_session_keys(),
slot_durations(),
bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
bp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
pezbp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
SIBLING_TEYRCHAIN_ID,
ByGenesis(PEZKUWICHAIN_GENESIS_HASH),
|| {
@@ -466,8 +466,8 @@ mod bridge_hub_zagros_tests {
#[test]
pub fn can_calculate_weight_for_paid_export_message_with_reserve_transfer() {
pezbridge_hub_test_utils::check_sane_fees_values(
"bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseXcmFeeInRocs",
bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseXcmFeeInRocs::get(),
"pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseXcmFeeInRocs",
pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseXcmFeeInRocs::get(),
|| {
pezbridge_hub_test_utils::test_cases::can_calculate_weight_for_paid_export_message_with_reserve_transfer::<
Runtime,
@@ -487,8 +487,8 @@ mod bridge_hub_zagros_tests {
#[test]
fn can_calculate_fee_for_standalone_message_delivery_transaction() {
pezbridge_hub_test_utils::check_sane_fees_values(
"bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseDeliveryFeeInRocs",
bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseDeliveryFeeInRocs::get(),
"pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseDeliveryFeeInRocs",
pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseDeliveryFeeInRocs::get(),
|| {
from_teyrchain::can_calculate_fee_for_standalone_message_delivery_transaction::<
RuntimeTestsAdapter,
@@ -506,8 +506,8 @@ mod bridge_hub_zagros_tests {
#[test]
fn can_calculate_fee_for_standalone_message_confirmation_transaction() {
pezbridge_hub_test_utils::check_sane_fees_values(
"bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseConfirmationFeeInRocs",
bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseConfirmationFeeInRocs::get(),
"pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseConfirmationFeeInRocs",
pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainBaseConfirmationFeeInRocs::get(),
|| {
from_teyrchain::can_calculate_fee_for_standalone_message_confirmation_transaction::<
RuntimeTestsAdapter,
@@ -525,7 +525,7 @@ mod bridge_hub_zagros_tests {
mod bridge_hub_bulletin_tests {
use super::*;
use bp_messages::LegacyLaneId;
use pezbp_messages::LegacyLaneId;
use bridge_common_config::BridgeGrandpaPezkuwichainBulletinInstance;
use bridge_to_bulletin_config::{
PezkuwichainBulletinGlobalConsensusNetwork,
@@ -565,7 +565,7 @@ mod bridge_hub_bulletin_tests {
BridgeGrandpaPezkuwichainBulletinInstance,
>(
collator_session_keys(),
bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
Governance::get(),
)
}
@@ -578,7 +578,7 @@ mod bridge_hub_bulletin_tests {
BridgeGrandpaPezkuwichainBulletinInstance,
>(
collator_session_keys(),
bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
Governance::get(),
)
}
@@ -591,7 +591,7 @@ mod bridge_hub_bulletin_tests {
WithPezkuwichainBulletinMessagesInstance,
>(
collator_session_keys(),
bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
Governance::get(),
)
}
@@ -605,7 +605,7 @@ mod bridge_hub_bulletin_tests {
WithPezkuwichainBulletinMessagesInstance,
>(
collator_session_keys(),
bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
SIBLING_PEOPLE_TEYRCHAIN_ID,
Box::new(|runtime_event_encoded: Vec<u8>| {
match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
@@ -659,7 +659,7 @@ mod bridge_hub_bulletin_tests {
>(
collator_session_keys(),
slot_durations(),
bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
SIBLING_PEOPLE_TEYRCHAIN_ID,
Box::new(|runtime_event_encoded: Vec<u8>| {
match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
@@ -683,7 +683,7 @@ mod bridge_hub_bulletin_tests {
from_grandpa_chain::relayed_incoming_message_works::<RuntimeTestsAdapter>(
collator_session_keys(),
slot_durations(),
bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
SIBLING_PEOPLE_TEYRCHAIN_ID,
ByGenesis(PEZKUWICHAIN_GENESIS_HASH),
|| {
@@ -717,7 +717,7 @@ mod bridge_hub_bulletin_tests {
from_grandpa_chain::free_relay_extrinsic_works::<RuntimeTestsAdapter>(
collator_session_keys(),
slot_durations(),
bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
SIBLING_PEOPLE_TEYRCHAIN_ID,
ByGenesis(PEZKUWICHAIN_GENESIS_HASH),
|| {
@@ -754,7 +754,7 @@ fn change_required_stake_by_governance_works() {
Balance,
>(
collator_session_keys(),
bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
Governance::get(),
|| {
(
pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/Cargo.toml
+36 -36
View File
@@ -85,18 +85,18 @@ teyrchain-info = { workspace = true }
teyrchains-common = { workspace = true }
# Bridges
bp-asset-hub-pezkuwichain = { workspace = true }
bp-asset-hub-zagros = { workspace = true }
bp-bridge-hub-pezkuwichain = { workspace = true }
bp-bridge-hub-zagros = { workspace = true }
bp-header-pez-chain = { workspace = true }
bp-messages = { workspace = true }
bp-pezkuwi-core = { workspace = true }
bp-pezkuwichain = { workspace = true }
bp-relayers = { workspace = true }
bp-teyrchains = { workspace = true }
bp-xcm-bridge-hub-router = { workspace = true }
bridge-hub-common = { workspace = true }
pezbp-asset-hub-pezkuwichain = { workspace = true }
pezbp-asset-hub-zagros = { workspace = true }
pezbp-bridge-hub-pezkuwichain = { workspace = true }
pezbp-bridge-hub-zagros = { workspace = true }
pezbp-header-pez-chain = { workspace = true }
pezbp-messages = { workspace = true }
pezbp-pezkuwi-core = { workspace = true }
pezbp-pezkuwichain = { workspace = true }
pezbp-relayers = { workspace = true }
pezbp-teyrchains = { workspace = true }
pezbp-xcm-bridge-hub-router = { workspace = true }
pezbridge-hub-common = { workspace = true }
pezbp-runtime = { workspace = true }
pezbridge-runtime-common = { workspace = true }
pezpallet-bridge-grandpa = { workspace = true }
@@ -140,18 +140,18 @@ bizinikiwi-wasm-builder = { optional = true, workspace = true, default-features
[features]
std = [
"bizinikiwi-wasm-builder",
"bp-asset-hub-pezkuwichain/std",
"bp-asset-hub-zagros/std",
"bp-bridge-hub-pezkuwichain/std",
"bp-bridge-hub-zagros/std",
"bp-header-pez-chain/std",
"bp-messages/std",
"bp-pezkuwi-core/std",
"bp-pezkuwichain/std",
"bp-relayers/std",
"bp-teyrchains/std",
"bp-xcm-bridge-hub-router/std",
"bridge-hub-common/std",
"pezbp-asset-hub-pezkuwichain/std",
"pezbp-asset-hub-zagros/std",
"pezbp-bridge-hub-pezkuwichain/std",
"pezbp-bridge-hub-zagros/std",
"pezbp-header-pez-chain/std",
"pezbp-messages/std",
"pezbp-pezkuwi-core/std",
"pezbp-pezkuwichain/std",
"pezbp-relayers/std",
"pezbp-teyrchains/std",
"pezbp-xcm-bridge-hub-router/std",
"pezbridge-hub-common/std",
"codec/std",
"pezbp-runtime/std",
"pezbridge-runtime-common/std",
@@ -242,18 +242,18 @@ default = ["std"]
runtime-benchmarks = [
"bizinikiwi-wasm-builder?/runtime-benchmarks",
"bp-asset-hub-pezkuwichain/runtime-benchmarks",
"bp-asset-hub-zagros/runtime-benchmarks",
"bp-bridge-hub-pezkuwichain/runtime-benchmarks",
"bp-bridge-hub-zagros/runtime-benchmarks",
"bp-header-pez-chain/runtime-benchmarks",
"bp-messages/runtime-benchmarks",
"bp-pezkuwi-core/runtime-benchmarks",
"bp-pezkuwichain/runtime-benchmarks",
"bp-relayers/runtime-benchmarks",
"bp-teyrchains/runtime-benchmarks",
"bp-xcm-bridge-hub-router/runtime-benchmarks",
"bridge-hub-common/runtime-benchmarks",
"pezbp-asset-hub-pezkuwichain/runtime-benchmarks",
"pezbp-asset-hub-zagros/runtime-benchmarks",
"pezbp-bridge-hub-pezkuwichain/runtime-benchmarks",
"pezbp-bridge-hub-zagros/runtime-benchmarks",
"pezbp-header-pez-chain/runtime-benchmarks",
"pezbp-messages/runtime-benchmarks",
"pezbp-pezkuwi-core/runtime-benchmarks",
"pezbp-pezkuwichain/runtime-benchmarks",
"pezbp-relayers/runtime-benchmarks",
"pezbp-teyrchains/runtime-benchmarks",
"pezbp-xcm-bridge-hub-router/runtime-benchmarks",
"pezbridge-hub-common/runtime-benchmarks",
"pezbp-runtime/runtime-benchmarks",
"pezbridge-hub-test-utils/runtime-benchmarks",
"pezbridge-runtime-common/runtime-benchmarks",
pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/bridge-primitives/Cargo.toml
+10 -10
View File
@@ -1,5 +1,5 @@
[package]
name = "bp-bridge-hub-zagros"
name = "pezbp-bridge-hub-zagros"
description = "Primitives of BridgeHubZagros teyrchain runtime."
version = "0.3.0"
authors.workspace = true
@@ -19,9 +19,9 @@ workspace = true
codec = { features = ["derive"], workspace = true }
# Bridge Dependencies
bp-bridge-hub-pezcumulus = { workspace = true }
bp-messages = { workspace = true }
bp-xcm-bridge-hub = { workspace = true }
pezbp-bridge-hub-pezcumulus = { workspace = true }
pezbp-messages = { workspace = true }
pezbp-xcm-bridge-hub = { workspace = true }
pezbp-runtime = { workspace = true }
# Bizinikiwi Based Dependencies
@@ -33,9 +33,9 @@ pezsp-std = { workspace = true }
[features]
default = ["std"]
std = [
"bp-bridge-hub-pezcumulus/std",
"bp-messages/std",
"bp-xcm-bridge-hub/std",
"pezbp-bridge-hub-pezcumulus/std",
"pezbp-messages/std",
"pezbp-xcm-bridge-hub/std",
"codec/std",
"pezbp-runtime/std",
"pezframe-support/std",
@@ -44,9 +44,9 @@ std = [
"pezsp-std/std",
]
runtime-benchmarks = [
"bp-bridge-hub-pezcumulus/runtime-benchmarks",
"bp-messages/runtime-benchmarks",
"bp-xcm-bridge-hub/runtime-benchmarks",
"pezbp-bridge-hub-pezcumulus/runtime-benchmarks",
"pezbp-messages/runtime-benchmarks",
"pezbp-xcm-bridge-hub/runtime-benchmarks",
"pezbp-runtime/runtime-benchmarks",
"pezframe-support/runtime-benchmarks",
"pezsp-api/runtime-benchmarks",
pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/bridge-primitives/src/lib.rs
+3 -3
View File
@@ -18,8 +18,8 @@
#![cfg_attr(not(feature = "std"), no_std)]
pub use bp_bridge_hub_pezcumulus::*;
use bp_messages::*;
pub use pezbp_bridge_hub_pezcumulus::*;
use pezbp_messages::*;
use codec::{Decode, Encode};
use pezbp_runtime::{
decl_bridge_finality_runtime_apis, decl_bridge_messages_runtime_apis, Chain, ChainId, Teyrchain,
@@ -109,5 +109,5 @@ pezframe_support::parameter_types! {
pub enum RuntimeCall {
/// Points to the `pezpallet_xcm_bridge_hub` pezpallet instance for `BridgeHubPezkuwichain`.
#[codec(index = 45)]
XcmOverBridgeHubPezkuwichain(bp_xcm_bridge_hub::XcmBridgeHubCall),
XcmOverBridgeHubPezkuwichain(pezbp_xcm_bridge_hub::XcmBridgeHubCall),
}
pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/bridge_common_config.rs
+5 -5
View File
@@ -26,8 +26,8 @@ use crate::{
bridge_to_ethereum_config::InboundQueueV2Location, xcm_config::XcmConfig, RuntimeCall,
XcmRouter,
};
use bp_messages::LegacyLaneId;
use bp_relayers::RewardsAccountParams;
use pezbp_messages::LegacyLaneId;
use pezbp_relayers::RewardsAccountParams;
use codec::{Decode, DecodeWithMemTracking, Encode, MaxEncodedLen};
use pezframe_support::parameter_types;
use scale_info::TypeInfo;
@@ -86,9 +86,9 @@ impl From<pezsp_runtime::AccountId32> for BridgeRewardBeneficiaries {
}
}
/// Implementation of `bp_relayers::PaymentProcedure` as a pay/claim rewards scheme.
/// Implementation of `pezbp_relayers::PaymentProcedure` as a pay/claim rewards scheme.
pub struct BridgeRewardPayer;
impl bp_relayers::PaymentProcedure<AccountId, BridgeReward, u128> for BridgeRewardPayer {
impl pezbp_relayers::PaymentProcedure<AccountId, BridgeReward, u128> for BridgeRewardPayer {
type Error = pezsp_runtime::DispatchError;
type Beneficiary = BridgeRewardBeneficiaries;
@@ -102,7 +102,7 @@ impl bp_relayers::PaymentProcedure<AccountId, BridgeReward, u128> for BridgeRewa
BridgeReward::PezkuwichainZagros(lane_params) => {
match beneficiary {
BridgeRewardBeneficiaries::LocalAccount(account) => {
bp_relayers::PayRewardFromAccount::<
pezbp_relayers::PayRewardFromAccount::<
Balances,
AccountId,
LegacyLaneId,
pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/bridge_to_ethereum_config.rs
+2 -2
View File
@@ -22,8 +22,8 @@ use crate::{
EthereumOutboundQueue, EthereumOutboundQueueV2, EthereumSystem, EthereumSystemV2, MessageQueue,
Runtime, RuntimeEvent, TransactionByteFee,
};
use bp_asset_hub_zagros::CreateForeignAssetDeposit;
use bridge_hub_common::AggregateMessageOrigin;
use pezbp_asset_hub_zagros::CreateForeignAssetDeposit;
use pezbridge_hub_common::AggregateMessageOrigin;
use hex_literal::hex;
use pezframe_support::{parameter_types, traits::Contains, weights::ConstantMultiplier};
use pezframe_system::EnsureRootWithSuccess;
pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/bridge_to_pezkuwichain_config.rs
+31 -31
View File
@@ -21,12 +21,12 @@ use crate::{
AccountId, Balance, Balances, BridgePezkuwichainMessages, PezkuwiXcm, Runtime, RuntimeEvent,
RuntimeHoldReason, XcmOverBridgeHubPezkuwichain, XcmRouter, XcmpQueue,
};
use bp_messages::{
use pezbp_messages::{
source_chain::FromBridgedChainMessagesDeliveryProof,
target_chain::FromBridgedChainMessagesProof, LegacyLaneId,
};
use bp_teyrchains::SingleParaStoredHeaderDataBuilder;
use bridge_hub_common::xcm_version::XcmVersionOfDestAndRemoteBridge;
use pezbp_teyrchains::SingleParaStoredHeaderDataBuilder;
use pezbridge_hub_common::xcm_version::XcmVersionOfDestAndRemoteBridge;
use pezpallet_xcm_bridge_hub::{BridgeId, XcmAsPlainPayload};
use pezframe_support::{
@@ -52,7 +52,7 @@ parameter_types! {
pub const TeyrchainHeadsToKeep: u32 = 64;
pub const PezkuwichainBridgeTeyrchainPalletName: &'static str = "Paras";
pub const MaxPezkuwichainParaHeadDataSize: u32 = bp_pezkuwichain::MAX_NESTED_TEYRCHAIN_HEAD_DATA_SIZE;
pub const MaxPezkuwichainParaHeadDataSize: u32 = pezbp_pezkuwichain::MAX_NESTED_TEYRCHAIN_HEAD_DATA_SIZE;
pub BridgeZagrosToPezkuwichainMessagesPalletInstance: InteriorLocation = [PalletInstance(<BridgePezkuwichainMessages as PalletInfoAccess>::index() as u8)].into();
pub PezkuwichainGlobalConsensusNetwork: NetworkId = NetworkId::ByGenesis(PEZKUWICHAIN_GENESIS_HASH);
@@ -71,7 +71,7 @@ parameter_types! {
2,
[
GlobalConsensus(PezkuwichainGlobalConsensusNetwork::get()),
Teyrchain(<bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain as pezbp_runtime::Teyrchain>::TEYRCHAIN_ID)
Teyrchain(<pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain as pezbp_runtime::Teyrchain>::TEYRCHAIN_ID)
]
);
@@ -81,10 +81,10 @@ parameter_types! {
/// Proof of messages, coming from Pezkuwichain.
pub type FromPezkuwichainBridgeHubMessagesProof<MI> =
FromBridgedChainMessagesProof<bp_bridge_hub_pezkuwichain::Hash, LaneIdOf<Runtime, MI>>;
FromBridgedChainMessagesProof<pezbp_bridge_hub_pezkuwichain::Hash, LaneIdOf<Runtime, MI>>;
/// Messages delivery proof for Pezkuwichain Bridge Hub -> Zagros Bridge Hub messages.
pub type ToPezkuwichainBridgeHubMessagesDeliveryProof<MI> =
FromBridgedChainMessagesDeliveryProof<bp_bridge_hub_pezkuwichain::Hash, LaneIdOf<Runtime, MI>>;
FromBridgedChainMessagesDeliveryProof<pezbp_bridge_hub_pezkuwichain::Hash, LaneIdOf<Runtime, MI>>;
/// Dispatches received XCM messages from other bridge
type FromPezkuwichainMessageBlobDispatcher = BridgeBlobDispatcher<
@@ -111,7 +111,7 @@ pezbp_runtime::generate_static_str_provider!(OnBridgeHubZagrosRefundBridgeHubPez
pub type BridgeGrandpaPezkuwichainInstance = pezpallet_bridge_grandpa::Instance1;
impl pezpallet_bridge_grandpa::Config<BridgeGrandpaPezkuwichainInstance> for Runtime {
type RuntimeEvent = RuntimeEvent;
type BridgedChain = bp_pezkuwichain::Pezkuwichain;
type BridgedChain = pezbp_pezkuwichain::Pezkuwichain;
type MaxFreeHeadersPerBlock = ConstU32<4>;
type FreeHeadersInterval = ConstU32<5>;
type HeadersToKeep = RelayChainHeadersToKeep;
@@ -126,7 +126,7 @@ impl pezpallet_bridge_teyrchains::Config<BridgeTeyrchainPezkuwichainInstance> fo
type BridgesGrandpaPalletInstance = BridgeGrandpaPezkuwichainInstance;
type ParasPalletName = PezkuwichainBridgeTeyrchainPalletName;
type ParaStoredHeaderDataBuilder =
SingleParaStoredHeaderDataBuilder<bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain>;
SingleParaStoredHeaderDataBuilder<pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain>;
type HeadsToKeep = TeyrchainHeadsToKeep;
type MaxParaHeadDataSize = MaxPezkuwichainParaHeadDataSize;
type OnNewHead = ();
@@ -138,12 +138,12 @@ impl pezpallet_bridge_messages::Config<WithBridgeHubPezkuwichainMessagesInstance
type RuntimeEvent = RuntimeEvent;
type WeightInfo = weights::pezpallet_bridge_messages::WeightInfo<Runtime>;
type ThisChain = bp_bridge_hub_zagros::BridgeHubZagros;
type BridgedChain = bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain;
type ThisChain = pezbp_bridge_hub_zagros::BridgeHubZagros;
type BridgedChain = pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain;
type BridgedHeaderChain = pezpallet_bridge_teyrchains::TeyrchainHeaders<
Runtime,
BridgeTeyrchainPezkuwichainInstance,
bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
>;
type OutboundPayload = XcmAsPlainPayload;
@@ -194,7 +194,7 @@ impl pezpallet_xcm_bridge_hub::Config<XcmOverBridgeHubPezkuwichainInstance> for
type BlobDispatcher = FromPezkuwichainMessageBlobDispatcher;
}
/// Implementation of `bp_xcm_bridge_hub::LocalXcmChannelManager` for congestion management.
/// Implementation of `pezbp_xcm_bridge_hub::LocalXcmChannelManager` for congestion management.
pub struct CongestionManager;
impl pezpallet_xcm_bridge_hub::LocalXcmChannelManager for CongestionManager {
type Error = SendError;
@@ -203,7 +203,7 @@ impl pezpallet_xcm_bridge_hub::LocalXcmChannelManager for CongestionManager {
// This is used to check the inbound bridge queue/messages to determine if they can be
// dispatched and sent to the sibling teyrchain. Therefore, checking outbound `XcmpQueue`
// is sufficient here.
use bp_xcm_bridge_hub_router::XcmChannelStatusProvider;
use pezbp_xcm_bridge_hub_router::XcmChannelStatusProvider;
pezcumulus_pezpallet_xcmp_queue::bridging::OutXcmpChannelStatusProvider::<Runtime>::is_congested(
with,
)
@@ -214,7 +214,7 @@ impl pezpallet_xcm_bridge_hub::LocalXcmChannelManager for CongestionManager {
// so `local_origin` is expected to represent only the local AH.
send_xcm::<XcmpQueue>(
local_origin.clone(),
bp_asset_hub_zagros::build_congestion_message(bridge.inner(), true).into(),
pezbp_asset_hub_zagros::build_congestion_message(bridge.inner(), true).into(),
)
.map(|_| ())
}
@@ -224,7 +224,7 @@ impl pezpallet_xcm_bridge_hub::LocalXcmChannelManager for CongestionManager {
// so `local_origin` is expected to represent only the local AH.
send_xcm::<XcmpQueue>(
local_origin.clone(),
bp_asset_hub_zagros::build_congestion_message(bridge.inner(), false).into(),
pezbp_asset_hub_zagros::build_congestion_message(bridge.inner(), false).into(),
)
.map(|_| ())
}
@@ -309,13 +309,13 @@ mod tests {
#[test]
fn ensure_bridge_hub_zagros_message_lane_weights_are_correct() {
check_message_lane_weights::<
bp_bridge_hub_zagros::BridgeHubZagros,
pezbp_bridge_hub_zagros::BridgeHubZagros,
Runtime,
WithBridgeHubPezkuwichainMessagesInstance,
>(
bp_bridge_hub_pezkuwichain::EXTRA_STORAGE_PROOF_SIZE,
bp_bridge_hub_zagros::MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX,
bp_bridge_hub_zagros::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX,
pezbp_bridge_hub_pezkuwichain::EXTRA_STORAGE_PROOF_SIZE,
pezbp_bridge_hub_zagros::MAX_UNREWARDED_RELAYERS_IN_CONFIRMATION_TX,
pezbp_bridge_hub_zagros::MAX_UNCONFIRMED_MESSAGES_IN_CONFIRMATION_TX,
true,
);
}
@@ -325,8 +325,8 @@ mod tests {
assert_complete_bridge_types!(
runtime: Runtime,
with_bridged_chain_messages_instance: WithBridgeHubPezkuwichainMessagesInstance,
this_chain: bp_bridge_hub_zagros::BridgeHubZagros,
bridged_chain: bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
this_chain: pezbp_bridge_hub_zagros::BridgeHubZagros,
bridged_chain: pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
expected_payload_type: XcmAsPlainPayload,
);
@@ -336,8 +336,8 @@ mod tests {
WithBridgeHubPezkuwichainMessagesInstance,
>(AssertCompleteBridgeConstants {
this_chain_constants: AssertChainConstants {
block_length: bp_bridge_hub_zagros::BlockLength::get(),
block_weights: bp_bridge_hub_zagros::BlockWeightsForAsyncBacking::get(),
block_length: pezbp_bridge_hub_zagros::BlockLength::get(),
block_weights: pezbp_bridge_hub_zagros::BlockWeightsForAsyncBacking::get(),
},
});
@@ -350,7 +350,7 @@ mod tests {
pezpallet_bridge_relayers::extension::per_teyrchain_header::ensure_priority_boost_is_sane::<
Runtime,
WithBridgeHubPezkuwichainMessagesInstance,
bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
PriorityBoostPerTeyrchainHeader,
>(FEE_BOOST_PER_TEYRCHAIN_HEADER);
@@ -363,7 +363,7 @@ mod tests {
assert_eq!(
BridgeZagrosToPezkuwichainMessagesPalletInstance::get(),
[PalletInstance(
bp_bridge_hub_zagros::WITH_BRIDGE_ZAGROS_TO_PEZKUWICHAIN_MESSAGES_PALLET_INDEX
pezbp_bridge_hub_zagros::WITH_BRIDGE_ZAGROS_TO_PEZKUWICHAIN_MESSAGES_PALLET_INDEX
)]
);
}
@@ -372,16 +372,16 @@ mod tests {
/// Contains the migration for the AssetHubZagros<>AssetHubPezkuwichain bridge.
pub mod migration {
use super::*;
use bp_messages::LegacyLaneId;
use pezbp_messages::LegacyLaneId;
parameter_types! {
pub AssetHubZagrosToAssetHubPezkuwichainMessagesLane: LegacyLaneId = LegacyLaneId([0, 0, 0, 2]);
pub AssetHubZagrosLocation: Location = Location::new(1, [Teyrchain(bp_asset_hub_zagros::ASSET_HUB_ZAGROS_TEYRCHAIN_ID)]);
pub AssetHubPezkuwichainUniversalLocation: InteriorLocation = [GlobalConsensus(PezkuwichainGlobalConsensusNetwork::get()), Teyrchain(bp_asset_hub_pezkuwichain::ASSET_HUB_PEZKUWICHAIN_TEYRCHAIN_ID)].into();
pub AssetHubZagrosLocation: Location = Location::new(1, [Teyrchain(pezbp_asset_hub_zagros::ASSET_HUB_ZAGROS_TEYRCHAIN_ID)]);
pub AssetHubPezkuwichainUniversalLocation: InteriorLocation = [GlobalConsensus(PezkuwichainGlobalConsensusNetwork::get()), Teyrchain(pezbp_asset_hub_pezkuwichain::ASSET_HUB_PEZKUWICHAIN_TEYRCHAIN_ID)].into();
}
mod v1_wrong {
use bp_messages::{LaneState, MessageNonce, UnrewardedRelayer};
use pezbp_messages::{LaneState, MessageNonce, UnrewardedRelayer};
use codec::{Decode, Encode};
use pezbp_runtime::AccountIdOf;
use pezpallet_bridge_messages::BridgedChainOf;
@@ -407,7 +407,7 @@ pub mod migration {
}
mod v1 {
pub use bp_messages::{InboundLaneData, LaneState, OutboundLaneData};
pub use pezbp_messages::{InboundLaneData, LaneState, OutboundLaneData};
pub use pezpallet_bridge_messages::{InboundLanes, OutboundLanes, StoredInboundLaneData};
}
pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/genesis_config_presets.rs
+2 -2
View File
@@ -33,7 +33,7 @@ fn bridge_hub_zagros_genesis(
id: ParaId,
bridges_pallet_owner: Option<AccountId>,
asset_hub_para_id: ParaId,
opened_bridges: Vec<(Location, InteriorLocation, Option<bp_messages::LegacyLaneId>)>,
opened_bridges: Vec<(Location, InteriorLocation, Option<pezbp_messages::LegacyLaneId>)>,
) -> serde_json::Value {
build_struct_json_patch!(RuntimeGenesisConfig {
balances: BalancesConfig {
@@ -91,7 +91,7 @@ pub fn get_preset(id: &pezsp_genesis_builder::PresetId) -> Option<pezsp_std::vec
NetworkId::ByGenesis(PEZKUWICHAIN_GENESIS_HASH).into(),
Teyrchain(1000),
]),
Some(bp_messages::LegacyLaneId([0, 0, 0, 2])),
Some(pezbp_messages::LegacyLaneId([0, 0, 0, 2])),
)],
),
pezsp_genesis_builder::DEV_RUNTIME_PRESET => bridge_hub_zagros_genesis(
pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/lib.rs
+37 -37
View File
@@ -54,7 +54,7 @@ use pezsp_runtime::{
use pezsp_version::NativeVersion;
use pezsp_version::RuntimeVersion;
use bridge_hub_common::{
use pezbridge_hub_common::{
message_queue::{NarrowOriginToSibling, ParaIdToSibling},
AggregateMessageOrigin,
};
@@ -165,12 +165,12 @@ pub type Migrations = (
pezpallet_bridge_relayers::migration::v1::MigrationToV1<
Runtime,
bridge_common_config::BridgeRelayersInstance,
bp_messages::LegacyLaneId,
pezbp_messages::LegacyLaneId,
>,
pezpallet_bridge_relayers::migration::v2::MigrationToV2<
Runtime,
bridge_common_config::BridgeRelayersInstance,
bp_messages::LegacyLaneId,
pezbp_messages::LegacyLaneId,
>,
pezsnowbridge_pezpallet_system::migration::v0::InitializeOnUpgrade<
Runtime,
@@ -416,7 +416,7 @@ impl pezpallet_message_queue::Config for Runtime {
type MessageProcessor =
pezpallet_message_queue::mock_helpers::NoopMessageProcessor<AggregateMessageOrigin>;
#[cfg(any(feature = "std", not(feature = "runtime-benchmarks")))]
type MessageProcessor = bridge_hub_common::BridgeHubDualMessageRouter<
type MessageProcessor = pezbridge_hub_common::BridgeHubDualMessageRouter<
xcm_builder::ProcessXcmMessage<
AggregateMessageOrigin,
xcm_executor::XcmExecutor<xcm_config::XcmConfig>,
@@ -619,7 +619,7 @@ pezbridge_runtime_common::generate_bridge_reject_obsolete_headers_and_messages!
CheckAndBoostBridgeTeyrchainsTransactions<
Runtime,
bridge_to_pezkuwichain_config::BridgeTeyrchainPezkuwichainInstance,
bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain,
bridge_to_pezkuwichain_config::PriorityBoostPerTeyrchainHeader,
xcm_config::TreasuryAccount,
>,
@@ -892,38 +892,38 @@ impl_runtime_apis! {
}
}
impl bp_pezkuwichain::PezkuwichainFinalityApi<Block> for Runtime {
fn best_finalized() -> Option<HeaderId<bp_pezkuwichain::Hash, bp_pezkuwichain::BlockNumber>> {
impl pezbp_pezkuwichain::PezkuwichainFinalityApi<Block> for Runtime {
fn best_finalized() -> Option<HeaderId<pezbp_pezkuwichain::Hash, pezbp_pezkuwichain::BlockNumber>> {
BridgePezkuwichainGrandpa::best_finalized()
}
fn free_headers_interval() -> Option<bp_pezkuwichain::BlockNumber> {
fn free_headers_interval() -> Option<pezbp_pezkuwichain::BlockNumber> {
<Runtime as pezpallet_bridge_grandpa::Config<
bridge_to_pezkuwichain_config::BridgeGrandpaPezkuwichainInstance
>>::FreeHeadersInterval::get()
}
fn synced_headers_grandpa_info(
) -> Vec<bp_header_pez_chain::StoredHeaderGrandpaInfo<bp_pezkuwichain::Header>> {
) -> Vec<pezbp_header_pez_chain::StoredHeaderGrandpaInfo<pezbp_pezkuwichain::Header>> {
BridgePezkuwichainGrandpa::synced_headers_grandpa_info()
}
}
impl bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainFinalityApi<Block> for Runtime {
impl pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichainFinalityApi<Block> for Runtime {
fn best_finalized() -> Option<HeaderId<Hash, BlockNumber>> {
BridgePezkuwichainTeyrchains::best_teyrchain_head_id::<
bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain
pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain
>().unwrap_or(None)
}
fn free_headers_interval() -> Option<bp_bridge_hub_pezkuwichain::BlockNumber> {
fn free_headers_interval() -> Option<pezbp_bridge_hub_pezkuwichain::BlockNumber> {
// "free interval" is not currently used for teyrchains
None
}
}
impl bp_bridge_hub_pezkuwichain::FromBridgeHubPezkuwichainInboundLaneApi<Block> for Runtime {
impl pezbp_bridge_hub_pezkuwichain::FromBridgeHubPezkuwichainInboundLaneApi<Block> for Runtime {
fn message_details(
lane: LaneIdOf<Runtime, bridge_to_pezkuwichain_config::WithBridgeHubPezkuwichainMessagesInstance>,
messages: Vec<(bp_messages::MessagePayload, bp_messages::OutboundMessageDetails)>,
) -> Vec<bp_messages::InboundMessageDetails> {
messages: Vec<(pezbp_messages::MessagePayload, pezbp_messages::OutboundMessageDetails)>,
) -> Vec<pezbp_messages::InboundMessageDetails> {
pezbridge_runtime_common::messages_api::inbound_message_details::<
Runtime,
bridge_to_pezkuwichain_config::WithBridgeHubPezkuwichainMessagesInstance,
@@ -931,12 +931,12 @@ impl_runtime_apis! {
}
}
impl bp_bridge_hub_pezkuwichain::ToBridgeHubPezkuwichainOutboundLaneApi<Block> for Runtime {
impl pezbp_bridge_hub_pezkuwichain::ToBridgeHubPezkuwichainOutboundLaneApi<Block> for Runtime {
fn message_details(
lane: LaneIdOf<Runtime, bridge_to_pezkuwichain_config::WithBridgeHubPezkuwichainMessagesInstance>,
begin: bp_messages::MessageNonce,
end: bp_messages::MessageNonce,
) -> Vec<bp_messages::OutboundMessageDetails> {
begin: pezbp_messages::MessageNonce,
end: pezbp_messages::MessageNonce,
) -> Vec<pezbp_messages::OutboundMessageDetails> {
pezbridge_runtime_common::messages_api::outbound_message_details::<
Runtime,
bridge_to_pezkuwichain_config::WithBridgeHubPezkuwichainMessagesInstance,
@@ -1240,7 +1240,7 @@ impl_runtime_apis! {
)?;
XcmOverBridgeHubPezkuwichain::do_open_bridge(
locations,
bp_messages::LegacyLaneId([1, 2, 3, 4]),
pezbp_messages::LegacyLaneId([1, 2, 3, 4]),
true,
).map_err(|e| {
tracing::error!(
@@ -1297,10 +1297,10 @@ impl_runtime_apis! {
pezpallet_bridge_relayers::Pezpallet::<Runtime, bridge_common_config::BridgeRelayersInstance>::relayer_reward(
relayer,
bridge_common_config::BridgeReward::PezkuwichainZagros(
bp_relayers::RewardsAccountParams::new(
pezbp_relayers::RewardsAccountParams::new(
bench_lane_id,
bridged_chain_id,
bp_relayers::RewardsAccountOwner::BridgedChain
pezbp_relayers::RewardsAccountOwner::BridgedChain
)
)
).is_some()
@@ -1339,7 +1339,7 @@ impl_runtime_apis! {
>(params)
}
fn is_message_successfully_dispatched(_nonce: bp_messages::MessageNonce) -> bool {
fn is_message_successfully_dispatched(_nonce: pezbp_messages::MessageNonce) -> bool {
use pezcumulus_primitives_core::XcmpMessageSource;
!XcmpQueue::take_outbound_messages(usize::MAX).is_empty()
}
@@ -1353,20 +1353,20 @@ impl_runtime_apis! {
};
impl BridgeTeyrchainsConfig<bridge_to_pezkuwichain_config::BridgeTeyrchainPezkuwichainInstance> for Runtime {
fn teyrchains() -> Vec<bp_pezkuwi_core::teyrchains::ParaId> {
fn teyrchains() -> Vec<pezbp_pezkuwi_core::teyrchains::ParaId> {
use pezbp_runtime::Teyrchain;
vec![bp_pezkuwi_core::teyrchains::ParaId(bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain::TEYRCHAIN_ID)]
vec![pezbp_pezkuwi_core::teyrchains::ParaId(pezbp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain::TEYRCHAIN_ID)]
}
fn prepare_teyrchain_heads_proof(
teyrchains: &[bp_pezkuwi_core::teyrchains::ParaId],
teyrchains: &[pezbp_pezkuwi_core::teyrchains::ParaId],
teyrchain_head_size: u32,
proof_params: pezbp_runtime::UnverifiedStorageProofParams,
) -> (
bp_teyrchains::RelayBlockNumber,
bp_teyrchains::RelayBlockHash,
bp_pezkuwi_core::teyrchains::ParaHeadsProof,
Vec<(bp_pezkuwi_core::teyrchains::ParaId, bp_pezkuwi_core::teyrchains::ParaHash)>,
pezbp_teyrchains::RelayBlockNumber,
pezbp_teyrchains::RelayBlockHash,
pezbp_pezkuwi_core::teyrchains::ParaHeadsProof,
Vec<(pezbp_pezkuwi_core::teyrchains::ParaId, pezbp_pezkuwi_core::teyrchains::ParaHash)>,
) {
prepare_teyrchain_heads_proof::<Runtime, bridge_to_pezkuwichain_config::BridgeTeyrchainPezkuwichainInstance>(
teyrchains,
@@ -1378,10 +1378,10 @@ impl_runtime_apis! {
impl BridgeRelayersConfig<bridge_common_config::BridgeRelayersInstance> for Runtime {
fn bench_reward() -> Self::Reward {
bp_relayers::RewardsAccountParams::new(
bp_messages::LegacyLaneId::default(),
pezbp_relayers::RewardsAccountParams::new(
pezbp_messages::LegacyLaneId::default(),
*b"test",
bp_relayers::RewardsAccountOwner::ThisChain
pezbp_relayers::RewardsAccountOwner::ThisChain
).into()
}
@@ -1392,10 +1392,10 @@ impl_runtime_apis! {
let bridge_common_config::BridgeReward::PezkuwichainZagros(reward_kind) = reward_kind else {
panic!("Unexpected reward_kind: {:?} - not compatible with `bench_reward`!", reward_kind);
};
let rewards_account = bp_relayers::PayRewardFromAccount::<
let rewards_account = pezbp_relayers::PayRewardFromAccount::<
Balances,
AccountId,
bp_messages::LegacyLaneId,
pezbp_messages::LegacyLaneId,
u128,
>::rewards_account(reward_kind);
Self::deposit_account(rewards_account, reward);
@@ -1463,7 +1463,7 @@ mod tests {
#[test]
fn ensure_transaction_extension_definition_is_compatible_with_relay() {
use bp_pezkuwi_core::SuffixedCommonTransactionExtensionExt;
use pezbp_pezkuwi_core::SuffixedCommonTransactionExtensionExt;
pezsp_io::TestExternalities::default().execute_with(|| {
pezframe_system::BlockHash::<Runtime>::insert(BlockNumber::zero(), Hash::default());
@@ -1487,7 +1487,7 @@ mod tests {
).into();
{
let bh_indirect_payload = bp_bridge_hub_zagros::TransactionExtension::from_params(
let bh_indirect_payload = pezbp_bridge_hub_zagros::TransactionExtension::from_params(
VERSION.spec_version,
VERSION.transaction_version,
pezbp_runtime::TransactionEra::Immortal,
pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/weights/mod.rs
+2 -2
View File
@@ -76,7 +76,7 @@ impl GrandpaWeightInfoExt for pezpallet_bridge_grandpa::WeightInfo<crate::Runtim
impl MessagesWeightInfoExt for pezpallet_bridge_messages::WeightInfo<crate::Runtime> {
fn expected_extra_storage_proof_size() -> u32 {
bp_bridge_hub_pezkuwichain::EXTRA_STORAGE_PROOF_SIZE
pezbp_bridge_hub_pezkuwichain::EXTRA_STORAGE_PROOF_SIZE
}
fn receive_messages_proof_overhead_from_runtime() -> Weight {
@@ -91,7 +91,7 @@ impl MessagesWeightInfoExt for pezpallet_bridge_messages::WeightInfo<crate::Runt
impl TeyrchainsWeightInfoExt for pezpallet_bridge_teyrchains::WeightInfo<crate::Runtime> {
fn expected_extra_storage_proof_size() -> u32 {
bp_bridge_hub_pezkuwichain::EXTRA_STORAGE_PROOF_SIZE
pezbp_bridge_hub_pezkuwichain::EXTRA_STORAGE_PROOF_SIZE
}
fn submit_teyrchain_heads_overhead_from_runtime() -> Weight {
pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/src/xcm_config.rs
+1 -1
View File
@@ -20,7 +20,7 @@ use super::{
TeyrchainSystem, TransactionByteFee, WeightToFee, XcmOverBridgeHubPezkuwichain, XcmpQueue,
};
use crate::bridge_to_ethereum_config::SnowbridgeFrontendLocation;
use bridge_hub_common::DenyExportMessageFrom;
use pezbridge_hub_common::DenyExportMessageFrom;
use pezframe_support::{
parameter_types,
traits::{
pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/tests/snowbridge.rs
+3 -3
View File
@@ -16,9 +16,9 @@
#![cfg(test)]
use bp_asset_hub_zagros::ASSET_HUB_ZAGROS_TEYRCHAIN_ID;
use bp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID;
use bp_pezkuwi_core::Signature;
use pezbp_asset_hub_zagros::ASSET_HUB_ZAGROS_TEYRCHAIN_ID;
use pezbp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID;
use pezbp_pezkuwi_core::Signature;
use codec::{Decode, Encode};
use pezbridge_hub_zagros_runtime::{
bridge_to_pezkuwichain_config, xcm_config::XcmConfig, AllPalletsWithoutSystem,
pezcumulus/teyrchains/runtimes/bridge-hubs/bridge-hub-zagros/tests/tests.rs
+25 -25
View File
@@ -17,9 +17,9 @@
#![cfg(test)]
use crate::bridge_common_config::BridgeRewardBeneficiaries;
use bp_messages::LegacyLaneId;
use bp_pezkuwi_core::Signature;
use bp_relayers::{PayRewardFromAccount, RewardsAccountOwner, RewardsAccountParams};
use pezbp_messages::LegacyLaneId;
use pezbp_pezkuwi_core::Signature;
use pezbp_relayers::{PayRewardFromAccount, RewardsAccountOwner, RewardsAccountParams};
use bridge_common_config::{BridgeRelayersInstance, BridgeReward, RequiredStakeForStakeAndSlash};
use bridge_to_pezkuwichain_config::{
BridgeGrandpaPezkuwichainInstance, BridgeHubPezkuwichainLocation,
@@ -168,7 +168,7 @@ pezbridge_hub_test_utils::test_cases::include_teleports_for_native_asset_works!(
_ => None,
}
}),
bp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID
pezbp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID
);
#[test]
@@ -178,7 +178,7 @@ fn initialize_bridge_by_governance_works() {
BridgeGrandpaPezkuwichainInstance,
>(
collator_session_keys(),
bp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
pezbp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
Governance::get(),
)
}
@@ -190,7 +190,7 @@ fn change_bridge_grandpa_pallet_mode_by_governance_works() {
BridgeGrandpaPezkuwichainInstance,
>(
collator_session_keys(),
bp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
pezbp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
Governance::get(),
)
}
@@ -202,7 +202,7 @@ fn change_bridge_teyrchains_pallet_mode_by_governance_works() {
BridgeTeyrchainPezkuwichainInstance,
>(
collator_session_keys(),
bp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
pezbp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
Governance::get(),
)
}
@@ -214,7 +214,7 @@ fn change_bridge_messages_pallet_mode_by_governance_works() {
WithBridgeHubPezkuwichainMessagesInstance,
>(
collator_session_keys(),
bp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
pezbp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
Governance::get(),
)
}
@@ -227,7 +227,7 @@ fn change_delivery_reward_by_governance_works() {
u64,
>(
collator_session_keys(),
bp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
pezbp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
Governance::get(),
|| (DeliveryRewardInBalance::key().to_vec(), DeliveryRewardInBalance::get()),
|old_value| old_value.checked_mul(2).unwrap(),
@@ -242,7 +242,7 @@ fn change_required_stake_by_governance_works() {
Balance,
>(
collator_session_keys(),
bp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
pezbp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
Governance::get(),
|| (RequiredStakeForStakeAndSlash::key().to_vec(), RequiredStakeForStakeAndSlash::get()),
|old_value| old_value.checked_mul(2).unwrap(),
@@ -257,7 +257,7 @@ fn handle_export_message_from_system_teyrchain_add_to_outbound_queue_works() {
WithBridgeHubPezkuwichainMessagesInstance,
>(
collator_session_keys(),
bp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
pezbp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
SIBLING_TEYRCHAIN_ID,
Box::new(|runtime_event_encoded: Vec<u8>| {
match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
@@ -268,7 +268,7 @@ fn handle_export_message_from_system_teyrchain_add_to_outbound_queue_works() {
|| ExportMessage { network: PezkuwichainGlobalConsensusNetwork::get(), destination: [Teyrchain(BRIDGED_LOCATION_TEYRCHAIN_ID)].into(), xcm: Xcm(vec![]) },
Some((ZagrosLocation::get(), ExistentialDeposit::get()).into()),
// value should be >= than value generated by `can_calculate_weight_for_paid_export_message_with_reserve_transfer`
Some((ZagrosLocation::get(), bp_bridge_hub_zagros::BridgeHubZagrosBaseXcmFeeInWnds::get()).into()),
Some((ZagrosLocation::get(), pezbp_bridge_hub_zagros::BridgeHubZagrosBaseXcmFeeInWnds::get()).into()),
|| {
PezkuwiXcm::force_xcm_version(RuntimeOrigin::root(), Box::new(BridgeHubPezkuwichainLocation::get()), XCM_VERSION).expect("version saved!");
@@ -306,7 +306,7 @@ fn message_dispatch_routing_works() {
>(
collator_session_keys(),
slot_durations(),
bp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
pezbp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
SIBLING_TEYRCHAIN_ID,
Box::new(|runtime_event_encoded: Vec<u8>| {
match RuntimeEvent::decode(&mut &runtime_event_encoded[..]) {
@@ -329,8 +329,8 @@ fn relayed_incoming_message_works() {
from_teyrchain::relayed_incoming_message_works::<RuntimeTestsAdapter>(
collator_session_keys(),
slot_durations(),
bp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
pezbp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
SIBLING_TEYRCHAIN_ID,
ByGenesis(ZAGROS_GENESIS_HASH),
|| {
@@ -364,8 +364,8 @@ fn free_relay_extrinsic_works() {
from_teyrchain::free_relay_extrinsic_works::<RuntimeTestsAdapter>(
collator_session_keys(),
slot_durations(),
bp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
pezbp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
pezbp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
SIBLING_TEYRCHAIN_ID,
ByGenesis(ZAGROS_GENESIS_HASH),
|| {
@@ -396,8 +396,8 @@ fn free_relay_extrinsic_works() {
#[test]
pub fn can_calculate_weight_for_paid_export_message_with_reserve_transfer() {
pezbridge_hub_test_utils::check_sane_fees_values(
"bp_bridge_hub_zagros::BridgeHubZagrosBaseXcmFeeInWnds",
bp_bridge_hub_zagros::BridgeHubZagrosBaseXcmFeeInWnds::get(),
"pezbp_bridge_hub_zagros::BridgeHubZagrosBaseXcmFeeInWnds",
pezbp_bridge_hub_zagros::BridgeHubZagrosBaseXcmFeeInWnds::get(),
|| {
pezbridge_hub_test_utils::test_cases::can_calculate_weight_for_paid_export_message_with_reserve_transfer::<
Runtime,
@@ -417,8 +417,8 @@ pub fn can_calculate_weight_for_paid_export_message_with_reserve_transfer() {
#[test]
pub fn can_calculate_fee_for_standalone_message_delivery_transaction() {
pezbridge_hub_test_utils::check_sane_fees_values(
"bp_bridge_hub_zagros::BridgeHubZagrosBaseDeliveryFeeInWnds",
bp_bridge_hub_zagros::BridgeHubZagrosBaseDeliveryFeeInWnds::get(),
"pezbp_bridge_hub_zagros::BridgeHubZagrosBaseDeliveryFeeInWnds",
pezbp_bridge_hub_zagros::BridgeHubZagrosBaseDeliveryFeeInWnds::get(),
|| {
from_teyrchain::can_calculate_fee_for_standalone_message_delivery_transaction::<
RuntimeTestsAdapter,
@@ -436,8 +436,8 @@ pub fn can_calculate_fee_for_standalone_message_delivery_transaction() {
#[test]
pub fn can_calculate_fee_for_standalone_message_confirmation_transaction() {
pezbridge_hub_test_utils::check_sane_fees_values(
"bp_bridge_hub_zagros::BridgeHubZagrosBaseConfirmationFeeInWnds",
bp_bridge_hub_zagros::BridgeHubZagrosBaseConfirmationFeeInWnds::get(),
"pezbp_bridge_hub_zagros::BridgeHubZagrosBaseConfirmationFeeInWnds",
pezbp_bridge_hub_zagros::BridgeHubZagrosBaseConfirmationFeeInWnds::get(),
|| {
from_teyrchain::can_calculate_fee_for_standalone_message_confirmation_transaction::<
RuntimeTestsAdapter,
@@ -699,7 +699,7 @@ fn xcm_payment_api_works() {
pub fn bridge_rewards_works() {
run_test::<Runtime, _>(
collator_session_keys(),
bp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
pezbp_bridge_hub_zagros::BRIDGE_HUB_ZAGROS_TEYRCHAIN_ID,
vec![],
|| {
// reward in WNDs
@@ -726,7 +726,7 @@ pub fn bridge_rewards_works() {
assert_ok!(Balances::mint_into(&account2, ExistentialDeposit::get() * 10000));
// register rewards
use bp_relayers::RewardLedger;
use pezbp_relayers::RewardLedger;
BridgeRelayers::register_reward(&account1, BridgeReward::from(reward1_for), reward1);
BridgeRelayers::register_reward(&account2, BridgeReward::Snowbridge, reward2);
pezcumulus/teyrchains/runtimes/bridge-hubs/common/Cargo.toml
+2 -2
View File
@@ -1,6 +1,6 @@
[package]
name = "bridge-hub-common"
version = "0.1.0"
name = "pezbridge-hub-common"
version = "0.1.1"
authors.workspace = true
edition.workspace = true
description = "Bridge hub common utilities"
pezcumulus/teyrchains/runtimes/bridge-hubs/common/tests/tests.rs
+1 -1
View File
@@ -15,7 +15,7 @@
// limitations under the License.
#![cfg(test)]
use bridge_hub_common::DenyExportMessageFrom;
use pezbridge_hub_common::DenyExportMessageFrom;
use pezframe_support::{
parameter_types,
traits::{Equals, EverythingBut, ProcessMessageError::Unsupported},
pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/Cargo.toml
+18 -18
View File
@@ -44,12 +44,12 @@ xcm-builder = { workspace = true }
xcm-executor = { workspace = true }
# Bridges
bp-header-pez-chain = { workspace = true }
bp-messages = { workspace = true }
bp-pezkuwi-core = { workspace = true }
bp-relayers = { workspace = true }
bp-test-utils = { workspace = true }
bp-teyrchains = { workspace = true }
pezbp-header-pez-chain = { workspace = true }
pezbp-messages = { workspace = true }
pezbp-pezkuwi-core = { workspace = true }
pezbp-relayers = { workspace = true }
pezbp-test-utils = { workspace = true }
pezbp-teyrchains = { workspace = true }
pezbp-runtime = { workspace = true }
pezpallet-bridge-grandpa = { workspace = true }
pezpallet-bridge-messages = { features = ["test-helpers"], workspace = true }
@@ -61,12 +61,12 @@ pezpallet-xcm-bridge-hub = { workspace = true }
default = ["std"]
std = [
"asset-test-pezutils/std",
"bp-header-pez-chain/std",
"bp-messages/std",
"bp-pezkuwi-core/std",
"bp-relayers/std",
"bp-test-utils/std",
"bp-teyrchains/std",
"pezbp-header-pez-chain/std",
"pezbp-messages/std",
"pezbp-pezkuwi-core/std",
"pezbp-relayers/std",
"pezbp-test-utils/std",
"pezbp-teyrchains/std",
"codec/std",
"pezbp-runtime/std",
"pezcumulus-pezpallet-teyrchain-system/std",
@@ -95,12 +95,12 @@ std = [
]
runtime-benchmarks = [
"asset-test-pezutils/runtime-benchmarks",
"bp-header-pez-chain/runtime-benchmarks",
"bp-messages/runtime-benchmarks",
"bp-pezkuwi-core/runtime-benchmarks",
"bp-relayers/runtime-benchmarks",
"bp-test-utils/runtime-benchmarks",
"bp-teyrchains/runtime-benchmarks",
"pezbp-header-pez-chain/runtime-benchmarks",
"pezbp-messages/runtime-benchmarks",
"pezbp-pezkuwi-core/runtime-benchmarks",
"pezbp-relayers/runtime-benchmarks",
"pezbp-test-utils/runtime-benchmarks",
"pezbp-teyrchains/runtime-benchmarks",
"pezbp-runtime/runtime-benchmarks",
"pezcumulus-pezpallet-teyrchain-system/runtime-benchmarks",
"pezcumulus-pezpallet-xcmp-queue/runtime-benchmarks",
pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/lib.rs
+1 -1
View File
@@ -21,7 +21,7 @@ pub mod test_data;
extern crate alloc;
pub use bp_test_utils::test_header;
pub use pezbp_test_utils::test_header;
use pezsp_runtime::Perbill;
pub use test_cases::helpers::for_pallet_xcm_bridge_hub::{
ensure_opened_bridge, open_bridge_with_extrinsic, open_bridge_with_storage,
pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/test_cases/from_grandpa_chain.rs
+3 -3
View File
@@ -24,9 +24,9 @@ use crate::{
};
use alloc::{boxed::Box, vec};
use bp_header_pez_chain::ChainWithGrandpa;
use bp_messages::UnrewardedRelayersState;
use bp_relayers::{RewardsAccountOwner, RewardsAccountParams};
use pezbp_header_pez_chain::ChainWithGrandpa;
use pezbp_messages::UnrewardedRelayersState;
use pezbp_relayers::{RewardsAccountOwner, RewardsAccountParams};
use pezframe_support::traits::{OnFinalize, OnInitialize};
use pezframe_system::pezpallet_prelude::BlockNumberFor;
use pezpallet_bridge_messages::{BridgedChainOf, LaneIdOf, ThisChainOf};
pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/test_cases/from_teyrchain.rs
+4 -4
View File
@@ -24,10 +24,10 @@ use crate::{
};
use alloc::{boxed::Box, vec};
use bp_header_pez_chain::ChainWithGrandpa;
use bp_messages::UnrewardedRelayersState;
use bp_pezkuwi_core::teyrchains::ParaHash;
use bp_relayers::{RewardsAccountOwner, RewardsAccountParams};
use pezbp_header_pez_chain::ChainWithGrandpa;
use pezbp_messages::UnrewardedRelayersState;
use pezbp_pezkuwi_core::teyrchains::ParaHash;
use pezbp_relayers::{RewardsAccountOwner, RewardsAccountParams};
use pezbp_runtime::{Chain, Teyrchain};
use pezframe_support::traits::{OnFinalize, OnInitialize};
use pezframe_system::pezpallet_prelude::BlockNumberFor;
pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/test_cases/helpers.rs
+3 -3
View File
@@ -19,8 +19,8 @@
use crate::test_cases::{bridges_prelude::*, run_test, RuntimeHelper};
use asset_test_pezutils::BasicTeyrchainRuntime;
use bp_messages::MessageNonce;
use bp_pezkuwi_core::teyrchains::{ParaHash, ParaId};
use pezbp_messages::MessageNonce;
use pezbp_pezkuwi_core::teyrchains::{ParaHash, ParaId};
use codec::Decode;
use core::marker::PhantomData;
use pezbp_runtime::Chain;
@@ -234,7 +234,7 @@ where
/// Initialize bridge GRANDPA pezpallet.
pub(crate) fn initialize_bridge_grandpa_pallet<Runtime, GPI>(
init_data: bp_header_pez_chain::InitializationData<BridgedHeader<Runtime, GPI>>,
init_data: pezbp_header_pez_chain::InitializationData<BridgedHeader<Runtime, GPI>>,
) where
Runtime: BridgeGrandpaConfig<GPI>
+ pezcumulus_pezpallet_teyrchain_system::Config
pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/test_cases/mod.rs
+2 -2
View File
@@ -27,7 +27,7 @@ pub(crate) mod helpers;
use crate::{test_cases::bridges_prelude::*, test_data};
use asset_test_pezutils::BasicTeyrchainRuntime;
use bp_messages::{
use pezbp_messages::{
target_chain::{DispatchMessage, DispatchMessageData, MessageDispatch},
LaneState, MessageKey, MessagesOperatingMode, OutboundLaneData,
};
@@ -54,7 +54,7 @@ use xcm_executor::{
/// Common bridges exports.
pub(crate) mod bridges_prelude {
pub use bp_teyrchains::{RelayBlockHash, RelayBlockNumber};
pub use pezbp_teyrchains::{RelayBlockHash, RelayBlockNumber};
pub use pezpallet_bridge_grandpa::{Call as BridgeGrandpaCall, Config as BridgeGrandpaConfig};
pub use pezpallet_bridge_messages::{
Call as BridgeMessagesCall, Config as BridgeMessagesConfig, LanesManagerError,
pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/test_data/from_grandpa_chain.rs
+6 -6
View File
@@ -18,12 +18,12 @@
use crate::test_data::{prepare_inbound_xcm, XcmAsPlainPayload};
use bp_messages::{
use pezbp_messages::{
source_chain::FromBridgedChainMessagesDeliveryProof,
target_chain::FromBridgedChainMessagesProof, ChainWithMessages, LaneState, MessageNonce,
UnrewardedRelayersState,
};
use bp_test_utils::make_default_justification;
use pezbp_test_utils::make_default_justification;
use codec::Encode;
use pezbp_runtime::{AccountIdOf, BlockNumberOf, Chain, HeaderOf, UnverifiedStorageProofParams};
use pezpallet_bridge_grandpa::{BridgedChain, BridgedHeader};
@@ -31,8 +31,8 @@ use pezsp_runtime::traits::Header as HeaderT;
use xcm::latest::prelude::*;
use crate::test_cases::helpers::InboundRelayerId;
use bp_header_pez_chain::{justification::GrandpaJustification, ChainWithGrandpa};
use bp_messages::{DeliveredMessages, InboundLaneData, UnrewardedRelayer};
use pezbp_header_pez_chain::{justification::GrandpaJustification, ChainWithGrandpa};
use pezbp_messages::{DeliveredMessages, InboundLaneData, UnrewardedRelayer};
use pezbp_runtime::HashOf;
use pezpallet_bridge_messages::{
messages_generation::{
@@ -270,7 +270,7 @@ pub fn make_complex_bridged_grandpa_header_proof<BridgedChain>(
where
BridgedChain: ChainWithGrandpa,
{
let mut header = bp_test_utils::test_header_with_root::<HeaderOf<BridgedChain>>(
let mut header = pezbp_test_utils::test_header_with_root::<HeaderOf<BridgedChain>>(
header_number.into(),
state_root.into(),
);
@@ -289,7 +289,7 @@ where
/// Maximal expected `submit_finality_proof` call size.
pub fn maximal_expected_submit_finality_proof_call_size<BridgedChain: ChainWithGrandpa>() -> usize {
bp_header_pez_chain::max_expected_submit_finality_proof_arguments_size::<BridgedChain>(
pezbp_header_pez_chain::max_expected_submit_finality_proof_arguments_size::<BridgedChain>(
false,
BridgedChain::MAX_AUTHORITIES_COUNT * 2 / 3 + 1,
) as usize
pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/test_data/from_teyrchain.rs
+7 -7
View File
@@ -21,13 +21,13 @@ use super::{
XcmAsPlainPayload,
};
use bp_messages::{
use pezbp_messages::{
source_chain::FromBridgedChainMessagesDeliveryProof,
target_chain::FromBridgedChainMessagesProof, ChainWithMessages, LaneState,
UnrewardedRelayersState, Weight,
};
use bp_test_utils::prepare_teyrchain_heads_proof;
use bp_teyrchains::{RelayBlockHash, RelayBlockNumber};
use pezbp_test_utils::prepare_teyrchain_heads_proof;
use pezbp_teyrchains::{RelayBlockHash, RelayBlockNumber};
use codec::Encode;
use pezbp_runtime::{
AccountIdOf, BlockNumberOf, Chain, HeaderOf, Teyrchain, UnverifiedStorageProofParams,
@@ -37,9 +37,9 @@ use pezsp_runtime::traits::Header as HeaderT;
use xcm::latest::prelude::*;
use crate::test_cases::helpers::InboundRelayerId;
use bp_header_pez_chain::{justification::GrandpaJustification, ChainWithGrandpa};
use bp_messages::{DeliveredMessages, InboundLaneData, MessageNonce, UnrewardedRelayer};
use bp_pezkuwi_core::teyrchains::{ParaHash, ParaHead, ParaHeadsProof, ParaId};
use pezbp_header_pez_chain::{justification::GrandpaJustification, ChainWithGrandpa};
use pezbp_messages::{DeliveredMessages, InboundLaneData, MessageNonce, UnrewardedRelayer};
use pezbp_pezkuwi_core::teyrchains::{ParaHash, ParaHead, ParaHeadsProof, ParaId};
use pezpallet_bridge_messages::{
messages_generation::{
encode_all_messages, encode_lane_data, prepare_message_delivery_storage_proof,
@@ -359,7 +359,7 @@ where
BridgedTeyrchain: pezbp_runtime::Chain<Hash = ParaHash> + Teyrchain,
{
let bridged_para_head = ParaHead(
bp_test_utils::test_header_with_root::<HeaderOf<BridgedTeyrchain>>(
pezbp_test_utils::test_header_with_root::<HeaderOf<BridgedTeyrchain>>(
para_header_number.into(),
para_state_root,
)
pezcumulus/teyrchains/runtimes/bridge-hubs/test-utils/src/test_data/mod.rs
+6 -6
View File
@@ -19,7 +19,7 @@
pub mod from_grandpa_chain;
pub mod from_teyrchain;
use bp_messages::{
use pezbp_messages::{
target_chain::{DispatchMessage, DispatchMessageData},
MessageKey,
};
@@ -28,8 +28,8 @@ use pezframe_support::traits::Get;
use pezpallet_bridge_grandpa::BridgedHeader;
use xcm::latest::prelude::*;
use bp_messages::MessageNonce;
use bp_test_utils::authority_list;
use pezbp_messages::MessageNonce;
use pezbp_test_utils::authority_list;
use pezbp_runtime::BasicOperatingMode;
use xcm::GetVersion;
use xcm_builder::{BridgeMessage, HaulBlob, HaulBlobError, HaulBlobExporter};
@@ -53,9 +53,9 @@ pub fn initialization_data<
GrandpaPalletInstance: 'static,
>(
block_number: u32,
) -> bp_header_pez_chain::InitializationData<BridgedHeader<Runtime, GrandpaPalletInstance>> {
bp_header_pez_chain::InitializationData {
header: Box::new(bp_test_utils::test_header(block_number.into())),
) -> pezbp_header_pez_chain::InitializationData<BridgedHeader<Runtime, GrandpaPalletInstance>> {
pezbp_header_pez_chain::InitializationData {
header: Box::new(pezbp_test_utils::test_header(block_number.into())),
authority_list: authority_list(),
set_id: 1,
operating_mode: BasicOperatingMode::Normal,
pezcumulus/teyrchains/runtimes/testing/penpal/Cargo.toml
+4 -4
View File
@@ -71,7 +71,7 @@ xcm-executor = { workspace = true }
xcm-runtime-pezapis = { workspace = true }
# Pezcumulus
assets-common = { workspace = true }
pez-assets-common = { workspace = true }
pezcumulus-pezpallet-aura-ext = { workspace = true }
pezcumulus-pezpallet-session-benchmarking = { workspace = true }
pezcumulus-pezpallet-teyrchain-system = { workspace = true }
@@ -98,7 +98,7 @@ bizinikiwi-wasm-builder = { optional = true, workspace = true, default-features
[features]
default = ["std"]
std = [
"assets-common/std",
"pez-assets-common/std",
"bizinikiwi-wasm-builder",
"codec/std",
"pezcumulus-pezpallet-aura-ext/std",
@@ -163,7 +163,7 @@ std = [
]
runtime-benchmarks = [
"assets-common/runtime-benchmarks",
"pez-assets-common/runtime-benchmarks",
"bizinikiwi-wasm-builder?/runtime-benchmarks",
"hex-literal",
"pezcumulus-pezpallet-aura-ext/runtime-benchmarks",
@@ -222,7 +222,7 @@ runtime-benchmarks = [
]
try-runtime = [
"assets-common/try-runtime",
"pez-assets-common/try-runtime",
"pezcumulus-pezpallet-aura-ext/try-runtime",
"pezcumulus-pezpallet-teyrchain-system/try-runtime",
"pezcumulus-pezpallet-xcm/try-runtime",
pezcumulus/teyrchains/runtimes/testing/penpal/src/lib.rs
+4 -4
View File
@@ -48,8 +48,8 @@ pub mod xcm_config;
extern crate alloc;
use alloc::{vec, vec::Vec};
pub use assets_common::local_and_foreign_assets::ForeignAssetReserveData;
use assets_common::{
pub use pez_assets_common::local_and_foreign_assets::ForeignAssetReserveData;
use pez_assets_common::{
foreign_creators::ForeignCreators,
local_and_foreign_assets::{LocalFromLeft, TargetFromLeft},
AssetIdForTrustBackedAssetsConvert,
@@ -526,7 +526,7 @@ impl pezpallet_assets::Config<ForeignAssetsInstance> for Runtime {
type AssetAccountDeposit = ForeignAssetsAssetAccountDeposit;
type RemoveItemsLimit = pezframe_support::traits::ConstU32<1000>;
#[cfg(feature = "runtime-benchmarks")]
type BenchmarkHelper = assets_common::benchmarks::LocationAssetsBenchmarkHelper;
type BenchmarkHelper = pez_assets_common::benchmarks::LocationAssetsBenchmarkHelper;
}
parameter_types! {
@@ -623,7 +623,7 @@ impl pezpallet_asset_conversion::Config for Runtime {
type MintMinLiquidity = ConstU128<100>;
type WeightInfo = ();
#[cfg(feature = "runtime-benchmarks")]
type BenchmarkHelper = assets_common::benchmarks::AssetPairFactory<
type BenchmarkHelper = pez_assets_common::benchmarks::AssetPairFactory<
xcm_config::RelayLocation,
teyrchain_info::Pezpallet<Runtime>,
xcm_config::TrustBackedAssetsPalletIndex,
pezcumulus/teyrchains/runtimes/testing/penpal/src/xcm_config.rs
+3 -3
View File
@@ -41,7 +41,7 @@ use super::{
TeyrchainSystem, WeightToFee, XcmpQueue,
};
use crate::{BaseDeliveryFee, FeeAssetId, TransactionByteFee};
use assets_common::TrustBackedAssetsAsLocation;
use pez_assets_common::TrustBackedAssetsAsLocation;
use core::marker::PhantomData;
use pezframe_support::{
parameter_types,
@@ -173,7 +173,7 @@ pub type ForeignAssetsConvertedConcreteId = xcm_builder::MatchedConvertedConcret
// assert!(Location::new(1,
// [Teyrchain(100)]).starts_with(&Location::parent()));
// assert!([Teyrchain(100)].into().starts_with(&Here));
StartsWith<assets_common::matching::LocalLocationPattern>,
StartsWith<pez_assets_common::matching::LocalLocationPattern>,
)>,
Identity,
TryConvertInto,
@@ -364,7 +364,7 @@ pub type TrustedAliasers = (
pub type WaivedLocations = Equals<RootLocation>;
/// `AssetId`/`Balance` converter for `TrustBackedAssets`.
pub type TrustBackedAssetsConvertedConcreteId =
assets_common::TrustBackedAssetsConvertedConcreteId<AssetsPalletLocation, Balance>;
pez_assets_common::TrustBackedAssetsConvertedConcreteId<AssetsPalletLocation, Balance>;
/// Asset converter for pool assets.
/// Used to convert assets in pools to the asset required for fee payment.
pezcumulus/teyrchains/runtimes/testing/yet-another-teyrchain/Cargo.toml
+5 -5
View File
@@ -1,6 +1,6 @@
[package]
name = "yet-another-teyrchain-runtime"
version = "0.6.0"
version = "0.6.1"
authors.workspace = true
edition.workspace = true
description = "Simple runtime used by the testing teyrchain(s)"
@@ -54,9 +54,9 @@ pezkuwi-sdk = { workspace = true, default-features = false, features = [
"pezkuwi-runtime-common",
"pezkuwi-teyrchain-primitives",
"pezpallet-xcm",
"pezstaging-xcm",
"pezstaging-xcm-builder",
"pezstaging-xcm-executor",
"xcm",
"xcm-builder",
"xcm-executor",
"pezcumulus-pezpallet-aura-ext",
"pezcumulus-pezpallet-weight-reclaim",
@@ -66,7 +66,7 @@ pezkuwi-sdk = { workspace = true, default-features = false, features = [
"pezcumulus-primitives-core",
"pezcumulus-primitives-utility",
"pezpallet-collator-selection",
"pezstaging-teyrchain-info",
"teyrchain-info",
"teyrchains-common",
"runtime",
pezcumulus/teyrchains/runtimes/testing/yet-another-teyrchain/src/genesis_config_presets.rs
+1 -1
View File
@@ -23,7 +23,7 @@ use pezsp_genesis_builder::PresetId;
use pezsp_keyring::Sr25519Keyring;
use teyrchains_common::{AccountId, AuraId};
const SAFE_XCM_VERSION: u32 = pezstaging_xcm::prelude::XCM_VERSION;
const SAFE_XCM_VERSION: u32 = xcm::prelude::XCM_VERSION;
const DEFAULT_PARA_ID: ParaId = ParaId::new(1000);
const ENDOWMENT: u128 = 1 << 60;
pezcumulus/teyrchains/runtimes/testing/yet-another-teyrchain/src/lib.rs
+2 -4
View File
@@ -28,10 +28,8 @@ mod xcm_config;
use crate::xcm_config::{RelayLocation, XcmOriginToTransactDispatchOrigin};
pub use pezkuwi_sdk::{pezstaging_teyrchain_info as teyrchain_info, *};
pub use pezkuwi_sdk::{teyrchain_info, *};
use pezpallet_xcm::{EnsureXcm, IsVoiceOfBody};
use pezstaging_xcm_builder as xcm_builder;
use pezstaging_xcm_executor as xcm_executor;
use pezcumulus_primitives_core::ParaId;
use pezkuwi_runtime_common::{prod_or_fast, xcm_sender::NoPriceForMessageDelivery};
@@ -81,7 +79,7 @@ pub use pezsp_runtime::BuildStorage;
pub use pezsp_runtime::{Perbill, Permill};
use pezcumulus_primitives_core::AggregateMessageOrigin; //, ClaimQueueOffset, CoreSelector};
use pezstaging_xcm::latest::prelude::BodyId;
use xcm::latest::prelude::BodyId;
use teyrchains_common::{AccountId, Signature};
pub type SessionHandlers = ();
pezcumulus/teyrchains/runtimes/testing/yet-another-teyrchain/src/xcm_config.rs
+1 -4
View File
@@ -19,10 +19,7 @@ use super::{
RuntimeOrigin, TeyrchainInfo, TeyrchainSystem, WeightToFee, XcmpQueue,
};
use pezkuwi_sdk::{
pezstaging_xcm as xcm, pezstaging_xcm_builder as xcm_builder,
pezstaging_xcm_executor as xcm_executor, *,
};
use pezkuwi_sdk::{xcm, xcm_builder, xcm_executor, *};
use pezframe_support::{
parameter_types,