chore: regenerate umbrella crate, fix feature propagation
This commit is contained in:
+1
-1
@@ -21,10 +21,10 @@
|
||||
|
||||
pub use bp_bridge_hub_pezcumulus::*;
|
||||
use bp_messages::*;
|
||||
use codec::{Decode, Encode};
|
||||
use pezbp_runtime::{
|
||||
decl_bridge_finality_runtime_apis, decl_bridge_messages_runtime_apis, Chain, ChainId, Teyrchain,
|
||||
};
|
||||
use codec::{Decode, Encode};
|
||||
use pezframe_support::{
|
||||
dispatch::DispatchClass,
|
||||
pezsp_runtime::{MultiAddress, MultiSigner, RuntimeDebug, StateVersion},
|
||||
|
||||
+4
-2
@@ -35,12 +35,12 @@ use pezframe_support::{
|
||||
traits::{Equals, 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 pezpallet_xcm_bridge_hub::XcmAsPlainPayload;
|
||||
use pezkuwi_teyrchain_primitives::primitives::Sibling;
|
||||
use testnet_teyrchains_constants::pezkuwichain::currency::UNITS as TYR;
|
||||
use xcm::{
|
||||
latest::prelude::*,
|
||||
@@ -115,7 +115,9 @@ pub type WithPezkuwichainBulletinMessagesInstance = pezpallet_bridge_messages::I
|
||||
impl pezpallet_bridge_messages::Config<WithPezkuwichainBulletinMessagesInstance> for Runtime {
|
||||
type RuntimeEvent = RuntimeEvent;
|
||||
type WeightInfo =
|
||||
weights::pezpallet_bridge_messages_pezkuwichain_to_pezkuwichain_bulletin::WeightInfo<Runtime>;
|
||||
weights::pezpallet_bridge_messages_pezkuwichain_to_pezkuwichain_bulletin::WeightInfo<
|
||||
Runtime,
|
||||
>;
|
||||
|
||||
type ThisChain = bp_bridge_hub_pezkuwichain::BridgeHubPezkuwichain;
|
||||
type BridgedChain = bp_pezkuwi_bulletin::PezkuwiBulletin;
|
||||
|
||||
+3
-2
@@ -38,8 +38,8 @@ use crate::xcm_config::RelayNetwork;
|
||||
#[cfg(feature = "runtime-benchmarks")]
|
||||
use benchmark_helpers::DoNothingRouter;
|
||||
use bp_asset_hub_pezkuwichain::CreateForeignAssetDeposit;
|
||||
use pezframe_support::{parameter_types, weights::ConstantMultiplier};
|
||||
use hex_literal::hex;
|
||||
use pezframe_support::{parameter_types, weights::ConstantMultiplier};
|
||||
use pezpallet_xcm::EnsureXcm;
|
||||
use pezsp_runtime::{
|
||||
traits::{ConstU32, ConstU8, Keccak256},
|
||||
@@ -186,7 +186,8 @@ parameter_types! {
|
||||
};
|
||||
}
|
||||
|
||||
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;
|
||||
|
||||
impl pezsnowbridge_pezpallet_ethereum_client::Config for Runtime {
|
||||
type RuntimeEvent = RuntimeEvent;
|
||||
|
||||
+13
-11
@@ -35,11 +35,11 @@ use pezpallet_xcm_bridge_hub::{BridgeId, XcmAsPlainPayload};
|
||||
|
||||
use pezframe_support::{parameter_types, traits::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::pezkuwichain::currency::UNITS as TYR;
|
||||
use teyrchains_common::xcm_config::{AllSiblingSystemTeyrchains, RelayOrOtherSystemTeyrchains};
|
||||
use xcm::{
|
||||
@@ -105,7 +105,8 @@ pezbp_runtime::generate_static_str_provider!(OnBridgeHubPezkuwichainRefundBridge
|
||||
pub type WithBridgeHubZagrosMessagesInstance = pezpallet_bridge_messages::Instance3;
|
||||
impl pezpallet_bridge_messages::Config<WithBridgeHubZagrosMessagesInstance> for Runtime {
|
||||
type RuntimeEvent = RuntimeEvent;
|
||||
type WeightInfo = weights::pezpallet_bridge_messages_pezkuwichain_to_zagros::WeightInfo<Runtime>;
|
||||
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;
|
||||
@@ -120,12 +121,13 @@ impl pezpallet_bridge_messages::Config<WithBridgeHubZagrosMessagesInstance> for
|
||||
type LaneId = LegacyLaneId;
|
||||
|
||||
type DeliveryPayments = ();
|
||||
type DeliveryConfirmationPayments = pezpallet_bridge_relayers::DeliveryConfirmationPaymentsAdapter<
|
||||
Runtime,
|
||||
WithBridgeHubZagrosMessagesInstance,
|
||||
RelayersForLegacyLaneIdsMessagesInstance,
|
||||
DeliveryRewardInBalance,
|
||||
>;
|
||||
type DeliveryConfirmationPayments =
|
||||
pezpallet_bridge_relayers::DeliveryConfirmationPaymentsAdapter<
|
||||
Runtime,
|
||||
WithBridgeHubZagrosMessagesInstance,
|
||||
RelayersForLegacyLaneIdsMessagesInstance,
|
||||
DeliveryRewardInBalance,
|
||||
>;
|
||||
|
||||
type MessageDispatch = XcmOverBridgeHubZagros;
|
||||
type OnMessagesDelivered = XcmOverBridgeHubZagros;
|
||||
@@ -363,8 +365,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;
|
||||
|
||||
@@ -396,8 +398,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;
|
||||
|
||||
@@ -75,11 +75,11 @@ use testnet_teyrchains_constants::pezkuwichain::{
|
||||
consensus::*, currency::*, fee::WeightToFee, time::*,
|
||||
};
|
||||
|
||||
use pezbp_runtime::HeaderId;
|
||||
use bridge_hub_common::{
|
||||
message_queue::{NarrowOriginToSibling, ParaIdToSibling},
|
||||
AggregateMessageOrigin,
|
||||
};
|
||||
use pezbp_runtime::HeaderId;
|
||||
pub use pezsp_consensus_aura::sr25519::AuthorityId as AuraId;
|
||||
pub use pezsp_runtime::{MultiAddress, Perbill, Permill};
|
||||
|
||||
@@ -501,7 +501,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;
|
||||
|
||||
+3
-3
@@ -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;
|
||||
@@ -44,12 +45,11 @@ 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 pezsnowbridge_pezpallet_ethereum_client;
|
||||
pub mod pezsnowbridge_pezpallet_inbound_queue;
|
||||
pub mod pezsnowbridge_pezpallet_outbound_queue;
|
||||
pub mod pezsnowbridge_pezpallet_system;
|
||||
pub mod rocksdb_weights;
|
||||
pub mod xcm;
|
||||
|
||||
pub use block_weights::constants::BlockExecutionWeight;
|
||||
|
||||
+2
-2
@@ -30,10 +30,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::pezkuwichain::snowbridge::EthereumNetwork;
|
||||
use teyrchains_common::{
|
||||
|
||||
+6
-5
@@ -17,13 +17,13 @@
|
||||
#![cfg(test)]
|
||||
|
||||
use bp_pezkuwi_core::Signature;
|
||||
use codec::{Decode, Encode};
|
||||
use pezbridge_hub_pezkuwichain_runtime::{
|
||||
bridge_to_zagros_config::OnBridgeHubPezkuwichainRefundBridgeHubZagrosMessages,
|
||||
xcm_config::XcmConfig, AllPalletsWithoutSystem, BridgeRejectObsoleteHeadersAndMessages,
|
||||
Executive, MessageQueueServiceWeight, Runtime, RuntimeCall, RuntimeEvent, SessionKeys,
|
||||
TxExtension, UncheckedExtrinsic,
|
||||
};
|
||||
use codec::{Decode, Encode};
|
||||
use pezcumulus_primitives_core::XcmError::FailedToTransactAsset;
|
||||
use pezframe_support::parameter_types;
|
||||
use pezsnowbridge_pezpallet_ethereum_client::WeightInfo;
|
||||
@@ -97,7 +97,8 @@ pub fn transfer_token_to_ethereum_insufficient_fund() {
|
||||
fn max_message_queue_service_weight_is_more_than_beacon_extrinsic_weights() {
|
||||
let max_message_queue_weight = MessageQueueServiceWeight::get();
|
||||
let force_checkpoint =
|
||||
<Runtime as pezsnowbridge_pezpallet_ethereum_client::Config>::WeightInfo::force_checkpoint();
|
||||
<Runtime as pezsnowbridge_pezpallet_ethereum_client::Config>::WeightInfo::force_checkpoint(
|
||||
);
|
||||
let submit_checkpoint =
|
||||
<Runtime as pezsnowbridge_pezpallet_ethereum_client::Config>::WeightInfo::submit();
|
||||
max_message_queue_weight.all_gt(force_checkpoint);
|
||||
@@ -123,9 +124,9 @@ fn ethereum_to_pezkuwi_message_extrinsics_work() {
|
||||
}
|
||||
|
||||
/// Tests that the digest items are as expected when a Ethereum Outbound message is received.
|
||||
/// If the MessageQueue pezpallet is configured before (i.e. the MessageQueue pezpallet is listed before
|
||||
/// the EthereumOutboundQueue in the construct_runtime macro) the EthereumOutboundQueue, this test
|
||||
/// will fail.
|
||||
/// If the MessageQueue pezpallet is configured before (i.e. the MessageQueue pezpallet is listed
|
||||
/// before the EthereumOutboundQueue in the construct_runtime macro) the EthereumOutboundQueue, this
|
||||
/// test will fail.
|
||||
#[test]
|
||||
pub fn ethereum_outbound_queue_processes_messages_before_message_queue_works() {
|
||||
pezsnowbridge_runtime_test_common::ethereum_outbound_queue_processes_messages_before_message_queue_works::<
|
||||
|
||||
@@ -17,6 +17,8 @@
|
||||
#![cfg(test)]
|
||||
|
||||
use bp_pezkuwi_core::Signature;
|
||||
use codec::{Decode, Encode};
|
||||
use hex_literal::hex;
|
||||
use pezbridge_hub_pezkuwichain_runtime::{
|
||||
bridge_common_config, bridge_to_bulletin_config, bridge_to_zagros_config,
|
||||
xcm_config::{RelayNetwork, TokenLocation, XcmConfig},
|
||||
@@ -25,9 +27,7 @@ use pezbridge_hub_pezkuwichain_runtime::{
|
||||
TeyrchainSystem, TransactionPayment, TxExtension, UncheckedExtrinsic,
|
||||
};
|
||||
use pezbridge_hub_test_utils::{GovernanceOrigin, SlotDurations};
|
||||
use codec::{Decode, Encode};
|
||||
use pezframe_support::{dispatch::GetDispatchInfo, parameter_types, traits::ConstU8};
|
||||
use hex_literal::hex;
|
||||
use pezsnowbridge_core::ChannelId;
|
||||
use pezsp_consensus_aura::SlotDuration;
|
||||
use pezsp_core::{crypto::Ss58Codec, H160};
|
||||
@@ -131,14 +131,14 @@ mod bridge_hub_zagros_tests {
|
||||
BridgeGrandpaZagrosInstance, BridgeTeyrchainZagrosInstance, DeliveryRewardInBalance,
|
||||
RelayersForLegacyLaneIdsMessagesInstance,
|
||||
};
|
||||
use pezbridge_hub_pezkuwichain_runtime::{
|
||||
bridge_to_ethereum_config::EthereumGatewayAddress, xcm_config::LocationToAccountId,
|
||||
};
|
||||
use pezbridge_hub_test_utils::test_cases::from_teyrchain;
|
||||
use bridge_to_zagros_config::{
|
||||
BridgeHubZagrosLocation, WithBridgeHubZagrosMessagesInstance,
|
||||
XcmOverBridgeHubZagrosInstance, ZagrosGlobalConsensusNetwork,
|
||||
};
|
||||
use pezbridge_hub_pezkuwichain_runtime::{
|
||||
bridge_to_ethereum_config::EthereumGatewayAddress, xcm_config::LocationToAccountId,
|
||||
};
|
||||
use pezbridge_hub_test_utils::test_cases::from_teyrchain;
|
||||
use pezcumulus_primitives_core::UpwardMessageSender;
|
||||
|
||||
// Random para id of sibling chain used in tests.
|
||||
@@ -240,14 +240,20 @@ mod bridge_hub_zagros_tests {
|
||||
bp_bridge_hub_pezkuwichain::BRIDGE_HUB_PEZKUWICHAIN_TEYRCHAIN_ID,
|
||||
Governance::get(),
|
||||
vec![
|
||||
(pezsnowbridge_pezpallet_outbound_queue::Nonce::<Runtime>::hashed_key_for::<ChannelId>(
|
||||
channel_id_one,
|
||||
)
|
||||
.to_vec(), 0u64.encode()),
|
||||
(pezsnowbridge_pezpallet_inbound_queue::Nonce::<Runtime>::hashed_key_for::<ChannelId>(
|
||||
channel_id_one,
|
||||
)
|
||||
.to_vec(), 0u64.encode()),
|
||||
(
|
||||
pezsnowbridge_pezpallet_outbound_queue::Nonce::<Runtime>::hashed_key_for::<
|
||||
ChannelId,
|
||||
>(channel_id_one)
|
||||
.to_vec(),
|
||||
0u64.encode(),
|
||||
),
|
||||
(
|
||||
pezsnowbridge_pezpallet_inbound_queue::Nonce::<Runtime>::hashed_key_for::<
|
||||
ChannelId,
|
||||
>(channel_id_one)
|
||||
.to_vec(),
|
||||
0u64.encode(),
|
||||
),
|
||||
],
|
||||
|| {
|
||||
// Outbound
|
||||
@@ -521,16 +527,16 @@ mod bridge_hub_bulletin_tests {
|
||||
use super::*;
|
||||
use bp_messages::LegacyLaneId;
|
||||
use bridge_common_config::BridgeGrandpaPezkuwichainBulletinInstance;
|
||||
use pezbridge_hub_pezkuwichain_runtime::{
|
||||
bridge_common_config::RelayersForLegacyLaneIdsMessagesInstance,
|
||||
xcm_config::LocationToAccountId,
|
||||
};
|
||||
use pezbridge_hub_test_utils::test_cases::from_grandpa_chain;
|
||||
use bridge_to_bulletin_config::{
|
||||
PezkuwichainBulletinGlobalConsensusNetwork,
|
||||
PezkuwichainBulletinGlobalConsensusNetworkLocation,
|
||||
WithPezkuwichainBulletinMessagesInstance, XcmOverPezkuwiBulletinInstance,
|
||||
};
|
||||
use pezbridge_hub_pezkuwichain_runtime::{
|
||||
bridge_common_config::RelayersForLegacyLaneIdsMessagesInstance,
|
||||
xcm_config::LocationToAccountId,
|
||||
};
|
||||
use pezbridge_hub_test_utils::test_cases::from_grandpa_chain;
|
||||
use pezcumulus_primitives_core::UpwardMessageSender;
|
||||
|
||||
// Random para id of sibling chain used in tests.
|
||||
|
||||
Reference in New Issue
Block a user