Skip to content

Commit

Permalink
pallet-xcm change and xtokens for funcs
Browse files Browse the repository at this point in the history
  • Loading branch information
@gitofdeepanshu
gitofdeepanshu committed Oct 8, 2023
1 parent 6987644 commit d58d0ae
Show file tree
Hide file tree
Showing 8 changed files with 152 additions and 152 deletions.
10 changes: 5 additions & 5 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ pallet-collator-selection = { path = "./pallets/collator-selection", default-fea
pallet-dapps-staking = { path = "./pallets/dapps-staking", default-features = false }
pallet-xc-asset-config = { path = "./pallets/xc-asset-config", default-features = false }
pallet-xvm = { path = "./pallets/xvm", default-features = false }
pallet-xcm = { path = "./pallets/pallet-xcm", default-features = false }
pallet-xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.43", default-features = false }
pallet-ethereum-checked = { path = "./pallets/ethereum-checked", default-features = false }
pallet-dynamic-evm-base-fee = { path = "./pallets/dynamic-evm-base-fee", default-features = false }
pallet-unified-accounts = { path = "./pallets/unified-accounts", default-features = false }
Expand Down
171 changes: 108 additions & 63 deletions precompiles/xcm/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ where
<R as orml_xtokens::Config>::MaxAssetsForTransfer::get() as u32
}
}

/// A precompile that expose XCM related functions.
pub struct XcmPrecompile<Runtime, C>(PhantomData<(Runtime, C)>);

Expand Down Expand Up @@ -181,19 +182,27 @@ where
input.expect_arguments(6)?;

// Read arguments and check it
let assets: Vec<MultiLocation> = input
.read::<Vec<Address>>()?
let assets_raw: Vec<_> = input
.read::<BoundedVec<Address, GetMaxAssets<Runtime>>>()?
.into();

let assets = assets_raw
.iter()
.cloned()
.filter_map(|address| {
Runtime::address_to_asset_id(address.into()).and_then(|x| C::reverse_ref(x).ok())
})
.collect();
let amounts_raw = input.read::<Vec<U256>>()?;
if amounts_raw.iter().any(|x| *x > u128::MAX.into()) {
return Err(revert("Asset amount is too big"));
}
let amounts: Vec<u128> = amounts_raw.iter().map(|x| x.low_u128()).collect();
.collect::<Vec<MultiLocation>>();

let amounts_raw: Vec<U256> = input
.read::<BoundedVec<U256, GetMaxAssets<Runtime>>>()?
.into();

let amounts = amounts_raw
.iter()
.map(|x| (*x).try_into())
.collect::<Result<Vec<u128>, _>>()
.map_err(|_| revert("error converting amounts, maybe value too large"))?;

// Check that assets list is valid:
// * all assets resolved to multi-location
Expand All @@ -202,57 +211,70 @@ where
return Err(revert("Assets resolution failure."));
}

