FAZ 1 Complete: Workspace compile fixes, warning cleanup, version bumps
- 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:
+1
-1
@@ -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};
|
||||
|
||||
@@ -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
|
||||
{
|
||||
|
||||
@@ -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,
|
||||
};
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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,
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user