Introduce first groundwork for Wasm executor

.gitignore

@@ -1,3 +1,5 @@
 /target/
 **/*.rs.bk
 *.swp
+runtime/**/target/
+**/._*

Cargo.toml

@@ -12,11 +12,14 @@ members = [
 	"candidate-agreement",
 	"client",
 	"collator",
-	"contracts",
+	"executor",
 	"primitives",
 	"rpc",
 	"rpc_servers",
 	"serializer",
 	"state_machine",
 	"validator",
 ]
+exclude = [
+	"runtime"
+]

cli/Cargo.toml

@@ -10,6 +10,6 @@ env_logger = "0.4"
 error-chain = "0.11"
 log = "0.3"
 polkadot-client = { path = "../client", version = "0.1" }
-polkadot-contracts = { path = "../contracts", version = "0.1" }
+polkadot-executor = { path = "../executor", version = "0.1" }
 polkadot-primitives = { path = "../primitives", version = "0.1" }
 polkadot-rpc-servers = { path = "../rpc_servers", version = "0.1" }

cli/src/lib.rs

@@ -20,7 +20,7 @@
 
 extern crate env_logger;
 extern crate polkadot_client as client;
-extern crate polkadot_contracts as contracts;
+extern crate polkadot_executor as executor;
 extern crate polkadot_primitives as primitives;
 extern crate polkadot_rpc_servers as rpc;
 
@@ -54,7 +54,7 @@ pub fn run<I, T>(args: I) -> error::Result<()> where
 
 	// Create client
 	let blockchain = DummyBlockchain;
-	let executor = contracts::executor();
+	let executor = executor::executor();
 	let client = client::Client::new(blockchain, executor);
 
 	let address = "127.0.0.1:9933".parse().unwrap();

client/src/lib.rs

@@ -26,8 +26,8 @@ extern crate error_chain;
 
 pub mod error;
 
-use primitives::{block, Address, H256};
-use primitives::contract::{CallData, OutData, StorageData};
+use primitives::{block};
+use primitives::contract::{CallData, StorageKey, StorageData};
 use state_machine::backend::Backend;
 
 use self::error::ResultExt;
@@ -44,6 +44,14 @@ pub trait Blockchain {
 	fn header(&self, hash: &block::HeaderHash) -> Result<Option<block::Header>, Self::Error>;
 }
 
+/// Information regarding the result of a call.
+pub struct CallResult {
+	/// The data that was returned from the call.
+	pub return_data: Vec<u8>,
+	/// The changes made to the state by the call.
+	pub changes: state_machine::OverlayedChanges,
+}
+
 /// Polkadot Client
 #[derive(Debug)]
 pub struct Client<B,  E> {
@@ -72,25 +80,27 @@ impl<B, E> Client<B, E> where
 	}
 
 	/// Return single storage entry of contract under given address in state in a block of given hash.
-	pub fn storage(&self, hash: &block::HeaderHash, address: &Address, key: &H256) -> error::Result<StorageData> {
+	pub fn storage(&self, hash: &block::HeaderHash, key: &StorageKey) -> error::Result<StorageData> {
 		self.state_at(hash)?
-			.storage(address, key)
+			.storage(&key.0)
 			.map(|x| StorageData(x.to_vec()))
 			.chain_err(|| error::ErrorKind::Backend)
 	}
 
 	/// Execute a call to a contract on top of state in a block of given hash.
-	pub fn call(&self, hash: &block::HeaderHash, address: &Address, method: &str, call_data: &CallData) -> error::Result<OutData> {
+	///
+	/// No changes are made.
+	pub fn call(&self, hash: &block::HeaderHash, method: &str, call_data: &CallData) -> error::Result<CallResult> {
 		let state = self.state_at(hash)?;
 		let mut changes = state_machine::OverlayedChanges::default();
 
-		Ok(state_machine::execute(
+		let _ = state_machine::execute(
 			&state,
 			&mut changes,
 			&self.executor,
-			address,
 			method,
 			call_data,
-		)?)
+		)?;
+		Ok(CallResult { return_data: vec![], changes })
 	}
 }