let beneficiary: MultiLocation = match beneficiary_type {
let beneficiary: Junction = match beneficiary_type {
BeneficiaryType::Account32 => {
let recipient: [u8; 32] = input.read::<H256>()?.into();
X1(Junction::AccountId32 {
Junction::AccountId32 {
network: None,
id: recipient,
})
}
}
BeneficiaryType::Account20 => {
let recipient: H160 = input.read::<Address>()?.into();
X1(Junction::AccountKey20 {
Junction::AccountKey20 {
network: None,
key: recipient.to_fixed_bytes(),
})
}
}
}
.into();

let is_relay = input.read::<bool>()?;
let parachain_id: u32 = input.read::<U256>()?.low_u32();
let fee_asset_item: u32 = input.read::<U256>()?.low_u32();

if fee_asset_item as usize > assets.len() {
return Err(revert("Bad fee index."));
}
let parachain_id: u32 = input
.read::<U256>()?
.try_into()
.map_err(|_| revert("error converting parachain_id, maybe value too large"))?;

// Prepare pallet-xcm call arguments
let dest = if is_relay {
let fee_item: u32 = input
.read::<U256>()?
.try_into()
.map_err(|_| revert("error converting fee_index, maybe value too large"))?;

let mut destination = if is_relay {
MultiLocation::parent()
} else {
X1(Junction::Parachain(parachain_id)).into_exterior(1)
};

let assets: MultiAssets = assets
destination
.push_interior(beneficiary)
.map_err(|_| revert("error converting destination multilocation"))?;

let assets = assets
.iter()
.cloned()
.zip(amounts.iter().cloned())
.map(Into::into)
.collect::<Vec<MultiAsset>>()
.into();
.collect::<Vec<MultiAsset>>();

// Build call with origin.
let origin = Some(Runtime::AddressMapping::into_account_id(
handle.context().caller,
))
.into();
let call = pallet_xcm::Call::<Runtime>::reserve_withdraw_assets {
dest: Box::new(dest.into()),
beneficiary: Box::new(beneficiary.into()),
assets: Box::new(assets.into()),
fee_asset_item,

// Since multiassets sorts them, we need to check whether the index is still correct,
// and error otherwise as there is not much we can do other than that
let multiassets = MultiAssets::from_sorted_and_deduplicated(assets).map_err(|_| {
revert("In field Assets, Provided assets either not sorted nor deduplicated")
})?;

let call = orml_xtokens::Call::<Runtime>::transfer_multiassets {
assets: Box::new(VersionedMultiAssets::V3(multiassets)),
fee_item,
dest: Box::new(VersionedMultiLocation::V3(destination)),
dest_weight_limit: WeightLimit::Unlimited,
};

// Dispatch a call.
Expand All @@ -266,24 +288,32 @@ where
input.expect_arguments(6)?;

// Raw call arguments
let para_id: u32 = input.read::<U256>()?.low_u32();
let parachain_id: u32 = input
.read::<U256>()?
.try_into()
.map_err(|_| revert("error converting parachain_id, maybe value too large"))?;

let is_relay = input.read::<bool>()?;

let fee_asset_addr = input.read::<Address>()?;
let fee_amount = input.read::<U256>()?;

let fee_amount: u128 = input
.read::<U256>()?
.try_into()
.map_err(|_| revert("error converting fee_amount, maybe value too large"))?;

let remote_call: Vec<u8> = input.read::<Bytes>()?.into();
let transact_weight = input.read::<u64>()?;

log::trace!(target: "xcm-precompile:remote_transact", "Raw arguments: para_id: {}, is_relay: {}, fee_asset_addr: {:?}, \
fee_amount: {:?}, remote_call: {:?}, transact_weight: {}",
para_id, is_relay, fee_asset_addr, fee_amount, remote_call, transact_weight);
parachain_id, is_relay, fee_asset_addr, fee_amount, remote_call, transact_weight);

// Process arguments
let dest = if is_relay {
MultiLocation::parent()
} else {
X1(Junction::Parachain(para_id)).into_exterior(1)
X1(Junction::Parachain(parachain_id)).into_exterior(1)
};

let fee_asset = {
Expand All @@ -301,11 +331,6 @@ where
}
};

if fee_amount > u128::MAX.into() {
return Err(revert("Fee amount is too big"));
}
let fee_amount = fee_amount.low_u128();

let context = <Runtime as pallet_xcm::Config>::UniversalLocation::get();
let fee_multilocation: MultiAsset = (fee_asset, fee_amount).into();
let fee_multilocation = fee_multilocation
Expand Down Expand Up @@ -352,8 +377,11 @@ where
input.expect_arguments(6)?;

// Read arguments and check it
let assets: Vec<MultiLocation> = input
.read::<Vec<Address>>()?
let assets_raw: Vec<_> = input
.read::<BoundedVec<Address, GetMaxAssets<Runtime>>>()?
.into();

let assets: Vec<MultiLocation> = assets_raw
.iter()
.cloned()
.filter_map(|address| {
Expand All @@ -367,11 +395,15 @@ where
}
})
.collect();
let amounts_raw = input.read::<Vec<U256>>()?;
if amounts_raw.iter().any(|x| *x > u128::MAX.into()) {
return Err(revert("Asset amount is too big"));
}
let amounts: Vec<u128> = amounts_raw.iter().map(|x| x.low_u128()).collect();
let amounts_raw: Vec<U256> = input
.read::<BoundedVec<U256, GetMaxAssets<Runtime>>>()?
.into();

