update for 1.6.0

nutsfinance · Jan 30, 2024 · c856125 · c856125
1 parent 1adce23
commit c856125
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,10 +13,10 @@ parity-scale-codec = { version = "3.6.5", default-features = false, features = [
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.101", default-features = false }
 
-frame-support = { version = "25.0.0", default-features = false }
-frame-system = { version = "25.0.0", default-features = false }
-sp-core = { version = "25.0.0", default-features = false }
-sp-std = { version = "12.0.0", default-features = false }
-sp-runtime = { version = "28.0.0", default-features = false }
-sp-io = { version = "27.0.0", default-features = false }
-pallet-balances = { version = "25.0.0", default-features = false }
+frame-support = { version = "28.0.0", default-features = false }
+frame-system = { version = "28.0.0", default-features = false }
+sp-core = { version = "28.0.0", default-features = false }
+sp-std = { version = "14.0.0", default-features = false }
+sp-runtime = { version = "31.0.1", default-features = false }
+sp-io = { version = "30.0.0", default-features = false }
+pallet-balances = { version = "28.0.0", default-features = false }
diff --git a/lib/stable-asset/src/lib.rs b/lib/stable-asset/src/lib.rs
@@ -731,8 +731,12 @@ impl<T: Config> Pallet<T> {
 	) -> Option<T::AtLeast64BitUnsigned> {
 		let current_block = frame_system::Pallet::<T>::block_number();
 		if current_block < t1 {
-			let time_diff: T::AtLeast64BitUnsigned = current_block.checked_sub(&t0)?.into();
-			let time_diff_div: T::AtLeast64BitUnsigned = t1.checked_sub(&t0)?.into();
+			let time_diff = current_block.checked_sub(&t0)?;
+			let time_diff: u128 = time_diff.saturated_into();
+			let time_diff: T::AtLeast64BitUnsigned = time_diff.into();
+			let time_diff_div = t1.checked_sub(&t0)?;
+			let time_diff_div: u128 = time_diff_div.saturated_into();
+			let time_diff_div: T::AtLeast64BitUnsigned = time_diff_div.into();
 			if a1 > a0 {
 				let diff = a1.checked_sub(&a0)?;
 				let amount = diff.checked_mul(&time_diff)?.checked_div(&time_diff_div)?;