chore: regenerate umbrella crate, fix feature propagation
This commit is contained in:
+18
-8
@@ -24,9 +24,9 @@ use crate::{
|
||||
};
|
||||
use bp_asset_hub_zagros::CreateForeignAssetDeposit;
|
||||
use bridge_hub_common::AggregateMessageOrigin;
|
||||
use hex_literal::hex;
|
||||
use pezframe_support::{parameter_types, traits::Contains, weights::ConstantMultiplier};
|
||||
use pezframe_system::EnsureRootWithSuccess;
|
||||
use hex_literal::hex;
|
||||
use pezpallet_xcm::EnsureXcm;
|
||||
use pezsnowbridge_beacon_primitives::{Fork, ForkVersions};
|
||||
use pezsnowbridge_core::{gwei, meth, AllowSiblingsOnly, PricingParameters, Rewards};
|
||||
@@ -53,7 +53,8 @@ use xcm::prelude::{GlobalConsensus, InteriorLocation, Location, PalletInstance,
|
||||
use xcm_executor::XcmExecutor;
|
||||
use zagros_runtime_constants::system_teyrchain::ASSET_HUB_ID;
|
||||
|
||||
pub const SLOTS_PER_EPOCH: u32 = pezsnowbridge_pezpallet_ethereum_client::config::SLOTS_PER_EPOCH as u32;
|
||||
pub const SLOTS_PER_EPOCH: u32 =
|
||||
pezsnowbridge_pezpallet_ethereum_client::config::SLOTS_PER_EPOCH as u32;
|
||||
|
||||
/// Exports message to the Ethereum Gateway contract.
|
||||
pub type SnowbridgeExporter = EthereumBlobExporter<
|
||||
@@ -194,7 +195,8 @@ impl pezsnowbridge_pezpallet_outbound_queue_v2::Config for Runtime {
|
||||
type WeightToFee = WeightToFee;
|
||||
type Verifier = EthereumBeaconClient;
|
||||
type GatewayAddress = EthereumGatewayAddress;
|
||||
type WeightInfo = crate::weights::pezsnowbridge_pezpallet_outbound_queue_v2::WeightInfo<Runtime>;
|
||||
type WeightInfo =
|
||||
crate::weights::pezsnowbridge_pezpallet_outbound_queue_v2::WeightInfo<Runtime>;
|
||||
type EthereumNetwork = EthereumNetwork;
|
||||
type RewardKind = BridgeReward;
|
||||
type DefaultRewardKind = SnowbridgeReward;
|
||||
@@ -325,8 +327,8 @@ pub mod benchmark_helpers {
|
||||
RuntimeOrigin, System,
|
||||
};
|
||||
use codec::Encode;
|
||||
use pezframe_support::assert_ok;
|
||||
use hex_literal::hex;
|
||||
use pezframe_support::assert_ok;
|
||||
use pezsnowbridge_beacon_primitives::BeaconHeader;
|
||||
use pezsnowbridge_inbound_queue_primitives::EventFixture;
|
||||
use pezsnowbridge_pezpallet_inbound_queue::BenchmarkHelper;
|
||||
@@ -357,7 +359,9 @@ pub mod benchmark_helpers {
|
||||
}
|
||||
}
|
||||
|
||||
impl<T: pezsnowbridge_pezpallet_inbound_queue_v2::Config> InboundQueueBenchmarkHelperV2<T> for Runtime {
|
||||
impl<T: pezsnowbridge_pezpallet_inbound_queue_v2::Config> InboundQueueBenchmarkHelperV2<T>
|
||||
for Runtime
|
||||
{
|
||||
fn initialize_storage() -> EventFixture {
|
||||
let message = make_register_token_message_v2();
|
||||
|
||||
@@ -370,7 +374,9 @@ pub mod benchmark_helpers {
|
||||
}
|
||||
}
|
||||
|
||||
impl<T: pezsnowbridge_pezpallet_outbound_queue_v2::Config> OutboundQueueBenchmarkHelperV2<T> for Runtime {
|
||||
impl<T: pezsnowbridge_pezpallet_outbound_queue_v2::Config> OutboundQueueBenchmarkHelperV2<T>
|
||||
for Runtime
|
||||
{
|
||||
fn initialize_storage(beacon_header: BeaconHeader, block_roots_root: H256) {
|
||||
EthereumBeaconClient::store_finalized_header(beacon_header, block_roots_root).unwrap();
|
||||
}
|
||||
@@ -440,7 +446,9 @@ pub(crate) mod migrations {
|
||||
>;
|
||||
|
||||
/// One shot migration for NetworkId::Zagros to NetworkId::ByGenesis(ZAGROS_GENESIS_HASH)
|
||||
pub struct MigrationForXcmV5<T: pezsnowbridge_pezpallet_system::Config>(core::marker::PhantomData<T>);
|
||||
pub struct MigrationForXcmV5<T: pezsnowbridge_pezpallet_system::Config>(
|
||||
core::marker::PhantomData<T>,
|
||||
);
|
||||
impl<T: pezsnowbridge_pezpallet_system::Config> pezframe_support::traits::OnRuntimeUpgrade
|
||||
for MigrationForXcmV5<T>
|
||||
{
|
||||
@@ -451,7 +459,9 @@ pub(crate) mod migrations {
|
||||
weight.saturating_accrue(T::DbWeight::get().reads_writes(1, 1));
|
||||
Some(xcm::v5::Location::try_from(pre).expect("valid location"))
|
||||
};
|
||||
pezsnowbridge_pezpallet_system::ForeignToNativeId::<T>::translate_values(translate_zagros);
|
||||
pezsnowbridge_pezpallet_system::ForeignToNativeId::<T>::translate_values(
|
||||
translate_zagros,
|
||||
);
|
||||
|
||||
weight
|
||||
}
|
||||
|
||||
+11
-10
@@ -34,11 +34,11 @@ use pezframe_support::{
|
||||
traits::{ConstU32, PalletInfoAccess},
|
||||
};
|
||||
use pezframe_system::{EnsureNever, EnsureRoot};
|
||||
use pezkuwi_teyrchain_primitives::primitives::Sibling;
|
||||
use pezpallet_bridge_messages::LaneIdOf;
|
||||
use pezpallet_bridge_relayers::extension::{
|
||||
BridgeRelayersTransactionExtension, WithMessagesExtensionConfig,
|
||||
};
|
||||
use pezkuwi_teyrchain_primitives::primitives::Sibling;
|
||||
use testnet_teyrchains_constants::zagros::currency::UNITS as ZGR;
|
||||
use teyrchains_common::xcm_config::{AllSiblingSystemTeyrchains, RelayOrOtherSystemTeyrchains};
|
||||
use xcm::{
|
||||
@@ -151,12 +151,13 @@ impl pezpallet_bridge_messages::Config<WithBridgeHubPezkuwichainMessagesInstance
|
||||
type LaneId = LegacyLaneId;
|
||||
|
||||
type DeliveryPayments = ();
|
||||
type DeliveryConfirmationPayments = pezpallet_bridge_relayers::DeliveryConfirmationPaymentsAdapter<
|
||||
Runtime,
|
||||
WithBridgeHubPezkuwichainMessagesInstance,
|
||||
BridgeRelayersInstance,
|
||||
DeliveryRewardInBalance,
|
||||
>;
|
||||
type DeliveryConfirmationPayments =
|
||||
pezpallet_bridge_relayers::DeliveryConfirmationPaymentsAdapter<
|
||||
Runtime,
|
||||
WithBridgeHubPezkuwichainMessagesInstance,
|
||||
BridgeRelayersInstance,
|
||||
DeliveryRewardInBalance,
|
||||
>;
|
||||
|
||||
type MessageDispatch = XcmOverBridgeHubPezkuwichain;
|
||||
type OnMessagesDelivered = XcmOverBridgeHubPezkuwichain;
|
||||
@@ -381,8 +382,8 @@ pub mod migration {
|
||||
|
||||
mod v1_wrong {
|
||||
use bp_messages::{LaneState, MessageNonce, UnrewardedRelayer};
|
||||
use pezbp_runtime::AccountIdOf;
|
||||
use codec::{Decode, Encode};
|
||||
use pezbp_runtime::AccountIdOf;
|
||||
use pezpallet_bridge_messages::BridgedChainOf;
|
||||
use pezsp_std::collections::vec_deque::VecDeque;
|
||||
|
||||
@@ -414,8 +415,8 @@ pub mod migration {
|
||||
/// for Pezkuwichain/Zagros).
|
||||
pub struct FixMessagesV1Migration<T, I>(pezsp_std::marker::PhantomData<(T, I)>);
|
||||
|
||||
impl<T: pezpallet_bridge_messages::Config<I>, I: 'static> pezframe_support::traits::OnRuntimeUpgrade
|
||||
for FixMessagesV1Migration<T, I>
|
||||
impl<T: pezpallet_bridge_messages::Config<I>, I: 'static>
|
||||
pezframe_support::traits::OnRuntimeUpgrade for FixMessagesV1Migration<T, I>
|
||||
{
|
||||
fn on_runtime_upgrade() -> Weight {
|
||||
use pezsp_core::Get;
|
||||
|
||||
@@ -485,7 +485,8 @@ impl pezpallet_session::Config for Runtime {
|
||||
// we don't have stash and controller, thus we don't need the convert as well.
|
||||
type ValidatorIdOf = pezpallet_collator_selection::IdentityCollator;
|
||||
type ShouldEndSession = pezpallet_session::PeriodicSessions<ConstU32<PERIOD>, ConstU32<OFFSET>>;
|
||||
type NextSessionRotation = pezpallet_session::PeriodicSessions<ConstU32<PERIOD>, ConstU32<OFFSET>>;
|
||||
type NextSessionRotation =
|
||||
pezpallet_session::PeriodicSessions<ConstU32<PERIOD>, ConstU32<OFFSET>>;
|
||||
type SessionManager = CollatorSelection;
|
||||
// Essentially just Aura, but let's be pedantic.
|
||||
type SessionHandler = <SessionKeys as pezsp_runtime::traits::OpaqueKeys>::KeyTypeIdProviders;
|
||||
|
||||
@@ -23,10 +23,11 @@ use ::pezpallet_bridge_relayers::WeightInfo as _;
|
||||
use ::pezpallet_bridge_teyrchains::WeightInfoExt as TeyrchainsWeightInfoExt;
|
||||
|
||||
pub mod block_weights;
|
||||
pub mod extrinsic_weights;
|
||||
pub mod paritydb_weights;
|
||||
pub mod pezcumulus_pezpallet_teyrchain_system;
|
||||
pub mod pezcumulus_pezpallet_weight_reclaim;
|
||||
pub mod pezcumulus_pezpallet_xcmp_queue;
|
||||
pub mod extrinsic_weights;
|
||||
pub mod pezframe_system;
|
||||
pub mod pezframe_system_extensions;
|
||||
pub mod pezpallet_balances;
|
||||
@@ -42,7 +43,6 @@ pub mod pezpallet_timestamp;
|
||||
pub mod pezpallet_transaction_payment;
|
||||
pub mod pezpallet_utility;
|
||||
pub mod pezpallet_xcm;
|
||||
pub mod paritydb_weights;
|
||||
pub mod rocksdb_weights;
|
||||
pub mod xcm;
|
||||
|
||||
|
||||
@@ -29,10 +29,10 @@ use pezframe_support::{
|
||||
},
|
||||
};
|
||||
use pezframe_system::EnsureRoot;
|
||||
use pezpallet_collator_selection::StakingPotAccountId;
|
||||
use pezpallet_xcm::{AuthorizedAliasers, XcmPassthrough};
|
||||
use pezkuwi_runtime_common::xcm_sender::ExponentialPrice;
|
||||
use pezkuwi_teyrchain_primitives::primitives::Sibling;
|
||||
use pezpallet_collator_selection::StakingPotAccountId;
|
||||
use pezpallet_xcm::{AuthorizedAliasers, XcmPassthrough};
|
||||
use pezsp_runtime::traits::AccountIdConversion;
|
||||
use testnet_teyrchains_constants::zagros::{
|
||||
locations::AssetHubLocation, snowbridge::EthereumNetwork,
|
||||
@@ -161,8 +161,8 @@ pub type Barrier = TrailingSetTopicAsId<
|
||||
// If the message is one that immediately attempts to pay for execution, then
|
||||
// allow it.
|
||||
AllowTopLevelPaidExecutionFrom<Everything>,
|
||||
// Parent, its pluralities (i.e. governance bodies) and relay treasury pezpallet
|
||||
// get free execution.
|
||||
// Parent, its pluralities (i.e. governance bodies) and relay treasury
|
||||
// pezpallet get free execution.
|
||||
AllowExplicitUnpaidExecutionFrom<(
|
||||
ParentOrParentsPlurality,
|
||||
Equals<RelayTreasuryLocation>,
|
||||
|
||||
Reference in New Issue
Block a user