Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

relay account transact #1614

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

relay account transact #1614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
206495e
fmt
zqhxuyuan Nov 16, 2021
e653fca
kusd and batch_call test
zqhxuyuan Nov 19, 2021
708d486
tiny
zqhxuyuan Nov 19, 2021
acfe34f
Merge branch 'master' into relay_account
zqhxuyuan Nov 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion orml
Open in desktop
Submodule orml updated 5 files
+83 −1 xcm-support/src/lib.rs
+80 −0 xcm-support/src/tests.rs
+30 −4 xtokens/src/mock/mod.rs
+10 −2 xtokens/src/mock/para.rs
+0 −27 xtokens/src/tests.rs
176 changes: 176 additions & 0 deletions runtime/integration-tests/src/relaychain/kusama_cross_chain_transfer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,182 @@ fn transfer_to_relay_chain() {
}

#[test]
fn transact_transfer_call_to_para_chain_use_ksm() {
Karura::execute_with(|| {
let _ = ParaBalances::deposit_creating(&AccountId::from(ALICE), 1000 * dollar(KAR));
});

let alice = Junctions::X1(Junction::AccountId32 {
network: NetworkId::Kusama,
id: ALICE,
});
let call = Call::Balances(pallet_balances::Call::<Runtime>::transfer {
dest: MultiAddress::Id(AccountId::from(BOB)),
value: 500 * dollar(KAR),
});
let assets: MultiAsset = (Parent, dollar(KSM)).into();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should also support withdraw KAR for fee payment

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

current ParaTokens::deposit(KAR, &AccountId::from(ALICE), 2000 * dollar(KAR)) have ExistentialDeposits limitation.
so I use KUSD instead.


KusamaNet::execute_with(|| {
let xcm = vec![
WithdrawAsset(assets.clone().into()),
BuyExecution {
fees: assets,
weight_limit: Limited(dollar(KSM) as u64),
},
Transact {
origin_type: OriginKind::SovereignAccount,
require_weight_at_most: (dollar(KSM) as u64) / 10 as u64,
call: call.encode().into(),
},
DepositAsset {
assets: All.into(),
max_assets: 1,
beneficiary: { (1, alice.clone()).into() },
},
];
assert_ok!(RelayChainPalletXcm::send_xcm(alice, Parachain(2000).into(), Xcm(xcm),));
});

Karura::execute_with(|| {
use {Event, System};
assert_eq!(9983840000000, ParaTokens::free_balance(KSM, &AccountId::from(ALICE)));
assert_eq!(500 * dollar(KAR), ParaBalances::free_balance(&AccountId::from(ALICE)));
assert_eq!(500 * dollar(KAR), ParaBalances::free_balance(&AccountId::from(BOB)));
System::assert_has_event(Event::Balances(pallet_balances::Event::Transfer(
AccountId::from(ALICE),
AccountId::from(BOB),
500 * dollar(KAR),
)));
});
}

#[test]
fn transact_transfer_call_to_para_chain_use_kusd() {
Karura::execute_with(|| {
let _ = ParaBalances::deposit_creating(&AccountId::from(ALICE), 1000 * dollar(KUSD));
assert_ok!(ParaTokens::deposit(KUSD, &AccountId::from(ALICE), 1000 * dollar(KUSD)));
});

let alice = Junctions::X1(Junction::AccountId32 {
network: NetworkId::Kusama,
id: ALICE,
});
let call = Call::Balances(pallet_balances::Call::<Runtime>::transfer {
dest: MultiAddress::Id(AccountId::from(BOB)),
value: 500 * dollar(KUSD),
});
let assets: MultiAsset = (
(Parent, X2(Parachain(2000), GeneralKey(KUSD.encode()))),
100 * dollar(KUSD),
)
.into();

KusamaNet::execute_with(|| {
let xcm = vec![
WithdrawAsset(assets.clone().into()),
BuyExecution {
fees: assets,
weight_limit: Limited(100 * dollar(KUSD) as u64),
},
Transact {
origin_type: OriginKind::SovereignAccount,
require_weight_at_most: dollar(KUSD) as u64,
call: call.encode().into(),
},
DepositAsset {
assets: All.into(),
max_assets: 1,
beneficiary: { (0, alice.clone()).into() },
},
];
assert_ok!(RelayChainPalletXcm::send_xcm(alice, Parachain(2000).into(), Xcm(xcm),));
});

Karura::execute_with(|| {
assert_eq!(935936000000000, ParaTokens::free_balance(KUSD, &AccountId::from(ALICE)));
assert_eq!(500 * dollar(KUSD), ParaBalances::free_balance(&AccountId::from(ALICE)));
assert_eq!(500 * dollar(KUSD), ParaBalances::free_balance(&AccountId::from(BOB)));
System::assert_has_event(Event::Balances(pallet_balances::Event::Transfer(
AccountId::from(ALICE),
AccountId::from(BOB),
500 * dollar(KUSD),
)));
});
}

