Merge branch 'master' into staking

src/runtimes.rs

@@ -113,7 +113,7 @@ impl_opaque_keys! {
 
 use crate::{
     contracts::Contracts,
-    extra::{
+    extrinsic::{
         DefaultExtra,
         SignedExtra,
     },
@@ -138,20 +138,6 @@ pub trait Runtime: System + Sized + Send + Sync + 'static {
     type Extra: SignedExtra<Self> + Send + Sync + 'static;
 }
 
-/// Extra type.
-pub type Extra<T> = <<T as Runtime>::Extra as SignedExtra<T>>::Extra;
-
-/// UncheckedExtrinsic type.
-pub type UncheckedExtrinsic<T> = sp_runtime::generic::UncheckedExtrinsic<
-    <T as System>::Address,
-    Encoded,
-    <T as Runtime>::Signature,
-    Extra<T>,
->;
-
-/// SignedPayload type.
-pub type SignedPayload<T> = sp_runtime::generic::SignedPayload<Encoded, Extra<T>>;
-
 /// Concrete type definitions compatible with those in the default substrate `node_runtime`
 ///
 /// # Note