remove balance as generic.

core/sr-primitives/src/generic/checked_extrinsic.rs

@@ -91,9 +91,9 @@ where
 		// Or 2- this is built from all other types of uncheckedextrinsic which do not have tip and
 		// hence are not tip-aware. These modules will naively place a u32 (can be `()` in practice)
 		// as the type and it does not matter since `None` is used in this case (first arm).
-		match self.tip {
+		match &self.tip {
 			None => None,
-			Some(Tip::Sender(v)) => Some(Tip::Sender(NodeBalance::from(v))),
+			Some(Tip::Sender(v)) => Some(Tip::Sender(NodeBalance::from(*v))),
 		}
 	}
-}
+}

core/sr-primitives/src/generic/mod.rs

@@ -40,7 +40,7 @@ pub use self::checked_extrinsic::CheckedExtrinsic;
 pub use self::header::Header;
 pub use self::block::{Block, SignedBlock, BlockId};
 pub use self::digest::{Digest, DigestItem, DigestItemRef, OpaqueDigestItemId};
-pub use self::tip::{Tip, Tippable};
+pub use self::tip::{Tip, Tippable, NoTipBalance};
 
 use crate::codec::Encode;
 use rstd::prelude::*;

core/sr-primitives/src/generic/tip.rs

@@ -19,6 +19,10 @@
 use crate::codec::{Encode, Decode};
 use crate::traits::Zero;
 
+/// A placeholder tip type that is used to fulfill the generic requirements of `checked_extrinsic`
+/// when the underlying `unchecked_extrinsic` actually does not have a tip.
+pub type NoTipBalance = u32;
+
 /// Representation of a transaction tip.
 ///
 /// Provided as an enum to support potential future use cases such as:
@@ -28,6 +32,8 @@ use crate::traits::Zero;
 #[derive(Clone, Copy, Eq, PartialEq, Encode, Decode)]
 pub enum Tip<Balance> {
     /// The sender of the transaction has included some tip.
+    ///
+    /// this must be signed and included in the signature payload.
     Sender(Balance),
 }
 

core/sr-primitives/src/generic/unchecked_extrinsic.rs

@@ -22,6 +22,7 @@ use std::fmt;
 use rstd::prelude::*;
 use crate::codec::{Decode, Encode, Codec, Input, HasCompact};
 use crate::traits::{self, Member, SimpleArithmetic, MaybeDisplay, Lookup, Extrinsic};
+use crate::generic::tip::NoTipBalance;
 use super::CheckedExtrinsic;
 
 #[derive(PartialEq, Eq, Clone, Encode, Decode)]
