Enable fixed point u128

bin/node/executor/tests/basic.rs

@@ -26,7 +26,7 @@ use frame_support::{
 };
 use sp_core::{NeverNativeValue, traits::Externalities, storage::well_known_keys};
 use sp_runtime::{
-	ApplyExtrinsicResult, Fixed128, FixedPointNumber,
+	ApplyExtrinsicResult, FixedI128, FixedPointNumber,
 	traits::Hash as HashT,
 	transaction_validity::InvalidTransaction,
 };
@@ -53,7 +53,7 @@ use self::common::{*, sign};
 pub const BLOATY_CODE: &[u8] = node_runtime::WASM_BINARY_BLOATY;
 
 /// Default transfer fee
-fn transfer_fee<E: Encode>(extrinsic: &E, fee_multiplier: Fixed128) -> Balance {
+fn transfer_fee<E: Encode>(extrinsic: &E, fee_multiplier: FixedI128) -> Balance {
 	let length_fee = TransactionByteFee::get() * (extrinsic.encode().len() as Balance);
 
 	let base_weight = ExtrinsicBaseWeight::get();

bin/node/executor/tests/fees.rs

@@ -22,7 +22,7 @@ use frame_support::{
 	weights::{GetDispatchInfo, constants::ExtrinsicBaseWeight, IdentityFee, WeightToFeePolynomial},
 };
 use sp_core::NeverNativeValue;
-use sp_runtime::{FixedPointNumber, Fixed128, Perbill};
+use sp_runtime::{FixedPointNumber, FixedI128, Perbill};
 use node_runtime::{
 	CheckedExtrinsic, Call, Runtime, Balances, TransactionPayment,
 	TransactionByteFee,
@@ -39,7 +39,7 @@ fn fee_multiplier_increases_and_decreases_on_big_weight() {
 	let mut t = new_test_ext(COMPACT_CODE, false);
 
 	// initial fee multiplier must be zero
-	let mut prev_multiplier = Fixed128::from_inner(0);
+	let mut prev_multiplier = FixedI128::from_inner(0);
 
 	t.execute_with(|| {
 		assert_eq!(TransactionPayment::next_fee_multiplier(), prev_multiplier);

bin/node/runtime/src/impls.rs

@@ -19,8 +19,9 @@
 
 use node_primitives::Balance;
 use sp_runtime::traits::{Convert, Saturating};
-use sp_runtime::{FixedPointNumber, Fixed128, Perquintill};
+use sp_runtime::{FixedPointNumber, Perquintill};
 use frame_support::traits::{OnUnbalanced, Currency, Get};
+use pallet_transaction_payment::Multiplier;
 use crate::{Balances, System, Authorship, MaximumBlockWeight, NegativeImbalance};
 
 pub struct Author;
@@ -56,8 +57,8 @@ impl Convert<u128, Balance> for CurrencyToVoteHandler {
 /// https://research.web3.foundation/en/latest/polkadot/Token%20Economics/#relay-chain-transaction-fees
 pub struct TargetedFeeAdjustment<T>(sp_std::marker::PhantomData<T>);
 
-impl<T: Get<Perquintill>> Convert<Fixed128, Fixed128> for TargetedFeeAdjustment<T> {
-	fn convert(multiplier: Fixed128) -> Fixed128 {
+impl<T: Get<Perquintill>> Convert<Multiplier, Multiplier> for TargetedFeeAdjustment<T> {
+	fn convert(multiplier: Multiplier) -> Multiplier {
 		let max_weight = MaximumBlockWeight::get();
 		let block_weight = System::block_weight().total().min(max_weight);
 		let target_weight = (T::get() * max_weight) as u128;
@@ -67,13 +68,13 @@ impl<T: Get<Perquintill>> Convert<Fixed128, Fixed128> for TargetedFeeAdjustment<
 		let positive = block_weight >= target_weight;
 		let diff_abs = block_weight.max(target_weight) - block_weight.min(target_weight);
 		// safe, diff_abs cannot exceed u64.
-		let diff = Fixed128::saturating_from_rational(diff_abs, max_weight.max(1));
+		let diff = Multiplier::saturating_from_rational(diff_abs, max_weight.max(1));
 		let diff_squared = diff.saturating_mul(diff);
 
 		// 0.00004 = 4/100_000 = 40_000/10^9
-		let v = Fixed128::saturating_from_rational(4, 100_000);
+		let v = Multiplier::saturating_from_rational(4, 100_000);
 		// 0.00004^2 = 16/10^10 Taking the future /2 into account... 8/10^10
-		let v_squared_2 = Fixed128::saturating_from_rational(8, 10_000_000_000u64);
+		let v_squared_2 = Multiplier::saturating_from_rational(8, 10_000_000_000u64);
 
 		let first_term = v.saturating_mul(diff);
 		let second_term = v_squared_2.saturating_mul(diff_squared);
@@ -92,7 +93,7 @@ impl<T: Get<Perquintill>> Convert<Fixed128, Fixed128> for TargetedFeeAdjustment<
 				// multiplier. While at -1, it means that the network is so un-congested that all
 				// transactions have no weight fee. We stop here and only increase if the network
 				// became more busy.
-				.max(Fixed128::saturating_from_integer(-1))
+				.max(Multiplier::saturating_from_integer(-1))
 		}
 	}
 }
@@ -114,7 +115,7 @@ mod tests {
 	}
 
 	// poc reference implementation.
-	fn fee_multiplier_update(block_weight: Weight, previous: Fixed128) -> Fixed128  {
+	fn fee_multiplier_update(block_weight: Weight, previous: Multiplier) -> Multiplier  {
 		// maximum tx weight
 		let m = max() as f64;
 		// block weight always truncated to max weight
@@ -127,7 +128,7 @@ mod tests {
 		let s = block_weight;
 
 		let fm = v * (s/m - ss/m) + v.powi(2) * (s/m - ss/m).powi(2) / 2.0;
-		let addition_fm = Fixed128::from_inner((fm * Fixed128::accuracy() as f64).round() as i128);
+		let addition_fm = Multiplier::from_inner((fm * Multiplier::accuracy() as f64).round() as i128);
 		previous.saturating_add(addition_fm)
 	}
 
@@ -142,7 +143,7 @@ mod tests {
 
 	#[test]
 	fn fee_multiplier_update_poc_works() {
-		let fm = Fixed128::saturating_from_rational(0, 1);
+		let fm = Multiplier::saturating_from_rational(0, 1);
 		let test_set = vec![
 			(0, fm.clone()),
 			(100, fm.clone()),
@@ -156,7 +157,7 @@ mod tests {
 					fee_multiplier_update(w, fm),
 					TargetedFeeAdjustment::<TargetBlockFullness>::convert(fm),
 					// Error is only 1 in 10^18
-					Fixed128::from_inner(1),
+					Multiplier::from_inner(1),
 				);
 			})
 		})
@@ -167,12 +168,12 @@ mod tests {
 		// just a few txs per_block.
 		let block_weight = 0;
 		run_with_system_weight(block_weight, || {
-			let mut fm = Fixed128::default();
+			let mut fm = Multiplier::default();
 			let mut iterations: u64 = 0;
 			loop {
 				let next = TargetedFeeAdjustment::<TargetBlockFullness>::convert(fm);
 				fm = next;
-				if fm == Fixed128::saturating_from_integer(-1) { break; }
+				if fm == Multiplier::saturating_from_integer(-1) { break; }
 				iterations += 1;
 			}
 			println!("iteration {}, new fm = {:?}. Weight fee is now zero", iterations, fm);
@@ -200,7 +201,7 @@ mod tests {
 
 		run_with_system_weight(block_weight, || {
 			// initial value configured on module
-			let mut fm = Fixed128::default();
+			let mut fm = Multiplier::default();
 			assert_eq!(fm, TransactionPayment::next_fee_multiplier());
 
 			let mut iterations: u64 = 0;
@@ -233,49 +234,49 @@ mod tests {
 		// and light blocks will have a weight multiplier less than 0.
 		run_with_system_weight(target() / 4, || {
 			// `fee_multiplier_update` is enough as it is the absolute truth value.
-			let next = TargetedFeeAdjustment::<TargetBlockFullness>::convert(Fixed128::default());
+			let next = TargetedFeeAdjustment::<TargetBlockFullness>::convert(Multiplier::default());
 			assert_eq!(
 				next,
-				fee_multiplier_update(target() / 4 ,Fixed128::default())
+				fee_multiplier_update(target() / 4 ,Multiplier::default())
 			);
 
 			// Light block. Fee is reduced a little.
-			assert!(next < Fixed128::zero())
+			assert!(next < Multiplier::zero())
 		});
 		run_with_system_weight(target() / 2, || {
-			let next = TargetedFeeAdjustment::<TargetBlockFullness>::convert(Fixed128::default());
+			let next = TargetedFeeAdjustment::<TargetBlockFullness>::convert(Multiplier::default());
 			assert_eq!(
 				next,
-				fee_multiplier_update(target() / 2 ,Fixed128::default())
+				fee_multiplier_update(target() / 2 ,Multiplier::default())
 			);
 
 			// Light block. Fee is reduced a little.
-			assert!(next < Fixed128::zero())
+			assert!(next < Multiplier::zero())
 
 		});
 		run_with_system_weight(target(), || {
 			// ideal. Original fee. No changes.
-			let next = TargetedFeeAdjustment::<TargetBlockFullness>::convert(Fixed128::default());
-			assert_eq!(next, Fixed128::zero())
+			let next = TargetedFeeAdjustment::<TargetBlockFullness>::convert(Multiplier::default());
+			assert_eq!(next, Multiplier::zero())
 		});
 		run_with_system_weight(target() * 2, || {
 			// More than ideal. Fee is increased.
-			let next = TargetedFeeAdjustment::<TargetBlockFullness>::convert(Fixed128::default());
+			let next = TargetedFeeAdjustment::<TargetBlockFullness>::convert(Multiplier::default());
 			assert_eq!(
 				next,
-				fee_multiplier_update(target() * 2 ,Fixed128::default())
+				fee_multiplier_update(target() * 2 ,Multiplier::default())
 			);
 
 			// Heavy block. Fee is increased a little.
-			assert!(next > Fixed128::zero())
+			assert!(next > Multiplier::zero())
 		});
 	}
 
 	#[test]
 	fn stateful_weight_mul_grow_to_infinity() {
 		run_with_system_weight(target() * 2, || {
-			let mut original = Fixed128::default();
-			let mut next = Fixed128::default();
+			let mut original = Multiplier::default();
+			let mut next = Multiplier::default();
 
 			(0..1_000).for_each(|_| {
 				next = TargetedFeeAdjustment::<TargetBlockFullness>::convert(original);
@@ -293,7 +294,7 @@ mod tests {
 	#[test]
 	fn stateful_weight_mil_collapse_to_minus_one() {
 		run_with_system_weight(0, || {
-			let mut original = Fixed128::default(); // 0
+			let mut original = Multiplier::default(); // 0
 			let mut next;
 
 			// decreases
@@ -315,8 +316,8 @@ mod tests {
 
 			// ... stops going down at -1
 			assert_eq!(
-				TargetedFeeAdjustment::<TargetBlockFullness>::convert(Fixed128::saturating_from_integer(-1)),
-				Fixed128::saturating_from_integer(-1)
+				TargetedFeeAdjustment::<TargetBlockFullness>::convert(Multiplier::saturating_from_integer(-1)),
+				Multiplier::saturating_from_integer(-1)
 			);
 		})
 	}
@@ -325,7 +326,7 @@ mod tests {
 	fn weight_to_fee_should_not_overflow_on_large_weights() {
 		let kb = 1024 as Weight;
 		let mb = kb * kb;
-		let max_fm = Fixed128::saturating_from_integer(i128::max_value());
+		let max_fm = Multiplier::saturating_from_integer(i128::max_value());
 
 		// check that for all values it can compute, correctly.
 		vec![
@@ -346,9 +347,9 @@ mod tests {
 			Weight::max_value(),
 		].into_iter().for_each(|i| {
 			run_with_system_weight(i, || {
-				let next = TargetedFeeAdjustment::<TargetBlockFullness>::convert(Fixed128::default());
-				let truth = fee_multiplier_update(i, Fixed128::default());
-				assert_eq_error_rate!(truth, next, Fixed128::from_inner(50_000_000));
+				let next = TargetedFeeAdjustment::<TargetBlockFullness>::convert(Multiplier::default());
+				let truth = fee_multiplier_update(i, Multiplier::default());
+				assert_eq_error_rate!(truth, next, Multiplier::from_inner(50_000_000));
 			});
 		});
 

frame/balances/src/tests.rs

@@ -37,7 +37,7 @@ macro_rules! decl_tests {
 	($test:ty, $ext_builder:ty, $existential_deposit:expr) => {
 
 		use crate::*;
-		use sp_runtime::{FixedPointNumber, Fixed128, traits::{SignedExtension, BadOrigin}};
+		use sp_runtime::{FixedPointNumber, FixedI128, traits::{SignedExtension, BadOrigin}};
 		use frame_support::{
 			assert_noop, assert_ok, assert_err,
 			traits::{
@@ -162,7 +162,7 @@ macro_rules! decl_tests {
 				.monied(true)
 				.build()
 				.execute_with(|| {
-					pallet_transaction_payment::NextFeeMultiplier::put(Fixed128::saturating_from_integer(1));
+					pallet_transaction_payment::NextFeeMultiplier::put(FixedI128::saturating_from_integer(1));
 					Balances::set_lock(ID_1, &1, 10, WithdrawReason::Reserve.into());
 					assert_noop!(
 						<Balances as Currency<_>>::transfer(&1, &2, 1, AllowDeath),

frame/transaction-payment/src/lib.rs

@@ -44,7 +44,7 @@ use frame_support::{
 	dispatch::DispatchResult,
 };
 use sp_runtime::{
-	Fixed128, FixedPointNumber, FixedPointOperand,
+	FixedI128, FixedPointNumber, FixedPointOperand,
 	transaction_validity::{
 		TransactionPriority, ValidTransaction, InvalidTransaction, TransactionValidityError,
 		TransactionValidity,
@@ -56,7 +56,9 @@ use sp_runtime::{
 };
 use pallet_transaction_payment_rpc_runtime_api::RuntimeDispatchInfo;
 
-type Multiplier = Fixed128;
+/// Fee multiplier.
+pub type Multiplier = FixedI128;
+
 type BalanceOf<T> =
 	<<T as Trait>::Currency as Currency<<T as frame_system::Trait>::AccountId>>::Balance;
 type NegativeImbalanceOf<T> =
@@ -617,7 +619,7 @@ mod tests {
 			.execute_with(||
 		{
 			let len = 10;
-			NextFeeMultiplier::put(Fixed128::saturating_from_rational(1, 2));
+			NextFeeMultiplier::put(Multiplier::saturating_from_rational(1, 2));
 
 			let pre = ChargeTransactionPayment::<Runtime>::from(5 /* tipped */)
 				.pre_dispatch(&2, CALL, &info_from_weight(100), len)
@@ -705,7 +707,7 @@ mod tests {
 			.execute_with(||
 		{
 			// all fees should be x1.5
-			NextFeeMultiplier::put(Fixed128::saturating_from_rational(1, 2));
+			NextFeeMultiplier::put(Multiplier::saturating_from_rational(1, 2));
 			let len = 10;
 
 			assert!(
@@ -733,7 +735,7 @@ mod tests {
 			.execute_with(||
 		{
 			// all fees should be x1.5
-			NextFeeMultiplier::put(Fixed128::saturating_from_rational(1, 2));
+			NextFeeMultiplier::put(Multiplier::saturating_from_rational(1, 2));
 
 			assert_eq!(
 				TransactionPayment::query_info(xt, len),
@@ -762,7 +764,7 @@ mod tests {
 			.execute_with(||
 		{
 			// Next fee multiplier is zero
-			assert_eq!(NextFeeMultiplier::get(), Fixed128::saturating_from_integer(0));
+			assert_eq!(NextFeeMultiplier::get(), Multiplier::saturating_from_integer(0));
 
 			// Tip only, no fees works
 			let dispatch_info = DispatchInfo {
@@ -802,7 +804,7 @@ mod tests {
 			.execute_with(||
 		{
 			// Add a next fee multiplier
-			NextFeeMultiplier::put(Fixed128::saturating_from_rational(1, 2)); // = 1/2 = .5
+			NextFeeMultiplier::put(Multiplier::saturating_from_rational(1, 2)); // = 1/2 = .5
 			// Base fee is unaffected by multiplier
 			let dispatch_info = DispatchInfo {
 				weight: 0,
@@ -835,7 +837,7 @@ mod tests {
 			.execute_with(||
 		{
 			// Add a next fee multiplier
-			NextFeeMultiplier::put(Fixed128::saturating_from_rational(-1, 2)); // = -1/2 = -.5
+			NextFeeMultiplier::put(Multiplier::saturating_from_rational(-1, 2)); // = -1/2 = -.5
 			// Base fee is unaffected by multiplier
 			let dispatch_info = DispatchInfo {
 				weight: 0,
@@ -990,7 +992,7 @@ mod tests {
 			let len = 10;
 			let tip = 5;
 
-			NextFeeMultiplier::put(Fixed128::saturating_from_rational(1, 4));
+			NextFeeMultiplier::put(Multiplier::saturating_from_rational(1, 4));
 
 			let pre = ChargeTransactionPayment::<Runtime>::from(tip)
 				.pre_dispatch(&2, CALL, &info, len)

primitives/arithmetic/fuzzer/Cargo.toml

@@ -33,5 +33,5 @@ name = "rational128"
 path = "src/rational128.rs"
 
 [[bin]]
-name = "fixed"
-path = "src/fixed.rs"
+name = "fixed_point"
+path = "src/fixed_point.rs"