One node two runtimes (paritytech#191)

* One node two runtimes

This enables the rococo-collator to run the normal and the contracts runtime.

* Fix tests

Author: bkchr

Cargo.lock

@@ -9,6 +9,7 @@ members = [
 	"rococo-parachains/contracts-runtime",
 	"rococo-parachains/pallets/parachain-info",
 	"rococo-parachains/pallets/token-dealer",
+	"rococo-parachains/primitives",
 	"rococo-parachains/runtime",
 	"runtime",
 	"service",

Cargo.toml

@@ -518,18 +518,17 @@ where
 				Box::new(self.polkadot_network.clone()),
 			)));
 
-		let follow =
-			match cumulus_consensus::follow_polkadot(
-				self.para_id,
-				self.client,
-				polkadot_client,
-				self.announce_block.clone(),
-			) {
-				Ok(follow) => follow,
-				Err(e) => {
-					return Err(error!("Could not start following polkadot: {:?}", e));
-				}
-			};
+		let follow = match cumulus_consensus::follow_polkadot(
+			self.para_id,
+			self.client,
+			polkadot_client,
+			self.announce_block.clone(),
+		) {
+			Ok(follow) => follow,
+			Err(e) => {
+				return Err(error!("Could not start following polkadot: {:?}", e));
+			}
+		};
 
 		self.spawner
 			.spawn("cumulus-follow-polkadot", follow.map(|_| ()).boxed());

collator/src/lib.rs

@@ -23,7 +23,10 @@ mod tests;
 
 use sp_api::ProvideRuntimeApi;
 use sp_blockchain::{Error as ClientError, HeaderBackend};
