Fix ADAR extrinsic fee (#726)

* Fix ADAR extrinsic fee * Optimize mul
sora-xor · Sep 15, 2023 · 8465c4b · 8465c4b
1 parent f9b1a14
commit 8465c4b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
@@ -259,10 +259,10 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("sora-substrate"),
     impl_name: create_runtime_str!("sora-substrate"),
     authoring_version: 1,
-    spec_version: 61,
+    spec_version: 62,
     impl_version: 1,
     apis: RUNTIME_API_VERSIONS,
-    transaction_version: 61,
+    transaction_version: 62,
     state_version: 0,
 };
 

diff --git a/runtime/src/xor_fee_impls.rs b/runtime/src/xor_fee_impls.rs
@@ -1,5 +1,6 @@
 use core::cmp::{Eq, PartialEq};
 use pallet_utility::Call as UtilityCall;
+use sp_runtime::traits::Zero;
 use sp_runtime::DispatchResult;
 
 use crate::*;
@@ -73,8 +74,9 @@ impl CustomFees {
                 swap_batches
                     .iter()
                     .map(|x| x.receivers.len() as Balance)
-                    .sum::<Balance>()
-                    * SMALL_FEE,
+                    .fold(Balance::zero(), |acc, x| acc.saturating_add(x))
+                    .saturating_mul(SMALL_FEE)
+                    .max(SMALL_FEE),
             ),
             RuntimeCall::Assets(assets::Call::register { .. })
             | RuntimeCall::EthBridge(eth_bridge::Call::transfer_to_sidechain { .. })