Merge remote-tracking branch 'origin/master' into bkchr-execution-str…

…ategies-remove

bin/node-template/node/Cargo.toml

@@ -29,6 +29,7 @@ sc-keystore = { version = "4.0.0-dev", path = "../../../client/keystore" }
 sc-transaction-pool = { version = "4.0.0-dev", path = "../../../client/transaction-pool" }
 sc-transaction-pool-api = { version = "4.0.0-dev", path = "../../../client/transaction-pool/api" }
 sc-offchain = { version = "4.0.0-dev", path = "../../../client/offchain" }
+sc-statement-store = { version = "4.0.0-dev", path = "../../../client/statement-store" }
 sc-consensus-aura = { version = "0.10.0-dev", path = "../../../client/consensus/aura" }
 sp-consensus-aura = { version = "0.10.0-dev", path = "../../../primitives/consensus/aura" }
 sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }

client/api/src/execution_extensions.rs

@@ -95,7 +95,6 @@ impl<Block: BlockT, Ext: Default + Extension> ExtensionsFactory<Block>
 /// for each call, based on required `Capabilities`.
 pub struct ExecutionExtensions<Block: BlockT> {
 	extensions_factory: RwLock<Box<dyn ExtensionsFactory<Block>>>,
-	statement_store: RwLock<Option<Weak<dyn sp_statement_store::StatementStore>>>,
 	read_runtime_version: Arc<dyn ReadRuntimeVersion>,
 }
 

client/cli/src/config.rs

@@ -279,24 +279,8 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 		self.import_params().map(|x| x.wasm_runtime_overrides()).unwrap_or_default()
 	}
 
