- Refactored the safe_multiply_offer helper function to return the product of two numbers after checked multiplication. This helps ensure arithmetic safety by throwing an ArithmeticOverflow error when an overflow occurs. Adjusted the start_take_sell_order function to incorporate these changes. It now uses the return value from safe_multiply_offer in calculations which increases the safety and reliability of our operations.

- Made adjustments in the test case `replicate_overflow_for_start_take_sell_order` omitting the unused variable `offer` for cleaner and more efficient code.
- Revised the `safe_add` function to return the sum of two numbers after checked addition. This helps ensure arithmetic safety by throwing an `ArithmeticOverflow` error when an overflow occurs. The `do_calculate_drawdown_total_amount` and `do_calculate_revenue_total_amount` functions have been updated to use the returned value from `safe_add` which increases arithmetic safety in these functions.

Author: didiermis

pallets/afloat/src/functions.rs

@@ -474,12 +474,10 @@ impl<T: Config> Pallet<T> {
 			Error::<T>::NotEnoughTaxCreditsAvailable
 		);
 
-		// check arithmatic overflow
-		Self::safe_multiply_offer(offer.price_per_credit, tax_credit_amount)?;
 		//ensure user has enough afloat balance
 		ensure!(
 			Self::do_get_afloat_balance(who.clone())? >=
-				offer.price_per_credit * tax_credit_amount.into(),
+				Self::safe_multiply_offer(offer.price_per_credit, tax_credit_amount.into())?,
 			Error::<T>::NotEnoughAfloatBalanceAvailable
 		);
 		let zero_balance: T::Balance = Zero::zero();
@@ -488,7 +486,7 @@ impl<T: Config> Pallet<T> {
 
 		let creation_date: u64 = T::Timestamp::now().into();
 		let price_per_credit: T::Balance = offer.price_per_credit.into();
-		let total_price: T::Balance = price_per_credit * tax_credit_amount;
+		let total_price: T::Balance = Self::safe_multiply_offer(price_per_credit, tax_credit_amount)?;
 		let fee: Option<T::Balance> = None;
 		let tax_credit_id: <T as pallet_uniques::Config>::ItemId = offer.tax_credit_id;
 		let seller_id: T::AccountId = offer.creator_id;
@@ -941,9 +939,9 @@ impl<T: Config> Pallet<T> {
 	fn safe_multiply_offer(
 		factor1: T::Balance,
 		factor2: T::Balance
-	) -> DispatchResult {
-		factor1.checked_mul(&factor2).ok_or_else(|| Error::<T>::ArithmeticOverflow)?;
-		Ok(())
+	) -> Result<T::Balance, DispatchError> {
+		let result = factor1.checked_mul(&factor2).ok_or_else(|| Error::<T>::ArithmeticOverflow)?;
+		Ok(result)
 	}
 
 	fn get_all_roles_for_user(account_id: T::AccountId) -> Result<Vec<AfloatRole>, DispatchError> {

pallets/afloat/src/tests.rs

@@ -59,7 +59,7 @@ fn replicate_overflow_for_start_take_sell_order() {
 			}
 		));
 
-		let (offer_id, offer) = AfloatOffers::<Test>::iter().next().unwrap().clone();
+		let (offer_id, _offer) = AfloatOffers::<Test>::iter().next().unwrap().clone();
 		assert_noop!(
 			Afloat::start_take_sell_order(
 				RawOrigin::Signed(other_user.clone()).into(),

pallets/fund-admin/src/functions.rs

@@ -3120,9 +3120,12 @@ impl<T: Config> Pallet<T> {
 		Ok(())
 	}
 
-	fn safe_add(a: u64, b: u64) -> DispatchResult {
-		a.checked_add(b).ok_or_else(|| Error::<T>::ArithmeticOverflow)?;
-		Ok(())
+	fn safe_add(
+		a: u64,
+		b: u64
+	) -> Result<u64, DispatchError> {
+		let result = a.checked_add(b).ok_or_else(|| Error::<T>::ArithmeticOverflow)?;
+		Ok(result)
 	}
 
 	fn do_calculate_drawdown_total_amount(
@@ -3145,11 +3148,9 @@ impl<T: Config> Pallet<T> {
 				// Get transaction data
 				let transaction_data = TransactionsInfo::<T>::get(transaction_id)
 					.ok_or(Error::<T>::TransactionNotFound)?;
-				// Check arithmetic overflow
-				Self::safe_add(drawdown_total_amount, transaction_data.amount)?;
 
 				// Add transaction amount to drawdown total amount
-				drawdown_total_amount += transaction_data.amount;
+				drawdown_total_amount = Self::safe_add(drawdown_total_amount, transaction_data.amount)?;
 			}
 		}
 
@@ -3300,11 +3301,8 @@ impl<T: Config> Pallet<T> {
 					RevenueTransactionsInfo::<T>::get(revenue_transaction_id)
 						.ok_or(Error::<T>::RevenueTransactionNotFound)?;
 
-				// Check arithmetic overflow
-				Self::safe_add(revenue_total_amount, revenue_transaction_data.amount)?;
-
 				// Add revenue transaction amount to revenue total amount
-				revenue_total_amount += revenue_transaction_data.amount;
+				revenue_total_amount = Self::safe_add(revenue_total_amount, revenue_transaction_data.amount)?;
 			}
 		}