Merge branch 'master' of https://github.com/parallel-finance/parallel

Author: 0xrjman

pallets/loans/src/interest.rs

@@ -151,10 +151,10 @@ impl<T: Config> Pallet<T> {
         Ok(Ratio::from_rational(borrows, total))
     }
 
-    /// The exchange rate should be greater than 0.02 and less than 1
+    /// The exchange rate should be greater than 0.015 and less than 1
     pub(crate) fn ensure_valid_exchange_rate(exchange_rate: Rate) -> DispatchResult {
         ensure!(
-            exchange_rate >= Rate::from_inner(MIN_EXCHANGE_RATE)
+            exchange_rate >= Rate::from_inner(MIN_VALID_EXCHANGE_RATE)
                 && exchange_rate < Rate::from_inner(MAX_EXCHANGE_RATE),
             Error::<T>::InvalidExchangeRate
         );

pallets/loans/src/lib.rs

@@ -80,6 +80,7 @@ pub const MIN_INTEREST_CALCULATING_INTERVAL: u64 = 100; // 100 seconds
 
 pub const MAX_EXCHANGE_RATE: u128 = 1_000_000_000_000_000_000; // 1
 pub const MIN_EXCHANGE_RATE: u128 = 20_000_000_000_000_000; // 0.02
+pub const MIN_VALID_EXCHANGE_RATE: u128 = 15_000_000_000_000_000; // 0.015
 
 type AccountIdOf<T> = <T as frame_system::Config>::AccountId;
 type AssetIdOf<T> =
@@ -1470,7 +1471,7 @@ impl<T: Config> Pallet<T> {
         Self::update_reward_supply_index(asset_id)?;
         Self::distribute_supplier_reward(asset_id, who)?;
 
-        let exchange_rate = Self::exchange_rate_stored(asset_id)?;
+        let exchange_rate: FixedU128 = Self::exchange_rate_stored(asset_id)?;
         let redeem_amount = Self::calc_underlying_amount(voucher_amount, exchange_rate)?;
 
         AccountDeposits::<T>::try_mutate_exists(asset_id, who, |deposits| -> DispatchResult {
@@ -1583,11 +1584,16 @@ impl<T: Config> Pallet<T> {
     ) -> DispatchResult {
         let deposits = AccountDeposits::<T>::get(asset_id, who);
         let account_earned = AccountEarned::<T>::get(asset_id, who);
-        let total_earned_prior_new = exchange_rate
-            .checked_sub(&account_earned.exchange_rate_prior)
-            .and_then(|r| r.checked_mul_int(deposits.voucher_balance))
-            .and_then(|r| r.checked_add(account_earned.total_earned_prior))
-            .ok_or(ArithmeticError::Overflow)?;
+
+        let total_earned_prior_new = if exchange_rate >= account_earned.exchange_rate_prior {
+            exchange_rate
+                .checked_sub(&account_earned.exchange_rate_prior)
+                .and_then(|delta| delta.checked_mul_int(deposits.voucher_balance))
+                .and_then(|result| result.checked_add(account_earned.total_earned_prior))
+                .ok_or(ArithmeticError::Overflow)?
+        } else {
+            account_earned.total_earned_prior
+        };
 
         AccountEarned::<T>::insert(
             asset_id,

runtime/heiko/src/lib.rs

@@ -180,7 +180,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("heiko"),
     impl_name: create_runtime_str!("heiko"),
     authoring_version: 1,
-    spec_version: 207,
+    spec_version: 210,
     impl_version: 33,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 17,

runtime/kerria/src/lib.rs

@@ -180,7 +180,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("kerria"),
     impl_name: create_runtime_str!("kerria"),
     authoring_version: 1,
-    spec_version: 207,
+    spec_version: 210,
     impl_version: 33,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 17,

runtime/parallel/src/lib.rs

@@ -185,7 +185,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("parallel"),
     impl_name: create_runtime_str!("parallel"),
     authoring_version: 1,
-    spec_version: 207,
+    spec_version: 210,
     impl_version: 33,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 17,

runtime/vanilla/src/lib.rs

@@ -180,7 +180,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     spec_name: create_runtime_str!("vanilla"),
     impl_name: create_runtime_str!("vanilla"),
     authoring_version: 1,
-    spec_version: 207,
+    spec_version: 210,
     impl_version: 33,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 17,

scripts/collator.sh

@@ -20,7 +20,7 @@ VOLUME="chains"
 NODE_KEY="$1"
 KEYSTORE_PATH="$2"
 NODE_NAME="$3"
-DOCKER_IMAGE="parallelfinance/parallel:v2.0.7"
+DOCKER_IMAGE="parallelfinance/parallel:v2.1.0"
 BASE_PATH="/data"
 
 if [ $# -lt 3 ]; then