-	/// Get the RPC HTTP address (`None` if disabled).
-	///
-	/// By default this is `None`.
-	fn rpc_http(&self, _default_listen_port: u16) -> Result<Option<SocketAddr>> {
-		Ok(None)
-	}
-
-	/// Get the RPC IPC path (`None` if disabled).
-	///
-	/// By default this is `None`.
-	fn rpc_ipc(&self) -> Result<Option<String>> {
-		Ok(None)
-	}
-
-	/// Get the RPC websocket address (`None` if disabled).
-	///
-	/// By default this is `None`.
-	fn rpc_ws(&self, _default_listen_port: u16) -> Result<Option<SocketAddr>> {
+	/// Get the RPC address.
+	fn rpc_addr(&self, _default_listen_port: u16) -> Result<Option<SocketAddr>> {
 		Ok(None)
 	}
 
@@ -497,9 +481,7 @@ pub trait CliConfiguration<DCV: DefaultConfigurationValues = ()>: Sized {
 			blocks_pruning: self.blocks_pruning()?,
 			wasm_method: self.wasm_method()?,
 			wasm_runtime_overrides: self.wasm_runtime_overrides(),
-			rpc_http: self.rpc_http(DCV::rpc_http_listen_port())?,
-			rpc_ws: self.rpc_ws(DCV::rpc_ws_listen_port())?,
-			rpc_ipc: self.rpc_ipc()?,
+			rpc_addr: self.rpc_addr(DCV::rpc_listen_port())?,
 			rpc_methods: self.rpc_methods()?,
 			rpc_max_connections: self.rpc_max_connections()?,
 			rpc_cors: self.rpc_cors(is_dev)?,

client/cli/src/runner.rs

@@ -287,10 +287,8 @@ mod tests {
 				)),
 				wasm_method: Default::default(),
 				wasm_runtime_overrides: None,
-				rpc_http: None,
-				rpc_ws: None,
-				rpc_ipc: None,
-				rpc_ws_max_connections: None,
+				rpc_addr: None,
+				rpc_max_connections: Default::default(),
 				rpc_cors: None,
 				rpc_methods: Default::default(),
 				rpc_max_request_size: Default::default(),

client/rpc/src/dev/tests.rs

@@ -59,9 +59,9 @@ async fn block_stats_work() {
 			.await
 			.unwrap(),
 		Some(BlockStats {
-			witness_len: 612,
-			witness_compact_len: 516,
-			block_len: 99,
+			witness_len: expected_witness_len,
+			witness_compact_len: expected_witness_compact_len,
+			block_len: expected_block_len,
 			num_extrinsics: 0,
 		}),
 	);

client/service/src/config.rs

@@ -80,14 +80,10 @@ pub struct Configuration {
 	/// over on-chain runtimes when the spec version matches. Set to `None` to
 	/// disable overrides (default).
 	pub wasm_runtime_overrides: Option<PathBuf>,
-	/// RPC over HTTP binding address. `None` if disabled.
-	pub rpc_http: Option<SocketAddr>,
-	/// RPC over Websockets binding address. `None` if disabled.
-	pub rpc_ws: Option<SocketAddr>,
-	/// RPC over IPC binding path. `None` if disabled.
-	pub rpc_ipc: Option<String>,
-	/// Maximum number of connections for WebSockets RPC server. `None` if default.
-	pub rpc_ws_max_connections: Option<usize>,
+	/// JSON-RPC server binding address.
+	pub rpc_addr: Option<SocketAddr>,
+	/// Maximum number of connections for JSON-RPC server.
+	pub rpc_max_connections: u32,
 	/// CORS settings for HTTP & WS servers. `None` if all origins are allowed.
 	pub rpc_cors: Option<Vec<String>>,
 	/// RPC methods to expose (by default only a safe subset or all of them).

client/service/test/src/client/mod.rs

@@ -226,39 +226,6 @@ fn construct_genesis_should_work_with_wasm() {
 	.unwrap();
 }
 
-#[test]
-fn construct_genesis_with_bad_transaction_should_panic() {
-	let mut storage = GenesisConfig::new(
-		vec![Sr25519Keyring::One.public().into(), Sr25519Keyring::Two.public().into()],
-		vec![AccountKeyring::One.into(), AccountKeyring::Two.into()],
-		68,
-		None,
-		Default::default(),
-	)
-	.genesis_map();
-	let genesis_hash = insert_genesis_block(&mut storage);
-
-	let backend = InMemoryBackend::from((storage, StateVersion::default()));
-	let (b1data, _b1hash) = block1(genesis_hash, &backend);
-	let backend_runtime_code = sp_state_machine::backend::BackendRuntimeCode::new(&backend);
-	let runtime_code = backend_runtime_code.runtime_code().expect("Code is part of the backend");
-
-	let mut overlay = OverlayedChanges::default();
-
-	let r = StateMachine::new(
-		&backend,
-		&mut overlay,
-		&new_native_or_wasm_executor(),
-		"Core_execute_block",
-		&b1data,
-		&mut Default::default(),
-		&runtime_code,
-		CallContext::Onchain,
-	)
-	.execute();
-	assert!(r.is_err());
-}
-
 #[test]
 fn client_initializes_from_genesis_ok() {
 	let client = substrate_test_runtime_client::new();
@@ -1710,7 +1677,14 @@ fn storage_keys_prefix_and_start_key_works() {
 		.unwrap()
 		.map(|x| array_bytes::bytes2hex("", &x.0))
 		.collect();
-	assert_eq!(res, [&child_root, "3a636f6465",]);
+	assert_eq!(
+		res,
+		[
+			&child_root,
+			"3a636f6465",                       //":code"
+			"3a65787472696e7369635f696e646578", //":extrinsic_index"
+		]
+	);
 
 	let res: Vec<_> = client
 		.storage_keys(
@@ -1721,7 +1695,18 @@ fn storage_keys_prefix_and_start_key_works() {
 		.unwrap()
 		.map(|x| array_bytes::bytes2hex("", &x.0))
 		.collect();
-	assert_eq!(res, Vec::<String>::new());
+	assert_eq!(res, ["3a65787472696e7369635f696e646578",]);
+
+	let res: Vec<_> = client
+		.storage_keys(
+			block_hash,
+			Some(&prefix),
+			Some(&StorageKey(array_bytes::hex2bytes_unchecked("3a686561707061676573"))),
+		)
+		.unwrap()
+		.map(|x| x.0)
+		.collect();
+	assert_eq!(res, Vec::<Vec<u8>>::new());
 
 	let res: Vec<_> = client
 		.child_storage_keys(block_hash, child_info.clone(), Some(&child_prefix), None)
@@ -1780,16 +1765,12 @@ fn storage_keys_works() {
 		.collect();
 	assert_eq!(
 		res,
-		[
-			"3a636f6465",
-			"52008686cc27f6e5ed83a216929942f8bcd32a396f09664a5698f81371934b56",
-			"5348d72ac6cc66e5d8cbecc27b0e0677503b845fe2382d819f83001781788fd5",
-			"5c2d5fda66373dabf970e4fb13d277ce91c5233473321129d32b5a8085fa8133",
-			"6644b9b8bc315888ac8e41a7968dc2b4141a5403c58acdf70b7e8f7e07bf5081",
-			"66484000ed3f75c95fc7b03f39c20ca1e1011e5999278247d3b2f5e3c3273808",
-			"7d5007603a7f5dd729d51d93cf695d6465789443bb967c0d1fe270e388c96eaa",
-			"811ecfaadcf5f2ee1d67393247e2f71a1662d433e8ce7ff89fb0d4aa9561820b",
-		]
+		expected_keys
+			.iter()
+			.filter(|&i| i > &"3a636f64".to_string())
+			.take(8)
+			.cloned()
+			.collect::<Vec<String>>()
 	);
 
 	// Starting at a complete key the first key is skipped.
@@ -1805,15 +1786,12 @@ fn storage_keys_works() {
 		.collect();
 	assert_eq!(
 		res,
-		[
-			"52008686cc27f6e5ed83a216929942f8bcd32a396f09664a5698f81371934b56",
-			"5348d72ac6cc66e5d8cbecc27b0e0677503b845fe2382d819f83001781788fd5",
-			"5c2d5fda66373dabf970e4fb13d277ce91c5233473321129d32b5a8085fa8133",
-			"6644b9b8bc315888ac8e41a7968dc2b4141a5403c58acdf70b7e8f7e07bf5081",
-			"66484000ed3f75c95fc7b03f39c20ca1e1011e5999278247d3b2f5e3c3273808",
-			"7d5007603a7f5dd729d51d93cf695d6465789443bb967c0d1fe270e388c96eaa",
-			"811ecfaadcf5f2ee1d67393247e2f71a1662d433e8ce7ff89fb0d4aa9561820b",
-		]
+		expected_keys
+			.iter()
+			.filter(|&i| i > &"3a636f6465".to_string())
+			.take(8)
+			.cloned()
+			.collect::<Vec<String>>()
 	);
 
 	const SOME_BALANCE_KEY : &str = "26aa394eea5630e07c48ae0c9558cef7b99d880ec681799c0cf30e8886371da9e2c1dc507e2035edbbd8776c440d870460c57f0008067cc01c5ff9eb2e2f9b3a94299a915a91198bd1021a6c55596f57";

client/service/test/src/lib.rs

@@ -245,10 +245,8 @@ fn node_config<
 		chain_spec: Box::new((*spec).clone()),
 		wasm_method: Default::default(),
 		wasm_runtime_overrides: Default::default(),
-		rpc_http: None,
-		rpc_ipc: None,
-		rpc_ws: None,
-		rpc_ws_max_connections: None,
+		rpc_addr: Default::default(),
+		rpc_max_connections: Default::default(),
 		rpc_cors: None,
 		rpc_methods: Default::default(),
 		rpc_max_request_size: Default::default(),

client/statement-store/src/lib.rs

@@ -491,8 +491,7 @@ impl Store {
 			+ 'static,
 		Client::Api: ValidateStatement<Block>,
 	{
-		let store = Arc::new(Self::new(path, options, client.clone(), prometheus)?);
-		client.execution_extensions().register_statement_store(store.clone());
+		let store = Arc::new(Self::new(path, options, client, prometheus)?);
 
 		// Perform periodic statement store maintenance
 		let worker_store = store.clone();

primitives/api/test/tests/runtime_calls.rs

@@ -39,14 +39,22 @@ fn calling_runtime_function() {
 }
 
 #[test]
-fn calling_runtime_signature_changed_old_function() {
+fn calling_native_runtime_function() {
+	calling_function_with_strat(ExecutionStrategy::NativeWhenPossible);
+}
+
+#[test]
+fn calling_wasm_runtime_function() {
+	calling_function_with_strat(ExecutionStrategy::AlwaysWasm);
+}
+
+#[test]
+fn calling_native_runtime_signature_changed_function() {
 	let client = TestClientBuilder::new().build();
 	let runtime_api = client.runtime_api();
 	let best_hash = client.chain_info().best_hash;
 
-	#[allow(deprecated)]
-	let res = runtime_api.function_signature_changed_before_version_2(best_hash).unwrap();
-	assert_eq!(&res, &[1, 2]);
+	assert_eq!(runtime_api.function_signature_changed(best_hash).unwrap(), 1);
 }
 
 #[test]

primitives/keystore/src/lib.rs

@@ -251,9 +251,18 @@ impl<T: Keystore + ?Sized> Keystore for Arc<T> {
 		&self,
 		key_type: KeyTypeId,
 		public: &sr25519::Public,
-		transcript: &sr25519::vrf::VrfTranscript,
+		data: &sr25519::vrf::VrfSignData,
 	) -> Result<Option<sr25519::vrf::VrfSignature>, Error> {
-		(**self).sr25519_vrf_sign(key_type, public, transcript)
+		(**self).sr25519_vrf_sign(key_type, public, data)
+	}
+
+	fn sr25519_vrf_output(
+		&self,
+		key_type: KeyTypeId,
+		public: &sr25519::Public,
+		input: &sr25519::vrf::VrfInput,
+	) -> Result<Option<sr25519::vrf::VrfOutput>, Error> {
+		(**self).sr25519_vrf_output(key_type, public, input)
 	}
 
 	fn ed25519_public_keys(&self, key_type: KeyTypeId) -> Vec<ed25519::Public> {

test-utils/runtime/src/genesismap.rs

@@ -87,29 +87,11 @@ impl GenesisStorageBuilder {
 		}
 	}
 
-	pub fn genesis_map(&self) -> Storage {
-		let wasm_runtime = wasm_binary_unwrap().to_vec();
-		let mut map: BTreeMap<Vec<u8>, Vec<u8>> = self
-			.balances
-			.iter()
-			.map(|&(ref account, balance)| {
-				(account.to_keyed_vec(b"balance:"), vec![].and(&balance))
-			})
-			.map(|(k, v)| (blake2_256(&k[..])[..].to_vec(), v.to_vec()))
-			.chain(
-				vec![(well_known_keys::CODE.into(), wasm_runtime)]
-					.into_iter()
-					.chain(
-						self.heap_pages_override
-							.into_iter()
-							.map(|h| (well_known_keys::HEAP_PAGES.into(), h.encode())),
-					)
-					.into_iter(),
-			)
-			.collect();
-		map.insert(twox_128(&b"sys:auth"[..])[..].to_vec(), self.authorities.encode());
-		// Add the extra storage entries.
-		map.extend(self.extra_storage.top.clone().into_iter());
+	/// Override default wasm code to be placed into GenesisConfig.
+	pub fn with_wasm_code(mut self, wasm_code: &Option<Vec<u8>>) -> Self {
+		self.wasm_code = wasm_code.clone();
+		self
+	}
 
 	pub fn with_heap_pages(mut self, heap_pages_override: Option<u64>) -> Self {
 		self.heap_pages_override = heap_pages_override;
@@ -141,10 +123,9 @@ impl GenesisStorageBuilder {
 			.build_storage()
 			.expect("Build storage from substrate-test-runtime GenesisConfig");
 
-		storage.top.insert(
-			well_known_keys::HEAP_PAGES.into(),
-			self.heap_pages_override.unwrap_or(16_u64).encode(),
-		);
+		if let Some(heap_pages) = self.heap_pages_override {
+			storage.top.insert(well_known_keys::HEAP_PAGES.into(), heap_pages.encode());
+		}
 
 		storage.top.extend(self.extra_storage.top.clone());
 		storage.children_default.extend(self.extra_storage.children_default.clone());