Upgrade to wasmtime 22.0.0

Signed-off-by: Lann Martin <[email protected]>

Author: lann

Cargo.lock

@@ -134,12 +134,10 @@ hyper = { version = "1.0.0", features = ["full"] }
 reqwest = { version = "0.12", features = ["stream", "blocking"] }
 tracing = { version = "0.1", features = ["log"] }
 
-wasi-common-preview1 = { version = "21.0.1", package = "wasi-common", features = [
-  "tokio",
-] }
-wasmtime = "21.0.1"
-wasmtime-wasi = "21.0.1"
-wasmtime-wasi-http = "21.0.1"
+wasi-common-preview1 = { version = "22.0.0", package = "wasi-common", features = ["tokio"] }
+wasmtime = "22.0.0"
+wasmtime-wasi = "22.0.0"
+wasmtime-wasi-http = "22.0.0"
 
 spin-componentize = { path = "crates/componentize" }
 

Cargo.toml

@@ -47,8 +47,7 @@ pub use store::{Store, StoreBuilder, Wasi, WasiVersion};
 pub const DEFAULT_EPOCH_TICK_INTERVAL: Duration = Duration::from_millis(10);
 
 const MB: u64 = 1 << 20;
-const GB: u64 = 1 << 30;
-const WASM_PAGE_SIZE: u64 = 64 * 1024;
+const GB: usize = 1 << 30;
 
 /// Global configuration for `EngineBuilder`.
 ///
@@ -127,7 +126,7 @@ impl Default for Config {
                 // Nothing is lost from allowing the maximum size of memory for
                 // all instance as it's still limited through other the normal
                 // `StoreLimitsAsync` accounting method too.
-                .memory_pages(4 * GB / WASM_PAGE_SIZE)
+                .max_memory_size(4 * GB)
                 // These numbers are completely arbitrary at something above 0.
                 .linear_memory_keep_resident((2 * MB) as usize)
                 .table_keep_resident((MB / 2) as usize);

crates/core/src/lib.rs

@@ -422,7 +422,10 @@ impl StoreBuilder {
         self.with_wasi(move |wasi| match wasi {
             WasiCtxBuilder::Preview1(_) => {}
             WasiCtxBuilder::Preview2(ctx) => {
-                ctx.socket_addr_check(move |addr, _| net_pool.check_addr(addr).is_ok());
+                ctx.socket_addr_check(move |addr, _| {
+                    let net_pool = net_pool.clone();
+                    Box::pin(async move { net_pool.check_addr(&addr).is_ok() })
+                });
             }
         });