-use sp_consensus::{block_validation::{BlockAnnounceValidator, Validation}, SyncOracle};
+use sp_consensus::{
+	block_validation::{BlockAnnounceValidator, Validation},
+	SyncOracle,
+};
 use sp_core::traits::SpawnNamed;
 use sp_runtime::{
 	generic::BlockId,

network/src/lib.rs

@@ -17,9 +17,9 @@
 use super::*;
 use cumulus_test_runtime::{Block, Header};
 use polkadot_primitives::v0::{
-	AbridgedCandidateReceipt, Chain, CollatorId, DutyRoster, GlobalValidationData,
-	Id as ParaId, LocalValidationData, ParachainHost, Retriable, SigningContext,
-	ValidationCode, ValidatorId, Block as PBlock, Hash as PHash, Header as PHeader,
+	AbridgedCandidateReceipt, Block as PBlock, Chain, CollatorId, DutyRoster, GlobalValidationData,
+	Hash as PHash, Header as PHeader, Id as ParaId, LocalValidationData, ParachainHost, Retriable,
+	SigningContext, ValidationCode, ValidatorId,
 };
 use polkadot_test_runtime_client::{
 	DefaultTestClientBuilderExt, TestClient, TestClientBuilder, TestClientBuilderExt,

network/src/tests.rs

@@ -25,13 +25,15 @@ hex-literal = "0.2.1"
 # Parachain dependencies
 parachain-runtime = { package = "cumulus-test-parachain-runtime", path = "runtime" }
 parachain-contracts-runtime = { package = "cumulus-contracts-parachain-runtime", path = "contracts-runtime" }
+rococo-parachain-primitives = { path = "primitives" }
 
 # Substrate dependencies
 sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-branch" }
 sp-io = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
 sp-inherents = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
 sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
+sp-session = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
 sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
 sc-cli = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
 sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
@@ -42,11 +44,15 @@ sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch
 sc-network = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
 sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch", version = "0.8.0-rc5" }
 sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
+sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
+sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
 sp-trie = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
 sp-api = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
 sc-finality-grandpa = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
 sc-informant = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
 sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
+sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
+sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "rococo-branch" }
 
 # RPC related dependencies
 cumulus-pallet-contracts-rpc = { path = "./pallets/contracts/rpc" }

rococo-parachains/Cargo.toml

@@ -10,6 +10,7 @@ codec = { package = "parity-scale-codec", version = "1.3.0", default-features =
 
 cumulus-token-dealer = { path = "../pallets/token-dealer", default-features = false}
 parachain-info = { path = "../pallets/parachain-info", default-features = false}
+rococo-parachain-primitives = { path = "../primitives", default-features = false}
 
 # Substrate dependencies
 sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-branch" }
@@ -79,6 +80,7 @@ std = [
 	"pallet-sudo/std",
 	"pallet-transaction-payment/std",
 	"parachain-info/std",
+	"rococo-parachain-primitives/std",
 	"cumulus-runtime/std",
 	"cumulus-parachain-upgrade/std",
 	"cumulus-message-broker/std",

rococo-parachains/contracts-runtime/Cargo.toml

@@ -23,13 +23,14 @@
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
 use cumulus_pallet_contracts_rpc_runtime_api::ContractExecResult;
+use rococo_parachain_primitives::*;
 use sp_api::impl_runtime_apis;
 use sp_core::OpaqueMetadata;
 use sp_runtime::{
 	create_runtime_str, generic, impl_opaque_keys,
-	traits::{BlakeTwo256, Block as BlockT, IdentifyAccount, IdentityLookup, Saturating, Verify},
+	traits::{BlakeTwo256, Block as BlockT, IdentityLookup, Saturating},
 	transaction_validity::{TransactionSource, TransactionValidity},
-	ApplyExtrinsicResult, MultiSignature,
+	ApplyExtrinsicResult,
 };
 use sp_std::prelude::*;
 #[cfg(feature = "std")]
@@ -49,61 +50,18 @@ pub use pallet_timestamp::Call as TimestampCall;
 pub use sp_runtime::BuildStorage;
 pub use sp_runtime::{Perbill, Permill};
 
-/// An index to a block.
-pub type BlockNumber = u32;
+pub type SessionHandlers = ();
 
-/// Alias to 512-bit hash when used in the context of a transaction signature on the chain.
-pub type Signature = MultiSignature;
-
-/// Some way of identifying an account on the chain. We intentionally make it equivalent
-/// to the public key of our transaction signing scheme.
-pub type AccountId = <<Signature as Verify>::Signer as IdentifyAccount>::AccountId;
-
-/// The type for looking up accounts. We don't expect more than 4 billion of them, but you
-/// never know...
-pub type AccountIndex = u32;
-
-/// Balance of an account.
-pub type Balance = u128;
-
-/// Index of a transaction in the chain.
-pub type Index = u32;
-
-/// A hash of some data used by the chain.
-pub type Hash = sp_core::H256;
-
-/// Digest item type.
-pub type DigestItem = generic::DigestItem<Hash>;
-
-/// Opaque types. These are used by the CLI to instantiate machinery that don't need to know
-/// the specifics of the runtime. They can then be made to be agnostic over specific formats
-/// of data like extrinsics, allowing for them to continue syncing the network through upgrades
-/// to even the core datastructures.
-pub mod opaque {
-	use super::*;
-
-	pub use sp_runtime::OpaqueExtrinsic as UncheckedExtrinsic;
-
-	/// Opaque block header type.
-	pub type Header = generic::Header<BlockNumber, BlakeTwo256>;
-	/// Opaque block type.
-	pub type Block = generic::Block<Header, UncheckedExtrinsic>;
-	/// Opaque block identifier type.
-	pub type BlockId = generic::BlockId<Block>;
-
-	pub type SessionHandlers = ();
-
-	impl_opaque_keys! {
-		pub struct SessionKeys {}
-	}
+impl_opaque_keys! {
+	pub struct SessionKeys {}
 }
 
 /// This runtime version.
 pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("cumulus-contracts-parachain"),
 	impl_name: create_runtime_str!("cumulus-contracts-parachain"),
 	authoring_version: 1,
-	spec_version: 1,
+	spec_version: 2,
 	impl_version: 1,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
@@ -292,7 +250,7 @@ impl cumulus_pallet_contracts::Trait for Runtime {
 construct_runtime! {
 	pub enum Runtime where
 		Block = Block,
-		NodeBlock = opaque::Block,
+		NodeBlock = rococo_parachain_primitives::Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
 		System: frame_system::{Module, Call, Storage, Config, Event<T>},
@@ -405,11 +363,11 @@ impl_runtime_apis! {
 		fn decode_session_keys(
 			encoded: Vec<u8>,
 		) -> Option<Vec<(Vec<u8>, sp_core::crypto::KeyTypeId)>> {
-			opaque::SessionKeys::decode_into_raw_public_keys(&encoded)
+			SessionKeys::decode_into_raw_public_keys(&encoded)
 		}
 
 		fn generate_session_keys(seed: Option<Vec<u8>>) -> Vec<u8> {
-			opaque::SessionKeys::generate(seed)
+			SessionKeys::generate(seed)
 		}
 	}
 

rococo-parachains/contracts-runtime/src/lib.rs

@@ -20,9 +20,9 @@
 use std::sync::Arc;
 
 use codec::Codec;
+use cumulus_pallet_contracts_primitives::RentProjection;
 use jsonrpc_core::{Error, ErrorCode, Result};
 use jsonrpc_derive::rpc;
-use cumulus_pallet_contracts_primitives::RentProjection;
 use serde::{Deserialize, Serialize};
 use sp_api::ProvideRuntimeApi;
 use sp_blockchain::HeaderBackend;
@@ -106,7 +106,11 @@ pub enum RpcContractExecResult {
 impl From<ContractExecResult> for RpcContractExecResult {
 	fn from(r: ContractExecResult) -> Self {
 		match r {
-			ContractExecResult::Success { flags, data, gas_consumed } => RpcContractExecResult::Success {
+			ContractExecResult::Success {
+				flags,
+				data,
+				gas_consumed,
+			} => RpcContractExecResult::Success {
 				flags,
 				data: data.into(),
 				gas_consumed,
@@ -293,15 +297,18 @@ mod tests {
 	#[test]
 	fn call_request_should_serialize_deserialize_properly() {
 		type Req = CallRequest<String, u128>;
-		let req: Req = serde_json::from_str(r#"
+		let req: Req = serde_json::from_str(
+			r#"
 		{
 			"origin": "5CiPPseXPECbkjWCa6MnjNokrgYjMqmKndv2rSnekmSK2DjL",
 			"dest": "5DRakbLVnjVrW6niwLfHGW24EeCEvDAFGEXrtaYS5M4ynoom",
 			"value": 0,
 			"gasLimit": 1000000000000,
 			"inputData": "0x8c97db39"
 		}
-		"#).unwrap();
+		"#,
+		)
+		.unwrap();
 		assert_eq!(req.gas_limit.into_u256(), U256::from(0xe8d4a51000u64));
 	}
 

rococo-parachains/pallets/contracts/rpc/src/lib.rs

@@ -21,14 +21,19 @@ use super::{
 	TrieIdGenerator,
 };
 use crate::exec::StorageKey;
-use sp_std::cell::RefCell;
-use sp_std::collections::btree_map::{BTreeMap, Entry};
-use sp_std::prelude::*;
+use frame_support::{
+	storage::unhashed as storage,
+	traits::{Currency, Imbalance, SignedImbalance},
+	StorageMap,
+};
+use frame_system;
 use sp_io::hashing::blake2_256;
 use sp_runtime::traits::{Bounded, Zero};
-use frame_support::traits::{Currency, Imbalance, SignedImbalance};
-use frame_support::{storage::unhashed as storage, StorageMap};
-use frame_system;
+use sp_std::{
+	cell::RefCell,
+	collections::btree_map::{BTreeMap, Entry},
+	prelude::*,
+};
 
 // Note: we don't provide Option<Contract> because we can't create
 // the trie_id in the overlay, thus we provide an overlay on the fields
@@ -133,8 +138,7 @@ impl<T: Trait> AccountDb<T> for DirectAccountDb {
 		trie_id: Option<&TrieId>,
 		location: &StorageKey,
 	) -> Option<Vec<u8>> {
-		trie_id
-			.and_then(|id| storage::get_raw(&crate::prefixed_key(id, &blake2_256(location))))
+		trie_id.and_then(|id| storage::get_raw(&crate::prefixed_key(id, &blake2_256(location))))
 	}
 	fn get_code_hash(&self, account: &T::AccountId) -> Option<CodeHash<T>> {
 		<ContractInfoOf<T>>::get(account).and_then(|i| i.as_alive().map(|i| i.code_hash))
@@ -241,13 +245,13 @@ impl<T: Trait> AccountDb<T> for DirectAccountDb {
 							if prev_value.is_empty() {
 								new_info.empty_pair_count -= 1;
 							}
-						},
+						}
 						(None, Some(new_value)) => {
 							new_info.total_pair_count += 1;
 							if new_value.is_empty() {
 								new_info.empty_pair_count += 1;
 							}
-						},
+						}
 						(Some(prev_value), Some(new_value)) => {
 							if prev_value.is_empty() {
 								new_info.empty_pair_count -= 1;