Go wasi code converge

Dockerfile

@@ -46,6 +46,7 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --de
 COPY ./Makefile ./
 COPY arbitrator/Cargo.* arbitrator/
 COPY arbitrator/arbutil arbitrator/arbutil
+COPY arbitrator/caller-env arbitrator/caller-env
 COPY arbitrator/prover arbitrator/prover
 COPY arbitrator/wasm-libraries arbitrator/wasm-libraries
 COPY arbitrator/tools/wasmer arbitrator/tools/wasmer
@@ -92,6 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 COPY arbitrator/Cargo.* arbitrator/
 COPY ./Makefile ./
 COPY arbitrator/arbutil arbitrator/arbutil
+COPY arbitrator/caller-env arbitrator/caller-env
 COPY arbitrator/prover arbitrator/prover
 COPY arbitrator/wasm-libraries arbitrator/wasm-libraries
 COPY arbitrator/jit arbitrator/jit
@@ -113,6 +115,7 @@ RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
     apt-get install -y llvm-15-dev libclang-common-15-dev libpolly-15-dev
 COPY arbitrator/Cargo.* arbitrator/
 COPY arbitrator/arbutil arbitrator/arbutil
+COPY arbitrator/caller-env arbitrator/caller-env
 COPY arbitrator/prover/Cargo.toml arbitrator/prover/
 COPY arbitrator/jit/Cargo.toml arbitrator/jit/
 COPY arbitrator/stylus/Cargo.toml arbitrator/stylus/
@@ -153,6 +156,7 @@ COPY --from=wasm-libs-builder /workspace/arbitrator/prover/ arbitrator/prover/
 COPY --from=wasm-libs-builder /workspace/arbitrator/tools/wasmer/ arbitrator/tools/wasmer/
 COPY --from=wasm-libs-builder /workspace/arbitrator/wasm-libraries/ arbitrator/wasm-libraries/
 COPY --from=wasm-libs-builder /workspace/arbitrator/arbutil arbitrator/arbutil
+COPY --from=wasm-libs-builder /workspace/arbitrator/caller-env arbitrator/caller-env
 COPY --from=wasm-libs-builder /workspace/.make/ .make/
 COPY ./Makefile ./
 COPY ./arbitrator ./arbitrator

Makefile

@@ -74,7 +74,7 @@ WASI_SYSROOT?=/opt/wasi-sdk/wasi-sysroot
 
 arbitrator_wasm_lib_flags=$(patsubst %, -l %, $(arbitrator_wasm_libs))
 
