Restore previous version of ext_sandbox_invoke (#236)

* Restore previous version of ext_sandbox_invoke. * Rebuild binaries.
paritytech · Jun 25, 2018 · e50bb08 · e50bb08
1 parent a663a8a
commit e50bb08
Show file tree

Hide file tree

Showing 13 changed files with 880 additions and 3 deletions.
diff --git a/demo/runtime/wasm/Cargo.lock b/demo/runtime/wasm/Cargo.lock
diff --git a/demo/runtime/wasm/target/wasm32-unknown-unknown/release/demo_runtime.compact.wasm b/demo/runtime/wasm/target/wasm32-unknown-unknown/release/demo_runtime.compact.wasm
diff --git a/demo/runtime/wasm/target/wasm32-unknown-unknown/release/demo_runtime.wasm b/demo/runtime/wasm/target/wasm32-unknown-unknown/release/demo_runtime.wasm
diff --git a/polkadot/runtime/wasm/Cargo.lock b/polkadot/runtime/wasm/Cargo.lock
diff --git a/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm b/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.compact.wasm
diff --git a/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm b/polkadot/runtime/wasm/target/wasm32-unknown-unknown/release/polkadot_runtime.wasm
diff --git a/substrate/executor/src/wasm_executor.rs b/substrate/executor/src/wasm_executor.rs
@@ -360,7 +360,25 @@ impl_function_executor!(this: FunctionExecutor<'e, E>,
 		this.sandbox_store.instance_teardown(instance_idx)?;
 		Ok(())
 	},
-	ext_sandbox_invoke(instance_idx: u32, export_ptr: *const u8, export_len: usize, args_ptr: *const u8, args_len: usize, return_val_ptr: *const u8, return_val_len: usize, state: usize) -> u32 => {
+	ext_sandbox_invoke(instance_idx: u32, export_ptr: *const u8, export_len: usize, state: usize) -> u32 => {
+		trace!(target: "runtime-sandbox", "invoke, instance_idx={}", instance_idx);
+		let export = this.memory.get(export_ptr, export_len as usize)
+			.map_err(|_| DummyUserError)
+			.and_then(|b|
+				String::from_utf8(b)
+					.map_err(|_| DummyUserError)
+			)?;
+
+		let instance = this.sandbox_store.instance(instance_idx)?;
+		let result = instance.invoke(&export, &[], this, state);
+		match result {
+			Ok(None) => Ok(sandbox_primitives::ERR_OK),
+			Ok(_) => unimplemented!(),
+			Err(_) => Ok(sandbox_primitives::ERR_EXECUTION),
+		}
+	},
+	// TODO: Remove the old 'ext_sandbox_invoke' and rename this to it.
+	ext_sandbox_invoke_poc2(instance_idx: u32, export_ptr: *const u8, export_len: usize, args_ptr: *const u8, args_len: usize, return_val_ptr: *const u8, return_val_len: usize, state: usize) -> u32 => {
 		use codec::Slicable;
 
 		trace!(target: "runtime-sandbox", "invoke, instance_idx={}", instance_idx);

diff --git a/substrate/executor/wasm/target/wasm32-unknown-unknown/release/runtime_test.compact.wasm b/substrate/executor/wasm/target/wasm32-unknown-unknown/release/runtime_test.compact.wasm
diff --git a/substrate/executor/wasm/target/wasm32-unknown-unknown/release/runtime_test.wasm b/substrate/executor/wasm/target/wasm32-unknown-unknown/release/runtime_test.wasm
diff --git a/substrate/runtime-sandbox/without_std.rs b/substrate/runtime-sandbox/without_std.rs
@@ -57,7 +57,8 @@ mod ffi {
 			imports_len: usize,
 			state: usize,
 		) -> u32;
-		pub fn ext_sandbox_invoke(
+		// TODO: Rename it back to 'ext_sandbox_invoke'.
+		pub fn ext_sandbox_invoke_poc2(
 			instance_idx: u32,
 			export_ptr: *const u8,
 			export_len: usize,
@@ -271,7 +272,7 @@ impl<T> Instance<T> {
 		let mut return_val = vec![0u8; sandbox_primitives::ReturnValue::ENCODED_MAX_SIZE];
 
 		let result = unsafe {
-			ffi::ext_sandbox_invoke(
+			ffi::ext_sandbox_invoke_poc2(
 				self.instance_idx,
 				name.as_ptr(),
 				name.len(),