Merge branch 'main' into feat/connectors-v2-message-poc

centrifuge · Apr 3, 2023 · 06ef965 · 06ef965
2 parents 3ba9230 + 79f2b05
commit 06ef965
Show file tree

Hide file tree

Showing 21 changed files with 352 additions and 523 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -47,7 +47,6 @@ members = [
   "pallets/investments",
   "pallets/keystore",
   "pallets/liquidity-rewards",
-  "pallets/loans",
   "pallets/loans-ref",
   "pallets/migration",
   "pallets/nft",

diff --git a/flake.nix b/flake.nix
@@ -93,7 +93,7 @@
             };
 
             # This is a hash of all the Cargo dependencies, for reproducibility.
-            cargoSha256 = "sha256-cfGNrb4391DiYSSFr0pB+UxaahZsFopwj5dMxs/1kJM=";
+            cargoSha256 = "sha256-BBuNvCWqMQDNDeDNCr/C4CvJay/2sPGAZQefaKg0EFg=";
 
             nativeBuildInputs = with pkgs; [ clang git-mock pkg-config ];
             buildInputs = with pkgs; [ openssl ] ++ (

diff --git a/libs/traits/src/lib.rs b/libs/traits/src/lib.rs
@@ -233,7 +233,7 @@ pub trait InterestAccrual<InterestRate, Balance, Adjustment> {
 
 	/// Calculate the current debt using normalized debt * cumulative rate
 	fn current_debt(
-		interest_rate_per_sec: InterestRate,
+		interest_rate_per_year: InterestRate,
 		normalized_debt: Self::NormalizedDebt,
 	) -> Result<Balance, DispatchError>;
 
@@ -244,14 +244,14 @@ pub trait InterestAccrual<InterestRate, Balance, Adjustment> {
 	/// (effectively "rewinding the clock" to before the value was
 	/// valid)
 	fn previous_debt(
-		interest_rate_per_sec: InterestRate,
+		interest_rate_per_year: InterestRate,
 		normalized_debt: Self::NormalizedDebt,
 		when: Moment,
 	) -> Result<Balance, DispatchError>;
 
 	/// Increase or decrease the normalized debt
 	fn adjust_normalized_debt(
-		interest_rate_per_sec: InterestRate,
+		interest_rate_per_year: InterestRate,
 		normalized_debt: Self::NormalizedDebt,
 		adjustment: Adjustment,
 	) -> Result<Self::NormalizedDebt, DispatchError>;
@@ -263,23 +263,14 @@ pub trait InterestAccrual<InterestRate, Balance, Adjustment> {
 		normalized_debt: Self::NormalizedDebt,
 	) -> Result<Self::NormalizedDebt, DispatchError>;
 
-	/// Indicate that a yearly rate is in use
-	///
-	/// Validates that the rate is allowed, and converts it to a per-second rate for future operations
-	fn reference_yearly_rate(
-		interest_rate_per_year: InterestRate,
-	) -> Result<InterestRate, DispatchError>;
-
-	/// Indicate that a rate is in use
-	fn reference_rate(interest_rate_per_sec: InterestRate) -> DispatchResult;
+	/// Validate and indicate that a yearly rate is in use
+	fn reference_rate(interest_rate_per_year: InterestRate) -> DispatchResult;
 
 	/// Indicate that a rate is no longer in use
-	fn unreference_rate(interest_rate_per_sec: InterestRate) -> DispatchResult;
+	fn unreference_rate(interest_rate_per_year: InterestRate) -> DispatchResult;
 
-	/// Verifies a yearly additive rate and converts it to a per-second additive rate
-	fn convert_additive_rate_to_per_sec(
-		interset_rate_per_year: InterestRate,
-	) -> Result<InterestRate, DispatchError>;
+	/// Ask if the rate is valid to use by the implementation
+	fn validate_rate(interest_rate_per_year: InterestRate) -> DispatchResult;
 
 	/// Returns a collection of pre-computed rates to perform multiple operations with
 	fn rates() -> Self::Rates;

diff --git a/pallets/connectors/Cargo.toml b/pallets/connectors/Cargo.toml
@@ -47,12 +47,6 @@ xcm-primitives = { git = "https://github.com/PureStake/moonbeam", default-featur
 hex = "0.4.3"
 serde = { version = "1.0.102" }
 
-# Our pallets
-pallet-interest-accrual = { path = "../interest-accrual", default-features = true }
-pallet-loans = { path = "../loans", default-features = true }
-pallet-permissions = { path = "../permissions", default-features = true }
-pallet-pool-system = { path = "../pool-system", default-features = true }
-
 # Substrate crates & pallets
 pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = true, branch = "polkadot-v0.9.32" }
 pallet-timestamp = { git = "https://github.com/paritytech/substrate", default-features = true, branch = "polkadot-v0.9.32" }
@@ -103,10 +97,6 @@ std = [
   "pallet-ethereum/std",
   "xcm-primitives/std",
   "ethabi/std",
-  "pallet-interest-accrual/std",
-  "pallet-permissions/std",
-  "pallet-loans/std",
-  "pallet-pool-system/std",
   "pallet-uniques/std",
   "cfg-primitives/std",
   "frame-benchmarking/std",