-rust_arbutil_files = $(wildcard arbitrator/arbutil/src/*.* arbitrator/arbutil/src/*/*.* arbitrator/arbutil/*.toml)
+rust_arbutil_files = $(wildcard arbitrator/arbutil/src/*.* arbitrator/arbutil/src/*/*.* arbitrator/arbutil/*.toml arbitrator/caller-env/src/*.* arbitrator/caller-env/src/*/*.* arbitrator/caller-env/*.toml)
 
 prover_direct_includes = $(patsubst %,$(output_latest)/%.wasm, forward forward_stub)
 prover_src = arbitrator/prover/src
@@ -341,7 +341,7 @@ $(output_latest)/user_host.wasm: $(DEP_PREDICATE) $(wasm_lib_user_host) $(rust_p
 	cargo build --manifest-path arbitrator/wasm-libraries/Cargo.toml --release --target wasm32-wasi --package user-host
 	install arbitrator/wasm-libraries/$(wasm32_wasi)/user_host.wasm $@
 
-$(output_latest)/program_exec.wasm: $(DEP_PREDICATE) $(call wasm_lib_deps,user-host) $(rust_prover_files) .make/machines
+$(output_latest)/program_exec.wasm: $(DEP_PREDICATE) $(call wasm_lib_deps,program-exec) $(rust_prover_files) .make/machines
 	cargo build --manifest-path arbitrator/wasm-libraries/Cargo.toml --release --target wasm32-wasi --package program-exec
 	install arbitrator/wasm-libraries/$(wasm32_wasi)/program_exec.wasm $@
 

arbcompress/compress_wasm.go

@@ -1,4 +1,4 @@
-// Copyright 2021-2022, Offchain Labs, Inc.
+// Copyright 2021-2024, Offchain Labs, Inc.
 // For license information, see https://github.com/nitro/blob/master/LICENSE
 
 //go:build wasm
@@ -13,16 +13,18 @@ import (
 	"github.com/offchainlabs/nitro/arbutil"
 )
 
-//go:wasmimport arbcompress brotliCompress
+//go:wasmimport arbcompress brotli_compress
 func brotliCompress(inBuf unsafe.Pointer, inBufLen uint32, outBuf unsafe.Pointer, outBufLen unsafe.Pointer, level, windowSize uint32) BrotliStatus
 
-//go:wasmimport arbcompress brotliDecompress
+//go:wasmimport arbcompress brotli_decompress
 func brotliDecompress(inBuf unsafe.Pointer, inBufLen uint32, outBuf unsafe.Pointer, outBufLen unsafe.Pointer) BrotliStatus
 
 func Decompress(input []byte, maxSize int) ([]byte, error) {
 	outBuf := make([]byte, maxSize)
 	outLen := uint32(len(outBuf))
-	status := brotliDecompress(arbutil.SliceToUnsafePointer(input), uint32(len(input)), arbutil.SliceToUnsafePointer(outBuf), unsafe.Pointer(&outLen))
+	status := brotliDecompress(
+		arbutil.SliceToUnsafePointer(input), uint32(len(input)), arbutil.SliceToUnsafePointer(outBuf), unsafe.Pointer(&outLen),
+	)
 	if status != BrotliSuccess {
 		return nil, fmt.Errorf("failed decompression")
 	}
@@ -33,7 +35,12 @@ func compressLevel(input []byte, level uint32) ([]byte, error) {
 	maxOutSize := compressedBufferSizeFor(len(input))
 	outBuf := make([]byte, maxOutSize)
 	outLen := uint32(len(outBuf))
-	status := brotliCompress(arbutil.SliceToUnsafePointer(input), uint32(len(input)), arbutil.SliceToUnsafePointer(outBuf), unsafe.Pointer(&outLen), level, WINDOW_SIZE)
+	status := brotliCompress(
+		arbutil.SliceToUnsafePointer(input), uint32(len(input)),
+		arbutil.SliceToUnsafePointer(outBuf), unsafe.Pointer(&outLen),
+		level,
+		WINDOW_SIZE,
+	)
 	if status != BrotliSuccess {
 		return nil, fmt.Errorf("failed compression")
 	}

arbitrator/arbutil/Cargo.toml

@@ -13,6 +13,3 @@ tiny-keccak = { version = "2.0.2", features = ["keccak"] }
 wasmparser.workspace = true
 serde = { version = "1.0.130", features = ["derive", "rc"] }
 num_enum = "0.7.1"
-
-[features]
-wavm = []

arbitrator/arbutil/src/evm/api.rs

@@ -1,4 +1,4 @@
-// Copyright 2023, Offchain Labs, Inc.
+// Copyright 2023-2024, Offchain Labs, Inc.
 // For license information, see https://github.com/OffchainLabs/nitro/blob/master/LICENSE
 
 use crate::{evm::user::UserOutcomeKind, Bytes20, Bytes32};
@@ -48,17 +48,18 @@ pub enum EvmApiMethod {
     CaptureHostIO,
 }
 
-// This offset is added to EvmApiMethod when sending a request
-// in WASM - program done is also indicated by a "request", with the
-// id below that offset, indicating program status
+/// This offset is added to EvmApiMethod when sending a request
+/// in WASM - program done is also indicated by a "request", with the
+/// id below that offset, indicating program status
 pub const EVM_API_METHOD_REQ_OFFSET: u32 = 0x10000000;
 
-// note: clone should not clone actual data, just the reader
+/// Copies data from Go into Rust.
+/// Note: clone should not clone actual data, just the reader.
 pub trait DataReader: Clone + Send + 'static {
     fn slice(&self) -> &[u8];
 }
 
-// simple implementation for DataReader, in case data comes from a Vec
+/// Simple implementation for `DataReader`, in case data comes from a `Vec`.
 #[derive(Clone, Debug)]
 pub struct VecReader(Arc<Vec<u8>>);
 

arbitrator/arbutil/src/evm/req.rs

@@ -1,4 +1,4 @@
-// Copyright 2023, Offchain Labs, Inc.
+// Copyright 2023-2024, Offchain Labs, Inc.
 // For license information, see https://github.com/OffchainLabs/nitro/blob/master/LICENSE
 
 use crate::{
@@ -11,7 +11,7 @@ use crate::{
 use eyre::{bail, eyre, Result};
 
 pub trait RequestHandler<D: DataReader>: Send + 'static {
-    fn handle_request(&mut self, _req_type: EvmApiMethod, _req_data: &[u8]) -> (Vec<u8>, D, u64);
+    fn handle_request(&mut self, req_type: EvmApiMethod, req_data: &[u8]) -> (Vec<u8>, D, u64);
 }
 
 pub struct EvmApiRequestor<D: DataReader, H: RequestHandler<D>> {
@@ -33,6 +33,7 @@ impl<D: DataReader, H: RequestHandler<D>> EvmApiRequestor<D, H> {
         self.handler.handle_request(req_type, req_data)
     }
 
+    /// Call out to a contract.
     fn call_request(
         &mut self,
         call_type: EvmApiMethod,
@@ -41,13 +42,14 @@ impl<D: DataReader, H: RequestHandler<D>> EvmApiRequestor<D, H> {
         gas: u64,
         value: Bytes32,
     ) -> (u32, u64, UserOutcomeKind) {
-        let mut request = vec![];
-        request.extend(contract.as_slice());
-        request.extend(value.as_slice());
-        request.extend(&gas.to_be_bytes());
+        let mut request = Vec::with_capacity(20 + 32 + 8 + input.len());
+        request.extend(contract);
+        request.extend(value);
+        request.extend(gas.to_be_bytes());
         request.extend(input);
+
         let (res, data, cost) = self.handle_request(call_type, &request);
-        let status: UserOutcomeKind = res[0].try_into().unwrap();
+        let status: UserOutcomeKind = res[0].try_into().expect("unknown outcome");
         let data_len = data.slice().len() as u32;
         self.last_return_data = Some(data);
         (data_len, cost, status)
@@ -65,24 +67,23 @@ impl<D: DataReader, H: RequestHandler<D>> EvmApiRequestor<D, H> {
         salt: Option<Bytes32>,
         gas: u64,
     ) -> (Result<Bytes20>, u32, u64) {
-        let mut request = vec![];
-        request.extend(&gas.to_be_bytes());
-        request.extend(endowment.as_slice());
+        let mut request = Vec::with_capacity(8 + 2 * 32 + code.len());
+        request.extend(gas.to_be_bytes());
+        request.extend(endowment);
         if let Some(salt) = salt {
-            request.extend(salt.as_slice());
+            request.extend(salt);
         }
-        request.extend(&code);
+        request.extend(code);
 
         let (mut res, data, cost) = self.handle_request(create_type, &request);
         if res.len() != 21 || res[0] == 0 {
-            if res.len() > 0 {
-                res.drain(0..=0);
+            if !res.is_empty() {
+                res.remove(0);
             }
-            let err_string =
-                String::from_utf8(res).unwrap_or(String::from("create_response_malformed"));
+            let err_string = String::from_utf8(res).unwrap_or("create_response_malformed".into());
             return (Err(eyre!(err_string)), 0, cost);
         }
-        res.drain(0..=0);
+        res.remove(0);
         let address = res.try_into().unwrap();
         let data_len = data.slice().len() as u32;
         self.last_return_data = Some(data);
@@ -97,9 +98,9 @@ impl<D: DataReader, H: RequestHandler<D>> EvmApi<D> for EvmApiRequestor<D, H> {
     }
 
     fn set_bytes32(&mut self, key: Bytes32, value: Bytes32) -> Result<u64> {
-        let mut request = vec![];
-        request.extend(key.as_slice());
-        request.extend(value.as_slice());
+        let mut request = Vec::with_capacity(64);
+        request.extend(key);
+        request.extend(value);
         let (res, _, cost) = self.handle_request(EvmApiMethod::SetBytes32, &request);
         if res.len() != 1 {
             bail!("bad response from set_bytes32")
@@ -170,18 +171,17 @@ impl<D: DataReader, H: RequestHandler<D>> EvmApi<D> for EvmApiRequestor<D, H> {
     }
 
     fn get_return_data(&self) -> D {
-        self.last_return_data
-            .as_ref()
-            .expect("get return data when no data")
-            .clone()
+        self.last_return_data.clone().expect("missing return data")
     }
 
     fn emit_log(&mut self, data: Vec<u8>, topics: u32) -> Result<()> {
-        let mut request = topics.to_be_bytes().to_vec();
-        request.extend(data.iter());
+        let mut request = Vec::with_capacity(4 + data.len());
+        request.extend(topics.to_be_bytes());
+        request.extend(data);
+
         let (res, _, _) = self.handle_request(EvmApiMethod::EmitLog, &request);
         if !res.is_empty() {
-            bail!(String::from_utf8(res).unwrap_or(String::from("malformed emit-log response")))
+            bail!(String::from_utf8(res).unwrap_or("malformed emit-log response".into()))
         }
         Ok(())
     }
@@ -197,10 +197,11 @@ impl<D: DataReader, H: RequestHandler<D>> EvmApi<D> for EvmApiRequestor<D, H> {
                 return (data.clone(), 0);
             }
         }
-        let mut req: Vec<u8> = address.as_slice().into();
+        let mut req = Vec::with_capacity(20 + 8);
+        req.extend(address);
         req.extend(gas_left.to_be_bytes());
-        let (_, data, cost) = self.handle_request(EvmApiMethod::AccountCode, &req);
 
+        let (_, data, cost) = self.handle_request(EvmApiMethod::AccountCode, &req);
         self.last_code = Some((address, data.clone()));
         (data, cost)
     }
@@ -211,8 +212,8 @@ impl<D: DataReader, H: RequestHandler<D>> EvmApi<D> for EvmApiRequestor<D, H> {
     }
 
     fn add_pages(&mut self, pages: u16) -> u64 {
-        let (_, _, cost) = self.handle_request(EvmApiMethod::AddPages, &pages.to_be_bytes());
-        cost
+        self.handle_request(EvmApiMethod::AddPages, &pages.to_be_bytes())
+            .2
     }
 
     fn capture_hostio(
@@ -223,13 +224,12 @@ impl<D: DataReader, H: RequestHandler<D>> EvmApi<D> for EvmApiRequestor<D, H> {
         start_ink: u64,
         end_ink: u64,
     ) {
-        let mut request = vec![];
-
-        request.extend(&start_ink.to_be_bytes());
-        request.extend(&end_ink.to_be_bytes());
-        request.extend(&(name.len() as u16).to_be_bytes());
-        request.extend(&(args.len() as u16).to_be_bytes());
-        request.extend(&(outs.len() as u16).to_be_bytes());
+        let mut request = Vec::with_capacity(2 * 8 + 3 * 2 + name.len() + args.len() + outs.len());
+        request.extend(start_ink.to_be_bytes());
+        request.extend(end_ink.to_be_bytes());
+        request.extend((name.len() as u16).to_be_bytes());
+        request.extend((args.len() as u16).to_be_bytes());
+        request.extend((outs.len() as u16).to_be_bytes());
         request.extend(name.as_bytes());
         request.extend(args);
         request.extend(outs);