@@ -85,7 +86,7 @@ where
 	AccountId: Member + MaybeDisplay,
 	Context: Lookup<Source=Address, Target=AccountId>,
 {
-	type Checked = CheckedExtrinsic<AccountId, Index, Call, u32>;
+	type Checked = CheckedExtrinsic<AccountId, Index, Call, NoTipBalance>;
 
 	fn check(self, context: &Context) -> Result<Self::Checked, &'static str> {
 		Ok(match self.signature {

core/sr-primitives/src/generic/unchecked_mortal_compact_extrinsic.rs

@@ -25,6 +25,7 @@ use crate::codec::{Decode, Encode, Input, Compact};
 use crate::traits::{self, Member, SimpleArithmetic, MaybeDisplay, CurrentHeight, BlockNumberToHash,
 	Lookup, Checkable, Extrinsic, SaturatedConversion};
 use super::{CheckedExtrinsic, Era};
+use crate::generic::tip::NoTipBalance;
 
 const TRANSACTION_VERSION: u8 = 1;
 
@@ -85,7 +86,7 @@ where
 {
 	/// NOTE: this transaction is not tipped i.e. the tip value will be `None`. It does not really
 	/// matter what the last generic is since it is always `None`.
-	type Checked = CheckedExtrinsic<AccountId, Index, Call, u32>;
+	type Checked = CheckedExtrinsic<AccountId, Index, Call, NoTipBalance>;
 
 	fn check(self, context: &Context) -> Result<Self::Checked, &'static str> {
 		Ok(match self.signature {
@@ -185,8 +186,7 @@ impl<Address: Encode, Index, Signature: Encode, Call: Encode> serde::Serialize
 }
 
 #[cfg(feature = "std")]
-impl<Address, Index, Call, Signature> fmt::Debug
-	for UncheckedMortalCompactExtrinsic<Address, Index, Call, Signature>
+impl<Address, Index, Call, Signature> fmt::Debug for UncheckedMortalCompactExtrinsic<Address, Index, Call, Signature>
 where
 	Address: fmt::Debug,
 	Index: fmt::Debug,
@@ -237,7 +237,7 @@ mod tests {
 	const DUMMY_ACCOUNTID: u64 = 0;
 
 	type Ex = UncheckedMortalCompactExtrinsic<u64, u64, Vec<u8>, TestSig>;
-	type CEx = CheckedExtrinsic<u64, u64, Vec<u8>, u32>;
+	type CEx = CheckedExtrinsic<u64, u64, Vec<u8>, NoTipBalance>;
 
 	#[test]
 	fn unsigned_codec_should_work() {

core/sr-primitives/src/generic/unchecked_mortal_compact_tipped_extrinsic.rs

@@ -1,4 +1,4 @@
-// Copyright 2017-2019 Parity Technologies (UK) Ltd.
+// Copyright 2019 Parity Technologies (UK) Ltd.
 // This file is part of Substrate.
 
 // Substrate is free software: you can redistribute it and/or modify
@@ -26,14 +26,14 @@ use crate::traits::{self, Member, SimpleArithmetic, MaybeDisplay, CurrentHeight,
 	Lookup, Checkable, Extrinsic, SaturatedConversion};
 use super::{CheckedExtrinsic, Era, Tip};
 
-const TRANSACTION_VERSION: u8 = 2;
+const TRANSACTION_VERSION: u8 = 64;
 
 /// A extrinsic right from the external world. This is unchecked and so
 /// can contain a signature.
 ///
 /// This type transaction:
-///   - _Must_ always have a valid `Tip` encoded, and included in the signature payload if it is
-///   signed.
+///   - _Must_ always have a valid `Tip` (not an option!) encoded, and included in the signature
+///  payload if it is signed.
 ///   - _Must_ not provide any `Tip` if it is unsigned.
 #[derive(PartialEq, Eq, Clone)]
 pub struct UncheckedMortalCompactTippedExtrinsic<Address, Index, Call, Signature, Balance> {
@@ -43,7 +43,8 @@ pub struct UncheckedMortalCompactTippedExtrinsic<Address, Index, Call, Signature
 	pub signature: Option<(Address, Signature, Compact<Index>, Era)>,
 	/// The function that should be called.
 	pub function: Call,
-	/// The tip for this transaction
+	/// The tip for this transaction. This is always `Some` for a signed transaction and always
+	/// `None` for unsigned.
 	pub tip: Option<Tip<Balance>>,
 }
 
@@ -57,12 +58,12 @@ impl<Address, Index, Call, Signature, Balance>
 		signed: Address,
 		signature: Signature,
 		era: Era,
-		tip: Option<Tip<Balance>>
+		tip: Tip<Balance>,
 	) -> Self {
 		UncheckedMortalCompactTippedExtrinsic {
 			signature: Some((signed, signature, index.into(), era)),
 			function,
-			tip,
+			tip: Some(tip),
 		}
 	}
 
@@ -71,7 +72,7 @@ impl<Address, Index, Call, Signature, Balance>
 		UncheckedMortalCompactTippedExtrinsic {
 			signature: None,
 			function,
-			tip: None
+			tip: None,
 		}
 	}
 }
@@ -105,11 +106,12 @@ where
 	fn check(self, context: &Context) -> Result<Self::Checked, &'static str> {
 		Ok(match self.signature {
 			Some((signed, signature, index, era)) => {
+				let tip = self.tip.ok_or("signed transaction must always have a tip.")?;
 				let current_u64 = context.current_height().saturated_into::<u64>();
 				let h = context.block_number_to_hash(era.birth(current_u64).saturated_into())
 					.ok_or("transaction birth block ancient")?;
 				let signed = context.lookup(signed)?;
-				let raw_payload = (index, self.function, self.tip, era, h);
+				let raw_payload = (index, self.function, tip, era, h);
 				if !raw_payload.using_encoded(|payload| {
 					if payload.len() > 256 {
 						signature.verify(&blake2_256(payload)[..], &signed)
@@ -122,7 +124,7 @@ where
 				CheckedExtrinsic {
 					signed: Some((signed, (raw_payload.0).0)),
 					function: raw_payload.1,
-					tip: raw_payload.2,
+					tip: Some(raw_payload.2),
 				}
 			}
 			None => {
@@ -169,7 +171,7 @@ where
 		Some(UncheckedMortalCompactTippedExtrinsic {
 			signature: if is_signed { Some(Decode::decode(input)?) } else { None },
 			function: Decode::decode(input)?,
-			tip: if is_signed { Decode::decode(input)? } else { None },
+			tip: if is_signed { Some(Decode::decode(input)?) } else { None },
 		})
 	}
 }
@@ -197,7 +199,7 @@ where
 			}
 			self.function.encode_to(v);
 			if self.signature.is_some() {
-				self.tip.encode_to(v);
+				self.tip.as_ref().unwrap().encode_to(v);
 			}
 		})
 	}
@@ -268,7 +270,7 @@ mod tests {
 	type Balance = u64;
 	type TipType = Tip<Balance>;
 	const DUMMY_ACCOUNTID: u64 = 0;
-	const TIP: Option<TipType> = Some(Tip::Sender(66));
+	const TIP: TipType = Tip::Sender(66);
 
 	type Ex = UncheckedMortalCompactTippedExtrinsic<u64, u64, Vec<u8>, TestSig, Balance>;
 	type CEx = CheckedExtrinsic<u64, u64, Vec<u8>, Balance>;
@@ -348,7 +350,7 @@ mod tests {
 		assert!(ux.is_signed().unwrap_or(false));
 		assert_eq!(
 			<Ex as Checkable<TestContext>>::check(ux, &TestContext),
-			Ok(CEx { signed: Some((DUMMY_ACCOUNTID, 0)), function: vec![0u8;0], tip: TIP })
+			Ok(CEx { signed: Some((DUMMY_ACCOUNTID, 0)), function: vec![0u8;0], tip: Some(TIP) })
 		);
 	}
 
@@ -368,7 +370,7 @@ mod tests {
 		assert!(ux.is_signed().unwrap_or(false));
 		assert_eq!(
 			<Ex as Checkable<TestContext>>::check(ux, &TestContext),
-			Ok(CEx { signed: Some((DUMMY_ACCOUNTID, 0)), function: vec![0u8;0], tip: TIP }));
+			Ok(CEx { signed: Some((DUMMY_ACCOUNTID, 0)), function: vec![0u8;0], tip: Some(TIP) }));
 	}
 
 	#[test]
@@ -387,7 +389,7 @@ mod tests {
 		assert!(ux.is_signed().unwrap_or(false));
 		assert_eq!(
 			<Ex as Checkable<TestContext>>::check(ux, &TestContext),
-			Ok(CEx { signed: Some((DUMMY_ACCOUNTID, 0)), function: vec![0u8;0], tip: TIP })
+			Ok(CEx { signed: Some((DUMMY_ACCOUNTID, 0)), function: vec![0u8;0], tip: Some(TIP) })
 		);
 	}
 
@@ -460,7 +462,7 @@ mod tests {
 			function: vec![0u8;0]
 		};
 		assert_eq!(
-			<Ex as Checkable<TestContext>>::check(ux, &TestContext).unwrap(),
+			<Ex as Checkable<TestContext>>::check(ux, &TestContext),
 			Err(crate::UNSIGNED_TIP)
 		);
 	}

core/sr-primitives/src/generic/unchecked_mortal_extrinsic.rs

@@ -26,6 +26,7 @@ use crate::traits::{
 	self, Member, SimpleArithmetic, MaybeDisplay, CurrentHeight, BlockNumberToHash,
 	Lookup, Checkable, Extrinsic, SaturatedConversion
 };
+use crate::generic::tip::NoTipBalance;
 use super::{CheckedExtrinsic, Era};
 
 const TRANSACTION_VERSION: u8 = 1;
@@ -84,7 +85,7 @@ where
 {
 	/// NOTE: this transaction is not tipped i.e. the tip value will be `None`. It does not really
 	/// matter what the last generic is since it is always `None`.
-	type Checked = CheckedExtrinsic<AccountId, Index, Call, u32>;
+	type Checked = CheckedExtrinsic<AccountId, Index, Call, NoTipBalance>;
 
 	fn check(self, context: &Context) -> Result<Self::Checked, &'static str> {
 		Ok(match self.signature {
@@ -236,7 +237,7 @@ mod tests {
 	const DUMMY_ACCOUNTID: u64 = 0;
 
 	type Ex = UncheckedMortalExtrinsic<u64, u64, Vec<u8>, TestSig>;
-	type CEx = CheckedExtrinsic<u64, u64, Vec<u8>, u32>;
+	type CEx = CheckedExtrinsic<u64, u64, Vec<u8>, NoTipBalance>;
 
 	#[test]
 	fn unsigned_codec_should_work() {

node-template/runtime/src/lib.rs

@@ -235,7 +235,7 @@ pub type UncheckedExtrinsic = generic::UncheckedMortalCompactExtrinsic<Address,
 /// Extrinsic type that has already been checked.
 pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, Nonce, Call, Balance>;
 /// Executive: handles dispatch to the various modules.
-pub type Executive = executive::Executive<Runtime, Block, Context, Balances, Balance, Runtime, AllModules>;
+pub type Executive = executive::Executive<Runtime, Block, Context, Balances, Runtime, AllModules>;
 
 // Implement our runtime API endpoints. This is just a bunch of proxying.
 impl_runtime_apis! {

node/executor/src/lib.rs

@@ -48,7 +48,7 @@ mod tests {
 	};
 	use node_primitives::{Hash, BlockNumber, AccountId};
 	use runtime_primitives::traits::{Header as HeaderT, Hash as HashT};
-	use runtime_primitives::{generic::{Era, Tip}, ApplyOutcome, ApplyError, ApplyResult, Perbill};
+	use runtime_primitives::{generic::Era, ApplyOutcome, ApplyError, ApplyResult, Perbill};
 	use {balances, contracts, indices, staking, system, timestamp};
 	use contracts::ContractAddressFor;
 	use system::{EventRecord, Phase};

node/runtime/src/lib.rs

@@ -432,14 +432,7 @@ pub type UncheckedExtrinsic = generic::UncheckedMortalCompactExtrinsic<Address,
 /// Extrinsic type that has already been checked.
 pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, Index, Call, Balance>;
 /// Executive: handles dispatch to the various modules.
-pub type Executive = executive::Executive<
-	Runtime, Block,
-	system::ChainContext<Runtime>,
-	Balances,
-	Balance,
-	Runtime,
-	AllModules,
->;
+pub type Executive = executive::Executive<Runtime, Block, system::ChainContext<Runtime>, Balances, Runtime, AllModules>;
 
 impl_runtime_apis! {
 	impl client_api::Core<Block> for Runtime {

srml/executive/src/lib.rs

@@ -69,7 +69,7 @@
 //! # 	}
 //! # }
 //! /// Executive: handles dispatch to the various modules.
-//! pub type Executive = executive::Executive<Runtime, Block, Context, Balances, Balances, Runtime, AllModules>;
+//! pub type Executive = executive::Executive<Runtime, Block, Context, Balances, Runtime, AllModules>;
 //! ```
 
 #![cfg_attr(not(feature = "std"), no_std)]
@@ -81,7 +81,6 @@ use primitives::{ApplyOutcome, ApplyError,
 	transaction_validity::{TransactionValidity, TransactionPriority, TransactionLongevity},
 	traits::{self, Header, Zero, One, Checkable, Applyable, CheckEqual, OnFinalize, OnInitialize,
 		NumberFor, Block as BlockT, OffchainWorker, ValidateUnsigned,
-		SimpleArithmetic,
 	},
 };
 use srml_support::{Dispatchable, traits::MakePayment};
@@ -116,19 +115,18 @@ pub type CallOf<E, C> = <CheckedOf<E, C> as Applyable>::Call;
 pub type OriginOf<E, C> = <CallOf<E, C> as Dispatchable>::Origin;
 pub type BalanceOf<P, A> = <P as MakePayment<A>>::Balance;
 
-pub struct Executive<System, Block, Context, Payment, Balance, UnsignedValidator, AllModules>(
-	PhantomData<(System, Block, Context, Payment, Balance, UnsignedValidator, AllModules)>
+pub struct Executive<System, Block, Context, Payment, UnsignedValidator, AllModules>(
+	PhantomData<(System, Block, Context, Payment, UnsignedValidator, AllModules)>
 );
 
 impl<
 	System: system::Trait,
 	Block: traits::Block<Header=System::Header, Hash=System::Hash>,
 	Context: Default,
 	Payment: MakePayment<System::AccountId>,
-	Balance,
 	UnsignedValidator,
 	AllModules: OnInitialize<System::BlockNumber> + OnFinalize<System::BlockNumber> + OffchainWorker<System::BlockNumber>,
-> ExecuteBlock<Block> for Executive<System, Block, Context, Payment, Balance, UnsignedValidator, AllModules>
+> ExecuteBlock<Block> for Executive<System, Block, Context, Payment, UnsignedValidator, AllModules>
 where
 	Block::Extrinsic: Checkable<Context> + Codec,
 	CheckedOf<Block::Extrinsic, Context>:
@@ -140,7 +138,7 @@ where
 	UnsignedValidator: ValidateUnsigned<Call=CallOf<Block::Extrinsic, Context>>,
 {
 	fn execute_block(block: Block) {
-		Executive::<System, Block, Context, Payment, Balance, UnsignedValidator, AllModules>::execute_block(block);
+		Executive::<System, Block, Context, Payment, UnsignedValidator, AllModules>::execute_block(block);
 	}
 }
 
@@ -149,10 +147,9 @@ impl<
 	Block: traits::Block<Header=System::Header, Hash=System::Hash>,
 	Context: Default,
 	Payment: MakePayment<System::AccountId>,
-	Balance: SimpleArithmetic + Copy,
 	UnsignedValidator,
 	AllModules: OnInitialize<System::BlockNumber> + OnFinalize<System::BlockNumber> + OffchainWorker<System::BlockNumber>,
-> Executive<System, Block, Context, Payment, Balance, UnsignedValidator, AllModules>
+> Executive<System, Block, Context, Payment, UnsignedValidator, AllModules>
 where
 	Block::Extrinsic: Checkable<Context> + Codec,
 	CheckedOf<Block::Extrinsic, Context>:
@@ -499,7 +496,6 @@ mod tests {
 		Block<TestXt>,
 		system::ChainContext<Runtime>,
 		balances::Module<Runtime>,
-		u64,
 		Runtime,
 		()
 	>;