Charge 0-asset XCM instructions as if they were 1-asset (#1071)

Signed-off-by: Adam Reif <[email protected]>
Manta-Network · Apr 13, 2023 · 0732a13 · 0732a13
1 parent c348344
commit 0732a13
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/runtime/calamari/src/weights/xcm/mod.rs b/runtime/calamari/src/weights/xcm/mod.rs
@@ -35,7 +35,8 @@ impl WeighMultiAssets for MultiAssetFilter {
     fn weigh_multi_assets(&self, weight: Weight) -> Weight {
         match self {
             Self::Definite(assets) => {
-                (assets.inner().iter().count() as Weight).saturating_mul(weight)
+                // NOTE: We charge fees for at least 1 asset even if 0 were requested to punish spam
+                (assets.inner().iter().count().max(1) as Weight).saturating_mul(weight)
             }
             Self::Wild(_) => (MAX_ASSETS as Weight).saturating_mul(weight),
         }
@@ -44,7 +45,7 @@ impl WeighMultiAssets for MultiAssetFilter {
 
 impl WeighMultiAssets for MultiAssets {
     fn weigh_multi_assets(&self, weight: Weight) -> Weight {
-        (self.inner().iter().count() as Weight).saturating_mul(weight)
+        (self.inner().iter().count().max(1) as Weight).saturating_mul(weight)
     }
 }
 

diff --git a/runtime/dolphin/src/weights/xcm/mod.rs b/runtime/dolphin/src/weights/xcm/mod.rs
@@ -35,7 +35,8 @@ impl WeighMultiAssets for MultiAssetFilter {
     fn weigh_multi_assets(&self, weight: Weight) -> Weight {
         match self {
             Self::Definite(assets) => {
-                (assets.inner().iter().count() as Weight).saturating_mul(weight)
+                // NOTE: We charge fees for at least 1 asset even if 0 were requested to punish spam
+                (assets.inner().iter().count().max(1) as Weight).saturating_mul(weight)
             }
             Self::Wild(_) => (MAX_ASSETS as Weight).saturating_mul(weight),
         }
@@ -44,7 +45,7 @@ impl WeighMultiAssets for MultiAssetFilter {
 
 impl WeighMultiAssets for MultiAssets {
     fn weigh_multi_assets(&self, weight: Weight) -> Weight {
-        (self.inner().iter().count() as Weight).saturating_mul(weight)
+        (self.inner().iter().count().max(1) as Weight).saturating_mul(weight)
     }
 }
 

diff --git a/runtime/manta/src/weights/xcm/mod.rs b/runtime/manta/src/weights/xcm/mod.rs
@@ -35,7 +35,8 @@ impl WeighMultiAssets for MultiAssetFilter {
     fn weigh_multi_assets(&self, weight: Weight) -> Weight {
         match self {
             Self::Definite(assets) => {
-                (assets.inner().iter().count() as Weight).saturating_mul(weight)
+                // NOTE: We charge fees for at least 1 asset even if 0 were requested to punish spam
+                (assets.inner().iter().count().max(1) as Weight).saturating_mul(weight)
             }
             Self::Wild(_) => (MAX_ASSETS as Weight).saturating_mul(weight),
         }
@@ -44,7 +45,7 @@ impl WeighMultiAssets for MultiAssetFilter {
 
 impl WeighMultiAssets for MultiAssets {
     fn weigh_multi_assets(&self, weight: Weight) -> Weight {
-        (self.inner().iter().count() as Weight).saturating_mul(weight)
+        (self.inner().iter().count().max(1) as Weight).saturating_mul(weight)
     }
 }