diff --git a/Cargo.lock b/Cargo.lock index a420dcd050..fb9485a98e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6234,9 +6234,6 @@ dependencies = [ "moonbeam-xcm-benchmarks", "nimbus-primitives", "num_enum 0.5.11", - "orml-traits", - "orml-xcm-support", - "orml-xtokens", "pallet-asset-manager", "pallet-assets", "pallet-async-backing", @@ -6751,9 +6748,6 @@ dependencies = [ "moonbeam-xcm-benchmarks", "nimbus-primitives", "num_enum 0.5.11", - "orml-traits", - "orml-xcm-support", - "orml-xtokens", "pallet-asset-manager", "pallet-assets", "pallet-async-backing", @@ -7184,9 +7178,6 @@ dependencies = [ "moonbeam-xcm-benchmarks", "nimbus-primitives", "num_enum 0.5.11", - "orml-traits", - "orml-xcm-support", - "orml-xtokens", "pallet-asset-manager", "pallet-assets", "pallet-async-backing", @@ -8029,76 +8020,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "orml-traits" -version = "1.0.0" -source = "git+https://github.com/moonbeam-foundation/open-runtime-module-library?branch=moonbeam-polkadot-stable2407#61df2a403c5e4f28ad780fdf3136a1fd9e8c3166" -dependencies = [ - "frame-support", - "impl-trait-for-tuples", - "num-traits", - "orml-utilities", - "parity-scale-codec", - "paste", - "scale-info", - "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", - "staging-xcm", -] - -[[package]] -name = "orml-utilities" -version = "1.0.0" -source = "git+https://github.com/moonbeam-foundation/open-runtime-module-library?branch=moonbeam-polkadot-stable2407#61df2a403c5e4f28ad780fdf3136a1fd9e8c3166" -dependencies = [ - "frame-support", - "parity-scale-codec", - "scale-info", - "serde", - "sp-core", - "sp-io", - "sp-runtime", - "sp-std", -] - -[[package]] -name = "orml-xcm-support" -version = "1.0.0" -source = "git+https://github.com/moonbeam-foundation/open-runtime-module-library?branch=moonbeam-polkadot-stable2407#61df2a403c5e4f28ad780fdf3136a1fd9e8c3166" -dependencies = [ - "frame-support", - "orml-traits", - "parity-scale-codec", - "sp-runtime", - "sp-std", - "staging-xcm", - "staging-xcm-executor", -] - -[[package]] -name = "orml-xtokens" -version = "1.0.0" -source = "git+https://github.com/moonbeam-foundation/open-runtime-module-library?branch=moonbeam-polkadot-stable2407#61df2a403c5e4f28ad780fdf3136a1fd9e8c3166" -dependencies = [ - "frame-support", - "frame-system", - "log", - "orml-traits", - "orml-xcm-support", - "pallet-xcm", - "parity-scale-codec", - "scale-info", - "serde", - "sp-io", - "sp-runtime", - "sp-std", - "staging-xcm", - "staging-xcm-executor", -] - [[package]] name = "overload" version = "0.1.1" @@ -9001,12 +8922,11 @@ dependencies = [ "hex-literal 0.4.1", "log", "num_enum 0.5.11", - "orml-traits", - "orml-xtokens", "pallet-balances", "pallet-evm", "pallet-timestamp", "pallet-xcm", + "pallet-xcm-transactor", "parity-scale-codec", "paste", "precompile-utils", @@ -9248,7 +9168,6 @@ dependencies = [ "hex-literal 0.4.1", "log", "num_enum 0.5.11", - "orml-traits", "pallet-balances", "pallet-evm", "pallet-message-queue", @@ -9369,7 +9288,6 @@ dependencies = [ "frame-system", "log", "num_enum 0.5.11", - "orml-traits", "pallet-balances", "pallet-evm", "pallet-timestamp", @@ -9402,7 +9320,6 @@ dependencies = [ "frame-support", "frame-system", "num_enum 0.5.11", - "orml-traits", "pallet-balances", "pallet-evm", "pallet-timestamp", @@ -9436,12 +9353,11 @@ dependencies = [ "frame-system", "log", "num_enum 0.5.11", - "orml-traits", - "orml-xtokens", "pallet-balances", "pallet-evm", "pallet-timestamp", "pallet-xcm", + "pallet-xcm-transactor", "parity-scale-codec", "precompile-utils", "rustc-hex", @@ -10418,7 +10334,6 @@ dependencies = [ "frame-support", "frame-system", "log", - "orml-traits", "pallet-balances", "pallet-timestamp", "pallet-xcm", @@ -18579,7 +18494,6 @@ dependencies = [ "hex", "impl-trait-for-tuples", "log", - "orml-traits", "pallet-staking", "parity-scale-codec", "polkadot-runtime-common", diff --git a/Cargo.toml b/Cargo.toml index 761621cf37..9ff6678e5b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -312,9 +312,6 @@ cumulus-relay-chain-minimal-node = { git = "https://github.com/moonbeam-foundati cumulus-relay-chain-rpc-interface = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-stable2407" } # Polkadot / XCM (wasm) -orml-traits = { git = "https://github.com/moonbeam-foundation/open-runtime-module-library", branch = "moonbeam-polkadot-stable2407", default-features = false } -orml-xcm-support = { git = "https://github.com/moonbeam-foundation/open-runtime-module-library", branch = "moonbeam-polkadot-stable2407", default-features = false } -orml-xtokens = { git = "https://github.com/moonbeam-foundation/open-runtime-module-library", branch = "moonbeam-polkadot-stable2407", default-features = false } pallet-xcm = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-stable2407", default-features = false } pallet-xcm-benchmarks = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-stable2407", default-features = false } polkadot-core-primitives = { git = "https://github.com/moonbeam-foundation/polkadot-sdk", branch = "moonbeam-polkadot-stable2407", default-features = false } @@ -442,7 +439,6 @@ crossbeam-deque = { opt-level = 3 } crypto-mac = { opt-level = 3 } curve25519-dalek = { opt-level = 3 } ed25519-zebra = { opt-level = 3 } -flate2 = { opt-level = 3 } futures-channel = { opt-level = 3 } hash-db = { opt-level = 3 } hashbrown = { opt-level = 3 } diff --git a/pallets/parachain-staking/src/set.rs b/pallets/parachain-staking/src/set.rs index 2fb15ffadf..9db24f4724 100644 --- a/pallets/parachain-staking/src/set.rs +++ b/pallets/parachain-staking/src/set.rs @@ -14,8 +14,6 @@ // You should have received a copy of the GNU General Public License // along with Moonbeam. If not, see . -/* TODO: use orml_utilities::OrderedSet without leaking substrate v2.0 dependencies*/ - use frame_support::traits::Get; use parity_scale_codec::{Decode, Encode}; use scale_info::TypeInfo; diff --git a/pallets/xcm-transactor/Cargo.toml b/pallets/xcm-transactor/Cargo.toml index db390ca17e..b2a54ecd14 100644 --- a/pallets/xcm-transactor/Cargo.toml +++ b/pallets/xcm-transactor/Cargo.toml @@ -24,7 +24,6 @@ sp-std = { workspace = true } cumulus-primitives-core = { workspace = true } # Polkadot / XCM -orml-traits = { workspace = true } xcm = { workspace = true } xcm-builder = { workspace = true } xcm-executor = { workspace = true } @@ -47,7 +46,6 @@ std = [ "frame-benchmarking/std", "frame-support/std", "frame-system/std", - "orml-traits/std", "parity-scale-codec/std", "sp-io/std", "sp-runtime/std", diff --git a/pallets/xcm-transactor/src/encode.rs b/pallets/xcm-transactor/src/encode.rs index 6d5f3c9113..11e587e2fb 100644 --- a/pallets/xcm-transactor/src/encode.rs +++ b/pallets/xcm-transactor/src/encode.rs @@ -21,7 +21,6 @@ //! Module to provide `StakeEncodeCall`, `HrmpEncodeCall` and `UtilityEncodeCall` implementations //! for the Xcm Transactor pallet -#![cfg_attr(not(feature = "std"), no_std)] use frame_support::pallet_prelude::*; use sp_runtime::traits::{AccountIdLookup, StaticLookup}; use sp_std::prelude::*; diff --git a/pallets/xcm-transactor/src/lib.rs b/pallets/xcm-transactor/src/lib.rs index a6ba5b2024..59a3d8fc53 100644 --- a/pallets/xcm-transactor/src/lib.rs +++ b/pallets/xcm-transactor/src/lib.rs @@ -100,7 +100,6 @@ pub mod pallet { dispatch::DispatchResult, pallet_prelude::*, weights::constants::WEIGHT_REF_TIME_PER_SECOND, }; use frame_system::{ensure_signed, pallet_prelude::*}; - use orml_traits::location::{Parse, Reserve}; use sp_runtime::traits::{AtLeast32BitUnsigned, Bounded, Convert}; use sp_std::boxed::Box; use sp_std::convert::TryFrom; @@ -109,7 +108,7 @@ pub mod pallet { use xcm::{latest::prelude::*, VersionedLocation}; use xcm_executor::traits::{TransactAsset, WeightBounds}; use xcm_primitives::{ - FilterMaxAssetFee, HrmpAvailableCalls, HrmpEncodeCall, UtilityAvailableCalls, + FilterMaxAssetFee, HrmpAvailableCalls, HrmpEncodeCall, Reserve, UtilityAvailableCalls, UtilityEncodeCall, XcmTransact, }; @@ -180,7 +179,7 @@ pub mod pallet { /// The way to retrieve the reserve of a Asset. This can be /// configured to accept absolute or relative paths for self tokens - type ReserveProvider: Reserve; + type ReserveProvider: xcm_primitives::Reserve; /// The way to filter the max fee to use for HRMP management operations type MaxHrmpFee: FilterMaxAssetFee; @@ -1167,8 +1166,9 @@ pub mod pallet { /// Ensure `dest` has chain part and none recipient part. fn ensure_valid_dest(dest: &Location) -> Result { - if let (Some(dest), None) = (dest.chain_part(), dest.non_chain_part()) { - Ok(dest) + let chain_location = dest.chain_location(); + if *dest == chain_location { + Ok(chain_location) } else { Err(Error::::InvalidDest.into()) } diff --git a/pallets/xcm-transactor/src/mock.rs b/pallets/xcm-transactor/src/mock.rs index f641d187cb..a6576dcccc 100644 --- a/pallets/xcm-transactor/src/mock.rs +++ b/pallets/xcm-transactor/src/mock.rs @@ -380,6 +380,10 @@ impl SendXcm for TestSendXcm { parameter_types! { pub MaxFee: Asset = (Location::parent(), 1_000_000_000_000u128).into(); + pub SelfLocationAbsolute: Location = Location { + parents: 1, + interior: [Parachain(ParachainId::get().into())].into(), + }; } pub type MaxHrmpRelayFee = xcm_builder::Case; @@ -398,7 +402,7 @@ impl Config for Test { type UniversalLocation = UniversalLocation; type BaseXcmWeight = BaseXcmWeight; type XcmSender = TestSendXcm; - type ReserveProvider = orml_traits::location::RelativeReserveProvider; + type ReserveProvider = xcm_primitives::AbsoluteAndRelativeReserve; type WeightInfo = (); type HrmpManipulatorOrigin = EnsureRoot; type HrmpOpenOrigin = EnsureRoot; diff --git a/precompiles/gmp/Cargo.toml b/precompiles/gmp/Cargo.toml index f2ad365014..e46ab48c12 100644 --- a/precompiles/gmp/Cargo.toml +++ b/precompiles/gmp/Cargo.toml @@ -13,6 +13,7 @@ slices = { workspace = true } # Moonbeam account = { workspace = true } +pallet-xcm-transactor = { workspace = true } # Substrate frame-support = { workspace = true } @@ -30,8 +31,6 @@ pallet-evm = { workspace = true, features = ["forbid-evm-reentrancy"] } precompile-utils = { workspace = true } # Polkadot / XCM -orml-traits = { workspace = true } -orml-xtokens = { workspace = true } pallet-xcm = { workspace = true } xcm = { workspace = true } xcm-builder = { workspace = true } diff --git a/precompiles/gmp/src/lib.rs b/precompiles/gmp/src/lib.rs index ccd14d0956..6e13b3501d 100644 --- a/precompiles/gmp/src/lib.rs +++ b/precompiles/gmp/src/lib.rs @@ -23,19 +23,20 @@ use evm::ExitReason; use fp_evm::{Context, ExitRevert, PrecompileFailure, PrecompileHandle}; use frame_support::{ dispatch::{GetDispatchInfo, PostDispatchInfo}, - sp_runtime::{traits::Zero, Saturating}, + sp_runtime::traits::Zero, traits::ConstU32, }; use pallet_evm::AddressMapping; use parity_scale_codec::{Decode, DecodeLimit}; use precompile_utils::{prelude::*, solidity::revert::revert_as_bytes}; use sp_core::{H160, U256}; -use sp_runtime::traits::Dispatchable; +use sp_runtime::traits::{Convert, Dispatchable}; use sp_std::boxed::Box; use sp_std::{marker::PhantomData, vec::Vec}; use types::*; -use xcm::opaque::latest::WeightLimit; -use xcm_primitives::AccountIdToCurrencyId; +use xcm::opaque::latest::{Asset, AssetId, Fungibility, WeightLimit}; +use xcm::{VersionedAssets, VersionedLocation}; +use xcm_primitives::{split_location_into_chain_part_and_beneficiary, AccountIdToCurrencyId}; #[cfg(test)] mod mock; @@ -45,8 +46,10 @@ mod tests; pub mod types; pub type SystemCallOf = ::RuntimeCall; -pub type CurrencyIdOf = ::CurrencyId; -pub type XBalanceOf = ::Balance; +pub type CurrencyIdOf = ::CurrencyId; +pub type CurrencyIdToLocationOf = + ::CurrencyIdToLocation; + pub const CALL_DATA_LIMIT: u32 = 2u32.pow(16); type GetCallDataLimit = ConstU32; @@ -66,13 +69,15 @@ pub struct GmpPrecompile(PhantomData); #[precompile_utils::precompile] impl GmpPrecompile where - Runtime: pallet_evm::Config + frame_system::Config + pallet_xcm::Config + orml_xtokens::Config, + Runtime: pallet_evm::Config + + frame_system::Config + + pallet_xcm::Config + + pallet_xcm_transactor::Config, SystemCallOf: Dispatchable + Decode + GetDispatchInfo, <::RuntimeCall as Dispatchable>::RuntimeOrigin: From>, - ::RuntimeCall: From>, + ::RuntimeCall: From>, Runtime: AccountIdToCurrencyId>, - XBalanceOf: TryFrom + Into + solidity::Codec, { #[precompile::public("wormholeTransferERC20(bytes)")] pub fn wormhole_transfer_erc20( @@ -176,7 +181,7 @@ where let currency_account_id = Runtime::AddressMapping::into_account_id(asset_erc20_address.into()); - let currency_id: ::CurrencyId = + let currency_id: CurrencyIdOf = Runtime::account_to_currency_id(currency_account_id) .ok_or(revert("Unsupported asset, not a valid currency id"))?; @@ -207,14 +212,32 @@ where .map_err(|_| revert("Amount overflows balance"))?; log::debug!(target: "gmp-precompile", "sending XCM via xtokens::transfer..."); - let call: Option> = match user_action { + let call: Option> = match user_action { VersionedUserAction::V1(action) => { log::debug!(target: "gmp-precompile", "Payload: V1"); - Some(orml_xtokens::Call::::transfer { - currency_id, - amount, - dest: Box::new(action.destination), - dest_weight_limit: WeightLimit::Unlimited, + + let asset = Asset { + fun: Fungibility::Fungible(amount), + id: AssetId( + >::convert(currency_id) + .ok_or(revert("Cannot convert CurrencyId into xcm asset"))?, + ), + }; + + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary( + action + .destination + .try_into() + .map_err(|_| revert("Invalid destination"))?, + ) + .ok_or(revert("Invalid destination"))?; + + Some(pallet_xcm::Call::::transfer_assets { + dest: Box::new(VersionedLocation::V4(chain_part)), + beneficiary: Box::new(VersionedLocation::V4(beneficiary)), + assets: Box::new(VersionedAssets::V4(asset.into())), + fee_asset_item: 0, + weight_limit: WeightLimit::Unlimited, }) } VersionedUserAction::V2(action) => { @@ -252,11 +275,28 @@ where let remaining = amount.saturating_sub(fee); if !remaining.is_zero() { - Some(orml_xtokens::Call::::transfer { - currency_id, - amount: remaining, - dest: Box::new(action.destination), - dest_weight_limit: WeightLimit::Unlimited, + let asset = Asset { + fun: Fungibility::Fungible(remaining), + id: AssetId( + >::convert(currency_id) + .ok_or(revert("Cannot convert CurrencyId into xcm asset"))?, + ), + }; + + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary( + action + .destination + .try_into() + .map_err(|_| revert("Invalid destination"))?, + ) + .ok_or(revert("Invalid destination"))?; + + Some(pallet_xcm::Call::::transfer_assets { + dest: Box::new(VersionedLocation::V4(chain_part)), + beneficiary: Box::new(VersionedLocation::V4(beneficiary)), + assets: Box::new(VersionedAssets::V4(asset.into())), + fee_asset_item: 0, + weight_limit: WeightLimit::Unlimited, }) } else { None diff --git a/precompiles/gmp/src/mock.rs b/precompiles/gmp/src/mock.rs index bd2e647743..386bf2b20c 100644 --- a/precompiles/gmp/src/mock.rs +++ b/precompiles/gmp/src/mock.rs @@ -16,11 +16,11 @@ //! Test utilities use super::*; +use cumulus_primitives_core::{relay_chain::HrmpChannelId, ParaId}; use frame_support::traits::{ EnsureOrigin, Everything, Nothing, OriginTrait, PalletInfo as PalletInfoTrait, }; use frame_support::{construct_runtime, parameter_types, weights::Weight}; -use orml_traits::{location::AbsoluteReserveProvider, parameter_type_with_key}; use pallet_evm::{EnsureAddressNever, EnsureAddressRoot}; use parity_scale_codec::{Decode, Encode}; use precompile_utils::{mock_account, precompile_set::*, testing::MockAccount}; @@ -35,7 +35,7 @@ use xcm::latest::{prelude::*, Error as XcmError}; use xcm_builder::{AllowUnpaidExecutionFrom, FixedWeightBounds}; use xcm_executor::{ traits::{TransactAsset, WeightTrader}, - AssetsInHolding, XcmExecutor, + AssetsInHolding, }; pub type AccountId = MockAccount; @@ -51,8 +51,8 @@ construct_runtime!( Balances: pallet_balances, Evm: pallet_evm, Timestamp: pallet_timestamp, - Xtokens: orml_xtokens, PolkadotXcm: pallet_xcm, + XcmTransactor: pallet_xcm_transactor, } ); @@ -289,6 +289,92 @@ impl pallet_evm::Config for Runtime { type WeightInfo = pallet_evm::weights::SubstrateWeight; } +#[derive(Encode, Decode)] +pub enum RelayCall { + #[codec(index = 5u8)] + // the index should match the position of the module in `construct_runtime!` + Utility(UtilityCall), + #[codec(index = 6u8)] + // the index should match the position of the module in `construct_runtime!` + Hrmp(HrmpCall), +} + +#[derive(Encode, Decode)] +pub enum UtilityCall { + #[codec(index = 1u8)] + AsDerivative(u16), +} + +// HRMP call encoding, needed for xcm transactor pallet +#[derive(Encode, Decode)] +pub enum HrmpCall { + #[codec(index = 0u8)] + InitOpenChannel(ParaId, u32, u32), + #[codec(index = 1u8)] + AcceptOpenChannel(ParaId), + #[codec(index = 2u8)] + CloseChannel(HrmpChannelId), + #[codec(index = 6u8)] + CancelOpenRequest(HrmpChannelId, u32), +} + +#[derive(Clone, Eq, Debug, PartialEq, Ord, PartialOrd, Encode, Decode, TypeInfo)] +pub enum MockTransactors { + Relay, +} + +impl xcm_primitives::XcmTransact for MockTransactors { + fn destination(self) -> Location { + match self { + MockTransactors::Relay => Location::parent(), + } + } +} + +impl xcm_primitives::UtilityEncodeCall for MockTransactors { + fn encode_call(self, call: xcm_primitives::UtilityAvailableCalls) -> Vec { + match self { + MockTransactors::Relay => match call { + xcm_primitives::UtilityAvailableCalls::AsDerivative(a, b) => { + let mut call = + RelayCall::Utility(UtilityCall::AsDerivative(a.clone())).encode(); + call.append(&mut b.clone()); + call + } + }, + } + } +} + +parameter_types! { + pub SelfLocationAbsolute: Location = Location { + parents: 1, + interior: [Parachain(ParachainId::get().into())].into(), + }; +} + +impl pallet_xcm_transactor::Config for Runtime { + type RuntimeEvent = RuntimeEvent; + type Balance = Balance; + type Transactor = MockTransactors; + type DerivativeAddressRegistrationOrigin = frame_system::EnsureRoot; + type SovereignAccountDispatcherOrigin = frame_system::EnsureRoot; + type CurrencyId = CurrencyId; + type AccountIdToLocation = AccountIdToLocation; + type CurrencyIdToLocation = CurrencyIdToMultiLocation; + type SelfLocation = SelfLocation; + type Weigher = FixedWeightBounds; + type UniversalLocation = UniversalLocation; + type BaseXcmWeight = BaseXcmWeight; + type XcmSender = DoNothingRouter; + type AssetTransactor = DummyAssetTransactor; + type ReserveProvider = xcm_primitives::AbsoluteAndRelativeReserve; + type WeightInfo = (); + type HrmpManipulatorOrigin = frame_system::EnsureRoot; + type HrmpOpenOrigin = frame_system::EnsureRoot; + type MaxHrmpFee = (); +} + parameter_types! { pub const MinimumPeriod: u64 = 5; } @@ -367,12 +453,6 @@ parameter_types! { pub MaxInstructions: u32 = 100; } -parameter_type_with_key! { - pub ParachainMinFee: |_location: Location| -> Option { - Some(u128::MAX) - }; -} - pub struct CurrencyIdToMultiLocation; impl sp_runtime::traits::Convert> for CurrencyIdToMultiLocation { @@ -394,25 +474,6 @@ impl sp_runtime::traits::Convert> for CurrencyIdToM } } -impl orml_xtokens::Config for Runtime { - type RuntimeEvent = RuntimeEvent; - type Balance = Balance; - type CurrencyId = CurrencyId; - type AccountIdToLocation = AccountIdToLocation; - type CurrencyIdConvert = CurrencyIdToMultiLocation; - type XcmExecutor = XcmExecutor; - type SelfLocation = SelfLocation; - type Weigher = xcm_builder::FixedWeightBounds; - type BaseXcmWeight = BaseXcmWeight; - type MaxAssetsForTransfer = MaxAssetsForTransfer; - type MinXcmFee = ParachainMinFee; - type LocationsFilter = Everything; - type ReserveProvider = AbsoluteReserveProvider; - type UniversalLocation = UniversalLocation; - type RateLimiter = (); - type RateLimiterId = (); -} - pub(crate) struct ExtBuilder { /// Endowed accounts with balances balances: Vec<(AccountId, Balance)>, diff --git a/precompiles/relay-encoder/Cargo.toml b/precompiles/relay-encoder/Cargo.toml index 9679a2777a..c27bf84a8e 100644 --- a/precompiles/relay-encoder/Cargo.toml +++ b/precompiles/relay-encoder/Cargo.toml @@ -55,9 +55,6 @@ xcm = { workspace = true, features = ["std"] } xcm-builder = { workspace = true, features = ["std"] } xcm-executor = { workspace = true, features = ["std"] } -# ORML -orml-traits = { workspace = true, features = ["std"] } - [features] default = ["std"] std = [ diff --git a/precompiles/relay-encoder/src/mock.rs b/precompiles/relay-encoder/src/mock.rs index 12587dd736..bd9c58252f 100644 --- a/precompiles/relay-encoder/src/mock.rs +++ b/precompiles/relay-encoder/src/mock.rs @@ -297,6 +297,13 @@ impl TransactAsset for DummyAssetTransactor { } } +parameter_types! { + pub SelfLocationAbsolute: Location = Location { + parents: 1, + interior: [Parachain(ParachainId::get().into())].into(), + }; +} + impl pallet_xcm_transactor::Config for Runtime { type RuntimeEvent = RuntimeEvent; type Balance = Balance; @@ -312,7 +319,7 @@ impl pallet_xcm_transactor::Config for Runtime { type BaseXcmWeight = BaseXcmWeight; type XcmSender = DoNothingRouter; type AssetTransactor = DummyAssetTransactor; - type ReserveProvider = orml_traits::location::RelativeReserveProvider; + type ReserveProvider = xcm_primitives::AbsoluteAndRelativeReserve; type WeightInfo = (); type HrmpManipulatorOrigin = frame_system::EnsureRoot; type HrmpOpenOrigin = frame_system::EnsureRoot; diff --git a/precompiles/xcm-transactor/Cargo.toml b/precompiles/xcm-transactor/Cargo.toml index 45eee059e2..8e15b33713 100644 --- a/precompiles/xcm-transactor/Cargo.toml +++ b/precompiles/xcm-transactor/Cargo.toml @@ -55,9 +55,6 @@ pallet-xcm = { workspace = true } xcm-builder = { workspace = true } xcm-executor = { workspace = true } -# ORML -orml-traits = { workspace = true } - [features] default = ["std"] std = [ diff --git a/precompiles/xcm-transactor/src/mock.rs b/precompiles/xcm-transactor/src/mock.rs index b239e660cc..948678bfa7 100644 --- a/precompiles/xcm-transactor/src/mock.rs +++ b/precompiles/xcm-transactor/src/mock.rs @@ -319,6 +319,10 @@ parameter_types! { pub MaxInstructions: u32 = 100; pub UniversalLocation: InteriorLocation = Here; + pub SelfLocationAbsolute: Location = Location { + parents: 1, + interior: [Parachain(ParachainId::get().into())].into(), + }; } impl pallet_xcm_transactor::Config for Runtime { @@ -336,7 +340,7 @@ impl pallet_xcm_transactor::Config for Runtime { type BaseXcmWeight = BaseXcmWeight; type XcmSender = DoNothingRouter; type AssetTransactor = DummyAssetTransactor; - type ReserveProvider = orml_traits::location::RelativeReserveProvider; + type ReserveProvider = xcm_primitives::AbsoluteAndRelativeReserve; type WeightInfo = (); type HrmpManipulatorOrigin = frame_system::EnsureRoot; type HrmpOpenOrigin = frame_system::EnsureRoot; diff --git a/precompiles/xcm-utils/Cargo.toml b/precompiles/xcm-utils/Cargo.toml index 7d49f6b145..5c5b1a6311 100644 --- a/precompiles/xcm-utils/Cargo.toml +++ b/precompiles/xcm-utils/Cargo.toml @@ -53,15 +53,11 @@ cumulus-primitives-core = { workspace = true } polkadot-parachain = { workspace = true } xcm-builder = { workspace = true } -# ORML -orml-traits = { workspace = true } - [features] default = ["std"] std = [ "frame-support/std", "frame-system/std", - "orml-traits/std", "pallet-balances/std", "pallet-evm/std", "pallet-timestamp/std", diff --git a/precompiles/xtokens/Cargo.toml b/precompiles/xtokens/Cargo.toml index 496c46d201..a75ede8089 100644 --- a/precompiles/xtokens/Cargo.toml +++ b/precompiles/xtokens/Cargo.toml @@ -13,6 +13,7 @@ rustc-hex = { workspace = true } # Moonbeam account = { workspace = true } xcm-primitives = { workspace = true } +pallet-xcm-transactor = { workspace = true } # Substrate frame-support = { workspace = true } @@ -28,8 +29,8 @@ pallet-evm = { workspace = true, features = ["forbid-evm-reentrancy"] } precompile-utils = { workspace = true, features = ["codec-xcm"] } # Polkadot / XCM -orml-xtokens = { workspace = true } xcm = { workspace = true } +pallet-xcm = { workspace = true } [dev-dependencies] derive_more = { workspace = true } @@ -50,7 +51,6 @@ sp-io = { workspace = true } cumulus-primitives-core = { workspace = true } # Polkadot -orml-traits = { workspace = true } pallet-xcm = { workspace = true } xcm-builder = { workspace = true } xcm-executor = { workspace = true } @@ -61,8 +61,9 @@ std = [ "fp-evm/std", "frame-support/std", "frame-system/std", - "orml-xtokens/std", "pallet-evm/std", + "pallet-xcm/std", + "pallet-xcm-transactor/std", "precompile-utils/std", "sp-core/std", "sp-std/std", diff --git a/precompiles/xtokens/src/lib.rs b/precompiles/xtokens/src/lib.rs index e8c8543b84..5fc36c70e6 100644 --- a/precompiles/xtokens/src/lib.rs +++ b/precompiles/xtokens/src/lib.rs @@ -20,47 +20,31 @@ use account::SYSTEM_ACCOUNT_SIZE; use fp_evm::PrecompileHandle; -use frame_support::{ - dispatch::{GetDispatchInfo, PostDispatchInfo}, - traits::Get, -}; +use frame_support::dispatch::{GetDispatchInfo, PostDispatchInfo}; use pallet_evm::AddressMapping; use precompile_utils::prelude::*; -use sp_core::{H160, U256}; -use sp_runtime::traits::Dispatchable; -use sp_std::{ - boxed::Box, - convert::{TryFrom, TryInto}, - marker::PhantomData, - vec::Vec, -}; +use sp_core::{ConstU32, H160, U256}; +use sp_runtime::traits::{Convert, Dispatchable}; +use sp_std::{boxed::Box, convert::TryInto, marker::PhantomData, vec::Vec}; use sp_weights::Weight; use xcm::{ latest::{Asset, AssetId, Assets, Fungibility, Location, WeightLimit}, - VersionedAsset, VersionedAssets, VersionedLocation, + VersionedAssets, VersionedLocation, +}; +use xcm_primitives::{ + split_location_into_chain_part_and_beneficiary, AccountIdToCurrencyId, DEFAULT_PROOF_SIZE, }; -use xcm_primitives::{AccountIdToCurrencyId, DEFAULT_PROOF_SIZE}; #[cfg(test)] mod mock; #[cfg(test)] mod tests; -pub type XBalanceOf = ::Balance; -pub type MaxAssetsForTransfer = ::MaxAssetsForTransfer; - -pub type CurrencyIdOf = ::CurrencyId; +pub type CurrencyIdOf = ::CurrencyId; +pub type CurrencyIdToLocationOf = + ::CurrencyIdToLocation; -pub struct GetMaxAssets(PhantomData); - -impl Get for GetMaxAssets -where - R: orml_xtokens::Config, -{ - fn get() -> u32 { - ::MaxAssetsForTransfer::get() as u32 - } -} +const MAX_ASSETS: u32 = 20; /// A precompile to wrap the functionality from xtokens pub struct XtokensPrecompile(PhantomData); @@ -69,11 +53,15 @@ pub struct XtokensPrecompile(PhantomData); #[precompile::test_concrete_types(mock::Runtime)] impl XtokensPrecompile where - Runtime: orml_xtokens::Config + pallet_evm::Config + frame_system::Config, - Runtime::RuntimeCall: Dispatchable + GetDispatchInfo, - Runtime::RuntimeCall: From>, - ::RuntimeOrigin: From>, - XBalanceOf: TryFrom + Into + solidity::Codec, + Runtime: pallet_evm::Config + + pallet_xcm::Config + + pallet_xcm_transactor::Config + + frame_system::Config, + ::RuntimeCall: + Dispatchable + GetDispatchInfo, + ::RuntimeCall: From>, + <::RuntimeCall as Dispatchable>::RuntimeOrigin: + From>, Runtime: AccountIdToCurrencyId>, { #[precompile::public("transfer(address,uint256,(uint8,bytes[]),uint64)")] @@ -88,9 +76,8 @@ where let to_account = Runtime::AddressMapping::into_account_id(to_address); // We convert the address into a currency id xtokens understands - let currency_id: ::CurrencyId = - Runtime::account_to_currency_id(to_account) - .ok_or(revert("cannot convert into currency id"))?; + let currency_id: CurrencyIdOf = Runtime::account_to_currency_id(to_account) + .ok_or(revert("cannot convert into currency id"))?; let origin = Runtime::AddressMapping::into_account_id(handle.context().caller); let amount = amount @@ -103,11 +90,20 @@ where WeightLimit::Limited(Weight::from_parts(weight, DEFAULT_PROOF_SIZE)) }; - let call = orml_xtokens::Call::::transfer { - currency_id, - amount, - dest: Box::new(VersionedLocation::V4(destination)), - dest_weight_limit, + let asset = Self::currency_to_asset(currency_id, amount).ok_or( + RevertReason::custom("Cannot convert currency into xcm asset") + .in_field("currency_address"), + )?; + + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(destination) + .ok_or_else(|| RevertReason::custom("Invalid destination").in_field("destination"))?; + + let call = pallet_xcm::Call::::transfer_assets { + dest: Box::new(VersionedLocation::V4(chain_part)), + beneficiary: Box::new(VersionedLocation::V4(beneficiary)), + assets: Box::new(VersionedAssets::V4(asset.into())), + fee_asset_item: 0, + weight_limit: dest_weight_limit, }; RuntimeHelper::::try_dispatch( @@ -120,13 +116,16 @@ where Ok(()) } + // transfer_with_fee no longer take the fee parameter into account since we start using + // pallet-xcm. Now, if you want to limit the maximum amount of fees, you'll have to use a + // different asset from the one you wish to transfer and use transfer_multi* selectors. #[precompile::public("transferWithFee(address,uint256,uint256,(uint8,bytes[]),uint64)")] #[precompile::public("transfer_with_fee(address,uint256,uint256,(uint8,bytes[]),uint64)")] fn transfer_with_fee( handle: &mut impl PrecompileHandle, currency_address: Address, amount: U256, - fee: U256, + _fee: U256, destination: Location, weight: u64, ) -> EvmResult { @@ -134,8 +133,8 @@ where let to_account = Runtime::AddressMapping::into_account_id(to_address); // We convert the address into a currency id xtokens understands - let currency_id: ::CurrencyId = - Runtime::account_to_currency_id(to_account).ok_or( + let currency_id: CurrencyIdOf = Runtime::account_to_currency_id(to_account) + .ok_or( RevertReason::custom("Cannot convert into currency id").in_field("currencyAddress"), )?; @@ -146,23 +145,26 @@ where .try_into() .map_err(|_| RevertReason::value_is_too_large("balance type").in_field("amount"))?; - // Fee amount - let fee = fee - .try_into() - .map_err(|_| RevertReason::value_is_too_large("balance type").in_field("fee"))?; - let dest_weight_limit = if weight == u64::MAX { WeightLimit::Unlimited } else { WeightLimit::Limited(Weight::from_parts(weight, DEFAULT_PROOF_SIZE)) }; - let call = orml_xtokens::Call::::transfer_with_fee { - currency_id, - amount, - fee, - dest: Box::new(VersionedLocation::V4(destination)), - dest_weight_limit, + let asset = Self::currency_to_asset(currency_id, amount).ok_or( + RevertReason::custom("Cannot convert currency into xcm asset") + .in_field("currency_address"), + )?; + + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(destination) + .ok_or_else(|| RevertReason::custom("Invalid destination").in_field("destination"))?; + + let call = pallet_xcm::Call::::transfer_assets { + dest: Box::new(VersionedLocation::V4(chain_part)), + beneficiary: Box::new(VersionedLocation::V4(beneficiary)), + assets: Box::new(VersionedAssets::V4(asset.into())), + fee_asset_item: 0, + weight_limit: dest_weight_limit, }; RuntimeHelper::::try_dispatch( @@ -195,13 +197,21 @@ where WeightLimit::Limited(Weight::from_parts(weight, DEFAULT_PROOF_SIZE)) }; - let call = orml_xtokens::Call::::transfer_multiasset { - asset: Box::new(VersionedAsset::V4(Asset { - id: AssetId(asset), - fun: Fungibility::Fungible(to_balance), - })), - dest: Box::new(VersionedLocation::V4(destination)), - dest_weight_limit, + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(destination) + .ok_or_else(|| RevertReason::custom("Invalid destination").in_field("destination"))?; + + let call = pallet_xcm::Call::::transfer_assets { + dest: Box::new(VersionedLocation::V4(chain_part)), + beneficiary: Box::new(VersionedLocation::V4(beneficiary)), + assets: Box::new(VersionedAssets::V4( + Asset { + id: AssetId(asset), + fun: Fungibility::Fungible(to_balance), + } + .into(), + )), + fee_asset_item: 0, + weight_limit: dest_weight_limit, }; RuntimeHelper::::try_dispatch( @@ -224,7 +234,7 @@ where handle: &mut impl PrecompileHandle, asset: Location, amount: U256, - fee: U256, + _fee: U256, destination: Location, weight: u64, ) -> EvmResult { @@ -232,9 +242,6 @@ where let amount = amount .try_into() .map_err(|_| RevertReason::value_is_too_large("balance type").in_field("amount"))?; - let fee = fee - .try_into() - .map_err(|_| RevertReason::value_is_too_large("balance type").in_field("fee"))?; let dest_weight_limit = if weight == u64::MAX { WeightLimit::Unlimited @@ -242,17 +249,21 @@ where WeightLimit::Limited(Weight::from_parts(weight, DEFAULT_PROOF_SIZE)) }; - let call = orml_xtokens::Call::::transfer_multiasset_with_fee { - asset: Box::new(VersionedAsset::V4(Asset { - id: AssetId(asset.clone()), - fun: Fungibility::Fungible(amount), - })), - fee: Box::new(VersionedAsset::V4(Asset { - id: AssetId(asset), - fun: Fungibility::Fungible(fee), - })), - dest: Box::new(VersionedLocation::V4(destination)), - dest_weight_limit, + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(destination) + .ok_or_else(|| RevertReason::custom("Invalid destination").in_field("destination"))?; + + let call = pallet_xcm::Call::::transfer_assets { + dest: Box::new(VersionedLocation::V4(chain_part)), + beneficiary: Box::new(VersionedLocation::V4(beneficiary)), + assets: Box::new(VersionedAssets::V4( + Asset { + id: AssetId(asset.clone()), + fun: Fungibility::Fungible(amount), + } + .into(), + )), + fee_asset_item: 0, + weight_limit: dest_weight_limit, }; RuntimeHelper::::try_dispatch( @@ -273,7 +284,7 @@ where )] fn transfer_multi_currencies( handle: &mut impl PrecompileHandle, - currencies: BoundedVec>, + currencies: BoundedVec>, fee_item: u32, destination: Location, weight: u64, @@ -282,7 +293,7 @@ where // Build all currencies let currencies: Vec<_> = currencies.into(); - let currencies = currencies + let assets = currencies .into_iter() .enumerate() .map(|(index, currency)| { @@ -293,19 +304,23 @@ where .in_field("currencies") })?; - Ok(( - Runtime::account_to_currency_id(Runtime::AddressMapping::into_account_id( - address_as_h160, - )) - .ok_or( - RevertReason::custom("Cannot convert into currency id") - .in_array(index) - .in_field("currencies"), - )?, - amount, - )) + let currency_id = Runtime::account_to_currency_id( + Runtime::AddressMapping::into_account_id(address_as_h160), + ) + .ok_or( + RevertReason::custom("Cannot convert into currency id") + .in_array(index) + .in_field("currencies"), + )?; + + Self::currency_to_asset(currency_id, amount).ok_or( + RevertReason::custom("Cannot convert currency into xcm asset") + .in_array(index) + .in_field("currencies") + .into(), + ) }) - .collect::>()?; + .collect::>>()?; let dest_weight_limit = if weight == u64::MAX { WeightLimit::Unlimited @@ -313,11 +328,15 @@ where WeightLimit::Limited(Weight::from_parts(weight, DEFAULT_PROOF_SIZE)) }; - let call = orml_xtokens::Call::::transfer_multicurrencies { - currencies, - fee_item, - dest: Box::new(VersionedLocation::V4(destination)), - dest_weight_limit, + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(destination) + .ok_or_else(|| RevertReason::custom("Invalid destination").in_field("destination"))?; + + let call = pallet_xcm::Call::::transfer_assets { + dest: Box::new(VersionedLocation::V4(chain_part)), + beneficiary: Box::new(VersionedLocation::V4(beneficiary)), + assets: Box::new(VersionedAssets::V4(assets.into())), + fee_asset_item: fee_item, + weight_limit: dest_weight_limit, }; RuntimeHelper::::try_dispatch( @@ -338,7 +357,7 @@ where )] fn transfer_multi_assets( handle: &mut impl PrecompileHandle, - assets: BoundedVec>, + assets: BoundedVec>, fee_item: u32, destination: Location, weight: u64, @@ -372,11 +391,15 @@ where WeightLimit::Limited(Weight::from_parts(weight, DEFAULT_PROOF_SIZE)) }; - let call = orml_xtokens::Call::::transfer_multiassets { + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(destination) + .ok_or_else(|| RevertReason::custom("Invalid destination").in_field("destination"))?; + + let call = pallet_xcm::Call::::transfer_assets { + dest: Box::new(VersionedLocation::V4(chain_part)), + beneficiary: Box::new(VersionedLocation::V4(beneficiary)), assets: Box::new(VersionedAssets::V4(assets)), - fee_item, - dest: Box::new(VersionedLocation::V4(destination)), - dest_weight_limit, + fee_asset_item: fee_item, + weight_limit: dest_weight_limit, }; RuntimeHelper::::try_dispatch( @@ -388,6 +411,13 @@ where Ok(()) } + + fn currency_to_asset(currency_id: CurrencyIdOf, amount: u128) -> Option { + Some(Asset { + fun: Fungibility::Fungible(amount), + id: AssetId(>::convert(currency_id)?), + }) + } } // Currency diff --git a/precompiles/xtokens/src/mock.rs b/precompiles/xtokens/src/mock.rs index a2f39ff9fb..93cb545efe 100644 --- a/precompiles/xtokens/src/mock.rs +++ b/precompiles/xtokens/src/mock.rs @@ -16,11 +16,11 @@ //! Test utilities use super::*; +use cumulus_primitives_core::{relay_chain::HrmpChannelId, ParaId}; use frame_support::traits::{ ConstU32, EnsureOrigin, Everything, Nothing, OriginTrait, PalletInfo as PalletInfoTrait, }; use frame_support::{construct_runtime, parameter_types, weights::Weight}; -use orml_traits::{location::AbsoluteReserveProvider, parameter_type_with_key}; use pallet_evm::{EnsureAddressNever, EnsureAddressRoot}; use parity_scale_codec::{Decode, Encode}; use precompile_utils::{ @@ -37,7 +37,7 @@ use xcm::latest::{prelude::*, Error as XcmError}; use xcm_builder::{AllowUnpaidExecutionFrom, FixedWeightBounds, IsConcrete}; use xcm_executor::{ traits::{TransactAsset, WeightTrader}, - AssetsInHolding, XcmExecutor, + AssetsInHolding, }; pub type AccountId = MockAccount; @@ -48,13 +48,13 @@ type Block = frame_system::mocking::MockBlockU32; // Configure a mock runtime to test the pallet. construct_runtime!( - pub enum Runtime { + pub enum Runtime { System: frame_system, Balances: pallet_balances, Evm: pallet_evm, Timestamp: pallet_timestamp, - Xtokens: orml_xtokens, PolkadotXcm: pallet_xcm, + XcmTransactor: pallet_xcm_transactor, } ); @@ -286,13 +286,99 @@ impl pallet_xcm::Config for Runtime { type AdminOrigin = frame_system::EnsureRoot; } +#[derive(Encode, Decode)] +pub enum RelayCall { + #[codec(index = 5u8)] + // the index should match the position of the module in `construct_runtime!` + Utility(UtilityCall), + #[codec(index = 6u8)] + // the index should match the position of the module in `construct_runtime!` + Hrmp(HrmpCall), +} + +#[derive(Encode, Decode)] +pub enum UtilityCall { + #[codec(index = 1u8)] + AsDerivative(u16), +} + +// HRMP call encoding, needed for xcm transactor pallet +#[derive(Encode, Decode)] +pub enum HrmpCall { + #[codec(index = 0u8)] + InitOpenChannel(ParaId, u32, u32), + #[codec(index = 1u8)] + AcceptOpenChannel(ParaId), + #[codec(index = 2u8)] + CloseChannel(HrmpChannelId), + #[codec(index = 6u8)] + CancelOpenRequest(HrmpChannelId, u32), +} + +#[derive(Clone, Eq, Debug, PartialEq, Ord, PartialOrd, Encode, Decode, TypeInfo)] +pub enum MockTransactors { + Relay, +} + +impl xcm_primitives::XcmTransact for MockTransactors { + fn destination(self) -> Location { + match self { + MockTransactors::Relay => Location::parent(), + } + } +} + +impl xcm_primitives::UtilityEncodeCall for MockTransactors { + fn encode_call(self, call: xcm_primitives::UtilityAvailableCalls) -> Vec { + match self { + MockTransactors::Relay => match call { + xcm_primitives::UtilityAvailableCalls::AsDerivative(a, b) => { + let mut call = + RelayCall::Utility(UtilityCall::AsDerivative(a.clone())).encode(); + call.append(&mut b.clone()); + call + } + }, + } + } +} + +parameter_types! { + pub SelfLocationAbsolute: Location = Location { + parents: 1, + interior: [Parachain(ParachainId::get().into())].into(), + }; +} + +impl pallet_xcm_transactor::Config for Runtime { + type RuntimeEvent = RuntimeEvent; + type Balance = Balance; + type Transactor = MockTransactors; + type DerivativeAddressRegistrationOrigin = frame_system::EnsureRoot; + type SovereignAccountDispatcherOrigin = frame_system::EnsureRoot; + type CurrencyId = CurrencyId; + type AccountIdToLocation = AccountIdToLocation; + type CurrencyIdToLocation = CurrencyIdToMultiLocation; + type SelfLocation = SelfLocation; + type Weigher = xcm_builder::FixedWeightBounds; + type UniversalLocation = UniversalLocation; + type BaseXcmWeight = BaseXcmWeight; + type XcmSender = DoNothingRouter; + type AssetTransactor = DummyAssetTransactor; + type ReserveProvider = xcm_primitives::AbsoluteAndRelativeReserve; + type WeightInfo = (); + type HrmpManipulatorOrigin = frame_system::EnsureRoot; + type HrmpOpenOrigin = frame_system::EnsureRoot; + type MaxHrmpFee = (); +} + pub struct XcmConfig; impl xcm_executor::Config for XcmConfig { type RuntimeCall = RuntimeCall; type XcmSender = DoNothingRouter; type AssetTransactor = DummyAssetTransactor; type OriginConverter = pallet_xcm::XcmPassthrough; - type IsReserve = (); + type IsReserve = xcm_primitives::MultiNativeAsset; type IsTeleporter = (); type UniversalLocation = UniversalLocation; type Barrier = Barrier; @@ -394,31 +480,6 @@ parameter_types! { pub MaxInstructions: u32 = 100; } -parameter_type_with_key! { - pub ParachainMinFee: |_location: Location| -> Option { - Some(u128::MAX) - }; -} - -impl orml_xtokens::Config for Runtime { - type RuntimeEvent = RuntimeEvent; - type Balance = Balance; - type CurrencyId = CurrencyId; - type AccountIdToLocation = AccountIdToLocation; - type CurrencyIdConvert = CurrencyIdToMultiLocation; - type XcmExecutor = XcmExecutor; - type SelfLocation = SelfLocation; - type Weigher = xcm_builder::FixedWeightBounds; - type BaseXcmWeight = BaseXcmWeight; - type UniversalLocation = UniversalLocation; - type MaxAssetsForTransfer = MaxAssetsForTransfer; - type MinXcmFee = ParachainMinFee; - type LocationsFilter = Everything; - type ReserveProvider = AbsoluteReserveProvider; - type RateLimiter = (); - type RateLimiterId = (); -} - pub(crate) struct ExtBuilder { // endowed accounts with balances balances: Vec<(AccountId, Balance)>, diff --git a/precompiles/xtokens/src/tests.rs b/precompiles/xtokens/src/tests.rs index ce2dff8a85..ff06430d68 100644 --- a/precompiles/xtokens/src/tests.rs +++ b/precompiles/xtokens/src/tests.rs @@ -15,15 +15,15 @@ // along with Moonbeam. If not, see . use crate::mock::{ - events, AssetAccount, CurrencyId, CurrencyIdToMultiLocation, ExtBuilder, PCall, Precompiles, - PrecompilesValue, Runtime, SelfReserveAccount, + events, AssetAccount, ExtBuilder, PCall, Precompiles, PrecompilesValue, Runtime, + SelfReserveAccount, }; -use crate::{Currency, EvmAsset}; -use orml_xtokens::Event as XtokensEvent; +use crate::{Currency, EvmAsset, MAX_ASSETS}; +use pallet_xcm::Event as PolkadotXcmEvent; use precompile_utils::{prelude::*, testing::*}; use sp_core::U256; -use sp_runtime::traits::Convert; -use xcm::latest::{Asset, AssetId, Assets, Fungibility, Junction, Location}; +use sp_weights::Weight; +use xcm::latest::{Junction, Location}; fn precompiles() -> Precompiles { PrecompilesValue::get() @@ -94,21 +94,17 @@ fn transfer_self_reserve_works() { weight: 4_000_000, }, ) - .expect_cost(3000) + .expect_cost(100000000) .expect_no_logs() .execute_returns(()); - let expected_asset: Asset = Asset { - id: AssetId(CurrencyIdToMultiLocation::convert(CurrencyId::SelfReserve).unwrap()), - fun: Fungibility::Fungible(500), - }; - let expected: crate::mock::RuntimeEvent = XtokensEvent::TransferredAssets { - sender: Alice.into(), - assets: vec![expected_asset.clone()].into(), - fee: expected_asset, - dest: destination, + let expected: crate::mock::RuntimeEvent = PolkadotXcmEvent::Attempted { + outcome: xcm::latest::Outcome::Complete { + used: Weight::from_parts(3000, 3000), + }, } .into(); + // Assert that the events vector contains the one expected assert!(events().contains(&expected)); }); @@ -139,21 +135,14 @@ fn transfer_to_reserve_works() { weight: 4_000_000, }, ) - .expect_cost(4000) + .expect_cost(100000000) .expect_no_logs() .execute_returns(()); - let expected_asset: Asset = Asset { - id: AssetId( - CurrencyIdToMultiLocation::convert(CurrencyId::OtherReserve(0u128)).unwrap(), - ), - fun: Fungibility::Fungible(500), - }; - let expected: crate::mock::RuntimeEvent = XtokensEvent::TransferredAssets { - sender: Alice.into(), - assets: vec![expected_asset.clone()].into(), - fee: expected_asset, - dest: destination, + let expected: crate::mock::RuntimeEvent = PolkadotXcmEvent::Attempted { + outcome: xcm::latest::Outcome::Complete { + used: Weight::from_parts(2000, 2000), + }, } .into(); // Assert that the events vector contains the one expected @@ -186,23 +175,17 @@ fn transfer_to_reserve_with_unlimited_weight_works() { weight: u64::MAX, }, ) - .expect_cost(4000) + .expect_cost(100000000) .expect_no_logs() .execute_returns(()); - let expected_asset: Asset = Asset { - id: AssetId( - CurrencyIdToMultiLocation::convert(CurrencyId::OtherReserve(0u128)).unwrap(), - ), - fun: Fungibility::Fungible(500), - }; - let expected: crate::mock::RuntimeEvent = XtokensEvent::TransferredAssets { - sender: Alice.into(), - assets: vec![expected_asset.clone()].into(), - fee: expected_asset, - dest: destination, + let expected: crate::mock::RuntimeEvent = PolkadotXcmEvent::Attempted { + outcome: xcm::latest::Outcome::Complete { + used: Weight::from_parts(2000, 2000), + }, } .into(); + // Assert that the events vector contains the one expected assert!(events().contains(&expected)); }); @@ -230,32 +213,19 @@ fn transfer_to_reserve_with_fee_works() { PCall::transfer_with_fee { currency_address: Address(AssetAccount(0u128).into()), amount: 500.into(), - fee: 50.into(), + _fee: 50.into(), destination: destination.clone().into(), weight: 4_000_000, }, ) - .expect_cost(4000) + .expect_cost(100000000) .expect_no_logs() .execute_returns(()); - let expected_asset: Asset = Asset { - id: AssetId( - CurrencyIdToMultiLocation::convert(CurrencyId::OtherReserve(0u128)).unwrap(), - ), - fun: Fungibility::Fungible(500), - }; - let expected_fee: Asset = Asset { - id: AssetId( - CurrencyIdToMultiLocation::convert(CurrencyId::OtherReserve(0u128)).unwrap(), - ), - fun: Fungibility::Fungible(50), - }; - let expected: crate::mock::RuntimeEvent = XtokensEvent::TransferredAssets { - sender: Alice.into(), - assets: vec![expected_asset.clone(), expected_fee.clone()].into(), - fee: expected_fee, - dest: destination, + let expected: crate::mock::RuntimeEvent = PolkadotXcmEvent::Attempted { + outcome: xcm::latest::Outcome::Complete { + used: Weight::from_parts(2000, 2000), + }, } .into(); @@ -290,21 +260,14 @@ fn transfer_non_reserve_to_non_reserve_works() { weight: 4_000_000, }, ) - .expect_cost(4000) + .expect_cost(100000000) .expect_no_logs() .execute_returns(()); - let expected_asset: Asset = Asset { - id: AssetId( - CurrencyIdToMultiLocation::convert(CurrencyId::OtherReserve(1u128)).unwrap(), - ), - fun: Fungibility::Fungible(500), - }; - let expected: crate::mock::RuntimeEvent = XtokensEvent::TransferredAssets { - sender: Alice.into(), - assets: vec![expected_asset.clone()].into(), - fee: expected_asset, - dest: destination, + let expected: crate::mock::RuntimeEvent = PolkadotXcmEvent::Attempted { + outcome: xcm::latest::Outcome::Complete { + used: Weight::from_parts(3000, 3000), + }, } .into(); // Assert that the events vector contains the one expected @@ -334,32 +297,19 @@ fn transfer_non_reserve_to_non_reserve_with_fee_works() { PCall::transfer_with_fee { currency_address: Address(AssetAccount(1u128).into()), amount: 500.into(), - fee: 50.into(), + _fee: 50.into(), destination: destination.clone().into(), weight: 4_000_000, }, ) - .expect_cost(4000) + .expect_cost(100000000) .expect_no_logs() .execute_returns(()); - let expected_asset: Asset = Asset { - id: AssetId( - CurrencyIdToMultiLocation::convert(CurrencyId::OtherReserve(1u128)).unwrap(), - ), - fun: Fungibility::Fungible(500), - }; - let expected_fee: Asset = Asset { - id: AssetId( - CurrencyIdToMultiLocation::convert(CurrencyId::OtherReserve(1u128)).unwrap(), - ), - fun: Fungibility::Fungible(50), - }; - let expected: crate::mock::RuntimeEvent = XtokensEvent::TransferredAssets { - sender: Alice.into(), - assets: vec![expected_asset.clone(), expected_fee.clone()].into(), - fee: expected_fee, - dest: destination, + let expected: crate::mock::RuntimeEvent = PolkadotXcmEvent::Attempted { + outcome: xcm::latest::Outcome::Complete { + used: Weight::from_parts(3000, 3000), + }, } .into(); // Assert that the events vector contains the one expected @@ -394,19 +344,14 @@ fn transfer_multi_asset_to_reserve_works() { weight: 4_000_000, }, ) - .expect_cost(4000) + .expect_cost(100000000) .expect_no_logs() .execute_returns(()); - let expected_asset: Asset = Asset { - id: AssetId(asset), - fun: Fungibility::Fungible(500), - }; - let expected: crate::mock::RuntimeEvent = XtokensEvent::TransferredAssets { - sender: Alice.into(), - assets: vec![expected_asset.clone()].into(), - fee: expected_asset, - dest: destination, + let expected: crate::mock::RuntimeEvent = PolkadotXcmEvent::Attempted { + outcome: xcm::latest::Outcome::Complete { + used: Weight::from_parts(2000, 2000), + }, } .into(); @@ -442,19 +387,14 @@ fn transfer_multi_asset_self_reserve_works() { weight: 4_000_000, }, ) - .expect_cost(3000) + .expect_cost(100000000) .expect_no_logs() .execute_returns(()); - let expected_asset: Asset = Asset { - id: AssetId(self_reserve), - fun: Fungibility::Fungible(500), - }; - let expected: crate::mock::RuntimeEvent = XtokensEvent::TransferredAssets { - sender: Alice.into(), - assets: vec![expected_asset.clone()].into(), - fee: expected_asset, - dest: destination, + let expected: crate::mock::RuntimeEvent = PolkadotXcmEvent::Attempted { + outcome: xcm::latest::Outcome::Complete { + used: Weight::from_parts(3000, 3000), + }, } .into(); // Assert that the events vector contains the one expected @@ -485,28 +425,19 @@ fn transfer_multi_asset_self_reserve_with_fee_works() { PCall::transfer_multiasset_with_fee { asset: self_reserve.clone().into(), amount: 500.into(), - fee: 50.into(), + _fee: 50.into(), destination: destination.clone().into(), weight: 4_000_000, }, ) - .expect_cost(3000) + .expect_cost(100000000) .expect_no_logs() .execute_returns(()); - let expected_asset: Asset = Asset { - id: AssetId(self_reserve.clone()), - fun: Fungibility::Fungible(500), - }; - let expected_fee: Asset = Asset { - id: AssetId(self_reserve), - fun: Fungibility::Fungible(50), - }; - let expected: crate::mock::RuntimeEvent = XtokensEvent::TransferredAssets { - sender: Alice.into(), - assets: vec![expected_asset.clone(), expected_fee.clone()].into(), - fee: expected_fee, - dest: destination, + let expected: crate::mock::RuntimeEvent = PolkadotXcmEvent::Attempted { + outcome: xcm::latest::Outcome::Complete { + used: Weight::from_parts(3000, 3000), + }, } .into(); // Assert that the events vector contains the one expected @@ -542,19 +473,14 @@ fn transfer_multi_asset_non_reserve_to_non_reserve() { weight: 4_000_000, }, ) - .expect_cost(4000) + .expect_cost(100000000) .expect_no_logs() .execute_returns(()); - let expected_asset: Asset = Asset { - id: AssetId(asset_location), - fun: Fungibility::Fungible(500), - }; - let expected: crate::mock::RuntimeEvent = XtokensEvent::TransferredAssets { - sender: Alice.into(), - assets: vec![expected_asset.clone()].into(), - fee: expected_asset, - dest: destination, + let expected: crate::mock::RuntimeEvent = PolkadotXcmEvent::Attempted { + outcome: xcm::latest::Outcome::Complete { + used: Weight::from_parts(3000, 3000), + }, } .into(); // Assert that the events vector contains the one expected @@ -586,28 +512,19 @@ fn transfer_multi_asset_non_reserve_to_non_reserve_with_fee() { PCall::transfer_multiasset_with_fee { asset: asset_location.clone().into(), amount: 500.into(), - fee: 50.into(), + _fee: 50.into(), destination: destination.clone().into(), weight: 4_000_000, }, ) - .expect_cost(4000) + .expect_cost(100000000) .expect_no_logs() .execute_returns(()); - let expected_asset: Asset = Asset { - id: AssetId(asset_location.clone()), - fun: Fungibility::Fungible(500), - }; - let expected_fee: Asset = Asset { - id: AssetId(asset_location), - fun: Fungibility::Fungible(50), - }; - let expected: crate::mock::RuntimeEvent = XtokensEvent::TransferredAssets { - sender: Alice.into(), - assets: vec![expected_asset.clone(), expected_fee.clone()].into(), - fee: expected_fee, - dest: destination, + let expected: crate::mock::RuntimeEvent = PolkadotXcmEvent::Attempted { + outcome: xcm::latest::Outcome::Complete { + used: Weight::from_parts(3000, 3000), + }, } .into(); // Assert that the events vector contains the one expected @@ -645,27 +562,14 @@ fn transfer_multi_currencies() { weight: 4_000_000, }, ) - .expect_cost(4000) + .expect_cost(100000000) .expect_no_logs() .execute_returns(()); - let expected_asset_1: Asset = Asset { - id: AssetId( - CurrencyIdToMultiLocation::convert(CurrencyId::OtherReserve(1u128)).unwrap(), - ), - fun: Fungibility::Fungible(500), - }; - let expected_asset_2: Asset = Asset { - id: AssetId( - CurrencyIdToMultiLocation::convert(CurrencyId::OtherReserve(2u128)).unwrap(), - ), - fun: Fungibility::Fungible(500), - }; - let expected: crate::mock::RuntimeEvent = XtokensEvent::TransferredAssets { - sender: Alice.into(), - assets: vec![expected_asset_1.clone(), expected_asset_2].into(), - fee: expected_asset_1, - dest: destination, + let expected: crate::mock::RuntimeEvent = PolkadotXcmEvent::Attempted { + outcome: xcm::latest::Outcome::Complete { + used: Weight::from_parts(3000, 3000), + }, } .into(); // Assert that the events vector contains the one expected @@ -700,12 +604,6 @@ fn transfer_multi_assets() { (asset_2_location.clone(), U256::from(500)).into(), ]; - let multiassets = Assets::from_sorted_and_deduplicated(vec![ - (asset_1_location.clone(), 500).into(), - (asset_2_location, 500).into(), - ]) - .unwrap(); - // We are transferring 2 assets precompiles() .prepare_test( @@ -718,15 +616,14 @@ fn transfer_multi_assets() { weight: 4_000_000, }, ) - .expect_cost(4000) + .expect_cost(100000000) .expect_no_logs() .execute_returns(()); - let expected: crate::mock::RuntimeEvent = XtokensEvent::TransferredAssets { - sender: Alice.into(), - assets: multiassets, - fee: (asset_1_location, 500).into(), - dest: destination, + let expected: crate::mock::RuntimeEvent = PolkadotXcmEvent::Attempted { + outcome: xcm::latest::Outcome::Complete { + used: Weight::from_parts(2000, 2000), + }, } .into(); println!("Events are {:?}", events()); @@ -749,11 +646,10 @@ fn transfer_multi_currencies_cannot_insert_more_than_max() { id: [1u8; 32], }], ); - let currencies: Vec = vec![ - (Address(AssetAccount(1u128).into()), U256::from(500)).into(), - (Address(AssetAccount(2u128).into()), U256::from(500)).into(), - (Address(AssetAccount(3u128).into()), U256::from(500)).into(), - ]; + let mut currencies: Vec = Vec::new(); + for i in 0..MAX_ASSETS + 1 { + currencies.push((Address(AssetAccount(i as u128).into()), U256::from(500)).into()); + } // We are transferring 3 assets, when max is 2 precompiles() @@ -788,19 +684,14 @@ fn transfer_multi_assets_cannot_insert_more_than_max() { ], ); - let asset_1_location = - Location::new(1, [Junction::Parachain(2), Junction::GeneralIndex(0u128)]); - let asset_2_location = - Location::new(1, [Junction::Parachain(2), Junction::GeneralIndex(1u128)]); - - let asset_3_location = - Location::new(1, [Junction::Parachain(2), Junction::GeneralIndex(2u128)]); - - let assets: Vec = vec![ - (asset_1_location.clone(), U256::from(500)).into(), - (asset_2_location.clone(), U256::from(500)).into(), - (asset_3_location.clone(), U256::from(500)).into(), - ]; + let mut assets: Vec = Vec::new(); + for i in 0..MAX_ASSETS + 1 { + let asset_location = Location::new( + 1, + [Junction::Parachain(2), Junction::GeneralIndex(i as u128)], + ); + assets.push((asset_location, U256::from(500)).into()); + } // We are transferring 3 assets, when max is 2 precompiles() diff --git a/primitives/xcm/Cargo.toml b/primitives/xcm/Cargo.toml index c8e7338ba5..1fb2bbe4ae 100644 --- a/primitives/xcm/Cargo.toml +++ b/primitives/xcm/Cargo.toml @@ -33,7 +33,6 @@ sp-std = { workspace = true } cumulus-primitives-core = { workspace = true } # Polkadot / XCM -orml-traits = { workspace = true } polkadot-runtime-common = { workspace = true } xcm = { workspace = true } xcm-builder = { workspace = true } diff --git a/primitives/xcm/src/get_by_key.rs b/primitives/xcm/src/get_by_key.rs new file mode 100644 index 0000000000..0a9b248401 --- /dev/null +++ b/primitives/xcm/src/get_by_key.rs @@ -0,0 +1,73 @@ +// Copyright 2024 Moonbeam foundation +// This file is part of Moonbeam. + +// Moonbeam is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Moonbeam is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Moonbeam. If not, see . + +/// A trait for querying a value by a key. +pub trait GetByKey { + /// Return the value. + fn get(k: &Key) -> Value; +} + +/// Create new implementations of the `GetByKey` trait. +/// +/// The implementation is typically used like a map or set. +/// +/// Example: +/// ```ignore +/// use primitives::CurrencyId; +/// parameter_type_with_key! { +/// pub Rates: |currency_id: CurrencyId| -> u32 { +/// match currency_id { +/// CurrencyId::DOT => 1, +/// CurrencyId::KSM => 2, +/// _ => 3, +/// } +/// } +/// } +/// ``` +#[macro_export] +macro_rules! parameter_type_with_key { + ( + pub $name:ident: |$k:ident: $key:ty| -> $value:ty $body:block; + ) => { + pub struct $name; + impl $crate::get_by_key::GetByKey<$key, $value> for $name { + fn get($k: &$key) -> $value { + $body + } + } + }; +} + +#[cfg(test)] +mod tests { + use super::*; + + parameter_type_with_key! { + pub Test: |k: u32| -> u32 { + match k { + 1 => 1, + _ => 2, + } + }; + } + + #[test] + fn get_by_key_should_work() { + assert_eq!(Test::get(&1), 1); + assert_eq!(Test::get(&2), 2); + assert_eq!(Test::get(&3), 2); + } +} diff --git a/primitives/xcm/src/lib.rs b/primitives/xcm/src/lib.rs index bbde1a9563..92afcf37eb 100644 --- a/primitives/xcm/src/lib.rs +++ b/primitives/xcm/src/lib.rs @@ -24,14 +24,45 @@ pub use asset_id_conversions::*; mod constants; pub use constants::*; +pub mod get_by_key; +pub use get_by_key::*; + +mod ethereum_xcm; +pub use ethereum_xcm::*; + +mod filter_asset_max_fee; +pub use filter_asset_max_fee::*; + mod origin_conversion; pub use origin_conversion::*; mod transactor_traits; pub use transactor_traits::*; -mod ethereum_xcm; -pub use ethereum_xcm::*; +use xcm::latest::{Junction, Junctions, Location}; -mod filter_asset_max_fee; -pub use filter_asset_max_fee::*; +pub fn split_location_into_chain_part_and_beneficiary( + mut location: Location, +) -> Option<(Location, Location)> { + let mut beneficiary_junctions = Junctions::Here; + + // start popping junctions until we reach chain identifier + while let Some(j) = location.last() { + if matches!(j, Junction::Parachain(_) | Junction::GlobalConsensus(_)) { + // return chain subsection + return Some((location, beneficiary_junctions.into_location())); + } else { + let (location_prefix, maybe_last_junction) = location.split_last_interior(); + location = location_prefix; + if let Some(junction) = maybe_last_junction { + beneficiary_junctions.push(junction).ok()?; + } + } + } + + if location.parent_count() == 1 { + Some((Location::parent(), beneficiary_junctions.into_location())) + } else { + None + } +} diff --git a/primitives/xcm/src/origin_conversion.rs b/primitives/xcm/src/origin_conversion.rs index a215627486..04732f8194 100644 --- a/primitives/xcm/src/origin_conversion.rs +++ b/primitives/xcm/src/origin_conversion.rs @@ -15,10 +15,14 @@ // along with Moonbeam. If not, see . use frame_support::traits::{ContainsPair, Get, OriginTrait}; -use orml_traits::location::{RelativeReserveProvider, Reserve}; use sp_runtime::traits::TryConvert; use sp_std::{convert::TryInto, marker::PhantomData}; -use xcm::latest::{Asset, AssetId, Fungibility, Junction::AccountKey20, Location, NetworkId}; +use xcm::latest::{Asset, AssetId, Fungibility, Junction, Location, NetworkId}; + +pub trait Reserve { + /// Returns assets reserve location. + fn reserve(asset: &Asset) -> Option; +} /// Instructs how to convert a 20 byte accountId into a Location pub struct AccountIdToLocation(sp_std::marker::PhantomData); @@ -29,7 +33,7 @@ where fn convert(account: AccountId) -> Location { Location { parents: 0, - interior: [AccountKey20 { + interior: [Junction::AccountKey20 { network: None, key: account.into(), }] @@ -50,7 +54,7 @@ where { fn try_convert(o: Origin) -> Result { o.try_with_caller(|caller| match caller.try_into() { - Ok(frame_system::RawOrigin::Signed(who)) => Ok(AccountKey20 { + Ok(frame_system::RawOrigin::Signed(who)) => Ok(Junction::AccountKey20 { key: who.into(), network: Some(Network::get()), } @@ -61,6 +65,40 @@ where } } +/// A `ContainsPair` implementation. Filters multi native assets whose +/// reserve is same with `origin`. +pub struct MultiNativeAsset(PhantomData); +impl ContainsPair for MultiNativeAsset +where + ReserveProvider: Reserve, +{ + fn contains(asset: &Asset, origin: &Location) -> bool { + if let Some(ref reserve) = ReserveProvider::reserve(asset) { + if reserve == origin { + return true; + } + } + false + } +} + +// Provide reserve in relative path view +// Self tokens are represeneted as Here +pub struct RelativeReserveProvider; + +impl Reserve for RelativeReserveProvider { + fn reserve(asset: &Asset) -> Option { + let AssetId(location) = &asset.id; + if location.parents == 0 + && !matches!(location.first_interior(), Some(Junction::Parachain(_))) + { + Some(Location::here()) + } else { + Some(location.chain_location()) + } + } +} + /// This struct offers uses RelativeReserveProvider to output relative views of multilocations /// However, additionally accepts a Location that aims at representing the chain part /// (parent: 1, Parachain(paraId)) of the absolute representation of our chain. diff --git a/runtime/moonbase/Cargo.toml b/runtime/moonbase/Cargo.toml index 160d5387f0..8d334d43ad 100644 --- a/runtime/moonbase/Cargo.toml +++ b/runtime/moonbase/Cargo.toml @@ -143,9 +143,6 @@ precompile-utils = { workspace = true } # Polkadot / XCM -orml-traits = { workspace = true } -orml-xcm-support = { workspace = true } -orml-xtokens = { workspace = true } pallet-xcm = { workspace = true } pallet-xcm-benchmarks = { workspace = true, optional = true } pallet-message-queue = { workspace = true } @@ -234,7 +231,6 @@ std = [ "moonbeam-runtime-common/std", "moonkit-xcm-primitives/std", "nimbus-primitives/std", - "orml-xtokens/std", "pallet-asset-manager/std", "pallet-assets/std", "pallet-async-backing/std", @@ -443,7 +439,6 @@ try-runtime = [ "pallet-crowdloan-rewards/try-runtime", "pallet-proxy/try-runtime", "pallet-identity/try-runtime", - "orml-xtokens/try-runtime", "pallet-assets/try-runtime", "pallet-xcm-transactor/try-runtime", "pallet-proxy-genesis-companion/try-runtime", diff --git a/runtime/moonbase/src/lib.rs b/runtime/moonbase/src/lib.rs index 0d51e602f2..b7677f7159 100644 --- a/runtime/moonbase/src/lib.rs +++ b/runtime/moonbase/src/lib.rs @@ -1182,7 +1182,6 @@ impl Contains for MaintenanceFilter { RuntimeCall::Ethereum(_) => false, RuntimeCall::EVM(_) => false, RuntimeCall::Identity(_) => false, - RuntimeCall::XTokens(_) => false, RuntimeCall::ParachainStaking(_) => false, RuntimeCall::MoonbeamOrbiters(_) => false, RuntimeCall::PolkadotXcm(_) => false, @@ -1426,7 +1425,7 @@ construct_runtime! { // Previously 27: DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event}, PolkadotXcm: pallet_xcm::{Pallet, Call, Storage, Event, Origin, Config} = 28, Assets: pallet_assets::{Pallet, Call, Storage, Event} = 29, - XTokens: orml_xtokens::{Pallet, Call, Storage, Event} = 30, + // Previously 30: XTokens AssetManager: pallet_asset_manager::{Pallet, Call, Storage, Event} = 31, Migrations: pallet_migrations::{Pallet, Storage, Config, Event} = 32, XcmTransactor: pallet_xcm_transactor::{Pallet, Call, Config, Storage, Event} = 33, @@ -1698,7 +1697,6 @@ mod tests { assert!( std::mem::size_of::>() <= CALL_ALIGN as usize ); - assert!(std::mem::size_of::>() <= CALL_ALIGN as usize); assert!(std::mem::size_of::>() <= CALL_ALIGN as usize); assert!(std::mem::size_of::>() <= CALL_ALIGN as usize); assert!( diff --git a/runtime/moonbase/src/xcm_config.rs b/runtime/moonbase/src/xcm_config.rs index cdb3aeba09..b121b191ca 100644 --- a/runtime/moonbase/src/xcm_config.rs +++ b/runtime/moonbase/src/xcm_config.rs @@ -58,11 +58,10 @@ use xcm::latest::prelude::{ use xcm_executor::traits::{CallDispatcher, ConvertLocation, JustTry}; use cumulus_primitives_core::{AggregateMessageOrigin, ParaId}; -use orml_xcm_support::MultiNativeAsset; use xcm_primitives::{ AbsoluteAndRelativeReserve, AccountIdToCurrencyId, AccountIdToLocation, AsAssetType, - IsBridgedConcreteAssetFrom, SignedToAccountId20, UtilityAvailableCalls, UtilityEncodeCall, - XcmTransact, + IsBridgedConcreteAssetFrom, MultiNativeAsset, SignedToAccountId20, UtilityAvailableCalls, + UtilityEncodeCall, XcmTransact, }; use parity_scale_codec::{Decode, Encode}; @@ -74,8 +73,6 @@ use sp_std::{ prelude::*, }; -use orml_traits::parameter_type_with_key; - use crate::governance::referenda::{FastGeneralAdminOrRoot, GeneralAdminOrRoot}; parameter_types! { @@ -582,38 +579,6 @@ parameter_types! { } -parameter_type_with_key! { - pub ParachainMinFee: |location: Location| -> Option { - match (location.parents, location.first_interior()) { - // AssetHub fee - (1, Some(Parachain(1001u32))) => Some(50_000_000u128), - _ => None, - } - }; -} - -impl orml_xtokens::Config for Runtime { - type RuntimeEvent = RuntimeEvent; - type Balance = Balance; - type CurrencyId = CurrencyId; - type AccountIdToLocation = AccountIdToLocation; - type CurrencyIdConvert = CurrencyIdToLocation<( - EvmForeignAssets, - AsAssetType, - )>; - type XcmExecutor = XcmExecutor; - type SelfLocation = SelfLocation; - type Weigher = XcmWeigher; - type BaseXcmWeight = BaseXcmWeight; - type UniversalLocation = UniversalLocation; - type MaxAssetsForTransfer = MaxAssetsForTransfer; - type MinXcmFee = ParachainMinFee; - type LocationsFilter = Everything; - type ReserveProvider = AbsoluteAndRelativeReserve; - type RateLimiter = (); - type RateLimiterId = (); -} - // 1 WND/ROC should be enough parameter_types! { pub MaxHrmpRelayFee: Asset = (Location::parent(), 1_000_000_000_000u128).into(); diff --git a/runtime/moonbase/tests/integration_test.rs b/runtime/moonbase/tests/integration_test.rs index 4cdd5cd806..b9018dcb23 100644 --- a/runtime/moonbase/tests/integration_test.rs +++ b/runtime/moonbase/tests/integration_test.rs @@ -57,7 +57,6 @@ use moonbase_runtime::{ TransactionPayment, TransactionPaymentAsGasPrice, TreasuryCouncilCollective, - XTokens, XcmTransactor, FOREIGN_ASSET_PRECOMPILE_ADDRESS_PREFIX, WEEKS, @@ -87,7 +86,7 @@ use sp_core::{crypto::UncheckedFrom, ByteArray, Pair, H160, H256, U256}; use sp_runtime::{bounded_vec, DispatchError, ModuleError}; use std::cell::Cell; use std::rc::Rc; -use xcm::latest::prelude::*; +use xcm::{latest::prelude::*, VersionedAssets, VersionedLocation}; type AuthorMappingPCall = pallet_evm_precompile_author_mapping::AuthorMappingPrecompileCall; @@ -160,7 +159,6 @@ fn verify_pallet_prefixes() { is_pallet_prefix::("CumulusXcm"); is_pallet_prefix::("PolkadotXcm"); is_pallet_prefix::("Assets"); - is_pallet_prefix::("XTokens"); is_pallet_prefix::("AssetManager"); is_pallet_prefix::("Migrations"); is_pallet_prefix::("XcmTransactor"); @@ -441,7 +439,7 @@ fn verify_pallet_indices() { is_pallet_index::(26); is_pallet_index::(28); is_pallet_index::(29); - is_pallet_index::(30); + // is_pallet_index::(30); Removed is_pallet_index::(31); is_pallet_index::(32); is_pallet_index::(33); @@ -1566,7 +1564,7 @@ fn xtokens_precompiles_transfer() { weight: 4_000_000, }, ) - .expect_cost(348298) + .expect_cost(174530) .expect_no_logs() // We expect an evm subcall ERC20.burnFrom .with_subcall_handle(move |subcall| { @@ -1657,7 +1655,7 @@ fn xtokens_precompiles_transfer_multiasset() { weight: 4_000_000, }, ) - .expect_cost(348298) + .expect_cost(174530) .expect_no_logs() // We expect an evm subcall ERC20.burnFrom .with_subcall_handle(move |subcall| { @@ -1741,7 +1739,7 @@ fn xtokens_precompiles_transfer_native() { weight: 4_000_000, }, ) - .expect_cost(16208) + .expect_cost(22930) .expect_no_logs() .execute_returns(()); }) @@ -2076,26 +2074,36 @@ fn root_can_change_default_xcm_vers() { }]) .build() .execute_with(|| { - let dest = Location { - parents: 1, - interior: [AccountId32 { - network: None, - id: [1u8; 32], - }] - .into(), - }; let source_id: moonbase_runtime::AssetId = 1; + let currency_id = moonbase_runtime::xcm_config::CurrencyId::ForeignAsset(source_id); + let asset = Asset { + id: AssetId( + ::CurrencyIdToLocation::convert( + currency_id, + ) + .unwrap(), + ), + fun: Fungibility::Fungible(100_000_000_000_000), + }; // Default XCM version is not set yet, so xtokens should fail because it does not // know with which version to send assert_noop!( - XTokens::transfer( + PolkadotXcm::transfer_assets( origin_of(AccountId::from(ALICE)), - moonbase_runtime::xcm_config::CurrencyId::ForeignAsset(source_id), - 100_000_000_000_000, - Box::new(xcm::VersionedLocation::V4(dest.clone())), + Box::new(VersionedLocation::V4(Location::parent())), + Box::new(VersionedLocation::V4(Location { + parents: 0, + interior: [AccountId32 { + network: None, + id: [1u8; 32], + }] + .into(), + })), + Box::new(VersionedAssets::V4(asset.clone().into())), + 0, WeightLimit::Unlimited ), - orml_xtokens::Error::::XcmExecutionFailed + pallet_xcm::Error::::SendFailure ); // Root sets the defaultXcm @@ -2105,11 +2113,19 @@ fn root_can_change_default_xcm_vers() { )); // Now transferring does not fail - assert_ok!(XTokens::transfer( + assert_ok!(PolkadotXcm::transfer_assets( origin_of(AccountId::from(ALICE)), - moonbase_runtime::xcm_config::CurrencyId::ForeignAsset(source_id), - 100_000_000_000_000, - Box::new(xcm::VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(Location::parent())), + Box::new(VersionedLocation::V4(Location { + parents: 0, + interior: [AccountId32 { + network: None, + id: [1u8; 32], + }] + .into(), + })), + Box::new(VersionedAssets::V4(asset.into())), + 0, WeightLimit::Unlimited )); }) diff --git a/runtime/moonbase/tests/xcm_mock/mod.rs b/runtime/moonbase/tests/xcm_mock/mod.rs index 4a9e567d99..36822a3023 100644 --- a/runtime/moonbase/tests/xcm_mock/mod.rs +++ b/runtime/moonbase/tests/xcm_mock/mod.rs @@ -266,7 +266,6 @@ pub type Assets = pallet_assets::Pallet; pub type AssetManager = pallet_asset_manager::Pallet; -pub type XTokens = orml_xtokens::Pallet; pub type RelayBalances = pallet_balances::Pallet; pub type ParaBalances = pallet_balances::Pallet; pub type XcmTransactor = pallet_xcm_transactor::Pallet; diff --git a/runtime/moonbase/tests/xcm_mock/parachain.rs b/runtime/moonbase/tests/xcm_mock/parachain.rs index 126acf659c..8989475cb5 100644 --- a/runtime/moonbase/tests/xcm_mock/parachain.rs +++ b/runtime/moonbase/tests/xcm_mock/parachain.rs @@ -39,7 +39,6 @@ use sp_std::{convert::TryFrom, prelude::*}; use xcm::{latest::prelude::*, Version as XcmVersion, VersionedXcm}; use cumulus_primitives_core::relay_chain::HrmpChannelId; -use orml_traits::parameter_type_with_key; use pallet_ethereum::PostLogContent; use polkadot_core_primitives::BlockNumber as RelayBlockNumber; use polkadot_parachain::primitives::{Id as ParaId, Sibling}; @@ -341,7 +340,7 @@ type Reserves = ( // Relaychain (DOT) from Asset Hub Case, // Assets which the reserve is the same as the origin. - orml_xcm_support::MultiNativeAsset< + xcm_primitives::MultiNativeAsset< xcm_primitives::AbsoluteAndRelativeReserve, >, ); @@ -427,36 +426,6 @@ parameter_types! { }; } -parameter_type_with_key! { - pub ParachainMinFee: |location: Location| -> Option { - match (location.parents, location.first_interior()) { - (1, Some(Parachain(1000u32))) => Some(50u128), - _ => None, - } - }; -} - -// The XCM message wrapper wrapper -impl orml_xtokens::Config for Runtime { - type RuntimeEvent = RuntimeEvent; - type Balance = Balance; - type CurrencyId = CurrencyId; - type AccountIdToLocation = xcm_primitives::AccountIdToLocation; - type CurrencyIdConvert = - CurrencyIdToLocation>; - type XcmExecutor = XcmExecutor; - type SelfLocation = SelfLocation; - type Weigher = xcm_builder::FixedWeightBounds; - type BaseXcmWeight = BaseXcmWeight; - type UniversalLocation = UniversalLocation; - type MaxAssetsForTransfer = MaxAssetsForTransfer; - type MinXcmFee = ParachainMinFee; - type LocationsFilter = Everything; - type ReserveProvider = xcm_primitives::AbsoluteAndRelativeReserve; - type RateLimiter = (); - type RateLimiterId = (); -} - parameter_types! { pub const ProposalBond: Permill = Permill::from_percent(5); pub const ProposalBondMinimum: Balance = 0; @@ -1092,7 +1061,6 @@ construct_runtime!( PolkadotXcm: pallet_xcm, Assets: pallet_assets, CumulusXcm: cumulus_pallet_xcm, - XTokens: orml_xtokens, AssetManager: pallet_asset_manager, XcmTransactor: pallet_xcm_transactor, XcmWeightTrader: pallet_xcm_weight_trader, diff --git a/runtime/moonbase/tests/xcm_mock/statemint_like.rs b/runtime/moonbase/tests/xcm_mock/statemint_like.rs index 7e096eb03f..53f39b2a77 100644 --- a/runtime/moonbase/tests/xcm_mock/statemint_like.rs +++ b/runtime/moonbase/tests/xcm_mock/statemint_like.rs @@ -321,8 +321,7 @@ impl Config for XcmConfig { type XcmSender = XcmRouter; type AssetTransactor = AssetTransactors; type OriginConverter = XcmOriginToTransactDispatchOrigin; - type IsReserve = - orml_xcm_support::MultiNativeAsset; + type IsReserve = xcm_primitives::MultiNativeAsset; type IsTeleporter = TrustedTeleporters; type UniversalLocation = UniversalLocation; type Barrier = Barrier; diff --git a/runtime/moonbase/tests/xcm_tests.rs b/runtime/moonbase/tests/xcm_tests.rs index e9234554ff..a7f38123be 100644 --- a/runtime/moonbase/tests/xcm_tests.rs +++ b/runtime/moonbase/tests/xcm_tests.rs @@ -27,21 +27,27 @@ use frame_support::{ use pallet_xcm_transactor::{ Currency, CurrencyPayment, HrmpInitParams, HrmpOperation, TransactWeights, }; -use sp_runtime::traits::MaybeEquivalence; +use sp_runtime::traits::{Convert, MaybeEquivalence}; use sp_std::boxed::Box; -use xcm::latest::prelude::{ - AccountId32, AccountKey20, All, Asset as XcmAsset, AssetId as XcmAssetId, Assets as XcmAssets, - BuyExecution, ClearOrigin, DepositAsset, Fungible, GeneralIndex, Junction, Junctions, Limited, - Location, OriginKind, PalletInstance, Parachain, QueryResponse, Reanchorable, Response, - WeightLimit, WithdrawAsset, Xcm, +use xcm::{ + latest::prelude::{ + AccountId32, AccountKey20, All, Asset, AssetId, Assets as XcmAssets, BuyExecution, + ClearOrigin, DepositAsset, Fungibility, GeneralIndex, Junction, Junctions, Limited, + Location, OriginKind, PalletInstance, Parachain, QueryResponse, Reanchorable, Response, + WeightLimit, WithdrawAsset, Xcm, + }, + VersionedAssets, }; use xcm::{IntoVersion, VersionedLocation, WrapVersion}; use xcm_executor::traits::ConvertLocation; use xcm_mock::*; -use xcm_primitives::{UtilityEncodeCall, DEFAULT_PROOF_SIZE}; +use xcm_primitives::{ + split_location_into_chain_part_and_beneficiary, UtilityEncodeCall, DEFAULT_PROOF_SIZE, +}; use xcm_simulator::TestExt; mod common; use cumulus_primitives_core::relay_chain::HrmpChannelId; +use parachain::PolkadotXcm; fn add_supported_asset(asset_type: parachain::AssetType, units_per_second: u128) -> Result<(), ()> { let parachain::AssetType::Xcm(location_v3) = asset_type; @@ -76,6 +82,18 @@ fn add_supported_asset(asset_type: parachain::AssetType, units_per_second: u128) Ok(()) } +fn currency_to_asset(currency_id: parachain::CurrencyId, amount: u128) -> Asset { + Asset { + id: AssetId( + ::CurrencyIdToLocation::convert( + currency_id, + ) + .unwrap(), + ), + fun: Fungibility::Fungible(amount), + } +} + // Send a relay asset (like DOT) to a parachain A #[test] fn receive_relay_asset_from_relay() { @@ -162,7 +180,7 @@ fn send_relay_asset_to_relay() { assert_ok!(RelayChainPalletXcm::limited_reserve_transfer_assets( relay_chain::RuntimeOrigin::signed(RELAYALICE), Box::new(Parachain(1).into()), - Box::new(VersionedLocation::V4(dest).clone().into()), + Box::new(VersionedLocation::V4(dest.clone()).into()), Box::new(([], 123).into()), 0, WeightLimit::Unlimited @@ -189,14 +207,17 @@ fn send_relay_asset_to_relay() { }] .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); ParaA::execute_with(|| { + let asset = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_id), 123); // free execution, full amount received - assert_ok!(XTokens::transfer( + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::ForeignAsset(source_id), - 123, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(asset.into())), + 0, WeightLimit::Limited(Weight::from_parts(40000u64, DEFAULT_PROOF_SIZE)) )); }); @@ -284,13 +305,16 @@ fn send_relay_asset_to_para_b() { ] .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); ParaA::execute_with(|| { - assert_ok!(XTokens::transfer( + let asset = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_id), 100); + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::ForeignAsset(source_id), - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(40000u64, DEFAULT_PROOF_SIZE)) )); }); @@ -348,13 +372,17 @@ fn send_para_a_asset_to_para_b() { .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); + ParaA::execute_with(|| { + let asset = currency_to_asset(parachain::CurrencyId::SelfReserve, 100); // Free execution, full amount received - assert_ok!(XTokens::transfer( + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::SelfReserve, - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(800000u64, DEFAULT_PROOF_SIZE)) )); }); @@ -426,13 +454,17 @@ fn send_para_a_asset_from_para_b_to_para_c() { ] .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); + ParaA::execute_with(|| { + let asset = currency_to_asset(parachain::CurrencyId::SelfReserve, 100); // free execution, full amount received - assert_ok!(XTokens::transfer( + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::SelfReserve, - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(80u64, DEFAULT_PROOF_SIZE)) )); }); @@ -462,17 +494,21 @@ fn send_para_a_asset_from_para_b_to_para_c() { ] .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); ParaB::execute_with(|| { - assert_ok!(XTokens::transfer( + let asset = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_id), 100); + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::ForeignAsset(source_id), - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(80u64, DEFAULT_PROOF_SIZE)) )); }); + // The message passed through parachainA so we needed to pay since its the native token // The message passed through parachainA so we needed to pay since its the native token ParaC::execute_with(|| { assert_eq!(Assets::balance(source_id, &PARAALICE.into()), 96); @@ -520,12 +556,16 @@ fn send_para_a_asset_to_para_b_and_back_to_para_a() { ] .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); + ParaA::execute_with(|| { - assert_ok!(XTokens::transfer( + let asset = currency_to_asset(parachain::CurrencyId::SelfReserve, 100); + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::SelfReserve, - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(80u64, DEFAULT_PROOF_SIZE)) )); }); @@ -555,12 +595,16 @@ fn send_para_a_asset_to_para_b_and_back_to_para_a() { ] .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); + ParaB::execute_with(|| { - assert_ok!(XTokens::transfer( + let asset = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_id), 100); + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::ForeignAsset(source_id), - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(80u64, DEFAULT_PROOF_SIZE)) )); }); @@ -612,12 +656,16 @@ fn send_para_a_asset_to_para_b_and_back_to_para_a_with_new_reanchoring() { ] .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); + ParaA::execute_with(|| { - assert_ok!(XTokens::transfer( + let asset = currency_to_asset(parachain::CurrencyId::SelfReserve, 100); + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::SelfReserve, - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(80u64, DEFAULT_PROOF_SIZE)) )); }); @@ -777,15 +825,18 @@ fn send_para_a_asset_to_para_b_with_trader() { ] .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); // In destination chain, we only need 4 weight // We put 10 weight, 6 of which should be refunded and 4 of which should go to treasury ParaA::execute_with(|| { - assert_ok!(XTokens::transfer( + let asset = currency_to_asset(parachain::CurrencyId::SelfReserve, 100); + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::SelfReserve, - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(10u64, DEFAULT_PROOF_SIZE)) )); }); @@ -850,15 +901,17 @@ fn send_para_a_asset_to_para_b_with_trader_and_fee() { ] .into(), }; - + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); // we use transfer_with_fee ParaA::execute_with(|| { - assert_ok!(XTokens::transfer_with_fee( + let asset = currency_to_asset(parachain::CurrencyId::SelfReserve, 100); + let asset_fee = currency_to_asset(parachain::CurrencyId::SelfReserve, 1); + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::SelfReserve, - 100, - 1, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset_fee, asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(800000u64, DEFAULT_PROOF_SIZE)) )); }); @@ -1018,14 +1071,17 @@ fn transact_through_derivative_multilocation() { }] .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); ParaA::execute_with(|| { + let asset = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_id), 100); // free execution, full amount received - assert_ok!(XTokens::transfer( + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::ForeignAsset(source_id), - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(40000u64, DEFAULT_PROOF_SIZE)) )); }); @@ -1167,14 +1223,17 @@ fn transact_through_derivative_with_custom_fee_weight() { }] .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); ParaA::execute_with(|| { + let asset = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_id), 100); // free execution, full amount received - assert_ok!(XTokens::transfer( + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::ForeignAsset(source_id), - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(40000u64, DEFAULT_PROOF_SIZE)) )); }); @@ -1318,14 +1377,17 @@ fn transact_through_derivative_with_custom_fee_weight_refund() { }] .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); ParaA::execute_with(|| { + let asset = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_id), 100); // free execution, full amount received - assert_ok!(XTokens::transfer( + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::ForeignAsset(source_id), - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(40000u64, DEFAULT_PROOF_SIZE)) )); }); @@ -1480,14 +1542,17 @@ fn transact_through_sovereign() { }] .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); ParaA::execute_with(|| { + let asset = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_id), 100); // free execution, full amount received - assert_ok!(XTokens::transfer( + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::ForeignAsset(source_id), - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(40000u64, DEFAULT_PROOF_SIZE)) )); }); @@ -1732,14 +1797,17 @@ fn transact_through_sovereign_with_custom_fee_weight() { }] .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); ParaA::execute_with(|| { + let asset = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_id), 100); // free execution, full amount received - assert_ok!(XTokens::transfer( + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::ForeignAsset(source_id), - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(40000u64, DEFAULT_PROOF_SIZE)) )); }); @@ -1881,14 +1949,17 @@ fn transact_through_sovereign_with_custom_fee_weight_refund() { }] .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); ParaA::execute_with(|| { + let asset = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_id), 100); // free execution, full amount received - assert_ok!(XTokens::transfer( + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::ForeignAsset(source_id), - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(40000u64, DEFAULT_PROOF_SIZE)) )); }); @@ -2185,13 +2256,16 @@ fn test_automatic_versioning_on_runtime_upgrade_with_para_b() { .into(), } .into(); + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); ParaA::execute_with(|| { + let asset = currency_to_asset(parachain::CurrencyId::SelfReserve, 100); // free execution, full amount received - assert_ok!(XTokens::transfer( + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::SelfReserve, - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(80u64, DEFAULT_PROOF_SIZE)) )); // free execution, full amount received @@ -2802,19 +2876,23 @@ fn send_statemint_asset_from_para_a_to_statemint_with_relay_fee() { assert_eq!(StatemintAssets::account_balances(RELAYBOB), vec![]); }); + let (chain_part, beneficiary) = + split_location_into_chain_part_and_beneficiary(statemint_beneficiary).unwrap(); + // Transfer USDC from Parachain A to Statemint using Relay asset as fee ParaA::execute_with(|| { - assert_ok!(XTokens::transfer_multicurrencies( + let asset = currency_to_asset( + parachain::CurrencyId::ForeignAsset(source_statemint_asset_id), + 100, + ); + let asset_fee = + currency_to_asset(parachain::CurrencyId::ForeignAsset(source_relay_id), 100); + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - vec![ - ( - parachain::CurrencyId::ForeignAsset(source_statemint_asset_id), - 100 - ), - (parachain::CurrencyId::ForeignAsset(source_relay_id), 100) - ], - 1, - Box::new(VersionedLocation::V4(statemint_beneficiary)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset_fee, asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(80_000_000u64, 100_000u64)) )); }); @@ -2941,14 +3019,17 @@ fn send_dot_from_moonbeam_to_statemint_via_xtokens_transfer() { }, ], ); + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); // Finally we test that we are able to send back the DOTs to AssetHub from the ParaA ParaA::execute_with(|| { - assert_ok!(XTokens::transfer( + let asset = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_relay_id), 100); + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::ForeignAsset(source_relay_id), - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(40000u64, DEFAULT_PROOF_SIZE)) )); @@ -3094,15 +3175,18 @@ fn send_dot_from_moonbeam_to_statemint_via_xtokens_transfer_with_fee() { }, ], ); + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); // Finally we test that we are able to send back the DOTs to AssetHub from the ParaA ParaA::execute_with(|| { - assert_ok!(XTokens::transfer_with_fee( + let asset = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_relay_id), 100); + let asset_fee = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_relay_id), 10); + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::ForeignAsset(source_relay_id), - 100, - 10, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset_fee, asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(40000u64, DEFAULT_PROOF_SIZE)) )); @@ -3252,12 +3336,19 @@ fn send_dot_from_moonbeam_to_statemint_via_xtokens_transfer_multiasset() { ], ); + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); + let asset = Asset { + id: AssetId(Location::parent()), + fun: Fungibility::Fungible(100), + }; // Finally we test that we are able to send back the DOTs to AssetHub from the ParaA ParaA::execute_with(|| { - assert_ok!(XTokens::transfer_multiasset( + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - Box::new((Location::parent(), 100).into()), - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(asset.into())), + 0, WeightLimit::Limited(Weight::from_parts(40000u64, DEFAULT_PROOF_SIZE)) )); @@ -3482,19 +3573,21 @@ fn send_dot_from_moonbeam_to_statemint_via_xtokens_transfer_multicurrencies() { ], ); + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); // Finally we test that we are able to send back the DOTs to AssetHub from the ParaA ParaA::execute_with(|| { - assert_ok!(XTokens::transfer_multicurrencies( + let asset = currency_to_asset( + parachain::CurrencyId::ForeignAsset(source_statemint_asset_id), + 100, + ); + let asset_fee = + currency_to_asset(parachain::CurrencyId::ForeignAsset(source_relay_id), 100); + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - vec![ - ( - parachain::CurrencyId::ForeignAsset(source_statemint_asset_id), - 100 - ), - (parachain::CurrencyId::ForeignAsset(source_relay_id), 100) - ], - 1, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset_fee, asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(80_000_000u64, 100_000u64)) )); @@ -3503,10 +3596,9 @@ fn send_dot_from_moonbeam_to_statemint_via_xtokens_transfer_multicurrencies() { Statemint::execute_with(|| { // Check that Bob received relay tokens back in AssetHub - // (100 - MinXcmFee) assert_eq!( StatemintBalances::free_balance(RELAYBOB), - INITIAL_BALANCE + 50 + INITIAL_BALANCE + 100 ); // Check that BOB received 100 USDC on AssetHub @@ -3728,16 +3820,17 @@ fn send_dot_from_moonbeam_to_statemint_via_xtokens_transfer_multiassets() { ], ); - let statemint_asset_to_send = XcmAsset { - id: XcmAssetId(statemint_asset), - fun: Fungible(100), + let statemint_asset_to_send = Asset { + id: AssetId(statemint_asset), + fun: Fungibility::Fungible(100), }; - let relay_asset_to_send = XcmAsset { - id: XcmAssetId(Location::parent()), - fun: Fungible(100), + let relay_asset_to_send = Asset { + id: AssetId(Location::parent()), + fun: Fungibility::Fungible(100), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); let assets_to_send: XcmAssets = XcmAssets::from(vec![statemint_asset_to_send, relay_asset_to_send.clone()]); @@ -3747,11 +3840,12 @@ fn send_dot_from_moonbeam_to_statemint_via_xtokens_transfer_multiassets() { // Finally we test that we are able to send back the DOTs to AssetHub from the ParaA ParaA::execute_with(|| { - assert_ok!(XTokens::transfer_multiassets( + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - Box::new(assets_to_send.into()), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(assets_to_send)), 0, - Box::new(VersionedLocation::V4(dest)), WeightLimit::Limited(Weight::from_parts(80_000_000u64, 100_000u64)) )); @@ -3760,10 +3854,9 @@ fn send_dot_from_moonbeam_to_statemint_via_xtokens_transfer_multiassets() { Statemint::execute_with(|| { // Check that Bob received relay tokens back in AssetHub - // (100 - MinXcmFee) assert_eq!( StatemintBalances::free_balance(RELAYBOB), - INITIAL_BALANCE + 50 + INITIAL_BALANCE + 100 ); // Check that BOB received 100 USDC on AssetHub diff --git a/runtime/moonbeam/Cargo.toml b/runtime/moonbeam/Cargo.toml index 5c3bba2ebe..1f87feabe2 100644 --- a/runtime/moonbeam/Cargo.toml +++ b/runtime/moonbeam/Cargo.toml @@ -139,9 +139,6 @@ pallet-evm-precompile-simple = { workspace = true } precompile-utils = { workspace = true } # Polkadot / XCM -orml-traits = { workspace = true } -orml-xcm-support = { workspace = true } -orml-xtokens = { workspace = true } pallet-xcm = { workspace = true } pallet-xcm-benchmarks = { workspace = true, optional = true } pallet-message-queue = { workspace = true } @@ -230,7 +227,6 @@ std = [ "moonbeam-xcm-benchmarks/std", "moonkit-xcm-primitives/std", "nimbus-primitives/std", - "orml-xtokens/std", "pallet-asset-manager/std", "pallet-assets/std", "pallet-async-backing/std", @@ -432,7 +428,6 @@ try-runtime = [ "pallet-crowdloan-rewards/try-runtime", "pallet-proxy/try-runtime", "pallet-identity/try-runtime", - "orml-xtokens/try-runtime", "pallet-assets/try-runtime", "pallet-xcm-transactor/try-runtime", "pallet-proxy-genesis-companion/try-runtime", diff --git a/runtime/moonbeam/src/lib.rs b/runtime/moonbeam/src/lib.rs index e99b378e10..05a79d2811 100644 --- a/runtime/moonbeam/src/lib.rs +++ b/runtime/moonbeam/src/lib.rs @@ -1173,7 +1173,6 @@ impl Contains for MaintenanceFilter { RuntimeCall::Ethereum(_) => false, RuntimeCall::EVM(_) => false, RuntimeCall::Identity(_) => false, - RuntimeCall::XTokens(_) => false, RuntimeCall::ParachainStaking(_) => false, RuntimeCall::MoonbeamOrbiters(_) => false, RuntimeCall::PolkadotXcm(_) => false, @@ -1209,6 +1208,7 @@ impl Contains for NormalFilter { // is populated at genesis RuntimeCall::PolkadotXcm(method) => match method { pallet_xcm::Call::force_default_xcm_version { .. } => true, + pallet_xcm::Call::transfer_assets { .. } => true, pallet_xcm::Call::transfer_assets_using_type_and_then { .. } => true, _ => false, }, @@ -1463,7 +1463,7 @@ construct_runtime! { PolkadotXcm: pallet_xcm::{Pallet, Storage, Call, Event, Origin, Config} = 103, Assets: pallet_assets::{Pallet, Call, Storage, Event} = 104, AssetManager: pallet_asset_manager::{Pallet, Call, Storage, Event} = 105, - XTokens: orml_xtokens::{Pallet, Call, Storage, Event} = 106, + // Previously 106: XTokens XcmTransactor: pallet_xcm_transactor::{Pallet, Call, Storage, Event} = 107, // Previously 108: pallet_assets:: EthereumXcm: pallet_ethereum_xcm::{Pallet, Call, Storage, Origin, Event} = 109, diff --git a/runtime/moonbeam/src/xcm_config.rs b/runtime/moonbeam/src/xcm_config.rs index c58e00bcdd..8719c260c3 100644 --- a/runtime/moonbeam/src/xcm_config.rs +++ b/runtime/moonbeam/src/xcm_config.rs @@ -57,11 +57,10 @@ use xcm::latest::prelude::{ use xcm_executor::traits::{CallDispatcher, ConvertLocation, JustTry}; use cumulus_primitives_core::{AggregateMessageOrigin, ParaId}; -use orml_xcm_support::MultiNativeAsset; use xcm_primitives::{ AbsoluteAndRelativeReserve, AccountIdToCurrencyId, AccountIdToLocation, AsAssetType, - IsBridgedConcreteAssetFrom, SignedToAccountId20, UtilityAvailableCalls, UtilityEncodeCall, - XcmTransact, + IsBridgedConcreteAssetFrom, MultiNativeAsset, SignedToAccountId20, UtilityAvailableCalls, + UtilityEncodeCall, XcmTransact, }; use parity_scale_codec::{Decode, Encode}; @@ -73,8 +72,6 @@ use sp_std::{ prelude::*, }; -use orml_traits::parameter_type_with_key; - use crate::governance::referenda::{FastGeneralAdminOrRoot, GeneralAdminOrRoot}; parameter_types! { @@ -570,35 +567,6 @@ parameter_types! { }; } -parameter_type_with_key! { - pub ParachainMinFee: |location: Location| -> Option { - match (location.parents, location.first_interior()) { - // Polkadot AssetHub fee - (1, Some(Parachain(1000u32))) => Some(50_000_000u128), - _ => None, - } - }; -} - -impl orml_xtokens::Config for Runtime { - type RuntimeEvent = RuntimeEvent; - type Balance = Balance; - type CurrencyId = CurrencyId; - type AccountIdToLocation = AccountIdToLocation; - type CurrencyIdConvert = CurrencyIdToLocation>; - type XcmExecutor = XcmExecutor; - type SelfLocation = SelfLocation; - type Weigher = XcmWeigher; - type BaseXcmWeight = BaseXcmWeight; - type UniversalLocation = UniversalLocation; - type MaxAssetsForTransfer = MaxAssetsForTransfer; - type MinXcmFee = ParachainMinFee; - type LocationsFilter = Everything; - type ReserveProvider = AbsoluteAndRelativeReserve; - type RateLimiter = (); - type RateLimiterId = (); -} - // 1 DOT should be enough parameter_types! { pub MaxHrmpRelayFee: Asset = (Location::parent(), 1_000_000_000_000u128).into(); diff --git a/runtime/moonbeam/tests/integration_test.rs b/runtime/moonbeam/tests/integration_test.rs index 10176af701..4feaef86c8 100644 --- a/runtime/moonbeam/tests/integration_test.rs +++ b/runtime/moonbeam/tests/integration_test.rs @@ -40,8 +40,7 @@ use moonbeam_runtime::{ AccountId, Balances, CrowdloanRewards, Executive, OpenTechCommitteeCollective, ParachainStaking, PolkadotXcm, Precompiles, Runtime, RuntimeBlockWeights, RuntimeCall, RuntimeEvent, System, TransactionPayment, TransactionPaymentAsGasPrice, - TreasuryCouncilCollective, XTokens, XcmTransactor, FOREIGN_ASSET_PRECOMPILE_ADDRESS_PREFIX, - WEEKS, + TreasuryCouncilCollective, XcmTransactor, FOREIGN_ASSET_PRECOMPILE_ADDRESS_PREFIX, WEEKS, }; use moonbeam_xcm_benchmarks::weights::XcmWeight; use moonkit_xcm_primitives::AccountIdAssetIdConversion; @@ -64,10 +63,10 @@ use sp_runtime::{ BuildStorage, DispatchError, ModuleError, }; use std::str::from_utf8; -use xcm::latest::prelude::*; -use xcm::{VersionedAsset, VersionedAssets, VersionedLocation}; +use xcm::{latest::prelude::*, VersionedAssets, VersionedLocation}; use xcm_builder::{ParentIsPreset, SiblingParachainConvertsVia}; use xcm_executor::traits::ConvertLocation; +use xcm_primitives::split_location_into_chain_part_and_beneficiary; type BatchPCall = pallet_evm_precompile_batch::BatchPrecompileCall; type CrowdloanRewardsPCall = @@ -86,6 +85,17 @@ type XcmTransactorV2PCall = const BASE_FEE_GENESIS: u128 = 10000 * GIGAWEI; +fn currency_to_asset(currency_id: CurrencyId, amount: u128) -> Asset { + Asset { + id: AssetId( + ::CurrencyIdToLocation::convert( + currency_id, + ) + .unwrap(), + ), + fun: Fungibility::Fungible(amount), + } +} #[test] fn xcmp_queue_controller_origin_is_root() { // important for the XcmExecutionManager impl of PauseExecution which uses root origin @@ -135,7 +145,6 @@ fn verify_pallet_prefixes() { is_pallet_prefix::("CumulusXcm"); is_pallet_prefix::("PolkadotXcm"); is_pallet_prefix::("Assets"); - is_pallet_prefix::("XTokens"); is_pallet_prefix::("AssetManager"); is_pallet_prefix::("Migrations"); is_pallet_prefix::("XcmTransactor"); @@ -442,7 +451,7 @@ fn verify_pallet_indices() { is_pallet_index::(103); is_pallet_index::(104); is_pallet_index::(105); - is_pallet_index::(106); + // is_pallet_index::(106); Removed is_pallet_index::(107); } @@ -1615,26 +1624,27 @@ fn root_can_change_default_xcm_vers() { .build() .execute_with(|| { let source_location = AssetType::Xcm(xcm::v3::Location::parent()); - let dest = Location { - parents: 1, - interior: [AccountId32 { - network: None, - id: [1u8; 32], - }] - .into(), - }; let source_id: moonbeam_runtime::AssetId = source_location.clone().into(); + let asset = currency_to_asset(CurrencyId::ForeignAsset(source_id), 100_000_000_000_000); // Default XCM version is not set yet, so xtokens should fail because it does not // know with which version to send assert_noop!( - XTokens::transfer( + PolkadotXcm::transfer_assets( origin_of(AccountId::from(ALICE)), - CurrencyId::ForeignAsset(source_id), - 100_000_000_000_000, - Box::new(xcm::VersionedLocation::V4(dest.clone())), - WeightLimit::Limited(4000000000.into()) + Box::new(VersionedLocation::V4(Location::parent())), + Box::new(VersionedLocation::V4(Location { + parents: 0, + interior: [AccountId32 { + network: None, + id: [1u8; 32], + }] + .into(), + })), + Box::new(VersionedAssets::V4(asset.clone().into())), + 0, + WeightLimit::Unlimited ), - orml_xtokens::Error::::XcmExecutionFailed + pallet_xcm::Error::::SendFailure ); // Root sets the defaultXcm @@ -1644,12 +1654,20 @@ fn root_can_change_default_xcm_vers() { )); // Now transferring does not fail - assert_ok!(XTokens::transfer( + assert_ok!(PolkadotXcm::transfer_assets( origin_of(AccountId::from(ALICE)), - CurrencyId::ForeignAsset(source_id), - 100_000_000_000_000, - Box::new(xcm::VersionedLocation::V4(dest)), - WeightLimit::Limited(4000000000.into()) + Box::new(VersionedLocation::V4(Location::parent())), + Box::new(VersionedLocation::V4(Location { + parents: 0, + interior: [AccountId32 { + network: None, + id: [1u8; 32], + }] + .into(), + })), + Box::new(VersionedAssets::V4(asset.clone().into())), + 0, + WeightLimit::Unlimited )); }) } @@ -1943,7 +1961,7 @@ fn xtokens_precompile_transfer() { weight: 4_000_000, }, ) - .expect_cost(196698) + .expect_cost(22930) .expect_no_logs() .execute_returns(()) }) @@ -1995,7 +2013,7 @@ fn xtokens_precompile_transfer_multiasset() { weight: 4_000_000, }, ) - .expect_cost(196698) + .expect_cost(22930) .expect_no_logs() .execute_returns(()); }) @@ -2016,21 +2034,25 @@ fn make_sure_glmr_can_be_transferred_precompile() { .with_safe_xcm_version(2) .build() .execute_with(|| { - let dest = Location { - parents: 1, - interior: [AccountId32 { - network: None, - id: [1u8; 32], - }] - .into(), - }; - assert_ok!(XTokens::transfer_multiasset( + assert_ok!(PolkadotXcm::transfer_assets( origin_of(AccountId::from(ALICE)), - Box::new(VersionedAsset::V4(Asset { - id: AssetId(moonbeam_runtime::xcm_config::SelfReserve::get()), - fun: Fungible(1000) + Box::new(VersionedLocation::V4(Location::parent())), + Box::new(VersionedLocation::V4(Location { + parents: 0, + interior: [AccountId32 { + network: None, + id: [1u8; 32], + }] + .into(), })), - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedAssets::V4( + Asset { + id: AssetId(moonbeam_runtime::xcm_config::SelfReserve::get()), + fun: Fungible(1000) + } + .into() + )), + 0, WeightLimit::Limited(40000.into()) )); }); @@ -2059,11 +2081,18 @@ fn make_sure_glmr_can_be_transferred() { }] .into(), }; - assert_ok!(XTokens::transfer( + assert_ok!(PolkadotXcm::transfer_assets( origin_of(AccountId::from(ALICE)), - CurrencyId::SelfReserve, - 100, + Box::new(VersionedLocation::V4(Location::parent())), Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedAssets::V4( + Asset { + id: AssetId(moonbeam_runtime::xcm_config::SelfReserve::get()), + fun: Fungible(100) + } + .into() + )), + 0, WeightLimit::Limited(40000.into()) )); }); @@ -2317,14 +2346,17 @@ fn call_xtokens_with_fee() { let before_balance = moonbeam_runtime::Assets::balance(source_id, &AccountId::from(ALICE)); - + let (chain_part, beneficiary) = + split_location_into_chain_part_and_beneficiary(dest).unwrap(); + let asset = currency_to_asset(CurrencyId::ForeignAsset(source_id), 100_000_000_000_000); + let asset_fee = currency_to_asset(CurrencyId::ForeignAsset(source_id), 100); // We are able to transfer with fee - assert_ok!(XTokens::transfer_with_fee( + assert_ok!(PolkadotXcm::transfer_assets( origin_of(AccountId::from(ALICE)), - CurrencyId::ForeignAsset(source_id), - 100_000_000_000_000, - 100, - Box::new(xcm::VersionedLocation::V4(dest.clone())), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset_fee, asset].into())), + 0, WeightLimit::Limited(4000000000.into()) )); diff --git a/runtime/moonbeam/tests/xcm_mock/mod.rs b/runtime/moonbeam/tests/xcm_mock/mod.rs index 231196031e..cf6b507984 100644 --- a/runtime/moonbeam/tests/xcm_mock/mod.rs +++ b/runtime/moonbeam/tests/xcm_mock/mod.rs @@ -265,7 +265,6 @@ pub type StatemintAssets = pallet_assets::Pallet; pub type Assets = pallet_assets::Pallet; pub type Treasury = pallet_treasury::Pallet; pub type AssetManager = pallet_asset_manager::Pallet; -pub type XTokens = orml_xtokens::Pallet; pub type RelayBalances = pallet_balances::Pallet; pub type ParaBalances = pallet_balances::Pallet; pub type XcmTransactor = pallet_xcm_transactor::Pallet; diff --git a/runtime/moonbeam/tests/xcm_mock/parachain.rs b/runtime/moonbeam/tests/xcm_mock/parachain.rs index 77beff13f9..fcf42d881c 100644 --- a/runtime/moonbeam/tests/xcm_mock/parachain.rs +++ b/runtime/moonbeam/tests/xcm_mock/parachain.rs @@ -40,7 +40,6 @@ use sp_std::{convert::TryFrom, prelude::*}; use xcm::{latest::prelude::*, Version as XcmVersion, VersionedXcm}; use cumulus_primitives_core::relay_chain::HrmpChannelId; -use orml_traits::parameter_type_with_key; use pallet_ethereum::PostLogContent; use polkadot_core_primitives::BlockNumber as RelayBlockNumber; use polkadot_parachain::primitives::{Id as ParaId, Sibling}; @@ -333,7 +332,7 @@ type Reserves = ( // Relaychain (DOT) from Asset Hub Case, // Assets which the reserve is the same as the origin. - orml_xcm_support::MultiNativeAsset< + xcm_primitives::MultiNativeAsset< xcm_primitives::AbsoluteAndRelativeReserve, >, ); @@ -413,36 +412,6 @@ parameter_types! { }; } -parameter_type_with_key! { - pub ParachainMinFee: |location: Location| -> Option { - match (location.parents, location.first_interior()) { - (1, Some(Parachain(1000u32))) => Some(50u128), - _ => None, - } - }; -} - -// The XCM message wrapper wrapper -impl orml_xtokens::Config for Runtime { - type RuntimeEvent = RuntimeEvent; - type Balance = Balance; - type CurrencyId = CurrencyId; - type AccountIdToLocation = xcm_primitives::AccountIdToLocation; - type CurrencyIdConvert = - CurrencyIdToLocation>; - type XcmExecutor = XcmExecutor; - type SelfLocation = SelfLocation; - type Weigher = xcm_builder::FixedWeightBounds; - type BaseXcmWeight = BaseXcmWeight; - type UniversalLocation = UniversalLocation; - type MaxAssetsForTransfer = MaxAssetsForTransfer; - type MinXcmFee = ParachainMinFee; - type LocationsFilter = Everything; - type ReserveProvider = xcm_primitives::AbsoluteAndRelativeReserve; - type RateLimiter = (); - type RateLimiterId = (); -} - parameter_types! { pub const ProposalBond: Permill = Permill::from_percent(5); pub const ProposalBondMinimum: Balance = 0; @@ -1078,7 +1047,6 @@ construct_runtime!( PolkadotXcm: pallet_xcm, Assets: pallet_assets, CumulusXcm: cumulus_pallet_xcm, - XTokens: orml_xtokens, AssetManager: pallet_asset_manager, XcmTransactor: pallet_xcm_transactor, XcmWeightTrader: pallet_xcm_weight_trader, diff --git a/runtime/moonbeam/tests/xcm_mock/statemint_like.rs b/runtime/moonbeam/tests/xcm_mock/statemint_like.rs index bc27a84ac0..7f30c345db 100644 --- a/runtime/moonbeam/tests/xcm_mock/statemint_like.rs +++ b/runtime/moonbeam/tests/xcm_mock/statemint_like.rs @@ -323,8 +323,7 @@ impl Config for XcmConfig { type XcmSender = XcmRouter; type AssetTransactor = AssetTransactors; type OriginConverter = XcmOriginToTransactDispatchOrigin; - type IsReserve = - orml_xcm_support::MultiNativeAsset; + type IsReserve = xcm_primitives::MultiNativeAsset; type IsTeleporter = TrustedTeleporters; type UniversalLocation = UniversalLocation; type Barrier = Barrier; diff --git a/runtime/moonbeam/tests/xcm_tests.rs b/runtime/moonbeam/tests/xcm_tests.rs index 1fdaa220d3..916190d68c 100644 --- a/runtime/moonbeam/tests/xcm_tests.rs +++ b/runtime/moonbeam/tests/xcm_tests.rs @@ -29,18 +29,25 @@ use pallet_xcm_transactor::{ Currency, CurrencyPayment, HrmpInitParams, HrmpOperation, TransactWeights, }; use sp_core::ConstU32; -use sp_runtime::traits::MaybeEquivalence; -use xcm::latest::prelude::{ - AccountId32, AccountKey20, Asset as XcmAsset, AssetId as XcmAssetId, Assets as XcmAssets, - Fungible, GeneralIndex, Junction, Junctions, Limited, Location, OriginKind, PalletInstance, - Parachain, QueryResponse, Reanchorable, Response, WeightLimit, Xcm, +use sp_runtime::traits::{Convert, MaybeEquivalence}; +use xcm::{ + latest::{ + prelude::{ + AccountId32, AccountKey20, Fungible, GeneralIndex, Junction, Junctions, Limited, + Location, OriginKind, PalletInstance, Parachain, QueryResponse, Reanchorable, Response, + WeightLimit, Xcm, + }, + Asset, AssetId, Assets as XcmAssets, Fungibility, + }, + IntoVersion, VersionedAssets, VersionedLocation, WrapVersion, }; -use xcm::{IntoVersion, VersionedLocation, WrapVersion}; use xcm_executor::traits::ConvertLocation; -use xcm_mock::parachain; +use xcm_mock::parachain::{self, PolkadotXcm}; use xcm_mock::relay_chain; use xcm_mock::*; -use xcm_primitives::{UtilityEncodeCall, DEFAULT_PROOF_SIZE}; +use xcm_primitives::{ + split_location_into_chain_part_and_beneficiary, UtilityEncodeCall, DEFAULT_PROOF_SIZE, +}; use xcm_simulator::TestExt; fn add_supported_asset(asset_type: parachain::AssetType, units_per_second: u128) -> Result<(), ()> { @@ -76,6 +83,18 @@ fn add_supported_asset(asset_type: parachain::AssetType, units_per_second: u128) Ok(()) } +fn currency_to_asset(currency_id: parachain::CurrencyId, amount: u128) -> Asset { + Asset { + id: AssetId( + ::CurrencyIdToLocation::convert( + currency_id, + ) + .unwrap(), + ), + fun: Fungibility::Fungible(amount), + } +} + // Send a relay asset (like DOT) to a parachain A #[test] fn receive_relay_asset_from_relay() { @@ -192,13 +211,15 @@ fn send_relay_asset_to_relay() { }] .into(), }; - + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); ParaA::execute_with(|| { - assert_ok!(XTokens::transfer( + let asset = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_id), 123); + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::ForeignAsset(source_id), - 123, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(asset.into())), + 0, WeightLimit::Limited(Weight::from_parts(40000u64, DEFAULT_PROOF_SIZE)) )); }); @@ -285,13 +306,15 @@ fn send_relay_asset_to_para_b() { ] .into(), }; - + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); ParaA::execute_with(|| { - assert_ok!(XTokens::transfer( + let asset = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_id), 100); + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::ForeignAsset(source_id), - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(asset.into())), + 0, WeightLimit::Limited(Weight::from_parts(40000u64, DEFAULT_PROOF_SIZE)) )); }); @@ -349,14 +372,17 @@ fn send_para_a_asset_to_para_b() { .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); // Native token is substracted in paraA ParaA::execute_with(|| { + let asset = currency_to_asset(parachain::CurrencyId::SelfReserve, 100); // Free execution, full amount received - assert_ok!(XTokens::transfer( + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::SelfReserve, - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(asset.into())), + 0, WeightLimit::Limited(Weight::from_parts(800000u64, DEFAULT_PROOF_SIZE)) )); }); @@ -427,12 +453,15 @@ fn send_para_a_asset_from_para_b_to_para_c() { ] .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); ParaA::execute_with(|| { - assert_ok!(XTokens::transfer( + let asset = currency_to_asset(parachain::CurrencyId::SelfReserve, 100); + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::SelfReserve, - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(asset.into())), + 0, WeightLimit::Limited(Weight::from_parts(80u64, DEFAULT_PROOF_SIZE)) )); }); @@ -462,13 +491,15 @@ fn send_para_a_asset_from_para_b_to_para_c() { ] .into(), }; - + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); ParaB::execute_with(|| { - assert_ok!(XTokens::transfer( + let asset = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_id), 100); + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::ForeignAsset(source_id), - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(asset.into())), + 0, WeightLimit::Limited(Weight::from_parts(80u64, DEFAULT_PROOF_SIZE)) )); }); @@ -520,13 +551,15 @@ fn send_para_a_asset_to_para_b_and_back_to_para_a() { ] .into(), }; - + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); ParaA::execute_with(|| { - assert_ok!(XTokens::transfer( + let asset = currency_to_asset(parachain::CurrencyId::SelfReserve, 100); + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::SelfReserve, - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(asset.into())), + 0, WeightLimit::Limited(Weight::from_parts(80u64, DEFAULT_PROOF_SIZE)) )); }); @@ -556,12 +589,15 @@ fn send_para_a_asset_to_para_b_and_back_to_para_a() { ] .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); ParaB::execute_with(|| { - assert_ok!(XTokens::transfer( + let asset = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_id), 100); + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::ForeignAsset(source_id), - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(asset.into())), + 0, WeightLimit::Limited(Weight::from_parts(80u64, DEFAULT_PROOF_SIZE)) )); }); @@ -677,14 +713,17 @@ fn send_para_a_asset_to_para_b_with_trader() { .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); // In destination chain, we only need 4 weight // We put 10 weight, 6 of which should be refunded and 4 of which should go to treasury ParaA::execute_with(|| { - assert_ok!(XTokens::transfer( + let asset = currency_to_asset(parachain::CurrencyId::SelfReserve, 100); + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::SelfReserve, - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(asset.into())), + 0, WeightLimit::Limited(Weight::from_parts(10u64, DEFAULT_PROOF_SIZE)) )); }); @@ -749,15 +788,17 @@ fn send_para_a_asset_to_para_b_with_trader_and_fee() { ] .into(), }; - + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); // we use transfer_with_fee ParaA::execute_with(|| { - assert_ok!(XTokens::transfer_with_fee( + let asset = currency_to_asset(parachain::CurrencyId::SelfReserve, 100); + let asset_fee = currency_to_asset(parachain::CurrencyId::SelfReserve, 1); + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::SelfReserve, - 100, - 1, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset_fee, asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(800000u64, DEFAULT_PROOF_SIZE)) )); }); @@ -915,14 +956,17 @@ fn transact_through_derivative_multilocation() { }] .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); ParaA::execute_with(|| { + let asset = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_id), 100); // free execution, full amount received - assert_ok!(XTokens::transfer( + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::ForeignAsset(source_id), - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(asset.into())), + 0, WeightLimit::Limited(Weight::from_parts(40000u64, DEFAULT_PROOF_SIZE)) )); }); @@ -1054,14 +1098,17 @@ fn transact_through_derivative_with_custom_fee_weight() { }] .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); ParaA::execute_with(|| { + let asset = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_id), 100); // free execution, full amount received - assert_ok!(XTokens::transfer( + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::ForeignAsset(source_id), - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(asset.into())), + 0, WeightLimit::Limited(Weight::from_parts(40000u64, DEFAULT_PROOF_SIZE)) )); }); @@ -1205,14 +1252,17 @@ fn transact_through_derivative_with_custom_fee_weight_refund() { }] .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); ParaA::execute_with(|| { + let asset = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_id), 100); // free execution, full amount received - assert_ok!(XTokens::transfer( + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::ForeignAsset(source_id), - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(asset.into())), + 0, WeightLimit::Limited(Weight::from_parts(40000u64, DEFAULT_PROOF_SIZE)) )); }); @@ -1367,14 +1417,17 @@ fn transact_through_sovereign() { }] .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); ParaA::execute_with(|| { + let asset = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_id), 100); // free execution, full amount received - assert_ok!(XTokens::transfer( + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::ForeignAsset(source_id), - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(asset.into())), + 0, WeightLimit::Limited(Weight::from_parts(40000u64, DEFAULT_PROOF_SIZE)) )); }); @@ -1619,14 +1672,17 @@ fn transact_through_sovereign_with_custom_fee_weight() { }] .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); ParaA::execute_with(|| { + let asset = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_id), 100); // free execution, full amount received - assert_ok!(XTokens::transfer( + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::ForeignAsset(source_id), - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(asset.into())), + 0, WeightLimit::Limited(Weight::from_parts(40000u64, DEFAULT_PROOF_SIZE)) )); }); @@ -1768,14 +1824,17 @@ fn transact_through_sovereign_with_custom_fee_weight_refund() { }] .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); ParaA::execute_with(|| { + let asset = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_id), 100); // free execution, full amount received - assert_ok!(XTokens::transfer( + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::ForeignAsset(source_id), - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(asset.into())), + 0, WeightLimit::Limited(Weight::from_parts(40000u64, DEFAULT_PROOF_SIZE)) )); }); @@ -2540,20 +2599,25 @@ fn send_statemint_asset_from_para_a_to_statemint_with_relay_fee() { // Check that BOB's balance is empty before the transfer assert_eq!(StatemintAssets::account_balances(RELAYBOB), vec![]); }); - + let (chain_part, beneficiary) = + split_location_into_chain_part_and_beneficiary(statemint_beneficiary).unwrap(); // Transfer USDC from Parachain A to Statemint using Relay asset as fee ParaA::execute_with(|| { - assert_ok!(XTokens::transfer_multicurrencies( + let asset = currency_to_asset( + parachain::CurrencyId::ForeignAsset(source_statemint_asset_id), + 100, + ); + let asset_fee = + currency_to_asset(parachain::CurrencyId::ForeignAsset(source_relay_id), 100); + let assets_to_send: XcmAssets = XcmAssets::from(vec![asset, asset_fee.clone()]); + assert_eq!(assets_to_send.get(0).unwrap(), &asset_fee); + + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - vec![ - ( - parachain::CurrencyId::ForeignAsset(source_statemint_asset_id), - 100 - ), - (parachain::CurrencyId::ForeignAsset(source_relay_id), 100) - ], - 1, - Box::new(VersionedLocation::V4(statemint_beneficiary)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(assets_to_send)), + 0, WeightLimit::Limited(Weight::from_parts(80_000_000u64, 100_000u64)) )); }); @@ -2681,14 +2745,17 @@ fn send_dot_from_moonbeam_to_statemint_via_xtokens_transfer() { }, ], ); + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); // Finally we test that we are able to send back the DOTs to AssetHub from the ParaA ParaA::execute_with(|| { - assert_ok!(XTokens::transfer( + let asset = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_relay_id), 100); + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::ForeignAsset(source_relay_id), - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(asset.into())), + 0, WeightLimit::Limited(Weight::from_parts(40000u64, DEFAULT_PROOF_SIZE)) )); @@ -2834,15 +2901,18 @@ fn send_dot_from_moonbeam_to_statemint_via_xtokens_transfer_with_fee() { }, ], ); + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); // Finally we test that we are able to send back the DOTs to AssetHub from the ParaA ParaA::execute_with(|| { - assert_ok!(XTokens::transfer_with_fee( + let asset = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_relay_id), 100); + let asset_fee = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_relay_id), 10); + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::ForeignAsset(source_relay_id), - 100, - 10, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset_fee, asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(40000u64, DEFAULT_PROOF_SIZE)) )); @@ -2991,13 +3061,15 @@ fn send_dot_from_moonbeam_to_statemint_via_xtokens_transfer_multiasset() { }, ], ); - + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); // Finally we test that we are able to send back the DOTs to AssetHub from the ParaA ParaA::execute_with(|| { - assert_ok!(XTokens::transfer_multiasset( + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - Box::new((Location::parent(), 100).into()), - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4((Location::parent(), 100).into())), + 0, WeightLimit::Limited(Weight::from_parts(40000u64, DEFAULT_PROOF_SIZE)) )); @@ -3222,19 +3294,22 @@ fn send_dot_from_moonbeam_to_statemint_via_xtokens_transfer_multicurrencies() { ], ); + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); + // Finally we test that we are able to send back the DOTs to AssetHub from the ParaA ParaA::execute_with(|| { - assert_ok!(XTokens::transfer_multicurrencies( + let asset_1 = currency_to_asset( + parachain::CurrencyId::ForeignAsset(source_statemint_asset_id), + 100, + ); + let asset_2 = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_relay_id), 100); + let assets_to_send = vec![asset_1, asset_2]; + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - vec![ - ( - parachain::CurrencyId::ForeignAsset(source_statemint_asset_id), - 100 - ), - (parachain::CurrencyId::ForeignAsset(source_relay_id), 100) - ], + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(assets_to_send.into())), 1, - Box::new(VersionedLocation::V4(dest)), WeightLimit::Limited(Weight::from_parts(80_000_000u64, 100_000u64)) )); @@ -3243,10 +3318,9 @@ fn send_dot_from_moonbeam_to_statemint_via_xtokens_transfer_multicurrencies() { Statemint::execute_with(|| { // Check that Bob received relay tokens back in AssetHub - // (100 - MinXcmFee) assert_eq!( StatemintBalances::free_balance(RELAYBOB), - INITIAL_BALANCE + 50 + INITIAL_BALANCE + 100 ); // Check that BOB received 100 USDC on AssetHub @@ -3468,30 +3542,31 @@ fn send_dot_from_moonbeam_to_statemint_via_xtokens_transfer_multiassets() { ], ); - let statemint_asset_to_send = XcmAsset { - id: XcmAssetId(statemint_asset), + let statemint_asset_to_send = Asset { + id: AssetId(statemint_asset), fun: Fungible(100), }; - let relay_asset_to_send = XcmAsset { - id: XcmAssetId(Location::parent()), + let relay_asset_to_send = Asset { + id: AssetId(Location::parent()), fun: Fungible(100), }; let assets_to_send: XcmAssets = XcmAssets::from(vec![statemint_asset_to_send, relay_asset_to_send.clone()]); - + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); // For some reason the order of the assets is inverted when creating the array above. // We need to use relay asset for fees, so we pick index 0. assert_eq!(assets_to_send.get(0).unwrap(), &relay_asset_to_send); // Finally we test that we are able to send back the DOTs to AssetHub from the ParaA ParaA::execute_with(|| { - assert_ok!(XTokens::transfer_multiassets( + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - Box::new(assets_to_send.into()), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(assets_to_send)), 0, - Box::new(VersionedLocation::V4(dest)), WeightLimit::Limited(Weight::from_parts(80_000_000u64, 100_000u64)) )); @@ -3500,10 +3575,9 @@ fn send_dot_from_moonbeam_to_statemint_via_xtokens_transfer_multiassets() { Statemint::execute_with(|| { // Check that Bob received relay tokens back in AssetHub - // (100 - MinXcmFee) assert_eq!( StatemintBalances::free_balance(RELAYBOB), - INITIAL_BALANCE + 50 + INITIAL_BALANCE + 100 ); // Check that BOB received 100 USDC on AssetHub diff --git a/runtime/moonriver/Cargo.toml b/runtime/moonriver/Cargo.toml index 668d644cac..7ac5e41d7d 100644 --- a/runtime/moonriver/Cargo.toml +++ b/runtime/moonriver/Cargo.toml @@ -140,9 +140,6 @@ pallet-evm-precompile-simple = { workspace = true } precompile-utils = { workspace = true } # Polkadot / XCM -orml-traits = { workspace = true } -orml-xcm-support = { workspace = true } -orml-xtokens = { workspace = true } pallet-xcm = { workspace = true } pallet-xcm-benchmarks = { workspace = true, optional = true } polkadot-core-primitives = { workspace = true } @@ -231,7 +228,6 @@ std = [ "moonbeam-xcm-benchmarks/std", "moonkit-xcm-primitives/std", "nimbus-primitives/std", - "orml-xtokens/std", "pallet-asset-manager/std", "pallet-assets/std", "pallet-async-backing/std", @@ -436,7 +432,6 @@ try-runtime = [ "pallet-crowdloan-rewards/try-runtime", "pallet-proxy/try-runtime", "pallet-identity/try-runtime", - "orml-xtokens/try-runtime", "pallet-assets/try-runtime", "pallet-async-backing/try-runtime", "pallet-xcm-transactor/try-runtime", diff --git a/runtime/moonriver/src/governance/origins.rs b/runtime/moonriver/src/governance/origins.rs index ef4675d629..bbfebcafe6 100644 --- a/runtime/moonriver/src/governance/origins.rs +++ b/runtime/moonriver/src/governance/origins.rs @@ -12,7 +12,7 @@ // GNU General Public License for more details. //! Custom origins for governance interventions. -#![cfg_attr(not(feature = "std"), no_std)] + pub use custom_origins::*; #[frame_support::pallet] diff --git a/runtime/moonriver/src/lib.rs b/runtime/moonriver/src/lib.rs index 3a7c0ffd6c..69fdba085e 100644 --- a/runtime/moonriver/src/lib.rs +++ b/runtime/moonriver/src/lib.rs @@ -1177,7 +1177,6 @@ impl Contains for MaintenanceFilter { RuntimeCall::Ethereum(_) => false, RuntimeCall::EVM(_) => false, RuntimeCall::Identity(_) => false, - RuntimeCall::XTokens(_) => false, RuntimeCall::ParachainStaking(_) => false, RuntimeCall::MoonbeamOrbiters(_) => false, RuntimeCall::PolkadotXcm(_) => false, @@ -1213,6 +1212,7 @@ impl Contains for NormalFilter { // is populated at genesis RuntimeCall::PolkadotXcm(method) => match method { pallet_xcm::Call::force_default_xcm_version { .. } => true, + pallet_xcm::Call::transfer_assets { .. } => true, pallet_xcm::Call::transfer_assets_using_type_and_then { .. } => true, _ => false, }, @@ -1466,7 +1466,7 @@ construct_runtime! { PolkadotXcm: pallet_xcm::{Pallet, Storage, Call, Event, Origin, Config} = 103, Assets: pallet_assets::{Pallet, Call, Storage, Event} = 104, AssetManager: pallet_asset_manager::{Pallet, Call, Storage, Event} = 105, - XTokens: orml_xtokens::{Pallet, Call, Storage, Event} = 106, + // Previously 106: XTokens XcmTransactor: pallet_xcm_transactor::{Pallet, Call, Storage, Event} = 107, // Previously 108: pallet_assets:: EthereumXcm: pallet_ethereum_xcm::{Pallet, Call, Storage, Origin, Event} = 109, diff --git a/runtime/moonriver/src/xcm_config.rs b/runtime/moonriver/src/xcm_config.rs index 00328bc571..2b77d4226b 100644 --- a/runtime/moonriver/src/xcm_config.rs +++ b/runtime/moonriver/src/xcm_config.rs @@ -57,11 +57,10 @@ use xcm::latest::prelude::{ use xcm_executor::traits::{CallDispatcher, ConvertLocation, JustTry}; use cumulus_primitives_core::{AggregateMessageOrigin, ParaId}; -use orml_xcm_support::MultiNativeAsset; use xcm_primitives::{ AbsoluteAndRelativeReserve, AccountIdToCurrencyId, AccountIdToLocation, AsAssetType, - IsBridgedConcreteAssetFrom, SignedToAccountId20, UtilityAvailableCalls, UtilityEncodeCall, - XcmTransact, + IsBridgedConcreteAssetFrom, MultiNativeAsset, SignedToAccountId20, UtilityAvailableCalls, + UtilityEncodeCall, XcmTransact, }; use parity_scale_codec::{Decode, Encode}; @@ -73,8 +72,6 @@ use sp_std::{ prelude::*, }; -use orml_traits::parameter_type_with_key; - use crate::governance::referenda::{FastGeneralAdminOrRoot, GeneralAdminOrRoot}; parameter_types! { @@ -583,35 +580,6 @@ parameter_types! { }; } -parameter_type_with_key! { - pub ParachainMinFee: |location: Location| -> Option { - match (location.parents, location.first_interior()) { - // Kusama AssetHub fee - (1, Some(Parachain(1000u32))) => Some(50_000_000u128), - _ => None, - } - }; -} - -impl orml_xtokens::Config for Runtime { - type RuntimeEvent = RuntimeEvent; - type Balance = Balance; - type CurrencyId = CurrencyId; - type AccountIdToLocation = AccountIdToLocation; - type CurrencyIdConvert = CurrencyIdToLocation>; - type XcmExecutor = XcmExecutor; - type SelfLocation = SelfLocation; - type Weigher = XcmWeigher; - type BaseXcmWeight = BaseXcmWeight; - type UniversalLocation = UniversalLocation; - type MaxAssetsForTransfer = MaxAssetsForTransfer; - type MinXcmFee = ParachainMinFee; - type LocationsFilter = Everything; - type ReserveProvider = AbsoluteAndRelativeReserve; - type RateLimiter = (); - type RateLimiterId = (); -} - // 1 KSM should be enough parameter_types! { pub MaxHrmpRelayFee: Asset = (Location::parent(), 1_000_000_000_000u128).into(); diff --git a/runtime/moonriver/tests/integration_test.rs b/runtime/moonriver/tests/integration_test.rs index 5b596b0ae7..980e41c50c 100644 --- a/runtime/moonriver/tests/integration_test.rs +++ b/runtime/moonriver/tests/integration_test.rs @@ -38,8 +38,7 @@ use moonriver_runtime::{ xcm_config::{CurrencyId, SelfReserve}, AssetId, Balances, CrowdloanRewards, Executive, OpenTechCommitteeCollective, PolkadotXcm, Precompiles, RuntimeBlockWeights, TransactionPayment, TransactionPaymentAsGasPrice, - TreasuryCouncilCollective, XTokens, XcmTransactor, FOREIGN_ASSET_PRECOMPILE_ADDRESS_PREFIX, - WEEKS, + TreasuryCouncilCollective, XcmTransactor, FOREIGN_ASSET_PRECOMPILE_ADDRESS_PREFIX, WEEKS, }; use nimbus_primitives::NimbusId; use pallet_evm::PrecompileSet; @@ -64,6 +63,7 @@ use xcm::latest::prelude::*; use xcm::{VersionedAssets, VersionedLocation}; use xcm_builder::{ParentIsPreset, SiblingParachainConvertsVia}; use xcm_executor::traits::ConvertLocation; +use xcm_primitives::split_location_into_chain_part_and_beneficiary; type BatchPCall = pallet_evm_precompile_batch::BatchPrecompileCall; type CrowdloanRewardsPCall = @@ -82,6 +82,18 @@ type XcmTransactorV2PCall = const BASE_FEE_GENESIS: u128 = 100 * GIGAWEI; +fn currency_to_asset(currency_id: CurrencyId, amount: u128) -> Asset { + Asset { + id: AssetId( + ::CurrencyIdToLocation::convert( + currency_id, + ) + .unwrap(), + ), + fun: Fungibility::Fungible(amount), + } +} + #[test] fn xcmp_queue_controller_origin_is_root() { // important for the XcmExecutionManager impl of PauseExecution which uses root origin @@ -131,7 +143,6 @@ fn verify_pallet_prefixes() { is_pallet_prefix::("CumulusXcm"); is_pallet_prefix::("PolkadotXcm"); is_pallet_prefix::("Assets"); - is_pallet_prefix::("XTokens"); is_pallet_prefix::("AssetManager"); is_pallet_prefix::("Migrations"); is_pallet_prefix::("XcmTransactor"); @@ -437,7 +448,7 @@ fn verify_pallet_indices() { is_pallet_index::(103); is_pallet_index::(104); is_pallet_index::(105); - is_pallet_index::(106); + // is_pallet_index::(106); Removed is_pallet_index::(107); } @@ -1607,17 +1618,21 @@ fn root_can_change_default_xcm_vers() { .into(), }; let source_id: moonriver_runtime::AssetId = source_location.clone().into(); + let asset = currency_to_asset(CurrencyId::ForeignAsset(source_id), 100_000_000_000_000); + let (chain_part, beneficiary) = + split_location_into_chain_part_and_beneficiary(dest).unwrap(); // Default XCM version is not set yet, so xtokens should fail because it does not // know with which version to send assert_noop!( - XTokens::transfer( + PolkadotXcm::transfer_assets( origin_of(AccountId::from(ALICE)), - CurrencyId::ForeignAsset(source_id), - 100_000_000_000_000, - Box::new(xcm::VersionedLocation::V4(dest.clone())), + Box::new(xcm::VersionedLocation::V4(chain_part.clone())), + Box::new(xcm::VersionedLocation::V4(beneficiary.clone())), + Box::new(VersionedAssets::V4(asset.clone().into())), + 0, WeightLimit::Limited(4000000000.into()) ), - orml_xtokens::Error::::XcmExecutionFailed + pallet_xcm::Error::::SendFailure ); // Root sets the defaultXcm @@ -1627,11 +1642,12 @@ fn root_can_change_default_xcm_vers() { )); // Now transferring does not fail - assert_ok!(XTokens::transfer( + assert_ok!(PolkadotXcm::transfer_assets( origin_of(AccountId::from(ALICE)), - CurrencyId::ForeignAsset(source_id), - 100_000_000_000_000, - Box::new(xcm::VersionedLocation::V4(dest)), + Box::new(xcm::VersionedLocation::V4(chain_part)), + Box::new(xcm::VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(asset.clone().into())), + 0, WeightLimit::Limited(4000000000.into()) )); }) @@ -1923,7 +1939,7 @@ fn xtokens_precompiles_transfer() { weight: 4_000_000, }, ) - .expect_cost(196698) + .expect_cost(22930) .expect_no_logs() .execute_returns(()) }) @@ -1975,7 +1991,7 @@ fn xtokens_precompiles_transfer_multiasset() { weight: 4_000_000, }, ) - .expect_cost(196698) + .expect_cost(22930) .expect_no_logs() .execute_returns(()); }) @@ -2230,14 +2246,19 @@ fn call_xtokens_with_fee() { let before_balance = moonriver_runtime::Assets::balance(source_id, &AccountId::from(ALICE)); + let asset = currency_to_asset(CurrencyId::ForeignAsset(source_id), 100_000_000_000_000); + let asset_fee = currency_to_asset(CurrencyId::ForeignAsset(source_id), 100); + let (chain_part, beneficiary) = + split_location_into_chain_part_and_beneficiary(dest).unwrap(); + // We are able to transfer with fee - assert_ok!(XTokens::transfer_with_fee( + assert_ok!(PolkadotXcm::transfer_assets( origin_of(AccountId::from(ALICE)), - CurrencyId::ForeignAsset(source_id), - 100_000_000_000_000, - 100, - Box::new(xcm::VersionedLocation::V4(dest.clone())), - WeightLimit::Limited(4000000000.into()) + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset_fee, asset].into())), + 0, + WeightLimit::Limited(4000000000.into()), ),); let after_balance = diff --git a/runtime/moonriver/tests/xcm_mock/mod.rs b/runtime/moonriver/tests/xcm_mock/mod.rs index cb1cacc488..ac703fe039 100644 --- a/runtime/moonriver/tests/xcm_mock/mod.rs +++ b/runtime/moonriver/tests/xcm_mock/mod.rs @@ -267,7 +267,6 @@ pub type Assets = pallet_assets::Pallet; pub type AssetManager = pallet_asset_manager::Pallet; -pub type XTokens = orml_xtokens::Pallet; pub type RelayBalances = pallet_balances::Pallet; pub type ParaBalances = pallet_balances::Pallet; pub type XcmTransactor = pallet_xcm_transactor::Pallet; diff --git a/runtime/moonriver/tests/xcm_mock/parachain.rs b/runtime/moonriver/tests/xcm_mock/parachain.rs index e7fd51ca06..cbade738a4 100644 --- a/runtime/moonriver/tests/xcm_mock/parachain.rs +++ b/runtime/moonriver/tests/xcm_mock/parachain.rs @@ -38,7 +38,6 @@ use sp_std::{convert::TryFrom, prelude::*}; use xcm::{latest::prelude::*, Version as XcmVersion, VersionedXcm}; use cumulus_primitives_core::relay_chain::HrmpChannelId; -use orml_traits::parameter_type_with_key; use pallet_ethereum::PostLogContent; use polkadot_core_primitives::BlockNumber as RelayBlockNumber; use polkadot_parachain::primitives::{Id as ParaId, Sibling}; @@ -333,7 +332,7 @@ type Reserves = ( // Relaychain (DOT) from Asset Hub Case, // Assets which the reserve is the same as the origin. - orml_xcm_support::MultiNativeAsset< + xcm_primitives::MultiNativeAsset< xcm_primitives::AbsoluteAndRelativeReserve, >, ); @@ -418,36 +417,6 @@ parameter_types! { }; } -parameter_type_with_key! { - pub ParachainMinFee: |location: Location| -> Option { - match (location.parents, location.first_interior()) { - (1, Some(Parachain(1000u32))) => Some(50u128), - _ => None, - } - }; -} - -// The XCM message wrapper wrapper -impl orml_xtokens::Config for Runtime { - type RuntimeEvent = RuntimeEvent; - type Balance = Balance; - type CurrencyId = CurrencyId; - type AccountIdToLocation = xcm_primitives::AccountIdToLocation; - type CurrencyIdConvert = - CurrencyIdToLocation>; - type XcmExecutor = XcmExecutor; - type SelfLocation = SelfLocation; - type Weigher = xcm_builder::FixedWeightBounds; - type BaseXcmWeight = BaseXcmWeight; - type UniversalLocation = UniversalLocation; - type MaxAssetsForTransfer = MaxAssetsForTransfer; - type MinXcmFee = ParachainMinFee; - type LocationsFilter = Everything; - type ReserveProvider = xcm_primitives::AbsoluteAndRelativeReserve; - type RateLimiter = (); - type RateLimiterId = (); -} - parameter_types! { pub const ProposalBond: Permill = Permill::from_percent(5); pub const ProposalBondMinimum: Balance = 0; @@ -1084,7 +1053,6 @@ construct_runtime!( PolkadotXcm: pallet_xcm, Assets: pallet_assets, CumulusXcm: cumulus_pallet_xcm, - XTokens: orml_xtokens, AssetManager: pallet_asset_manager, XcmTransactor: pallet_xcm_transactor, XcmWeightTrader: pallet_xcm_weight_trader, diff --git a/runtime/moonriver/tests/xcm_mock/statemine_like.rs b/runtime/moonriver/tests/xcm_mock/statemine_like.rs index ca59f9d706..eb0e39b2ac 100644 --- a/runtime/moonriver/tests/xcm_mock/statemine_like.rs +++ b/runtime/moonriver/tests/xcm_mock/statemine_like.rs @@ -323,8 +323,7 @@ impl Config for XcmConfig { type XcmSender = XcmRouter; type AssetTransactor = AssetTransactors; type OriginConverter = XcmOriginToTransactDispatchOrigin; - type IsReserve = - orml_xcm_support::MultiNativeAsset; + type IsReserve = xcm_primitives::MultiNativeAsset; type IsTeleporter = TrustedTeleporters; type UniversalLocation = UniversalLocation; type Barrier = Barrier; diff --git a/runtime/moonriver/tests/xcm_tests.rs b/runtime/moonriver/tests/xcm_tests.rs index ceee8aa521..920f440dda 100644 --- a/runtime/moonriver/tests/xcm_tests.rs +++ b/runtime/moonriver/tests/xcm_tests.rs @@ -24,16 +24,18 @@ use frame_support::{ BoundedVec, }; use sp_core::ConstU32; -use sp_runtime::traits::MaybeEquivalence; -use xcm::latest::prelude::{ - AccountId32, AccountKey20, All, Asset as XcmAsset, AssetId as XcmAssetId, Assets as XcmAssets, - BuyExecution, ClearOrigin, DepositAsset, Fungible, GeneralIndex, Junction, Junctions, Limited, - Location, OriginKind, PalletInstance, Parachain, QueryResponse, Reanchorable, Response, - WeightLimit, WithdrawAsset, Xcm, +use sp_runtime::traits::{Convert, MaybeEquivalence}; +use xcm::{ + latest::prelude::{ + AccountId32, AccountKey20, All, Asset, AssetId, Assets as XcmAssets, BuyExecution, + ClearOrigin, DepositAsset, Fungibility, GeneralIndex, Junction, Junctions, Limited, + Location, OriginKind, PalletInstance, Parachain, QueryResponse, Reanchorable, Response, + WeightLimit, WithdrawAsset, Xcm, + }, + IntoVersion, VersionedAssets, VersionedLocation, WrapVersion, }; -use xcm::{IntoVersion, VersionedLocation, WrapVersion}; use xcm_executor::traits::ConvertLocation; -use xcm_mock::parachain; +use xcm_mock::parachain::{self, PolkadotXcm}; use xcm_mock::relay_chain; use xcm_mock::*; use xcm_simulator::TestExt; @@ -42,7 +44,9 @@ use cumulus_primitives_core::relay_chain::HrmpChannelId; use pallet_xcm_transactor::{ Currency, CurrencyPayment, HrmpInitParams, HrmpOperation, TransactWeights, }; -use xcm_primitives::{UtilityEncodeCall, DEFAULT_PROOF_SIZE}; +use xcm_primitives::{ + split_location_into_chain_part_and_beneficiary, UtilityEncodeCall, DEFAULT_PROOF_SIZE, +}; fn add_supported_asset(asset_type: parachain::AssetType, units_per_second: u128) -> Result<(), ()> { let parachain::AssetType::Xcm(location_v3) = asset_type; @@ -77,6 +81,18 @@ fn add_supported_asset(asset_type: parachain::AssetType, units_per_second: u128) Ok(()) } +fn currency_to_asset(currency_id: parachain::CurrencyId, amount: u128) -> Asset { + Asset { + id: AssetId( + ::CurrencyIdToLocation::convert( + currency_id, + ) + .unwrap(), + ), + fun: Fungibility::Fungible(amount), + } +} + // Send a relay asset (like DOT) to a parachain A #[test] fn receive_relay_asset_from_relay() { @@ -190,13 +206,16 @@ fn send_relay_asset_to_relay() { }] .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); ParaA::execute_with(|| { - assert_ok!(XTokens::transfer( + let asset = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_id), 123); + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::ForeignAsset(source_id), - 123, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(40000u64, DEFAULT_PROOF_SIZE)) )); }); @@ -282,13 +301,16 @@ fn send_relay_asset_to_para_b() { ] .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); ParaA::execute_with(|| { - assert_ok!(XTokens::transfer( + let asset = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_id), 100); + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::ForeignAsset(source_id), - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(40000u64, DEFAULT_PROOF_SIZE)) )); }); @@ -345,13 +367,16 @@ fn send_para_a_asset_to_para_b() { ] .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); ParaA::execute_with(|| { - assert_ok!(XTokens::transfer( + let asset = currency_to_asset(parachain::CurrencyId::SelfReserve, 100); + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::SelfReserve, - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(800000u64, DEFAULT_PROOF_SIZE)) )); }); @@ -425,12 +450,16 @@ fn send_para_a_asset_from_para_b_to_para_c() { ] .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); + ParaA::execute_with(|| { - assert_ok!(XTokens::transfer( + let asset = currency_to_asset(parachain::CurrencyId::SelfReserve, 100); + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::SelfReserve, - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(80u64, DEFAULT_PROOF_SIZE)) )); }); @@ -460,13 +489,16 @@ fn send_para_a_asset_from_para_b_to_para_c() { ] .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); ParaB::execute_with(|| { - assert_ok!(XTokens::transfer( + let asset = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_id), 100); + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::ForeignAsset(source_id), - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(80u64, DEFAULT_PROOF_SIZE)) )); }); @@ -519,12 +551,16 @@ fn send_para_a_asset_to_para_b_and_back_to_para_a() { ] .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); + ParaA::execute_with(|| { - assert_ok!(XTokens::transfer( + let asset = currency_to_asset(parachain::CurrencyId::SelfReserve, 100); + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::SelfReserve, - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(80u64, DEFAULT_PROOF_SIZE)) )); }); @@ -554,12 +590,16 @@ fn send_para_a_asset_to_para_b_and_back_to_para_a() { ] .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); + ParaB::execute_with(|| { - assert_ok!(XTokens::transfer( + let asset = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_id), 100); + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::ForeignAsset(source_id), - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(80u64, DEFAULT_PROOF_SIZE)) )); }); @@ -612,12 +652,16 @@ fn send_para_a_asset_to_para_b_and_back_to_para_a_with_new_reanchoring() { ] .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); + ParaA::execute_with(|| { - assert_ok!(XTokens::transfer( + let asset = currency_to_asset(parachain::CurrencyId::SelfReserve, 100); + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::SelfReserve, - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(80u64, DEFAULT_PROOF_SIZE)) )); }); @@ -826,15 +870,18 @@ fn send_para_a_asset_to_para_b_with_trader() { ] .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); // In destination chain, we only need 4 weight // We put 10 weight, 6 of which should be refunded and 4 of which should go to treasury ParaA::execute_with(|| { - assert_ok!(XTokens::transfer( + let asset = currency_to_asset(parachain::CurrencyId::SelfReserve, 100); + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::SelfReserve, - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(10u64, DEFAULT_PROOF_SIZE)) )); }); @@ -899,15 +946,18 @@ fn send_para_a_asset_to_para_b_with_trader_and_fee() { ] .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); // we use transfer_with_fee ParaA::execute_with(|| { - assert_ok!(XTokens::transfer_with_fee( + let asset = currency_to_asset(parachain::CurrencyId::SelfReserve, 100); + let asset_fee = currency_to_asset(parachain::CurrencyId::SelfReserve, 1); + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::SelfReserve, - 100, - 1, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset_fee, asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(800000u64, DEFAULT_PROOF_SIZE)) )); }); @@ -1065,14 +1115,17 @@ fn transact_through_derivative_multilocation() { }] .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); ParaA::execute_with(|| { + let asset = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_id), 100); // free execution, full amount received - assert_ok!(XTokens::transfer( + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::ForeignAsset(source_id), - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(40000u64, DEFAULT_PROOF_SIZE)) )); }); @@ -1204,14 +1257,17 @@ fn transact_through_derivative_with_custom_fee_weight() { }] .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); ParaA::execute_with(|| { + let asset = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_id), 100); // free execution, full amount received - assert_ok!(XTokens::transfer( + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::ForeignAsset(source_id), - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(40000u64, DEFAULT_PROOF_SIZE)) )); }); @@ -1355,14 +1411,17 @@ fn transact_through_derivative_with_custom_fee_weight_refund() { }] .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); ParaA::execute_with(|| { + let asset = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_id), 100); // free execution, full amount received - assert_ok!(XTokens::transfer( + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::ForeignAsset(source_id), - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(40000u64, DEFAULT_PROOF_SIZE)) )); }); @@ -1517,14 +1576,17 @@ fn transact_through_sovereign() { }] .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); ParaA::execute_with(|| { + let asset = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_id), 100); // free execution, full amount received - assert_ok!(XTokens::transfer( + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::ForeignAsset(source_id), - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(40000u64, DEFAULT_PROOF_SIZE)) )); }); @@ -1769,14 +1831,17 @@ fn transact_through_sovereign_with_custom_fee_weight() { }] .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); ParaA::execute_with(|| { + let asset = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_id), 100); // free execution, full amount received - assert_ok!(XTokens::transfer( + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::ForeignAsset(source_id), - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(40000u64, DEFAULT_PROOF_SIZE)) )); }); @@ -1918,14 +1983,17 @@ fn transact_through_sovereign_with_custom_fee_weight_refund() { }] .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); ParaA::execute_with(|| { + let asset = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_id), 100); // free execution, full amount received - assert_ok!(XTokens::transfer( + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::ForeignAsset(source_id), - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(40000u64, DEFAULT_PROOF_SIZE)) )); }); @@ -2222,13 +2290,16 @@ fn test_automatic_versioning_on_runtime_upgrade_with_para_b() { ] .into(), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); ParaA::execute_with(|| { + let asset = currency_to_asset(parachain::CurrencyId::SelfReserve, 100); // free execution, full amount received - assert_ok!(XTokens::transfer( + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::SelfReserve, - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(80u64, DEFAULT_PROOF_SIZE)) )); // free execution, full amount received @@ -2838,20 +2909,23 @@ fn send_statemine_asset_from_para_a_to_statemine_with_relay_fee() { // Check that BOB's balance is empty before the transfer assert_eq!(StatemineAssets::account_balances(RELAYBOB), vec![]); }); + let (chain_part, beneficiary) = + split_location_into_chain_part_and_beneficiary(statemine_beneficiary).unwrap(); // Transfer USDC from Parachain A to Statemine using Relay asset as fee ParaA::execute_with(|| { - assert_ok!(XTokens::transfer_multicurrencies( + let asset_1 = currency_to_asset( + parachain::CurrencyId::ForeignAsset(source_statemine_asset_id), + 100, + ); + let asset_2 = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_relay_id), 100); + let assets_to_send = vec![asset_1, asset_2]; + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - vec![ - ( - parachain::CurrencyId::ForeignAsset(source_statemine_asset_id), - 100 - ), - (parachain::CurrencyId::ForeignAsset(source_relay_id), 100) - ], + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(assets_to_send.into())), 1, - Box::new(VersionedLocation::V4(statemine_beneficiary)), WeightLimit::Limited(Weight::from_parts(80_000_000u64, 100_000u64)) )); }); @@ -2978,14 +3052,16 @@ fn send_dot_from_moonbeam_to_statemine_via_xtokens_transfer() { }, ], ); - + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); // Finally we test that we are able to send back the DOTs to AssetHub from the ParaA ParaA::execute_with(|| { - assert_ok!(XTokens::transfer( + let asset = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_relay_id), 100); + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::ForeignAsset(source_relay_id), - 100, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(40000u64, DEFAULT_PROOF_SIZE)) )); @@ -3131,15 +3207,17 @@ fn send_dot_from_moonbeam_to_statemine_via_xtokens_transfer_with_fee() { }, ], ); - + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); // Finally we test that we are able to send back the DOTs to AssetHub from the ParaA ParaA::execute_with(|| { - assert_ok!(XTokens::transfer_with_fee( + let asset = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_relay_id), 100); + let asset_fee = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_relay_id), 10); + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - parachain::CurrencyId::ForeignAsset(source_relay_id), - 100, - 10, - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset_fee, asset].into())), + 0, WeightLimit::Limited(Weight::from_parts(40000u64, DEFAULT_PROOF_SIZE)) )); @@ -3289,12 +3367,18 @@ fn send_dot_from_moonbeam_to_statemine_via_xtokens_transfer_multiasset() { ], ); + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); + // Finally we test that we are able to send back the DOTs to AssetHub from the ParaA ParaA::execute_with(|| { - assert_ok!(XTokens::transfer_multiasset( + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - Box::new((Location::parent(), 100).into()), - Box::new(VersionedLocation::V4(dest)), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4( + vec![(Location::parent(), 100).into()].into() + )), + 0, WeightLimit::Limited(Weight::from_parts(40000u64, DEFAULT_PROOF_SIZE)) )); @@ -3519,19 +3603,21 @@ fn send_dot_from_moonbeam_to_statemine_via_xtokens_transfer_multicurrencies() { ], ); + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); + // Finally we test that we are able to send back the DOTs to AssetHub from the ParaA ParaA::execute_with(|| { - assert_ok!(XTokens::transfer_multicurrencies( + let asset_1 = currency_to_asset( + parachain::CurrencyId::ForeignAsset(source_statemine_asset_id), + 100, + ); + let asset_2 = currency_to_asset(parachain::CurrencyId::ForeignAsset(source_relay_id), 100); + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - vec![ - ( - parachain::CurrencyId::ForeignAsset(source_statemine_asset_id), - 100 - ), - (parachain::CurrencyId::ForeignAsset(source_relay_id), 100) - ], + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(vec![asset_1, asset_2].into())), 1, - Box::new(VersionedLocation::V4(dest)), WeightLimit::Limited(Weight::from_parts(80_000_000u64, 100_000u64)) )); @@ -3543,7 +3629,7 @@ fn send_dot_from_moonbeam_to_statemine_via_xtokens_transfer_multicurrencies() { // (100 - MinXcmFee) assert_eq!( StatemineBalances::free_balance(RELAYBOB), - INITIAL_BALANCE + 50 + INITIAL_BALANCE + 100 ); // Check that BOB received 100 USDC on AssetHub @@ -3765,30 +3851,31 @@ fn send_dot_from_moonbeam_to_statemine_via_xtokens_transfer_multiassets() { ], ); - let statemine_asset_to_send = XcmAsset { - id: XcmAssetId(statemine_asset), - fun: Fungible(100), + let statemine_asset_to_send = Asset { + id: AssetId(statemine_asset), + fun: Fungibility::Fungible(100), }; - let relay_asset_to_send = XcmAsset { - id: XcmAssetId(Location::parent()), - fun: Fungible(100), + let relay_asset_to_send = Asset { + id: AssetId(Location::parent()), + fun: Fungibility::Fungible(100), }; + let (chain_part, beneficiary) = split_location_into_chain_part_and_beneficiary(dest).unwrap(); let assets_to_send: XcmAssets = XcmAssets::from(vec![statemine_asset_to_send, relay_asset_to_send.clone()]); - // For some reason the order of the assets is inverted when creating the array above. // We need to use relay asset for fees, so we pick index 0. assert_eq!(assets_to_send.get(0).unwrap(), &relay_asset_to_send); // Finally we test that we are able to send back the DOTs to AssetHub from the ParaA ParaA::execute_with(|| { - assert_ok!(XTokens::transfer_multiassets( + assert_ok!(PolkadotXcm::transfer_assets( parachain::RuntimeOrigin::signed(PARAALICE.into()), - Box::new(assets_to_send.into()), + Box::new(VersionedLocation::V4(chain_part)), + Box::new(VersionedLocation::V4(beneficiary)), + Box::new(VersionedAssets::V4(assets_to_send)), 0, - Box::new(VersionedLocation::V4(dest)), WeightLimit::Limited(Weight::from_parts(80_000_000u64, 100_000u64)) )); @@ -3800,7 +3887,7 @@ fn send_dot_from_moonbeam_to_statemine_via_xtokens_transfer_multiassets() { // (100 - MinXcmFee) assert_eq!( StatemineBalances::free_balance(RELAYBOB), - INITIAL_BALANCE + 50 + INITIAL_BALANCE + 100 ); // Check that BOB received 100 USDC on AssetHub diff --git a/test/suites/dev/moonbase/test-maintenance/test-maintenance-filter.ts b/test/suites/dev/moonbase/test-maintenance/test-maintenance-filter.ts index 0d8bf793f5..6c76ba2c9a 100644 --- a/test/suites/dev/moonbase/test-maintenance/test-maintenance-filter.ts +++ b/test/suites/dev/moonbase/test-maintenance/test-maintenance-filter.ts @@ -148,29 +148,51 @@ describeSuite({ it({ id: "T05", - title: "should forbid xtokens transfer", + title: "should forbid xcm transfer", test: async () => { expect( async () => await context.createBlock( context .polkadotJs() - .tx.xTokens.transfer( - "SelfReserve", //enum - 100n * GLMR, + .tx.polkadotXcm.transferAssets( + // Destination { - V3: { + V4: { parents: 1n, interior: { - X2: [ - { Parachain: 2000n }, - { AccountKey20: { network: null, key: hexToU8a(baltathar.address) } }, - ], + X1: [{ Parachain: 2000n }], + }, + }, + } as any, + // Beneficiary + { + V4: { + parents: 0n, + interior: { + X1: [{ AccountKey20: { network: null, key: hexToU8a(baltathar.address) } }], }, }, } as any, + // Assets + { + V4: [ + { + id: { + V4: { + parents: 0n, + interior: { + Here: null, + }, + }, + }, + fun: { Fungible: 100n * GLMR }, + }, + ], + }, + 0, // FeeAssetItem { - Limited: { refTime: 4000000000, proofSize: 64 * 1024 }, + Limited: { refTime: 8000000000, proofSize: 128 * 1024 }, } ) .signAsync(baltathar) diff --git a/test/suites/dev/moonbase/test-precompile/test-precompile-wormhole.ts b/test/suites/dev/moonbase/test-precompile/test-precompile-wormhole.ts index 02905121ee..da36d5e40a 100644 --- a/test/suites/dev/moonbase/test-precompile/test-precompile-wormhole.ts +++ b/test/suites/dev/moonbase/test-precompile/test-precompile-wormhole.ts @@ -375,11 +375,9 @@ describeSuite({ } expectEVMResult(block.result.events, "Succeed", "Returned"); - const events = expectSubstrateEvents(block, "xTokens", "TransferredAssets"); - const transferFungible = events[0].data[1][0].fun; - expect(transferFungible.isFungible); - const transferAmount = transferFungible.asFungible.toBigInt(); - expect(transferAmount).to.eq(realAmount); + const events = expectSubstrateEvents(block, "polkadotXcm", "Attempted"); + const outcomeEvent = events[0].data[0]; + expect(outcomeEvent.isComplete); }, }); @@ -426,11 +424,9 @@ describeSuite({ } expectEVMResult(block.result.events, "Succeed", "Returned"); - const events = expectSubstrateEvents(block, "xTokens", "TransferredAssets"); - const transferFungible = events[0].data[1][0].fun; - expect(transferFungible.isFungible); - const transferAmount = transferFungible.asFungible.toBigInt(); - expect(transferAmount).to.eq(realAmount - fee); + const events = expectSubstrateEvents(block, "polkadotXcm", "Attempted"); + const outcomeEvent = events[0].data[0]; + expect(outcomeEvent.isComplete); const alithWHTokenAfter = await whWethContract.balanceOf(ALITH_ADDRESS); expect(alithWHTokenAfter - alithWHTokenBefore).to.eq(fee); @@ -481,7 +477,7 @@ describeSuite({ expectEVMResult(block.result.events, "Succeed", "Returned"); // there should be no xTokens TransferredMultiAssets event since fee >= amount sent - const events = expectSubstrateEvents(block!, "xTokens", "TransferredAssets"); + const events = expectSubstrateEvents(block!, "polkadotXcm", "Attempted"); expect(events.length).to.eq(0); // TODO: isn't expectSubstrateEvents supposed to expect > 0? const alithWHTokenAfter = await whWethContract.balanceOf(ALITH_ADDRESS); @@ -532,11 +528,9 @@ describeSuite({ } expectEVMResult(block.result.events, "Succeed", "Returned"); - const events = expectSubstrateEvents(block, "xTokens", "TransferredAssets"); - const transferFungible = events[0].data[1][0].fun; - expect(transferFungible.isFungible); - const transferAmount = transferFungible.asFungible.toBigInt(); - expect(transferAmount).to.eq(realAmount); + const events = expectSubstrateEvents(block, "polkadotXcm", "Attempted"); + const outcomeEvent = events[0].data[0]; + expect(outcomeEvent.isComplete); // no fee paid const alithWHTokenAfter = await whWethContract.balanceOf(ALITH_ADDRESS); @@ -644,11 +638,9 @@ describeSuite({ } expectEVMResult(result.result.events, "Succeed", "Returned"); - const events = expectSubstrateEvents(result, "xTokens", "TransferredAssets"); - const transferFungible = events[0].data[1][0].fun; - expect(transferFungible.isFungible); - const transferAmount = transferFungible.asFungible.toBigInt(); - expect(transferAmount).to.eq(realAmount); + const events = expectSubstrateEvents(result, "polkadotXcm", "Attempted"); + const outcomeEvent = events[0].data[0]; + expect(outcomeEvent.isComplete); }, }); }, diff --git a/test/suites/dev/moonbase/test-precompile/test-precompile-xtokens.ts b/test/suites/dev/moonbase/test-precompile/test-precompile-xtokens.ts index d5872abc4a..db14721c5d 100644 --- a/test/suites/dev/moonbase/test-precompile/test-precompile-xtokens.ts +++ b/test/suites/dev/moonbase/test-precompile/test-precompile-xtokens.ts @@ -61,52 +61,6 @@ describeSuite({ }, }); - it({ - id: "T02", - title: "allows to issue transfer xtokens with fee", - test: async function () { - const destination_enum_selector = "0x01"; - // [0x01; 32] - const destination_address = - "0101010101010101010101010101010101010101010101010101010101010101"; - // NetworkId::Any - const destination_network_id = "00"; - - // This represents X2(Parent, AccountId32([0x01; 32])) - // We will transfer the tokens the former account in the relay chain - // However it does not really matter as we are not testing what happens - // in the relay side of things - const destination = [ - 1, - // junction: AccountId32 enum (01) + the 32 byte account + Any network selector(00) - [destination_enum_selector + destination_address + destination_network_id], - ]; - const amountTransferred = 1000n; - const fee = 100n; - const weight = 100n; - const balBefore = await context.viem().getBalance({ address: ALITH_ADDRESS }); - const rawTxn = await context.writePrecompile!({ - precompileName: "Xtokens", - functionName: "transferWithFee", - args: [PRECOMPILES.NativeErc20[0], amountTransferred, fee, destination, weight], - rawTxOnly: true, - gas: 500_000n, - }); - - const { result } = await context.createBlock(rawTxn); - const balAfter = await context.viem().getBalance({ address: ALITH_ADDRESS }); - const receipt = await context - .viem() - .getTransactionReceipt({ hash: result!.hash as `0x${string}` }); - expectEVMResult(result!.events, "Succeed"); - const gasPrice = receipt.effectiveGasPrice; - const fees = receipt.gasUsed * gasPrice; - - expect(balBefore - balAfter).to.equal(amountTransferred + fee + fees); - await verifyLatestBlockFees(context, amountTransferred + fee); - }, - }); - it({ id: "T03", title: "allows to issue transfer_multiasset xtokens", @@ -167,67 +121,6 @@ describeSuite({ }, }); - it({ - id: "T04", - title: "allows to issue transfer_multiasset xtokens with fee", - test: async function () { - const destination_enum_selector = "0x01"; - // [0x01; 32] - const destination_address = - "0101010101010101010101010101010101010101010101010101010101010101"; - // NetworkId::Any - const destination_network_id = "00"; - - const x2_pallet_instance_enum_selector = "0x04"; - const x2_instance = "03"; - - // This represents X1(PalletInstance(3))) - // This multilocation represents our native token - const asset = [ - // one parent - 0, - // X1(PalletInstance) - // PalletInstance: Selector (04) + palconst instance 1 byte (03) - [x2_pallet_instance_enum_selector + x2_instance], - ]; - // This represents X2(Parent, AccountId32([0x01; 32])) - // We will transfer the tokens the former account in the relay chain - // However it does not really matter as we are not testing what happens - // in the relay side of things - const destination = [ - 1, - // junction: AccountId32 enum (01) + the 32 byte account + Any network selector(00) - [destination_enum_selector + destination_address + destination_network_id], - ]; - const amountTransferred = 1000n; - - const fee = 100n; - const weight = 100; - - const balBefore = await context.viem().getBalance({ address: ALITH_ADDRESS }); - const rawTxn = await context.writePrecompile!({ - precompileName: "Xtokens", - functionName: "transferMultiassetWithFee", - args: [asset, amountTransferred, fee, destination, weight], - gas: 1_200_000n, - rawTxOnly: true, - }); - - const { result } = await context.createBlock(rawTxn); - const balAfter = await context.viem().getBalance({ address: ALITH_ADDRESS }); - const receipt = await context - .viem() - .getTransactionReceipt({ hash: result!.hash as `0x${string}` }); - expectEVMResult(result!.events, "Succeed"); - - const gasPrice = receipt.effectiveGasPrice; - const fees = receipt.gasUsed * gasPrice; - - expect(balBefore - balAfter).to.equal(amountTransferred + fee + fees); - await verifyLatestBlockFees(context, amountTransferred + fee); - }, - }); - it({ id: "T05", title: "allows to issue transfer multicurrencies xtokens", diff --git a/test/suites/tracing-tests/test-trace-filter.ts b/test/suites/tracing-tests/test-trace-filter.ts index ca9becdec8..65f4686b38 100644 --- a/test/suites/tracing-tests/test-trace-filter.ts +++ b/test/suites/tracing-tests/test-trace-filter.ts @@ -1,5 +1,6 @@ import { beforeAll, customDevRpcRequest, describeSuite, expect } from "@moonwall/cli"; import { ALITH_ADDRESS, ALITH_CONTRACT_ADDRESSES, GLMR, alith } from "@moonwall/util"; +import { hexToU8a } from "@polkadot/util"; describeSuite({ id: "T14", @@ -258,31 +259,80 @@ describeSuite({ id: "T10", title: "should only trace transactions included in a block", test: async function () { - context - .polkadotJs() - .tx.xTokens.transfer( + const metadata = await context.polkadotJs().rpc.state.getMetadata(); + const erc20XcmBridgePalletIndex = metadata.asLatest.pallets + .find(({ name }) => name.toString() == "Erc20XcmBridge")! + .index.toNumber(); + + const dest = { + V4: { + parents: 1n, + interior: { + X1: [{ Parachain: 2104n }], + }, + }, + } as any; + + const beneficiary = { + V4: { + parents: 0n, + interior: { + X1: [ + { + AccountId32: { + network: null, + id: "0x608a07e4dfc71e7d99a3d3759ce12ccbb1e4d9f917cc67779c13aaeaea52794d", + }, + }, + ], + }, + }, + } as any; + + const assetsToSend = { + V4: [ { - Erc20: { - contractAddress: "0x931715fee2d06333043d11f658c8ce934ac61d0c", + id: { + V4: { + parents: 0n, + interior: { + Here: null, + }, + }, }, - }, //enum - 100n * GLMR, + fun: { Fungible: 100n * GLMR }, + }, { - V2: { - parents: 1n, - interior: { - X2: [ - { Parachain: 2104n }, - { - AccountId32: { - network: "Any", - id: "0x608a07e4dfc71e7d99a3d3759ce12ccbb1e4d9f917cc67779c13aaeaea52794d", + id: { + V4: { + parents: 0n, + interior: { + X2: [ + { PalletInstance: Number(erc20XcmBridgePalletIndex) }, + { + AccountKey20: { + network: null, + key: hexToU8a("0x931715fee2d06333043d11f658c8ce934ac61d0c"), + }, }, - }, - ], + ], + }, }, }, - } as any, + fun: { + Fungible: 100n * GLMR, + }, + }, + ], + }; + + context + .polkadotJs() + .tx.polkadotXcm.transferAssets( + dest, + beneficiary, + assetsToSend, + 0, // feeAssetId { Limited: { refTime: 4000000000, proofSize: 0 }, }