linera-{execution,witty}: allow non-Send types in UserData`

Cargo.toml

@@ -215,3 +215,8 @@ opt-level = 3
 version = "0.4.1"
 git = "https://github.com/Twey/rust-indexed-db"
 branch = "no-uuid-wasm-bindgen"
+
+[patch.crates-io.wasmer]
+version = "4.3.0-alpha.1"
+git = "https://github.com/Twey/wasmer"
+branch = "non-send-environments"

examples/Cargo.toml

@@ -52,3 +52,8 @@ strip = 'debuginfo'
 
 [profile.bench]
 debug = true
+
+[patch.crates-io.wasmer]
+version = "4.3.0-alpha.1"
+git = "https://github.com/Twey/wasmer"
+branch = "non-send-environments"

linera-execution/Cargo.toml

@@ -88,3 +88,8 @@ cfg_aliases.workspace = true
 
 [package.metadata.cargo-machete]
 ignored = ["serde_bytes"]
+
+[patch.crates-io.wasmer]
+version = "4.3.0-alpha.1"
+git = "https://github.com/Twey/wasmer"
+branch = "non-send-environments"

linera-execution/src/lib.rs

@@ -69,10 +69,10 @@ pub type UserContractCode = Arc<dyn UserContractModule + Send + Sync + 'static>;
 pub type UserServiceCode = Arc<dyn UserServiceModule + Send + Sync + 'static>;
 
 /// An implementation of [`UserContract`].
-pub type UserContractInstance = Box<dyn UserContract + Send + Sync + 'static>;
+pub type UserContractInstance = Box<dyn UserContract + 'static>;
 
 /// An implementation of [`UserService`].
-pub type UserServiceInstance = Box<dyn UserService + Send + Sync + 'static>;
+pub type UserServiceInstance = Box<dyn UserService + 'static>;
 
 /// A factory trait to obtain a [`UserContract`] from a [`UserContractModule`]
 pub trait UserContractModule {

linera-execution/src/test_utils/mock_application.rs

@@ -195,7 +195,7 @@ impl UserContractModule for MockApplication {
     fn instantiate(
         &self,
         runtime: ContractSyncRuntime,
-    ) -> Result<Box<dyn UserContract + Send + Sync + 'static>, ExecutionError> {
+    ) -> Result<Box<dyn UserContract + 'static>, ExecutionError> {
         Ok(Box::new(self.create_mock_instance(runtime)))
     }
 }
@@ -204,7 +204,7 @@ impl UserServiceModule for MockApplication {
     fn instantiate(
         &self,
         runtime: ServiceSyncRuntime,
-    ) -> Result<Box<dyn UserService + Send + Sync + 'static>, ExecutionError> {
+    ) -> Result<Box<dyn UserService + 'static>, ExecutionError> {
         Ok(Box::new(self.create_mock_instance(runtime)))
     }
 }

linera-execution/src/wasm/system_api.rs

@@ -79,7 +79,7 @@ pub struct ContractSystemApi<Caller>(PhantomData<Caller>);
 impl<Caller, Runtime> ContractSystemApi<Caller>
 where
     Caller: Instance<UserData = SystemApiData<Runtime>>,
-    Runtime: ContractRuntime + Send + 'static,
+    Runtime: ContractRuntime + 'static,
 {
     /// Returns the ID of the current chain.
     fn get_chain_id(caller: &mut Caller) -> Result<ChainId, RuntimeError> {
@@ -354,7 +354,7 @@ pub struct ServiceSystemApi<Caller>(PhantomData<Caller>);
 impl<Caller, Runtime> ServiceSystemApi<Caller>
 where
     Caller: Instance<UserData = SystemApiData<Runtime>>,
-    Runtime: ServiceRuntime + Send + 'static,
+    Runtime: ServiceRuntime + 'static,
 {
     /// Returns the ID of the current chain.
     fn get_chain_id(caller: &mut Caller) -> Result<ChainId, RuntimeError> {
@@ -503,7 +503,7 @@ pub struct ViewSystemApi<Caller>(PhantomData<Caller>);
 impl<Caller, Runtime> ViewSystemApi<Caller>
 where
     Caller: Instance<UserData = SystemApiData<Runtime>>,
-    Runtime: BaseRuntime + WriteBatch + Send + 'static,
+    Runtime: BaseRuntime + WriteBatch + 'static,
 {
     /// Creates a new promise to check if the `key` is in storage.
     fn contains_key_new(caller: &mut Caller, key: Vec<u8>) -> Result<u32, RuntimeError> {

linera-execution/src/wasm/wasmer.rs

@@ -26,13 +26,6 @@ use crate::{
     QueryContext, ServiceRuntime,
 };
 
-#[cfg(not(web))]
-use {
-    wasmer::sys::EngineBuilder,
-    wasmer::Cranelift,
-    wasmer::Singlepass,
-};
-
 /// An [`Engine`] instance configured to run application services.
 static SERVICE_ENGINE: Lazy<Engine> = Lazy::new(|| {
     #[cfg(web)]
@@ -79,7 +72,7 @@ impl WasmContractModule {
 
 impl<Runtime> WasmerContractInstance<Runtime>
 where
-    Runtime: ContractRuntime + WriteBatch + Clone + Send + Sync + Unpin + 'static,
+    Runtime: ContractRuntime + WriteBatch + Clone + Unpin + 'static,
 {
     /// Prepares a runtime instance to call into the Wasm contract.
     pub fn prepare(
@@ -114,7 +107,7 @@ impl WasmServiceModule {
 
 impl<Runtime> WasmerServiceInstance<Runtime>
 where
-    Runtime: ServiceRuntime + WriteBatch + Clone + Send + Sync + Unpin + 'static,
+    Runtime: ServiceRuntime + WriteBatch + Clone + Unpin + 'static,
 {
     /// Prepares a runtime instance to call into the Wasm service.
     pub fn prepare(service_module: &Module, runtime: Runtime) -> Result<Self, WasmExecutionError> {
@@ -132,7 +125,7 @@ where
 
 impl<Runtime> crate::UserContract for WasmerContractInstance<Runtime>
 where
-    Runtime: ContractRuntime + Send + Unpin + 'static,
+    Runtime: ContractRuntime + Unpin + 'static,
 {
     fn instantiate(
         &mut self,
@@ -174,10 +167,7 @@ where
     }
 }
 
-impl<Runtime> crate::UserService for WasmerServiceInstance<Runtime>
-where
-    Runtime: Send + 'static,
-{
+impl<Runtime: 'static> crate::UserService for WasmerServiceInstance<Runtime> {
     fn handle_query(
         &mut self,
         _context: QueryContext,

linera-witty/src/runtime/wasmer/export_function.rs

@@ -20,7 +20,7 @@ macro_rules! export_function {
         where
             $( $types: FromToNativeWasmType, )*
             FlatResult: MaybeFlatType + WasmTypeList,
-            UserData: Send + 'static,
+            UserData: 'static,
             HandlerError: Error + Send + Sync + 'static,
             Handler:
                 Fn(

linera-witty/src/runtime/wasmer/function.rs

@@ -32,7 +32,7 @@ macro_rules! impl_instance_with_function_for {
         where
             $( $types: FlatType + FromToNativeWasmType + NativeWasmTypeInto, )*
             Results: FlatLayout + WasmerResults,
-            UserData: Send + 'static,
+            UserData: 'static,
         {
             type Function = TypedFunction<
                 <HList![$( $types ),*] as WasmerParameters>::ImportParameters,

linera-witty/src/runtime/wasmer/memory.rs

@@ -12,10 +12,7 @@ use crate::{GuestPointer, RuntimeError, RuntimeMemory};
 
 macro_rules! impl_memory_traits {
     ($instance:ty) => {
-        impl<UserData> InstanceWithMemory for $instance
-        where
-            UserData: Send + 'static,
-        {
+        impl<UserData: 'static> InstanceWithMemory for $instance {
             fn memory_from_export(&self, export: Extern) -> Result<Option<Memory>, RuntimeError> {
                 Ok(match export {
                     Extern::Memory(memory) => Some(memory),
@@ -24,10 +21,7 @@ macro_rules! impl_memory_traits {
             }
         }
 
-        impl<UserData> RuntimeMemory<$instance> for Memory
-        where
-            UserData: Send + 'static,
-        {
+        impl<UserData: 'static> RuntimeMemory<$instance> for Memory {
             fn read<'instance>(
                 &self,
                 instance: &'instance $instance,

linera-witty/src/runtime/wasmer/mod.rs

@@ -35,10 +35,7 @@ pub struct InstanceBuilder<UserData> {
     environment: Environment<UserData>,
 }
 
-impl<UserData> InstanceBuilder<UserData>
-where
-    UserData: Send + 'static,
-{
+impl<UserData: 'static> InstanceBuilder<UserData> {
     /// Creates a new [`InstanceBuilder`].
     pub fn new(engine: Engine, user_data: UserData) -> Self {
         InstanceBuilder {
@@ -160,10 +157,7 @@ impl<UserData> Instance for EntrypointInstance<UserData> {
 /// guest.
 pub type ReentrantInstance<'a, UserData> = FunctionEnvMut<'a, Environment<UserData>>;
 
-impl<UserData> Instance for ReentrantInstance<'_, UserData>
-where
-    UserData: Send + 'static,
-{
+impl<UserData: 'static> Instance for ReentrantInstance<'_, UserData> {
     type Runtime = Wasmer;
     type UserData = UserData;
     type UserDataReference<'a> = MutexGuard<'a, UserData>