chore: regenerate umbrella crate, fix feature propagation
This commit is contained in:
@@ -142,7 +142,8 @@ where
|
||||
};
|
||||
|
||||
// Adjust gas using actual weight or fallback to initially charged weight
|
||||
let actual_weight = pezframe_support::dispatch::extract_actual_weight(&result, &pre);
|
||||
let actual_weight =
|
||||
pezframe_support::dispatch::extract_actual_weight(&result, &pre);
|
||||
env.adjust_gas(charged_amount, actual_weight);
|
||||
|
||||
result.map(|_| Vec::new()).map_err(|error| {
|
||||
|
||||
@@ -329,9 +329,13 @@ pub fn new_test_ext_with_balances_and_xcm_version(
|
||||
.assimilate_storage(&mut t)
|
||||
.unwrap();
|
||||
|
||||
pezpallet_xcm::GenesisConfig::<Test> { safe_xcm_version, supported_version, ..Default::default() }
|
||||
.assimilate_storage(&mut t)
|
||||
.unwrap();
|
||||
pezpallet_xcm::GenesisConfig::<Test> {
|
||||
safe_xcm_version,
|
||||
supported_version,
|
||||
..Default::default()
|
||||
}
|
||||
.assimilate_storage(&mut t)
|
||||
.unwrap();
|
||||
|
||||
pezpallet_revive::GenesisConfig::<Test> { mapped_accounts: vec![ALICE], ..Default::default() }
|
||||
.assimilate_storage(&mut t)
|
||||
|
||||
@@ -21,6 +21,7 @@ use crate::{
|
||||
VersionedLocation, VersionedXcm,
|
||||
};
|
||||
use pezframe_support::traits::Currency;
|
||||
use pezkuwi_teyrchain_primitives::primitives::Id as ParaId;
|
||||
use pezpallet_revive::{
|
||||
precompiles::{
|
||||
alloy::{
|
||||
@@ -31,7 +32,6 @@ use pezpallet_revive::{
|
||||
},
|
||||
ExecConfig, U256,
|
||||
};
|
||||
use pezkuwi_teyrchain_primitives::primitives::Id as ParaId;
|
||||
use pezsp_runtime::traits::AccountIdConversion;
|
||||
use xcm::{prelude::*, v3, v4};
|
||||
|
||||
|
||||
@@ -48,7 +48,6 @@ use pezframe_support::{
|
||||
};
|
||||
use pezframe_system::pezpallet_prelude::{BlockNumberFor, *};
|
||||
pub use pezpallet::*;
|
||||
use scale_info::TypeInfo;
|
||||
use pezsp_core::H256;
|
||||
use pezsp_runtime::{
|
||||
traits::{
|
||||
@@ -57,6 +56,7 @@ use pezsp_runtime::{
|
||||
},
|
||||
Either, RuntimeDebug, SaturatedConversion,
|
||||
};
|
||||
use scale_info::TypeInfo;
|
||||
use storage::{with_transaction, TransactionOutcome};
|
||||
use xcm::{latest::QueryResponseInfo, prelude::*};
|
||||
use xcm_builder::{
|
||||
@@ -255,7 +255,8 @@ pub mod pezpallet {
|
||||
pub trait Config: pezframe_system::Config {
|
||||
/// The overarching event type.
|
||||
#[allow(deprecated)]
|
||||
type RuntimeEvent: From<Event<Self>> + IsType<<Self as pezframe_system::Config>::RuntimeEvent>;
|
||||
type RuntimeEvent: From<Event<Self>>
|
||||
+ IsType<<Self as pezframe_system::Config>::RuntimeEvent>;
|
||||
|
||||
/// A lockable currency.
|
||||
// TODO: We should really use a trait which can handle multiple currencies.
|
||||
@@ -1722,7 +1723,8 @@ pub mod pezpallet {
|
||||
if let Some(expiry) = expires {
|
||||
ensure!(
|
||||
expiry >
|
||||
pezframe_system::Pezpallet::<T>::current_block_number().saturated_into::<u64>(),
|
||||
pezframe_system::Pezpallet::<T>::current_block_number()
|
||||
.saturated_into::<u64>(),
|
||||
Error::<T>::ExpiresInPast
|
||||
);
|
||||
}
|
||||
@@ -1970,7 +1972,10 @@ impl<T: Config> QueryHandler for Pezpallet<T> {
|
||||
let response = response.into();
|
||||
Queries::<T>::insert(
|
||||
id,
|
||||
QueryStatus::Ready { response, at: pezframe_system::Pezpallet::<T>::current_block_number() },
|
||||
QueryStatus::Ready {
|
||||
response,
|
||||
at: pezframe_system::Pezpallet::<T>::current_block_number(),
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -3068,7 +3073,10 @@ impl<T: Config> Pezpallet<T> {
|
||||
origin: OriginCaller,
|
||||
call: RuntimeCall,
|
||||
result_xcms_version: XcmVersion,
|
||||
) -> Result<CallDryRunEffects<<Runtime as pezframe_system::Config>::RuntimeEvent>, XcmDryRunApiError>
|
||||
) -> Result<
|
||||
CallDryRunEffects<<Runtime as pezframe_system::Config>::RuntimeEvent>,
|
||||
XcmDryRunApiError,
|
||||
>
|
||||
where
|
||||
Runtime: crate::Config,
|
||||
Router: InspectMessageQueues,
|
||||
@@ -3456,7 +3464,8 @@ impl<T: Config> Pezpallet<T> {
|
||||
aliaser
|
||||
.expiry
|
||||
.map(|expiry| {
|
||||
pezframe_system::Pezpallet::<T>::current_block_number().saturated_into::<u64>() <
|
||||
pezframe_system::Pezpallet::<T>::current_block_number()
|
||||
.saturated_into::<u64>() <
|
||||
expiry
|
||||
})
|
||||
.unwrap_or(true)
|
||||
@@ -3492,10 +3501,10 @@ impl<T: Config> Pezpallet<T> {
|
||||
/// - `message`: The message whose outcome should be reported.
|
||||
/// - `responder`: The origin from which a response should be expected.
|
||||
/// - `notify`: A dispatchable function which will be called once the outcome of `message` is
|
||||
/// known. It may be a dispatchable in any pezpallet of the local chain, but other than the usual
|
||||
/// origin, it must accept exactly two arguments: `query_id: QueryId` and `outcome: Response`,
|
||||
/// and in that order. It should expect that the origin is `Origin::Response` and will contain
|
||||
/// the responder's location.
|
||||
/// known. It may be a dispatchable in any pezpallet of the local chain, but other than the
|
||||
/// usual origin, it must accept exactly two arguments: `query_id: QueryId` and `outcome:
|
||||
/// Response`, and in that order. It should expect that the origin is `Origin::Response` and
|
||||
/// will contain the responder's location.
|
||||
/// - `timeout`: The block number after which it is permissible for `notify` not to be called
|
||||
/// even if a response is received.
|
||||
///
|
||||
@@ -4120,7 +4129,8 @@ impl<T: Config> OnResponse for Pezpallet<T> {
|
||||
let dispatch_origin = Origin::Response(origin.clone()).into();
|
||||
match call.dispatch(dispatch_origin) {
|
||||
Ok(post_info) => {
|
||||
let e = Event::Notified { query_id, pezpallet_index, call_index };
|
||||
let e =
|
||||
Event::Notified { query_id, pezpallet_index, call_index };
|
||||
Self::deposit_event(e);
|
||||
post_info.actual_weight
|
||||
},
|
||||
|
||||
@@ -455,9 +455,9 @@ pub mod v1 {
|
||||
>;
|
||||
}
|
||||
|
||||
/// When adding a new XCM version, we need to run this migration for `pezpallet_xcm` to ensure that all
|
||||
/// previously stored data with pez_subkey prefix `XCM_VERSION-1` (and below) are migrated to the
|
||||
/// `XCM_VERSION`.
|
||||
/// When adding a new XCM version, we need to run this migration for `pezpallet_xcm` to ensure that
|
||||
/// all previously stored data with pez_subkey prefix `XCM_VERSION-1` (and below) are migrated to
|
||||
/// the `XCM_VERSION`.
|
||||
///
|
||||
/// NOTE: This migration can be permanently added to the runtime migrations.
|
||||
pub struct MigrateToLatestXcmVersion<T>(core::marker::PhantomData<T>);
|
||||
|
||||
@@ -68,7 +68,8 @@ pub mod pezpallet_test_notifier {
|
||||
#[pezpallet::config]
|
||||
pub trait Config: pezframe_system::Config + crate::Config {
|
||||
#[allow(deprecated)]
|
||||
type RuntimeEvent: IsType<<Self as pezframe_system::Config>::RuntimeEvent> + From<Event<Self>>;
|
||||
type RuntimeEvent: IsType<<Self as pezframe_system::Config>::RuntimeEvent>
|
||||
+ From<Event<Self>>;
|
||||
type RuntimeOrigin: IsType<<Self as pezframe_system::Config>::RuntimeOrigin>
|
||||
+ Into<Result<crate::Origin, <Self as Config>::RuntimeOrigin>>;
|
||||
type RuntimeCall: IsType<<Self as crate::Config>::RuntimeCall> + From<Call<Self>>;
|
||||
@@ -741,9 +742,13 @@ pub(crate) fn new_test_ext_with_balances_and_xcm_version(
|
||||
.assimilate_storage(&mut t)
|
||||
.unwrap();
|
||||
|
||||
pezpallet_xcm::GenesisConfig::<Test> { safe_xcm_version, supported_version, ..Default::default() }
|
||||
.assimilate_storage(&mut t)
|
||||
.unwrap();
|
||||
pezpallet_xcm::GenesisConfig::<Test> {
|
||||
safe_xcm_version,
|
||||
supported_version,
|
||||
..Default::default()
|
||||
}
|
||||
.assimilate_storage(&mut t)
|
||||
.unwrap();
|
||||
|
||||
let mut ext = pezsp_io::TestExternalities::new(t);
|
||||
ext.execute_with(|| System::set_block_number(1));
|
||||
|
||||
Reference in New Issue
Block a user