Builds.

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

@@ -24,8 +24,7 @@ use crate::codec::{Encode, Decode};
 /// stream.
 /// If non-existent, the default implementation will be used.s
 #[derive(Clone, Eq, PartialEq, Encode, Decode)]
-#[cfg(feature = "std")]
-#[derive(Debug)]
+#[cfg_attr(feature = "std", derive(Debug))]
 pub enum Tip<Balance> {
     /// This transaction does not include any tips.
     None,

node-template/runtime/src/lib.rs

@@ -205,9 +205,9 @@ pub type Block = generic::Block<Header, UncheckedExtrinsic>;
 /// BlockId type as expected by this runtime.
 pub type BlockId = generic::BlockId<Block>;
 /// Unchecked extrinsic type as expected by this runtime.
-pub type UncheckedExtrinsic = generic::UncheckedMortalCompactExtrinsic<Address, Nonce, Call, AccountSignature>;
+pub type UncheckedExtrinsic = generic::UncheckedMortalCompactExtrinsic<Address, Nonce, Call, AccountSignature, u128>;
 /// Extrinsic type that has already been checked.
-pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, Nonce, Call>;
+pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, Nonce, Call, u128>;
 /// Executive: handles dispatch to the various modules.
 pub type Executive = executive::Executive<Runtime, Block, Context, Balances, Runtime, AllModules>;
 

node/cli/src/factory_impl.rs

@@ -28,7 +28,7 @@ use node_runtime::{Call, CheckedExtrinsic, UncheckedExtrinsic, BalancesCall};
 use primitives::sr25519;
 use primitives::crypto::Pair;
 use parity_codec::Encode;
-use sr_primitives::generic::Era;
+use sr_primitives::generic::{Era, Tip};
 use sr_primitives::traits::{Block as BlockT, Header as HeaderT};
 use substrate_service::ServiceFactory;
 use transaction_factory::RuntimeAdapter;
@@ -54,6 +54,7 @@ pub struct FactoryState<N> {
 
 type Number = <<node_primitives::Block as BlockT>::Header as HeaderT>::Number;
 
+// TODO: fix the tip amount here.
 impl RuntimeAdapter for FactoryState<Number> {
 	type AccountId = node_primitives::AccountId;
 	type Balance = node_primitives::Balance;
@@ -140,7 +141,8 @@ impl RuntimeAdapter for FactoryState<Number> {
 					),
 					(*amount).into()
 				)
-			)
+			),
+			tip: Tip::default(),
 		}, key, &prior_block_hash, phase)
 	}
 
@@ -246,11 +248,13 @@ fn sign<F: ServiceFactory, RA: RuntimeAdapter>(
 			UncheckedExtrinsic {
 				signature: Some((indices::address::Address::Id(signed), signature, payload.0, era)),
 				function: payload.1,
+				tip: Tip::default(),
 			}
 		}
 		None => UncheckedExtrinsic {
 			signature: None,
 			function: xt.function,
+			tip: Tip::default(),
 		},
 	};
 

node/runtime/src/lib.rs

@@ -277,9 +277,9 @@ pub type SignedBlock = generic::SignedBlock<Block>;
 /// BlockId type as expected by this runtime.
 pub type BlockId = generic::BlockId<Block>;
 /// Unchecked extrinsic type as expected by this runtime.
-pub type UncheckedExtrinsic = generic::UncheckedMortalCompactExtrinsic<Address, Index, Call, Signature>;
+pub type UncheckedExtrinsic = generic::UncheckedMortalCompactExtrinsic<Address, Index, Call, Signature, Balance>;
 /// Extrinsic type that has already been checked.
-pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, Index, Call>;
+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, Runtime, AllModules>;
 

srml/support/src/inherent.rs

@@ -20,6 +20,8 @@ pub use crate::rstd::vec::Vec;
 pub use crate::runtime_primitives::traits::{Block as BlockT, Extrinsic};
 #[doc(hidden)]
 pub use inherents::{InherentData, ProvideInherent, CheckInherentsResult, IsFatalError};
+#[doc(hidden)]
+pub use crate::runtime_primitives::generic::Tip;
 
 
 /// Implement the outer inherent.
@@ -58,10 +60,11 @@ macro_rules! impl_outer_inherent {
 
 				let mut inherents = Vec::new();
 
+				// TODO: fix tip value here.
 				$(
 					if let Some(inherent) = $module::create_inherent(self) {
 						inherents.push($uncheckedextrinsic::new_unsigned(
-							Call::$call(inherent))
+							Call::$call(inherent), $crate::inherent::Tip::default())
 						);
 					}
 				)*

srml/support/test/tests/instance.rs

@@ -294,7 +294,7 @@ srml_support::construct_runtime!(
 
 pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
 pub type Block = generic::Block<Header, UncheckedExtrinsic>;
-pub type UncheckedExtrinsic = generic::UncheckedMortalCompactExtrinsic<u32, Index, Call, Signature>;
+pub type UncheckedExtrinsic = generic::UncheckedMortalCompactExtrinsic<u32, Index, Call, Signature, u32>;
 
 fn new_test_ext() -> runtime_io::TestExternalities<Blake2Hasher> {
 	GenesisConfig{