Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

[Fix] Weight calculations for Wild -> affects teleports #1639

Merged
paritytech-processbot merged 8 commits into from
Sep 19, 2022
Merged

[Fix] Weight calculations for Wild -> affects teleports #1639

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5ebdb90
[Fix] Weight calculations for Wild -> affects teleports
ruseinov Sep 19, 2022
77d33b1
introduce a separate asset limit for teleports
ruseinov Sep 19, 2022
4901fe3
fix deposit
ruseinov Sep 19, 2022
81ea3be
reshuffle abstractions
ruseinov Sep 19, 2022
9efa822
fix imports
ruseinov Sep 19, 2022
9258f4e
little refactoring
ruseinov Sep 19, 2022
2d60b9f
Update parachains/common/src/xcm_config.rs
ruseinov Sep 19, 2022
4b1583a
add comments
ruseinov Sep 19, 2022
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
Prev Previous commit
Next Next commit
introduce a separate asset limit for teleports
  • Loading branch information
@ruseinov
ruseinov committed Sep 19, 2022
commit 77d33b1407dc4f7dd5a653d8d9fd63da115c6bac
33 changes: 26 additions & 7 deletions parachains/runtimes/assets/statemine/src/weights/xcm/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,38 @@ use xcm::{
DoubleEncoded,
};

fn weigh_multi_assets_generic(
filter: &MultiAssetFilter,
weight: Weight,
max_assets: u32,
) -> XCMWeight {
let weight = match filter {
MultiAssetFilter::Definite(assets) => weight.saturating_mul(assets.len() as u64),
MultiAssetFilter::Wild(_) => weight.saturating_mul(max_assets as u64),
};
weight.ref_time()
}

trait WeighMultiAssets {
fn weigh_multi_assets(&self, weight: Weight) -> XCMWeight;
}

const MAX_ASSETS: u32 = 1;
trait WeighMultiAssetsTeleport {
fn weigh_multi_assets_teleport(&self, weight: Weight) -> XCMWeight;
}

const MAX_ASSETS: u32 = 100;
const TELEPORT_MAX_ASSETS: u32 = 1;

impl WeighMultiAssets for MultiAssetFilter {
fn weigh_multi_assets(&self, weight: Weight) -> XCMWeight {
let weight = match self {
Self::Definite(assets) => weight.saturating_mul(assets.len() as u64),
Self::Wild(_) => weight.saturating_mul(MAX_ASSETS as u64),
};
weight.ref_time()
weigh_multi_assets_generic(self, weight, MAX_ASSETS)
}
}

impl WeighMultiAssetsTeleport for MultiAssetFilter {
fn weigh_multi_assets_teleport(&self, weight: Weight) -> XCMWeight {
weigh_multi_assets_generic(self, weight, TELEPORT_MAX_ASSETS)
}
}

Expand Down Expand Up @@ -141,7 +160,7 @@ impl<Call> XcmWeightInfo<Call> for StatemineXcmWeight<Call> {
_dest: &MultiLocation,
_xcm: &Xcm<()>,
) -> XCMWeight {
assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::initiate_teleport())
assets.weigh_multi_assets_teleport(XcmFungibleWeight::<Runtime>::initiate_teleport())
}
fn query_holding(
_query_id: &u64,
Expand Down
33 changes: 26 additions & 7 deletions parachains/runtimes/assets/statemint/src/weights/xcm/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,38 @@ use xcm::{
DoubleEncoded,
};

fn weigh_multi_assets_generic(
filter: &MultiAssetFilter,
weight: Weight,
max_assets: u32,
) -> XCMWeight {
let weight = match filter {
MultiAssetFilter::Definite(assets) => weight.saturating_mul(assets.len() as u64),
MultiAssetFilter::Wild(_) => weight.saturating_mul(max_assets as u64),
};
weight.ref_time()
}

trait WeighMultiAssets {
fn weigh_multi_assets(&self, weight: Weight) -> XCMWeight;
}

const MAX_ASSETS: u32 = 1;
trait WeighMultiAssetsTeleport {
fn weigh_multi_assets_teleport(&self, weight: Weight) -> XCMWeight;
}

const MAX_ASSETS: u32 = 100;
const TELEPORT_MAX_ASSETS: u32 = 1;

impl WeighMultiAssets for MultiAssetFilter {
fn weigh_multi_assets(&self, weight: Weight) -> XCMWeight {
let weight = match self {
Self::Definite(assets) => weight.saturating_mul(assets.len() as u64),
Self::Wild(_) => weight.saturating_mul(MAX_ASSETS as u64),
};
weight.ref_time()
weigh_multi_assets_generic(self, weight, MAX_ASSETS)
}
}

impl WeighMultiAssetsTeleport for MultiAssetFilter {
fn weigh_multi_assets_teleport(&self, weight: Weight) -> XCMWeight {
weigh_multi_assets_generic(self, weight, TELEPORT_MAX_ASSETS)
}
}

Expand Down Expand Up @@ -141,7 +160,7 @@ impl<Call> XcmWeightInfo<Call> for StatemintXcmWeight<Call> {
_dest: &MultiLocation,
_xcm: &Xcm<()>,
) -> XCMWeight {
assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::initiate_teleport())
assets.weigh_multi_assets_teleport(XcmFungibleWeight::<Runtime>::initiate_teleport())
}
fn query_holding(
_query_id: &u64,
Expand Down
33 changes: 26 additions & 7 deletions parachains/runtimes/assets/westmint/src/weights/xcm/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,38 @@ use xcm::{
DoubleEncoded,
};

fn weigh_multi_assets_generic(
filter: &MultiAssetFilter,
weight: Weight,
max_assets: u32,
) -> XCMWeight {
let weight = match filter {
MultiAssetFilter::Definite(assets) => weight.saturating_mul(assets.len() as u64),
MultiAssetFilter::Wild(_) => weight.saturating_mul(max_assets as u64),
};
weight.ref_time()
}

trait WeighMultiAssets {
fn weigh_multi_assets(&self, weight: Weight) -> XCMWeight;
}

const MAX_ASSETS: u32 = 1;
trait WeighMultiAssetsTeleport {
fn weigh_multi_assets_teleport(&self, weight: Weight) -> XCMWeight;
}

const MAX_ASSETS: u32 = 100;
const TELEPORT_MAX_ASSETS: u32 = 1;

impl WeighMultiAssets for MultiAssetFilter {
fn weigh_multi_assets(&self, weight: Weight) -> XCMWeight {
let weight = match self {
Self::Definite(assets) => weight.saturating_mul(assets.len() as u64),
Self::Wild(_) => weight.saturating_mul(MAX_ASSETS as u64),
};
weight.ref_time()
weigh_multi_assets_generic(self, weight, MAX_ASSETS)
}
}

impl WeighMultiAssetsTeleport for MultiAssetFilter {
fn weigh_multi_assets_teleport(&self, weight: Weight) -> XCMWeight {
weigh_multi_assets_generic(self, weight, TELEPORT_MAX_ASSETS)
}
}

Expand Down Expand Up @@ -141,7 +160,7 @@ impl<Call> XcmWeightInfo<Call> for WestmintXcmWeight<Call> {
_dest: &MultiLocation,
_xcm: &Xcm<()>,
) -> XCMWeight {
assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::initiate_teleport())
assets.weigh_multi_assets_teleport(XcmFungibleWeight::<Runtime>::initiate_teleport())
}
fn query_holding(
_query_id: &u64,
Expand Down