From 13dc9c84c60bf57ab52a0c2387dbd62b97883b4d Mon Sep 17 00:00:00 2001 From: dio-will Date: Thu, 8 Aug 2024 15:30:04 +0800 Subject: [PATCH 1/2] Update MIN_VALID_EXCHANGE_RATE for loans --- pallets/loans/src/interest.rs | 4 ++-- pallets/loans/src/lib.rs | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pallets/loans/src/interest.rs b/pallets/loans/src/interest.rs index 7176c2033..93f2d9a4d 100644 --- a/pallets/loans/src/interest.rs +++ b/pallets/loans/src/interest.rs @@ -151,10 +151,10 @@ impl Pallet { 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::::InvalidExchangeRate ); diff --git a/pallets/loans/src/lib.rs b/pallets/loans/src/lib.rs index 788ccc3d4..4091ee513 100644 --- a/pallets/loans/src/lib.rs +++ b/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 = ::AccountId; type AssetIdOf = From 637d95003fbd9dc62685f1d93fbdc5b38e9d911e Mon Sep 17 00:00:00 2001 From: dio-will Date: Thu, 8 Aug 2024 15:38:47 +0800 Subject: [PATCH 2/2] Bump to spec 210 --- runtime/heiko/src/lib.rs | 2 +- runtime/kerria/src/lib.rs | 2 +- runtime/parallel/src/lib.rs | 2 +- runtime/vanilla/src/lib.rs | 2 +- scripts/collator.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/runtime/heiko/src/lib.rs b/runtime/heiko/src/lib.rs index c031b2f30..857331596 100644 --- a/runtime/heiko/src/lib.rs +++ b/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: 209, + spec_version: 210, impl_version: 33, apis: RUNTIME_API_VERSIONS, transaction_version: 17, diff --git a/runtime/kerria/src/lib.rs b/runtime/kerria/src/lib.rs index 1fb5a5d45..a1ae7a6e3 100644 --- a/runtime/kerria/src/lib.rs +++ b/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: 209, + spec_version: 210, impl_version: 33, apis: RUNTIME_API_VERSIONS, transaction_version: 17, diff --git a/runtime/parallel/src/lib.rs b/runtime/parallel/src/lib.rs index 7defcd91d..4623e76ad 100644 --- a/runtime/parallel/src/lib.rs +++ b/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: 209, + spec_version: 210, impl_version: 33, apis: RUNTIME_API_VERSIONS, transaction_version: 17, diff --git a/runtime/vanilla/src/lib.rs b/runtime/vanilla/src/lib.rs index b9fc400f9..e2dcfe135 100644 --- a/runtime/vanilla/src/lib.rs +++ b/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: 209, + spec_version: 210, impl_version: 33, apis: RUNTIME_API_VERSIONS, transaction_version: 17, diff --git a/scripts/collator.sh b/scripts/collator.sh index a6f6b796c..46818597d 100755 --- a/scripts/collator.sh +++ b/scripts/collator.sh @@ -20,7 +20,7 @@ VOLUME="chains" NODE_KEY="$1" KEYSTORE_PATH="$2" NODE_NAME="$3" -DOCKER_IMAGE="parallelfinance/parallel:v2.0.9" +DOCKER_IMAGE="parallelfinance/parallel:v2.1.0" BASE_PATH="/data" if [ $# -lt 3 ]; then