Update to use the latest wasi sdk (#101)

Signed-off-by: James Sturtevant <[email protected]>

Author: jsturtevant

.devcontainer/Dockerfile

@@ -18,7 +18,7 @@ RUN apt-get install -y g++-multilib \
     && apt-get install -y libgcc-${GCC_VERSION}-dev \
     && apt-get install -y lib32gcc-${GCC_VERSION}-dev 
 
-ARG WASI_SDK_VERSION_FULL=20.0
+ARG WASI_SDK_VERSION_FULL=25.0
 ARG WASI_SDK_VERSION_MAJOR=${WASI_SDK_VERSION_FULL%%.*}
 
 # Install wasi-sdk

.github/workflows/CreateDevcontainerImage.yml

@@ -18,7 +18,7 @@ env:
   LLVM_VERSION: 17
   RUST_TOOLCHAIN_DEFAULT: 1.85.0
   RUST_TOOLCHAIN_FILE: rust-toolchain.toml
-  WASI_SDK_VERSION_FULL: "20.0"
+  WASI_SDK_VERSION_FULL: "25.0"
   GCC_VERSION: "12" 
 
 # There is a single job in this workflow. It's configured to run on the latest available version of Ubuntu.

.github/workflows/dep_build_wasm_examples.yml

@@ -71,7 +71,7 @@ jobs:
             load: true
             push: ${{ env.DO_PUSH }}
             build-args: |
-              WASI_SDK_VERSION_FULL=20.0
+              WASI_SDK_VERSION_FULL=25.0
               GCC_VERSION=12
             tags: ghcr.io/${{ github.repository_owner }}/wasm-clang-builder:latest
             cache-from: type=registry,ref=ghcr.io/${{ github.repository_owner }}/wasm-clang-builder:buildcache

src/hyperlight_wasm/scripts/build-wasm-examples.sh

@@ -31,7 +31,7 @@ else
 
     docker pull ghcr.io/hyperlight-dev/wasm-clang-builder:latest
 
-    docker build --build-arg GCC_VERSION=12 --build-arg WASI_SDK_VERSION_FULL=20.0 --cache-from ghcr.io/hyperlight-dev/wasm-clang-builder:latest -t wasm-clang-builder:latest . 2> ${OUTPUT_DIR}/dockerbuild.log
+    docker build --build-arg GCC_VERSION=12 --build-arg WASI_SDK_VERSION_FULL=25.0 --cache-from ghcr.io/hyperlight-dev/wasm-clang-builder:latest -t wasm-clang-builder:latest . 2> ${OUTPUT_DIR}/dockerbuild.log
 
     for FILENAME in $(find . -name '*.c')
     do

src/hyperlight_wasm_macro/Cargo.lock

@@ -81,6 +81,13 @@ pub(crate) fn register_handlers<T: 'static>(linker: &mut Linker<T>) -> Result<()
     linker.func_wrap("wasi_snapshot_preview1", "fd_close", |fd: i32| -> i32 {
         panic!("fd_close called {}", fd);
     })?;
+    linker.func_wrap(
+        "wasi_snapshot_preview1",
+        "random_get",
+        |buff: i32, len: i32| -> i32 {
+            panic!("random_get called for {} with len {}", buff, len);
+        },
+    )?;
     linker.func_wrap(
         "wasi_snapshot_preview1",
         "fd_fdstat_get",

src/wasm_runtime/src/wasip1.rs

@@ -18,7 +18,7 @@ where docker || (
 
 echo Building docker image that has Wasm sdk. Should be quick if no changes to docker image.
 echo Log in %2\dockerbuild.log
-%dockercmd% build --build-arg GCC_VERSION=12 --build-arg WASI_SDK_VERSION_FULL=20.0 --cache-from ghcr.io/hyperlight-dev/wasm-clang-builder:latest -t wasm-clang-builder:latest !dockerinput! 2> %2dockerbuild.log
+%dockercmd% build --build-arg GCC_VERSION=12 --build-arg WASI_SDK_VERSION_FULL=25.0 --cache-from ghcr.io/hyperlight-dev/wasm-clang-builder:latest -t wasm-clang-builder:latest !dockerinput! 2> %2dockerbuild.log
 
 echo Building Wasm files in %1 and output to %2
 for /R "%1" %%i in (*.c) do (

src/wasmsamples/compile-wasm.bat

@@ -13,11 +13,11 @@ RUN apt-get install -y  wget  \
  && apt-get install -y libgcc-${GCC_VERSION}-dev \
  && apt-get install -y lib32gcc-${GCC_VERSION}-dev 
 
-ARG WASI_SDK_VERSION_FULL=20.0
+ARG WASI_SDK_VERSION_FULL=25.0
 ARG WASI_SDK_VERSION_MAJOR=${WASI_SDK_VERSION_FULL%%.*}
 
-RUN wget https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VERSION_MAJOR}/wasi-sdk-${WASI_SDK_VERSION_FULL}-linux.tar.gz \
- && tar xvf wasi-sdk-${WASI_SDK_VERSION_FULL}-linux.tar.gz \
- && rm wasi-sdk-${WASI_SDK_VERSION_FULL}-linux.tar.gz \
- && mv /wasi-sdk-${WASI_SDK_VERSION_FULL} /opt/wasi-sdk
+RUN wget https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VERSION_MAJOR}/wasi-sdk-${WASI_SDK_VERSION_FULL}-x86_64-linux.tar.gz \
+ && tar xvf wasi-sdk-${WASI_SDK_VERSION_FULL}-x86_64-linux.tar.gz \
+ && rm wasi-sdk-${WASI_SDK_VERSION_FULL}-x86_64-linux.tar.gz \
+ && mv /wasi-sdk-${WASI_SDK_VERSION_FULL}-x86_64-linux /opt/wasi-sdk
 CMD ["/bin/sh"]