Update Hyperlight to 0.18, hyperlight-js 0.5 and hyperlight-wasm 0.16

crates/hyperlight-dummy-guest/Cargo.toml

@@ -7,6 +7,5 @@ publish = false
 rust-version = "1.89"
 
 [dependencies]
-hyperlight-common = { version = "0.17.0", default-features = false }
-hyperlight-guest = { version = "0.17.0", default-features = false }
-hyperlight-guest-bin = { version = "0.17.0", default-features = false, features = ["macros"] }
+hyperlight-guest = { version = "0.18.0", default-features = false }
+hyperlight-guest-bin = { version = "0.18.0", default-features = false, features = ["macros"] }

crates/hyperlight-dummy-guest/src/main.rs

@@ -2,30 +2,13 @@
 #![no_main]
 
 extern crate alloc;
-extern crate hyperlight_guest_bin;
 
 use alloc::string::String;
-use alloc::vec::Vec;
-
-use hyperlight_common::flatbuffer_wrappers::function_call::FunctionCall;
-use hyperlight_common::flatbuffer_wrappers::guest_error::ErrorCode;
-use hyperlight_guest::bail;
 use hyperlight_guest::error::Result;
+use hyperlight_guest_bin::guest_function;
 
-#[hyperlight_guest_bin::guest_function("handle_request")]
+#[guest_function]
 fn handle_request(req: String) -> Result<String> {
     assert_eq!(req, r#"{"uri": "/index.html"}"#);
     Ok(String::from(r#"{"uri":"/redirected.html"}"#))
 }
-
-#[unsafe(no_mangle)]
-pub extern "C" fn hyperlight_main() {}
-
-#[unsafe(no_mangle)]
-pub fn guest_dispatch_function(function_call: FunctionCall) -> Result<Vec<u8>> {
-    let function_name = function_call.function_name;
-    bail!(ErrorCode::GuestFunctionNotFound => "{function_name}");
-}
-
-#[unsafe(no_mangle)]
-pub extern "C" fn srand(_seed: u32) {}

crates/observer/Cargo.toml

@@ -6,6 +6,6 @@ license.workspace = true
 publish = false
 
 [dependencies]
-hyperlight-host = { version = "0.17.0", default-features = false, features = [ "kvm", "mshv3" ]}
+hyperlight-host = { version = "0.18.0", default-features = false, features = [ "kvm", "mshv3" ]}
 libc = "0.2.176"
 

crates/server/Cargo.toml

@@ -26,11 +26,11 @@ sandbox-observer = { path = "../observer" }
 # IMPORTANT: pinned to exact version because the wasmtime-aot handler loads .aot files
 # compiled by hyperlight-wasm-aot, and wasmtime requires an exact version match for AOT.
 # To find the required version, run: cargo install hyperlight-wasm-aot@<version> && rg 'wasmtime' ~/.cargo/registry/src/*/hyperlight-wasm-aot-*/Cargo.toml
-wasmtime = { version = "=36.0.14", default-features = false, features = ["cranelift", "runtime", "component-model", "pooling-allocator", "pulley" ] }
+wasmtime = { version = "=36.0.18", default-features = false, features = ["cranelift", "runtime", "component-model", "pooling-allocator", "pulley" ] }
 # If updating hyperlight-host, don't forget to update crates/hyperlight-dummy-guest/Cargo.toml
-hyperlight-host = { version = "0.17.0", default-features = false, features = [ "kvm", "mshv3" ]}
-hyperlight-common = { version = "0.17.0", default-features = false }
-hyperlight-js = { version = "0.4.0", features = ["mshv3"] }
+hyperlight-host = { version = "0.18.0", default-features = false, features = [ "kvm", "mshv3" ]}
+hyperlight-common = { version = "0.18.0", default-features = false }
+hyperlight-js = { version = "0.5.0", features = ["mshv3"] }
 # Keep hyperlight-wasm-aot in tool-versions.sh aligned with this version.
-hyperlight-wasm = { version = "0.15.0" }
-hyperlight-component-macro = "0.17.0"
+hyperlight-wasm = { version = "0.16.0" }
+hyperlight-component-macro = "0.18.0"

crates/server/src/handlers/hyperlight_dummy.rs

@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use hyperlight_host::MultiUseSandbox;
+use hyperlight_host::Sandbox;
 use hyperlight_host::sandbox::snapshot::Snapshot;
 use sandbox_observer::observer::CpuTimeObserver;
 
@@ -19,7 +19,7 @@ enum DummyLifecycle {
 }
 
 pub struct HyperlightDummyContext {
-    sandbox: MultiUseSandbox,
+    sandbox: Sandbox,
     lifecycle: DummyLifecycle,
 }
 

crates/server/src/handlers/hyperlight_wasm.rs

@@ -2,8 +2,7 @@ use super::{Handler, SandboxMemory};
 use crate::{DEFAULT_REQUEST_URI, SandboxReuseStrategy};
 
 use bindings::hyperlight::bench::handler_interface::Request;
-use hyperlight_host::sandbox::snapshot::Snapshot;
-use hyperlight_wasm::{LoadedWasmSandbox, WasmSandbox};
+use hyperlight_wasm::{LoadedWasmSandbox, Snapshot, WasmSandbox};
 use sandbox_observer::observer::{CpuTimeObserver, Observer};
 
 use std::{os::fd::AsRawFd, sync::Arc};
@@ -64,8 +63,8 @@ enum WasmState {
 
 enum WasmLifecycle {
     Renew,
-    Restore(Arc<Snapshot>),
-    Reuse(Arc<Snapshot>),
+    Restore(Snapshot<LoadedWasmSandbox>),
+    Reuse(Snapshot<LoadedWasmSandbox>),
 }
 
 pub struct HyperlightWASMContext {
@@ -123,7 +122,7 @@ impl Handler for HyperlightWASMHandler {
         let rt = bindings::register_host_functions(&mut sb, state).unwrap();
         let sb = sb.load_runtime().unwrap();
 
-        let prepare_snapshot = |sandbox: WasmSandbox, lifecycle: fn(Arc<Snapshot>) -> WasmLifecycle| {
+        let prepare_snapshot = |sandbox: WasmSandbox, lifecycle: fn(Snapshot<LoadedWasmSandbox>) -> WasmLifecycle| {
             let mut loaded = unsafe {
                 sandbox.load_module_by_mapping(worker.aot.base, worker.aot.len)
                     .expect("Failed to load the Wasm module for snapshot preparation")

tool-versions.sh

@@ -3,7 +3,7 @@
 : "${OHA_VERSION:=1.9.0}"
 
 # Must use the Wasmtime version pinned by crates/server/Cargo.toml.
-: "${HYPERLIGHT_WASM_AOT_VERSION:=0.15.0}"
+: "${HYPERLIGHT_WASM_AOT_VERSION:=0.16.0}"
 : "${HYPERLIGHT_WASM_AOT_GIT_URL:=https://github.com/hyperlight-dev/hyperlight-wasm}"
 : "${HYPERLIGHT_WASM_AOT_GIT_REV:=}"