Skip to content

Commit

Permalink
Update after selfreview
Browse files Browse the repository at this point in the history
  • Loading branch information
simonsso committed Feb 22, 2024
1 parent b6690e7 commit ccd56cb
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
1 change: 0 additions & 1 deletion runtimes/eden/src/pallets_util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,6 @@ impl pallet_contracts::Config for Runtime {
pallet_contracts::migration::v14::Migration<Runtime, Balances>,
pallet_contracts::migration::v15::Migration<Runtime>,
);
// TODO check all of here
type CodeHashLockupDepositPercent = CodeHashLockupDepositPercent;
type MaxDelegateDependencies = ConstU32<32>;
type RuntimeHoldReason = crate::RuntimeHoldReason;
Expand Down
16 changes: 12 additions & 4 deletions runtimes/eden/src/xcm_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ use super::{
};
#[cfg(feature = "runtime-benchmarks")]
use crate::constants::NODL;
use crate::implementations::DealWithFees;
use crate::{implementations::DealWithFees, pallets_system::TransactionByteFee};
use codec::{Decode, Encode};
use cumulus_primitives_core::ParaId;
#[cfg(feature = "runtime-benchmarks")]
use frame_benchmarking::BenchmarkError;
use frame_support::{
Expand All @@ -19,7 +18,6 @@ use frame_system::EnsureRoot;
use orml_traits::{location::RelativeReserveProvider, parameter_type_with_key};
use pallet_xcm::XcmPassthrough;
use polkadot_parachain_primitives::primitives::Sibling;
use polkadot_runtime_common::xcm_sender::NoPriceForMessageDelivery;
use scale_info::TypeInfo;
use sp_core::RuntimeDebug;
use sp_runtime::traits::Convert;
Expand Down Expand Up @@ -192,14 +190,24 @@ impl pallet_xcm::Config for Runtime {
type RemoteLockConsumerIdentifier = ();
}

parameter_types! {
/// The asset ID for the asset that we use to pay for message delivery fees.
pub FeeAssetId: AssetId = Concrete(NodlLocation::get());
/// The base fee for the message delivery fees.
pub const BaseDeliveryFee: u128 = crate::constants::NODL.saturating_mul(3);
}

pub type PriceForSiblingParachainDelivery =
polkadot_runtime_common::xcm_sender::ExponentialPrice<FeeAssetId, BaseDeliveryFee, TransactionByteFee, XcmpQueue>;

impl cumulus_pallet_xcmp_queue::Config for Runtime {
type RuntimeEvent = RuntimeEvent;
type ChannelInfo = ParachainSystem;
type VersionWrapper = PolkadotXcm;
type ControllerOrigin = EnsureRoot<AccountId>;
type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin;
type WeightInfo = cumulus_pallet_xcmp_queue::weights::SubstrateWeight<Self>;
type PriceForSiblingDelivery = NoPriceForMessageDelivery<ParaId>;
type PriceForSiblingDelivery = PriceForSiblingParachainDelivery;
type XcmpQueue = ();
type MaxInboundSuspended = sp_core::ConstU32<1_000>;
}
Expand Down

0 comments on commit ccd56cb

Please sign in to comment.