Merge remote-tracking branch 'origin/master' into the-big-reorg

.editorconfig

@@ -6,7 +6,7 @@ tab_width=4
 end_of_line=lf
 charset=utf-8
 trim_trailing_whitespace=true
-max_line_length=120
+max_line_length=100
 insert_final_newline=true
 
 [*.yml]

Cargo.toml

@@ -29,6 +29,9 @@ members = [
 	"client/rpc",
 	"client/rpc/primitives",
 	"client/rpc-servers",
+	"client/runtime-interface",
+	"client/runtime-interface/proc-macro",
+	"client/runtime-interface/test-wasm",
 	"client/serializer",
 	"client/service",
 	"client/service/test",
@@ -43,17 +46,18 @@ members = [
 	"client/sr-version",
 	"client/state-machine",
 	"client/telemetry",
-	"test/utils/client",
-	"test/utils/runtime",
-	"test/utils/runtime/client",
 	"client/transaction-pool",
 	"client/transaction-pool/graph",
 	"client/trie",
 	"client/utils/fork-tree",
 	"client/utils/wasm-builder",
 	"client/utils/wasm-builder-runner",
 	"client/wasm-interface",
+
+# SRML
+
 	"srml/support",
+	"srml/support/rpc",
 	"srml/support/procedural",
 	"srml/support/procedural/tools",
 	"srml/support/procedural/tools/derive",
@@ -94,6 +98,9 @@ members = [
 	"srml/transaction-payment/rpc",
 	"srml/utility",
 	"srml/evm",
+
+# BIN
+
 	"bin/node/cli",
 	"bin/node/executor",
 	"bin/node/primitives",
@@ -103,10 +110,17 @@ members = [
 	"bin/node/testing",
 	"bin/node-template",
 	"bin/subkey",
+
+# TEST HELPERS
+
+	"test/utils/client",
+	"test/utils/runtime",
+	"test/utils/runtime/client",
 	"test/utils/chain-spec-builder",
+
+# TESTS
 ]
 
 [profile.release]
 # Substrate runtime requires unwinding.
 panic = "unwind"
-

bin/node-template/Cargo.toml

@@ -32,9 +32,9 @@ aura-primitives = { package = "substrate-consensus-aura-primitives", path = "../
 grandpa = { package = "substrate-finality-grandpa", path = "../../client/finality-grandpa" }
 grandpa-primitives = { package = "substrate-finality-grandpa-primitives", path = "../../client/finality-grandpa/primitives" }
 substrate-client = {  path = "../../client/client" }
-basic-authorship = { package = "substrate-basic-authorship", path = "../../client/basic-authorship" }
 runtime = { package = "node-template-runtime", path = "runtime" }
 sr-primitives = { path = "../../client/sr-primitives" }
+basic-authorship = { package = "substrate-basic-authorship", path  = "../../client/basic-authorship"}
 
 [build-dependencies]
 vergen = "3.0.4"

bin/node-template/runtime/src/lib.rs

@@ -349,7 +349,6 @@ impl_runtime_apis! {
 
 	impl substrate_session::SessionKeys<Block> for Runtime {
 		fn generate_session_keys(seed: Option<Vec<u8>>) -> Vec<u8> {
-			let seed = seed.as_ref().map(|s| rstd::str::from_utf8(&s).expect("Seed is an utf8 string"));
 			opaque::SessionKeys::generate(seed)
 		}
 	}

bin/node-template/src/service.rs

@@ -12,6 +12,7 @@ use substrate_executor::native_executor_instance;
 pub use substrate_executor::NativeExecutor;
 use aura_primitives::sr25519::{AuthorityPair as AuraPair};
 use grandpa::{self, FinalityProofProvider as GrandpaFinalityProofProvider};
+use basic_authorship;
 
 // Our native executor instance.
 native_executor_instance!(

bin/node/cli/Cargo.toml

@@ -39,7 +39,7 @@ babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../
 grandpa_primitives = { package = "substrate-finality-grandpa-primitives", path = "../../../client/finality-grandpa/primitives" }
 
 # core dependencies
-sr-io = { path = "../../../client/sr-io" }
+runtime-io = { package = "sr-io", path = "../../../client/sr-io" }
 client = { package = "substrate-client", path = "../../../client/client" }
 inherents = { package = "substrate-inherents", path = "../../../client/inherents" }
 chain-spec = { package = "substrate-chain-spec", path = "../../../client/chain-spec" }

bin/node/cli/src/factory_impl.rs

@@ -247,7 +247,7 @@ fn sign<RA: RuntimeAdapter>(
 			let payload = (xt.function, extra.clone(), additional_signed);
 			let signature = payload.using_encoded(|b| {
 				if b.len() > 256 {
-					key.sign(&sr_io::blake2_256(b))
+					key.sign(&runtime_io::hashing::blake2_256(b))
 				} else {
 					key.sign(b)
 				}

bin/node/cli/src/service.rs

@@ -390,7 +390,7 @@ mod tests {
 				origin: BlockOrigin::File,
 				justification: Vec::new(),
 				internal_justification: Vec::new(),
-				finalized: true,
+				finalized: false,
 				body: Some(block.extrinsics),
 				header: block.header,
 				auxiliary: Vec::new(),
@@ -520,7 +520,7 @@ mod tests {
 					justification: None,
 					post_digests: vec![item],
 					body: Some(new_body),
-					finalized: true,
+					finalized: false,
 					auxiliary: Vec::new(),
 					fork_choice: ForkChoiceStrategy::LongestChain,
 					allow_missing_state: false,

bin/node/runtime/src/lib.rs

@@ -698,8 +698,6 @@ impl_runtime_apis! {
 
 	impl substrate_session::SessionKeys<Block> for Runtime {
 		fn generate_session_keys(seed: Option<Vec<u8>>) -> Vec<u8> {
-			let seed = seed.as_ref().map(|s| rstd::str::from_utf8(&s)
-				.expect("Seed is an utf8 string"));
 			SessionKeys::generate(seed)
 		}
 	}

bin/node/testing/Cargo.toml

@@ -17,7 +17,7 @@ node-primitives = { path = "../primitives" }
 node-runtime = { path = "../runtime" }
 codec = { package = "parity-scale-codec", version = "1.0.0" }
 primitives = { package = "substrate-primitives", path = "../../../client/primitives" }
-sr-io = { path = "../../../client/sr-io" }
+runtime-io = { package = "sr-io", path = "../../../client/sr-io" }
 sr-primitives = { path = "../../../client/sr-primitives" }
 runtime_support = { package = "srml-support", path = "../../../srml/support" }
 session = { package = "srml-session", path = "../../../srml/session" }

bin/node/testing/src/keyring.rs

@@ -83,7 +83,7 @@ pub fn sign(xt: CheckedExtrinsic, version: u32, genesis_hash: [u8; 32]) -> Unche
 			let key = AccountKeyring::from_account_id(&signed).unwrap();
 			let signature = payload.using_encoded(|b| {
 				if b.len() > 256 {
-					key.sign(&sr_io::blake2_256(b))
+					key.sign(&runtime_io::hashing::blake2_256(b))
 				} else {
 					key.sign(b)
 				}

client/application-crypto/src/ed25519.rs

@@ -18,6 +18,8 @@
 
 use crate::{RuntimePublic, KeyTypeId};
 
+use rstd::vec::Vec;
+
 pub use primitives::ed25519::*;
 
 mod app {
@@ -29,28 +31,27 @@ mod app {
 	}
 }
 
-pub use app::Public as AppPublic;
-pub use app::Signature as AppSignature;
+pub use app::{Public as AppPublic, Signature as AppSignature};
 #[cfg(feature = "full_crypto")]
 pub use app::Pair as AppPair;
 
 impl RuntimePublic for Public {
 	type Signature = Signature;
 
 	fn all(key_type: KeyTypeId) -> crate::Vec<Self> {
-		runtime_io::ed25519_public_keys(key_type)
+		runtime_io::crypto::ed25519_public_keys(key_type)
 	}
 
-	fn generate_pair(key_type: KeyTypeId, seed: Option<&str>) -> Self {
-		runtime_io::ed25519_generate(key_type, seed)
+	fn generate_pair(key_type: KeyTypeId, seed: Option<Vec<u8>>) -> Self {
+		runtime_io::crypto::ed25519_generate(key_type, seed)
 	}
 
 	fn sign<M: AsRef<[u8]>>(&self, key_type: KeyTypeId, msg: &M) -> Option<Self::Signature> {
-		runtime_io::ed25519_sign(key_type, self, msg.as_ref())
+		runtime_io::crypto::ed25519_sign(key_type, self, msg.as_ref())
 	}
 
 	fn verify<M: AsRef<[u8]>>(&self, msg: &M, signature: &Self::Signature) -> bool {
-		runtime_io::ed25519_verify(&signature, msg.as_ref(), self)
+		runtime_io::crypto::ed25519_verify(&signature, msg.as_ref(), self)
 	}
 }
 

client/application-crypto/src/lib.rs

@@ -286,7 +286,7 @@ macro_rules! app_crypto_public_common {
 				<$public as $crate::RuntimePublic>::all($key_type).into_iter().map(Self).collect()
 			}
 
-			fn generate_pair(seed: Option<&str>) -> Self {
+			fn generate_pair(seed: Option<$crate::Vec<u8>>) -> Self {
 				Self(<$public as $crate::RuntimePublic>::generate_pair($key_type, seed))
 			}
 

client/application-crypto/src/sr25519.rs

@@ -18,6 +18,8 @@
 
 use crate::{RuntimePublic, KeyTypeId};
 
+use rstd::vec::Vec;
+
 pub use primitives::sr25519::*;
 
 mod app {
@@ -29,28 +31,27 @@ mod app {
 	}
 }
 
-pub use app::Public as AppPublic;
-pub use app::Signature as AppSignature;
+pub use app::{Public as AppPublic, Signature as AppSignature};
 #[cfg(feature = "full_crypto")]
 pub use app::Pair as AppPair;
 
 impl RuntimePublic for Public {
 	type Signature = Signature;
 
 	fn all(key_type: KeyTypeId) -> crate::Vec<Self> {
-		runtime_io::sr25519_public_keys(key_type)
+		runtime_io::crypto::sr25519_public_keys(key_type)
 	}
 
-	fn generate_pair(key_type: KeyTypeId, seed: Option<&str>) -> Self {
-		runtime_io::sr25519_generate(key_type, seed)
+	fn generate_pair(key_type: KeyTypeId, seed: Option<Vec<u8>>) -> Self {
+		runtime_io::crypto::sr25519_generate(key_type, seed)
 	}
 
 	fn sign<M: AsRef<[u8]>>(&self, key_type: KeyTypeId, msg: &M) -> Option<Self::Signature> {
-		runtime_io::sr25519_sign(key_type, self, msg.as_ref())
+		runtime_io::crypto::sr25519_sign(key_type, self, msg.as_ref())
 	}
 
 	fn verify<M: AsRef<[u8]>>(&self, msg: &M, signature: &Self::Signature) -> bool {
-		runtime_io::sr25519_verify(&signature, msg.as_ref(), self)
+		runtime_io::crypto::sr25519_verify(&signature, msg.as_ref(), self)
 	}
 }
 

client/application-crypto/src/traits.rs

@@ -19,7 +19,7 @@ use primitives::crypto::Pair;
 
 use codec::Codec;
 use primitives::crypto::{KeyTypeId, CryptoType, IsWrappedBy, Public};
-use rstd::fmt::Debug;
+use rstd::{fmt::Debug, vec::Vec};
 
 /// An application-specific key.
 pub trait AppKey: 'static + Send + Sync + Sized + CryptoType + Clone {
@@ -88,10 +88,13 @@ pub trait RuntimePublic: Sized {
 	/// Returns all public keys for the given key type in the keystore.
 	fn all(key_type: KeyTypeId) -> crate::Vec<Self>;
 
-	/// Generate a public/private pair for the given key type and store it in the keystore.
+	/// Generate a public/private pair for the given key type with an optional `seed` and
+	/// store it in the keystore.
+	///
+	/// The `seed` needs to be valid utf8.
 	///
 	/// Returns the generated public key.
-	fn generate_pair(key_type: KeyTypeId, seed: Option<&str>) -> Self;
+	fn generate_pair(key_type: KeyTypeId, seed: Option<Vec<u8>>) -> Self;
 
 	/// Sign the given message with the corresponding private key of this public key.
 	///
@@ -116,10 +119,12 @@ pub trait RuntimeAppPublic: Sized  {
 	/// Returns all public keys for this application in the keystore.
 	fn all() -> crate::Vec<Self>;
 
-	/// Generate a public/private pair and store it in the keystore.
+	/// Generate a public/private pair with an optional `seed` and store it in the keystore.
+	///
+	/// The `seed` needs to be valid utf8.
 	///
 	/// Returns the generated public key.
-	fn generate_pair(seed: Option<&str>) -> Self;
+	fn generate_pair(seed: Option<Vec<u8>>) -> Self;
 
 	/// Sign the given message with the corresponding private key of this public key.
 	///

client/executor/Cargo.toml

@@ -17,6 +17,7 @@ wasmi = "0.5.1"
 parity-wasm = "0.40.3"
 lazy_static = "1.4.0"
 wasm-interface = { package = "substrate-wasm-interface", path = "../wasm-interface" }
+runtime-interface = { package = "substrate-runtime-interface", path = "../runtime-interface" }
 externalities = { package = "substrate-externalities", path = "../externalities" }
 parking_lot = "0.9.0"
 log = "0.4.8"
@@ -46,12 +47,12 @@ test-case = "0.3.3"
 default = []
 wasm-extern-trace = []
 wasmtime = [
-    "cranelift-codegen",
-    "cranelift-entity",
-    "cranelift-frontend",
-    "cranelift-native",
-    "cranelift-wasm",
-    "wasmtime-environ",
-    "wasmtime-jit",
-    "wasmtime-runtime",
+	"cranelift-codegen",
+	"cranelift-entity",
+	"cranelift-frontend",
+	"cranelift-native",
+	"cranelift-wasm",
+	"wasmtime-environ",
+	"wasmtime-jit",
+	"wasmtime-runtime",
 ]