#[test]
fn batch_call_execute_then_send_xcm_to_para_chain() {
Karura::execute_with(|| {
assert_ok!(ParaTokens::deposit(KUSD, &AccountId::from(ALICE), 2000 * dollar(KUSD)));
});

let alice = Junctions::X1(Junction::AccountId32 {
network: NetworkId::Kusama,
id: ALICE,
});
let bob = X1(Junction::AccountId32 {
network: NetworkId::Kusama,
id: BOB,
});
KusamaNet::execute_with(|| {
// current kusama runtime `XcmExecuteFilter = Nothing` cause xcm_relay_call `Filtered` error
let _xcm_relay_call = kusama_runtime::Call::XcmPallet(pallet_xcm::Call::<kusama_runtime::Runtime>::execute {
message: Box::new(xcm::VersionedXcm::from(Xcm(vec![
WithdrawAsset((Here, 1100 * dollar(KSM)).into()),
BuyExecution {
fees: (Here, 1100 * dollar(KSM)).into(),
weight_limit: Limited(dollar(KSM) as u64),
},
DepositAsset {
assets: All.into(),
max_assets: 1,
beneficiary: { (0, alice.clone()).into() },
},
]))),
max_weight: dollar(KSM) as u64,
});

let xcm_para_call = kusama_runtime::Call::XcmPallet(pallet_xcm::Call::<kusama_runtime::Runtime>::send {
dest: Box::new(xcm::VersionedMultiLocation::from(Parachain(2000).into())),
message: Box::new(xcm::VersionedXcm::from(Xcm(vec![
WithdrawAsset(
(
(Parent, X2(Parachain(2000), GeneralKey(KUSD.encode()))),
1000 * dollar(KUSD),
)
.into(),
),
BuyExecution {
fees: (
(Parent, X2(Parachain(2000), GeneralKey(KUSD.encode()))),
1000 * dollar(KUSD),
)
.into(),
weight_limit: Limited(dollar(KUSD) as u64),
},
DepositAsset {
assets: All.into(),
max_assets: 1,
beneficiary: { (0, bob).into() },
},
]))),
});

assert_ok!(pallet_utility::Pallet::<kusama_runtime::Runtime>::batch_all(
kusama_runtime::Origin::signed(AccountId::from(ALICE)),
vec![xcm_para_call]
));
});

Karura::execute_with(|| {
assert_eq!(
1000 * dollar(KUSD),
ParaTokens::free_balance(KUSD, &AccountId::from(ALICE))
);
assert_eq!(999948800000000, ParaTokens::free_balance(KUSD, &AccountId::from(BOB)));
});
}

fn foreign_asset_transfer_to_relay_chain() {
Karura::execute_with(|| {
// register KSM as foreign asset
Expand Down
6 changes: 6 additions & 0 deletions runtime/integration-tests/src/relaychain/kusama_test_net.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,12 @@ decl_test_network! {
}
}

pub type ParaBalances = pallet_balances::Pallet<Runtime>;

pub type ParaTokens = orml_tokens::Pallet<Runtime>;

pub type RelayChainPalletXcm = pallet_xcm::Pallet<kusama_runtime::Runtime>;

fn default_parachains_host_configuration() -> HostConfiguration<BlockNumber> {
HostConfiguration {
validation_upgrade_frequency: 1u32,
Expand Down
3 changes: 3 additions & 0 deletions runtime/karura/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ pub use sp_runtime::BuildStorage;

pub use authority::AuthorityConfigImpl;
pub use constants::{fee::*, parachains, time::*};
use orml_xcm_support::{AllowRelayedPaidExecutionFromParent, RelayChainAccountId32Aliases};
pub use primitives::{
define_combined_task, evm::EstimateResourcesRequest, task::TaskResult, AccountId, AccountIndex, Address, Amount,
AuctionId, AuthoritysOriginId, Balance, BlockNumber, CurrencyId, DataProviderId, EraIndex, Hash, Moment, Nonce,
Expand Down Expand Up @@ -1401,6 +1402,7 @@ pub type LocationToAccountId = (
SiblingParachainConvertsVia<Sibling, AccountId>,
// Straight up local `AccountId32` origins just alias directly to `AccountId`.
AccountId32Aliases<RelayNetwork, AccountId>,
RelayChainAccountId32Aliases<RelayNetwork, AccountId>,
);

/// This is the type we use to convert an (incoming) XCM origin into a local `Origin` instance,
Expand Down Expand Up @@ -1461,6 +1463,7 @@ pub type Barrier = (
AllowKnownQueryResponses<PolkadotXcm>,
// Subscriptions for version tracking are OK.
AllowSubscriptionsFrom<Everything>,
AllowRelayedPaidExecutionFromParent<RelayNetwork>,
);

pub struct ToTreasury;
Expand Down