Revert "Remove sandboxing host function interface (paritytech#12852)"

This reverts commit 5722ece.

Cargo.toml

@@ -208,6 +208,7 @@ members = [
 	"primitives/runtime-interface/test",
 	"primitives/runtime-interface/test-wasm",
 	"primitives/runtime-interface/test-wasm-deprecated",
+	"primitives/sandbox",
 	"primitives/serializer",
 	"primitives/session",
 	"primitives/staking",

bin/node/runtime/Cargo.toml

@@ -40,6 +40,7 @@ sp-session = { version = "4.0.0-dev", default-features = false, path = "../../..
 sp-transaction-pool = { version = "4.0.0-dev", default-features = false, path = "../../../primitives/transaction-pool" }
 sp-version = { version = "5.0.0", default-features = false, path = "../../../primitives/version" }
 sp-io = { version = "7.0.0", default-features = false, path = "../../../primitives/io" }
+sp-sandbox = { version = "0.10.0-dev", default-features = false, path = "../../../primitives/sandbox" }
 
 # frame dependencies
 frame-executive = { version = "4.0.0-dev", default-features = false, path = "../../../frame/executive" }
@@ -118,6 +119,7 @@ substrate-wasm-builder = { version = "5.0.0-dev", path = "../../../utils/wasm-bu
 default = ["std"]
 with-tracing = ["frame-executive/with-tracing"]
 std = [
+	"sp-sandbox/std",
 	"pallet-whitelist/std",
 	"pallet-offences-benchmarking?/std",
 	"pallet-election-provider-support-benchmarking?/std",
@@ -315,3 +317,8 @@ try-runtime = [
 	"pallet-vesting/try-runtime",
 	"pallet-whitelist/try-runtime",
 ]
+# Force `sp-sandbox` to call into the host resident executor. One still need to make sure
+# that `sc-executor` gets the `wasmer-sandbox` feature which happens automatically when
+# specified on the command line.
+# Don't use that on a production chain.
+wasmer-sandbox = ["sp-sandbox/wasmer-sandbox"]

client/executor/Cargo.toml

@@ -14,6 +14,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+lazy_static = "1.4.0"
 lru = "0.8.1"
 parking_lot = "0.12.1"
 tracing = "0.1.29"
@@ -25,6 +26,7 @@ sc-executor-wasmi = { version = "0.10.0-dev", path = "wasmi" }
 sc-executor-wasmtime = { version = "0.10.0-dev", path = "wasmtime" }
 sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
 sp-core = { version = "7.0.0", path = "../../primitives/core" }
+sp-core-hashing-proc-macro = { version = "5.0.0", path = "../../primitives/core/hashing/proc-macro" }
 sp-externalities = { version = "0.13.0", path = "../../primitives/externalities" }
 sp-io = { version = "7.0.0", path = "../../primitives/io" }
 sp-panic-handler = { version = "5.0.0", path = "../../primitives/panic-handler" }
@@ -59,3 +61,4 @@ default = ["std"]
 # This crate does not have `no_std` support, we just require this for tests
 std = []
 wasm-extern-trace = []
+wasmer-sandbox = ["sc-executor-common/wasmer-sandbox"]

client/executor/common/Cargo.toml

@@ -14,12 +14,19 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+codec = { package = "parity-scale-codec", version = "3.0.0" }
+environmental = "1.1.3"
 thiserror = "1.0.30"
 wasm-instrument = "0.3"
+wasmer = { version = "2.2", features = ["singlepass"], optional = true }
 wasmi = "0.13"
 sc-allocator = { version = "4.1.0-dev", path = "../../allocator" }
 sp-maybe-compressed-blob = { version = "4.1.0-dev", path = "../../../primitives/maybe-compressed-blob" }
+sp-sandbox = { version = "0.10.0-dev", path = "../../../primitives/sandbox" }
 sp-wasm-interface = { version = "7.0.0", path = "../../../primitives/wasm-interface" }
 
 [features]
 default = []
+wasmer-sandbox = [
+	"wasmer",
+]

client/executor/common/src/error.rs

@@ -30,6 +30,9 @@ pub enum Error {
 	#[error(transparent)]
 	Wasmi(#[from] wasmi::Error),
 
+	#[error("Sandbox error: {0}")]
+	Sandbox(String),
+
 	#[error("Error calling api function: {0}")]
 	ApiError(Box<dyn std::error::Error + Send + Sync>),
 

client/executor/common/src/lib.rs

@@ -23,5 +23,6 @@
 
 pub mod error;
 pub mod runtime_blob;
+pub mod sandbox;
 pub mod util;
 pub mod wasm_runtime;