let amounts = amounts_raw
.iter()
.map(|x| (*x).try_into())
.collect::<Result<Vec<u128>, _>>()
.map_err(|_| revert("error converting amounts, maybe value too large"))?;

log::trace!(target: "xcm-precompile:assets_reserve_transfer", "Processed arguments: assets {:?}, amounts: {:?}", assets, amounts);

Expand All @@ -382,57 +414,70 @@ where
return Err(revert("Assets resolution failure."));
}

let beneficiary: MultiLocation = match beneficiary_type {
let beneficiary: Junction = match beneficiary_type {
BeneficiaryType::Account32 => {
let recipient: [u8; 32] = input.read::<H256>()?.into();
X1(Junction::AccountId32 {
Junction::AccountId32 {
network: None,
id: recipient,
})
}
}
BeneficiaryType::Account20 => {
let recipient: H160 = input.read::<Address>()?.into();
X1(Junction::AccountKey20 {
Junction::AccountKey20 {
network: None,
key: recipient.to_fixed_bytes(),
})
}
}
}
.into();

let is_relay = input.read::<bool>()?;
let parachain_id: u32 = input.read::<U256>()?.low_u32();
let fee_asset_item: u32 = input.read::<U256>()?.low_u32();
let parachain_id: u32 = input
.read::<U256>()?
.try_into()
.map_err(|_| revert("error converting parachain_id, maybe value too large"))?;

if fee_asset_item as usize > assets.len() {
return Err(revert("Bad fee index."));
}
let fee_item: u32 = input
.read::<U256>()?
.try_into()
.map_err(|_| revert("error converting fee_index, maybe value too large"))?;

// Prepare pallet-xcm call arguments
let dest = if is_relay {
let mut destination = if is_relay {
MultiLocation::parent()
} else {
X1(Junction::Parachain(parachain_id)).into_exterior(1)
};

let assets: MultiAssets = assets
destination
.push_interior(beneficiary)
.map_err(|_| revert("error converting destination multilocation"))?;

let assets = assets
.iter()
.cloned()
.zip(amounts.iter().cloned())
.map(Into::into)
.collect::<Vec<MultiAsset>>()
.into();
.collect::<Vec<MultiAsset>>();

// Build call with origin.
let origin = Some(Runtime::AddressMapping::into_account_id(
handle.context().caller,
))
.into();
let call = pallet_xcm::Call::<Runtime>::reserve_transfer_assets {
dest: Box::new(dest.into()),
beneficiary: Box::new(beneficiary.into()),
assets: Box::new(assets.into()),
fee_asset_item,

// Since multiassets sorts them, we need to check whether the index is still correct,
// and error otherwise as there is not much we can do other than that
let multiassets = MultiAssets::from_sorted_and_deduplicated(assets).map_err(|_| {
revert("In field Assets, Provided assets either not sorted nor deduplicated")
})?;

let call = orml_xtokens::Call::<Runtime>::transfer_multiassets {
assets: Box::new(VersionedMultiAssets::V3(multiassets)),
fee_item,
dest: Box::new(VersionedMultiLocation::V3(destination)),
dest_weight_limit: WeightLimit::Unlimited,
};

// Dispatch a call.
Expand Down
2 changes: 2 additions & 0 deletions precompiles/xcm/src/mock.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -525,6 +525,8 @@ impl pallet_xcm::Config for Runtime {
type Currency = Balances;
type CurrencyMatcher = ();
type MaxLockers = frame_support::traits::ConstU32<8>;
type MaxRemoteLockConsumers = ConstU32<0>;
type RemoteLockConsumerIdentifier = ();
type WeightInfo = pallet_xcm::TestWeightInfo;
type AdminOrigin = frame_system::EnsureRoot<AccountId>;
#[cfg(feature = "runtime-benchmarks")]
Expand Down
Loading

0 comments on commit d58d0ae

Please sign in to comment.