New convert for weight to fee

core/sr-primitives/src/traits.rs

@@ -166,7 +166,6 @@ impl<T> Convert<T, T> for Identity {
 
 /// A structure that performs standard conversion using the standard Rust conversion traits.
 pub struct ConvertInto;
-
 impl<A, B: From<A>> Convert<A, B> for ConvertInto {
 	fn convert(a: A) -> B { a.into() }
 }

node-template/runtime/src/lib.rs

@@ -10,10 +10,9 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
 use rstd::prelude::*;
 use primitives::{ed25519, sr25519, OpaqueMetadata};
-use sr_primitives::{
-	ApplyResult, transaction_validity::TransactionValidity, generic, create_runtime_str,
-	traits::{NumberFor, BlakeTwo256, Block as BlockT, StaticLookup, Verify}, weights::Weight,
-};
+use sr_primitives::{ApplyResult, transaction_validity::TransactionValidity, generic, create_runtime_str};
+use sr_primitives::traits::{NumberFor, BlakeTwo256, Block as BlockT, StaticLookup, Verify, ConvertInto};
+use sr_primitives::weights::Weight;
 use client::{
 	block_builder::api::{CheckInherentsResult, InherentData, self as block_builder_api},
 	runtime_api, impl_runtime_apis
@@ -166,7 +165,6 @@ parameter_types! {
 	pub const CreationFee: u128 = 0;
 	pub const TransactionBaseFee: u128 = 0;
 	pub const TransactionByteFee: u128 = 1;
-	pub const TransactionWeightFee: u128 = 1;
 }
 
 impl balances::Trait for Runtime {
@@ -187,7 +185,7 @@ impl balances::Trait for Runtime {
 	type CreationFee = CreationFee;
 	type TransactionBaseFee = TransactionBaseFee;
 	type TransactionByteFee = TransactionByteFee;
-	type TransactionWeightFee = TransactionWeightFee;
+	type WeightToFee = ConvertInto;
 }
 
 impl sudo::Trait for Runtime {

node/executor/src/lib.rs

@@ -47,7 +47,7 @@ mod tests {
 		NativeOrEncoded
 	};
 	use node_primitives::{Hash, BlockNumber, AccountId, Balance, Index};
-	use runtime_primitives::traits::{Header as HeaderT, Hash as HashT};
+	use runtime_primitives::traits::{Header as HeaderT, Hash as HashT, Convert};
 	use runtime_primitives::{generic::Era, ApplyOutcome, ApplyError, ApplyResult, Perbill};
 	use runtime_primitives::weights::{WeightMultiplier, GetDispatchInfo, Weight};
 	use {balances, contracts, indices, staking, system, timestamp};
@@ -60,6 +60,7 @@ mod tests {
 		TransactionBaseFee, TransactionByteFee, MaximumBlockWeight,
 	};
 	use node_runtime::constants::currency::*;
+	use node_runtime::impls::WeightToFee;
 	use wabt;
 	use primitives::map;
 
@@ -1104,18 +1105,16 @@ mod tests {
 			let length_fee = <TransactionBaseFee as Get<Balance>>::get() +
 				<TransactionByteFee as Get<Balance>>::get() *
 				(xt.clone().encode().len() as Balance);
-			println!("++ len fee = {:?}", length_fee);
 			balance_alice -= length_fee;
 
-			// TODO: the 1_000_000 should go away.
-			let weight_fee = default_transfer_call().get_dispatch_info().weight as Balance * 1_000_000;
+			let weight = default_transfer_call().get_dispatch_info().weight;
+			let weight_fee = WeightToFee::convert(weight);
+
 			// we know that weight to fee multiplier is effect-less in block 1.
 			assert_eq!(weight_fee as Balance, MILLICENTS);
 			balance_alice -= weight_fee;
-			println!("++ wei fee = {:?}", weight_fee);
 
 			balance_alice -= tip;
-			println!("++ tip fee = {:?}", tip);
 
 			// TODO: why again??? creation fee should not be deducted here.
 			balance_alice -= creation_fee();

node/runtime/src/impls.rs

@@ -47,6 +47,27 @@ impl Convert<u128, Balance> for CurrencyToVoteHandler {
 	fn convert(x: u128) -> Balance { x * Self::factor() }
 }
 
+/// Handles converting a weight scalar to a fee value, based on the scale and granularity of the
+/// node's balance type.
+///
+/// This should typically create a mapping between the following ranges:
+///   - [0, system::MaximumBlockWeight]
+///   - [Balance::min, Balance::max]
+///
+/// Yet, it can be used for any other sort of change to weight-fee. Some examples being:
+///   - Setting it to `0` will essentially disable the weight fee.
+///   - Setting it to `1` will cause the literal `#[weight = x]` values to be charged.
+///
+/// By default, substrate node will have a weight range of [0, 1_000_000].
+pub struct WeightToFee;
+impl Convert<Weight, Balance> for WeightToFee {
+	fn convert(x: Weight) -> Balance {
+		// substrate-node a weight of 10 (smallest non-zero weight) to be mapped to 10^7 units of
+		// fees, hence:
+		Balance::from(x).saturating_mul(1_000_000)
+	}
+}
+
 /// A struct that updates the weight multiplier based on the saturation level of the previous block.
 /// This should typically be called once per-block.
 ///

node/runtime/src/lib.rs

@@ -59,7 +59,7 @@ pub use staking::StakerStatus;
 
 /// Implementations of some helper traits passed into runtime modules as associated types.
 pub mod impls;
-use impls::{CurrencyToVoteHandler, WeightMultiplierUpdateHandler, Author};
+use impls::{CurrencyToVoteHandler, WeightMultiplierUpdateHandler, Author, WeightToFee};
 
 /// Constant values used within the runtime.
 pub mod constants;
@@ -143,7 +143,6 @@ parameter_types! {
 	pub const CreationFee: Balance = 1 * CENTS;
 	pub const TransactionBaseFee: Balance = 1 * CENTS;
 	pub const TransactionByteFee: Balance = 10 * MILLICENTS;
-	pub const TransactionWeightFee: Balance = MILLICENTS / 1000;
 }
 
 impl balances::Trait for Runtime {
@@ -159,7 +158,7 @@ impl balances::Trait for Runtime {
 	type CreationFee = CreationFee;
 	type TransactionBaseFee = TransactionBaseFee;
 	type TransactionByteFee = TransactionByteFee;
-	type TransactionWeightFee = TransactionWeightFee;
+	type WeightToFee = WeightToFee;
 }
 
 parameter_types! {

srml/balances/src/lib.rs

@@ -161,10 +161,10 @@ use srml_support::traits::{
 use srml_support::dispatch::Result;
 use primitives::traits::{
 	Zero, SimpleArithmetic, StaticLookup, Member, CheckedAdd, CheckedSub, MaybeSerializeDebug,
-	Saturating, Bounded, SignedExtension, SaturatedConversion, DispatchError
+	Saturating, Bounded, SignedExtension, SaturatedConversion, DispatchError, Convert,
 };
 use primitives::transaction_validity::{TransactionPriority, ValidTransaction};
-use primitives::weights::{DispatchInfo, SimpleDispatchInfo};
+use primitives::weights::{DispatchInfo, SimpleDispatchInfo, Weight};
 use system::{IsDeadAccount, OnNewAccount, ensure_signed, ensure_root};
 
 mod mock;
@@ -207,8 +207,8 @@ pub trait Subtrait<I: Instance = DefaultInstance>: system::Trait {
 	/// The fee to be paid for making a transaction; the per-byte portion.
 	type TransactionByteFee: Get<Self::Balance>;
 
-	/// The amount of fee deducted oer unit of weight.
-	type TransactionWeightFee: Get<Self::Balance>;
+	/// Convert a weight value into a deductible fee based on the currency type.
+	type WeightToFee: Convert<Weight, Self::Balance>;
 }
 
 pub trait Trait<I: Instance = DefaultInstance>: system::Trait {
@@ -253,8 +253,8 @@ pub trait Trait<I: Instance = DefaultInstance>: system::Trait {
 	/// The fee to be paid for making a transaction; the per-byte portion.
 	type TransactionByteFee: Get<Self::Balance>;
 
-	/// The amount of fee deducted oer unit of weight.
-	type TransactionWeightFee: Get<Self::Balance>;
+	/// Convert a weight value into a deductible fee based on the currency type.
+	type WeightToFee: Convert<Weight, Self::Balance>;
 }
 
 impl<T: Trait<I>, I: Instance> Subtrait<I> for T {
@@ -266,7 +266,7 @@ impl<T: Trait<I>, I: Instance> Subtrait<I> for T {
 	type CreationFee = T::CreationFee;
 	type TransactionBaseFee = T::TransactionBaseFee;
 	type TransactionByteFee = T::TransactionByteFee;
-	type TransactionWeightFee = T::TransactionWeightFee;
+	type WeightToFee = T::WeightToFee;
 }
 
 decl_event!(
@@ -790,7 +790,7 @@ impl<T: Subtrait<I>, I: Instance> Trait<I> for ElevatedTrait<T, I> {
 	type CreationFee = T::CreationFee;
 	type TransactionBaseFee = T::TransactionBaseFee;
 	type TransactionByteFee = T::TransactionByteFee;
-	type TransactionWeightFee = T::TransactionWeightFee;
+	type WeightToFee = T::WeightToFee;
 }
 
 impl<T: Trait<I>, I: Instance> Currency<T::AccountId> for Module<T, I>
@@ -1195,10 +1195,9 @@ impl<T: Trait<I>, I: Instance> TakeFees<T, I> {
 			// cap the weight to the maximum defined in runtime, otherwise it will be the `Bounded`
 			// maximum of its data type, which is not desired.
 			let capped_weight = info.weight.min(<T as system::Trait>::MaximumBlockWeight::get());
-			let weight_fee: T::Balance = <system::Module<T>>::next_weight_multiplier()
-				.apply_to(capped_weight).saturated_into();
-			let per_weight = T::TransactionWeightFee::get();
-			weight_fee.saturating_mul(per_weight)
+			let weight_update = <system::Module<T>>::next_weight_multiplier();
+			let adjusted_weight = weight_update.apply_to(capped_weight);
+			T::WeightToFee::convert(adjusted_weight)
 		};
 
 		len_fee.saturating_add(weight_fee).saturating_add(tip)

srml/balances/src/mock.rs

@@ -18,7 +18,7 @@
 
 #![cfg(test)]
 
-use primitives::{Perbill, traits::IdentityLookup, testing::Header, weights::{DispatchInfo, Weight}};
+use primitives::{Perbill, traits::{Convert, IdentityLookup}, testing::Header, weights::{DispatchInfo, Weight}};
 use substrate_primitives::{H256, Blake2Hasher};
 use runtime_io;
 use srml_support::{impl_outer_origin, parameter_types};
@@ -37,6 +37,7 @@ thread_local! {
 	static TRANSACTION_BASE_FEE: RefCell<u64> = RefCell::new(0);
 	static TRANSACTION_BYTE_FEE: RefCell<u64> = RefCell::new(1);
 	static TRANSACTION_WEIGHT_FEE: RefCell<u64> = RefCell::new(1);
+	static WEIGHT_TO_FEE: RefCell<u64> = RefCell::new(1);
 }
 
 pub struct ExistentialDeposit;
@@ -64,9 +65,11 @@ impl Get<u64> for TransactionByteFee {
 	fn get() -> u64 { TRANSACTION_BYTE_FEE.with(|v| *v.borrow()) }
 }
 
-pub struct TransactionWeightFee;
-impl Get<u64> for TransactionWeightFee {
-	fn get() -> u64 { TRANSACTION_WEIGHT_FEE.with(|v| *v.borrow()) }
+pub struct WeightToFee(u64);
+impl Convert<Weight, u64> for WeightToFee {
+	fn convert(t: Weight) -> u64 {
+		WEIGHT_TO_FEE.with(|v| *v.borrow() * (t as u64))
+	}
 }
 
 // Workaround for https://github.com/rust-lang/rust/issues/26925 . Remove when sorted.
@@ -107,13 +110,13 @@ impl Trait for Runtime {
 	type CreationFee = CreationFee;
 	type TransactionBaseFee = TransactionBaseFee;
 	type TransactionByteFee = TransactionByteFee;
-	type TransactionWeightFee = TransactionWeightFee;
+	type WeightToFee = WeightToFee;
 }
 
 pub struct ExtBuilder {
 	transaction_base_fee: u64,
 	transaction_byte_fee: u64,
-	transaction_weight_fee: u64,
+	weight_to_fee: u64,
 	existential_deposit: u64,
 	transfer_fee: u64,
 	creation_fee: u64,
@@ -125,7 +128,7 @@ impl Default for ExtBuilder {
 		Self {
 			transaction_base_fee: 0,
 			transaction_byte_fee: 0,
-			transaction_weight_fee: 0,
+			weight_to_fee: 0,
 			existential_deposit: 0,
 			transfer_fee: 0,
 			creation_fee: 0,
@@ -138,7 +141,7 @@ impl ExtBuilder {
 	pub fn transaction_fees(mut self, base_fee: u64, byte_fee: u64, weight_fee: u64) -> Self {
 		self.transaction_base_fee = base_fee;
 		self.transaction_byte_fee = byte_fee;
-		self.transaction_weight_fee = weight_fee;
+		self.weight_to_fee = weight_fee;
 		self
 	}
 	pub fn existential_deposit(mut self, existential_deposit: u64) -> Self {
@@ -171,7 +174,7 @@ impl ExtBuilder {
 		CREATION_FEE.with(|v| *v.borrow_mut() = self.creation_fee);
 		TRANSACTION_BASE_FEE.with(|v| *v.borrow_mut() = self.transaction_base_fee);
 		TRANSACTION_BYTE_FEE.with(|v| *v.borrow_mut() = self.transaction_byte_fee);
-		TRANSACTION_WEIGHT_FEE.with(|v| *v.borrow_mut() = self.transaction_weight_fee);
+		WEIGHT_TO_FEE.with(|v| *v.borrow_mut() = self.weight_to_fee);
 	}
 	pub fn build(self) -> runtime_io::TestExternalities<Blake2Hasher> {
 		self.set_associated_consts();

srml/contracts/src/tests.rs

@@ -100,7 +100,6 @@ parameter_types! {
 	pub const MaximumBlockLength: u32 = 2 * 1024;
 	pub const BalancesTransactionBaseFee: u64 = 0;
 	pub const BalancesTransactionByteFee: u64 = 0;
-	pub const BalancesTransactionWeightFee: u64 = 0;
 	pub const AvailableBlockRatio: Perbill = Perbill::one();
 }
 impl system::Trait for Test {
@@ -132,7 +131,7 @@ impl balances::Trait for Test {
 	type CreationFee = CreationFee;
 	type TransactionBaseFee = BalancesTransactionBaseFee;
 	type TransactionByteFee = BalancesTransactionByteFee;
-	type TransactionWeightFee = BalancesTransactionWeightFee;
+	type WeightToFee = ();
 }
 parameter_types! {
 	pub const MinimumPeriod: u64 = 1;

srml/council/src/lib.rs

@@ -125,7 +125,6 @@ mod tests {
 		pub const CreationFee: u64 = 0;
 		pub const TransactionBaseFee: u64 = 1;
 		pub const TransactionByteFee: u64 = 0;
-		pub const TransactionWeightFee: u64 = 0;
 	}
 	impl balances::Trait for Test {
 		type Balance = u64;
@@ -140,7 +139,7 @@ mod tests {
 		type CreationFee = CreationFee;
 		type TransactionBaseFee = TransactionBaseFee;
 		type TransactionByteFee = TransactionByteFee;
-		type TransactionWeightFee = TransactionWeightFee;
+		type WeightToFee = ();
 	}
 	parameter_types! {
 		pub const LaunchPeriod: u64 = 1;

srml/democracy/src/lib.rs

@@ -1043,7 +1043,6 @@ mod tests {
 		pub const CreationFee: u64 = 0;
 		pub const TransactionBaseFee: u64 = 0;
 		pub const TransactionByteFee: u64 = 0;
-		pub const TransactionWeightFee: u64 = 0;
 	}
 	impl balances::Trait for Test {
 		type Balance = u64;
@@ -1058,7 +1057,7 @@ mod tests {
 		type CreationFee = CreationFee;
 		type TransactionBaseFee = TransactionBaseFee;
 		type TransactionByteFee = TransactionByteFee;
-		type TransactionWeightFee = TransactionWeightFee;
+		type WeightToFee = ();
 	}
 	parameter_types! {
 		pub const LaunchPeriod: u64 = 2;

srml/elections/src/lib.rs

@@ -1145,7 +1145,6 @@ mod tests {
 		pub const CreationFee: u64 = 0;
 		pub const TransactionBaseFee: u64 = 0;
 		pub const TransactionByteFee: u64 = 0;
-		pub const TransactionWeightFee: u64 = 0;
 	}
 	impl balances::Trait for Test {
 		type Balance = u64;
@@ -1160,7 +1159,7 @@ mod tests {
 		type CreationFee = CreationFee;
 		type TransactionBaseFee = TransactionBaseFee;
 		type TransactionByteFee = TransactionByteFee;
-		type TransactionWeightFee = TransactionWeightFee;
+		type WeightToFee = ();
 	}
 	parameter_types! {
 		pub const CandidacyBond: u64 = 3;

srml/example/src/lib.rs

@@ -550,7 +550,6 @@ mod tests {
 		pub const CreationFee: u64 = 0;
 		pub const TransactionBaseFee: u64 = 0;
 		pub const TransactionByteFee: u64 = 0;
-		pub const TransactionWeightFee: u64 = 0;
 	}
 	impl balances::Trait for Test {
 		type Balance = u64;
@@ -565,7 +564,7 @@ mod tests {
 		type CreationFee = CreationFee;
 		type TransactionBaseFee = TransactionBaseFee;
 		type TransactionByteFee = TransactionByteFee;
-		type TransactionWeightFee = TransactionWeightFee;
+		type WeightToFee = ();
 	}
 	impl Trait for Test {
 		type Event = ();

srml/executive/src/lib.rs

@@ -360,7 +360,7 @@ mod tests {
 	use primitives::generic::Era;
 	use primitives::Perbill;
 	use primitives::weights::Weight;
-	use primitives::traits::{Header as HeaderT, BlakeTwo256, IdentityLookup};
+	use primitives::traits::{Header as HeaderT, BlakeTwo256, IdentityLookup, ConvertInto};
 	use primitives::testing::{Digest, Header, Block};
 	use srml_support::{impl_outer_event, impl_outer_origin, parameter_types};
 	use srml_support::traits::{Currency, LockIdentifier, LockableCurrency, WithdrawReasons, WithdrawReason, Get};
@@ -409,7 +409,6 @@ mod tests {
 		pub const CreationFee: u64 = 0;
 		pub const TransactionBaseFee: u64 = 10;
 		pub const TransactionByteFee: u64 = 0;
-		pub const TransactionWeightFee: u64 = 1;
 	}
 	impl balances::Trait for Runtime {
 		type Balance = u64;
@@ -424,7 +423,7 @@ mod tests {
 		type CreationFee = CreationFee;
 		type TransactionBaseFee = TransactionBaseFee;
 		type TransactionByteFee = TransactionByteFee;
-		type TransactionWeightFee = TransactionWeightFee;
+		type WeightToFee = ConvertInto;
 	}
 
 	impl ValidateUnsigned for Runtime {