fix AssetFeeAsExistentialDepositMultiplier

This commit is contained in:
joepetrowski
2022-11-30 21:48:20 +01:00
parent e8afde4bfa
commit e569b68889
6 changed files with 35 additions and 17 deletions
@@ -189,6 +189,7 @@ impl xcm_executor::Config for XcmConfig {
ConvertInto,
TrustBackedAssetsInstance,
>,
TrustBackedAssetsInstance,
>,
ConvertedConcreteId<
AssetId,
@@ -249,6 +249,19 @@ impl pallet_assets::Config<TrustBackedAssetsInstance> for Runtime {
type Helper = ();
}
// This is frustrating...
// use pallet_assets::BenchmarkHelper;
// pub struct XcmBenchmarkHelper;
// #[cfg(feature = "runtime-benchmarks")]
// impl<AssetId: From<MultiLocationForAssetId>> BenchmarkHelper<AssetId> for XcmBenchmarkHelper {
// fn create_asset_id(id: u32) -> AssetId {
// match id {
// x => MultiLocationForAssetId { parents: 1, interior: X1(Parachain(x)) },
// _ => MultiLocationForAssetId { parents: 0, interior: Here },
// }
// }
// }
/// Assets managed by some foreign location.
type ForeignAssetsInstance = pallet_assets::Instance2;
impl pallet_assets::Config<ForeignAssetsInstance> for Runtime {
@@ -189,6 +189,7 @@ impl xcm_executor::Config for XcmConfig {
ConvertInto,
TrustBackedAssetsInstance,
>,
TrustBackedAssetsInstance,
>,
ConvertedConcreteId<
AssetId,
@@ -35,7 +35,7 @@ use frame_support::{
construct_runtime,
dispatch::DispatchClass,
parameter_types,
traits::Everything,
traits::{AsEnsureOriginWithArg, Everything},
weights::{
constants::WEIGHT_PER_SECOND, ConstantMultiplier, Weight, WeightToFeeCoefficient,
WeightToFeeCoefficients, WeightToFeePolynomial,
@@ -44,7 +44,7 @@ use frame_support::{
};
use frame_system::{
limits::{BlockLength, BlockWeights},
EnsureRoot,
EnsureRoot, EnsureSigned,
};
use smallvec::smallvec;
use sp_api::impl_runtime_apis;
@@ -398,6 +398,7 @@ impl pallet_assets::Config for Runtime {
type Balance = Balance;
type AssetId = AssetId;
type Currency = Balances;
type CreateOrigin = AsEnsureOriginWithArg<EnsureSigned<AccountId>>;
type ForceOrigin = EnsureRoot<AccountId>;
type AssetDeposit = AssetDeposit;
type MetadataDepositBase = MetadataDepositBase;
@@ -42,7 +42,7 @@ pub use frame_support::{
construct_runtime,
dispatch::DispatchClass,
match_types, parameter_types,
traits::{EitherOfDiverse, Everything, IsInVec, Randomness},
traits::{AsEnsureOriginWithArg, EitherOfDiverse, Everything, IsInVec, Randomness},
weights::{
constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},
ConstantMultiplier, IdentityFee, Weight,
@@ -51,7 +51,7 @@ pub use frame_support::{
};
use frame_system::{
limits::{BlockLength, BlockWeights},
EnsureRoot,
EnsureRoot, EnsureSigned,
};
pub use pallet_balances::Call as BalancesCall;
pub use pallet_timestamp::Call as TimestampCall;
@@ -513,6 +513,7 @@ impl pallet_assets::Config for Runtime {
type Balance = u64;
type AssetId = AssetId;
type Currency = Balances;
type CreateOrigin = AsEnsureOriginWithArg<EnsureSigned<AccountId>>;
type ForceOrigin = AdminOrigin;
type AssetDeposit = AssetDeposit;
type MetadataDepositBase = MetadataDepositBase;