fix merge errors

arbcompress/compress_wasm.go

@@ -31,14 +31,14 @@ func Decompress(input []byte, maxSize int) ([]byte, error) {
 	return outBuf[:outLen], nil
 }
 
-func compressLevel(input []byte, level uint32) ([]byte, error) {
+func compressLevel(input []byte, level int) ([]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,
+		uint32(level),
 		WINDOW_SIZE,
 	)
 	if status != BrotliSuccess {

arbitrator/jit/src/main.rs

@@ -79,7 +79,7 @@ fn main() -> Result<()> {
         }
     };
 
-    let memory_used = instance.exports.get_memory("mem").unwrap().view(&mut store).size().0 as u64 * 65_536;
+    let memory_used = instance.exports.get_memory("memory").unwrap().view(&mut store).size().0 as u64 * 65_536;
 
     let env = env.as_mut(&mut store);
     let user = env.process.socket.is_none();

arbitrator/prover/test-cases/go/main.go

@@ -5,15 +5,22 @@ package main
 
 import (
 	"bytes"
+	"crypto/sha512"
+	"encoding/hex"
 	"fmt"
 	"math/big"
 	"os"
 	"runtime"
+	"sync"
 	"time"
 
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/common/math"
 	merkletree "github.com/wealdtech/go-merkletree"
 
 	"github.com/offchainlabs/nitro/arbcompress"
+	"github.com/offchainlabs/nitro/arbutil"
+	"github.com/offchainlabs/nitro/wavmio"
 )
 
 // MerkleSample is an example using the Merkle tree to generate and verify proofs.

arbitrator/wasm-libraries/host-io/src/lib.rs

@@ -114,7 +114,7 @@ pub unsafe extern "C" fn wavmio__readDelayedInboxMessage(
 
 /// Retrieves the preimage of the given hash.
 #[no_mangle]
-pub unsafe extern "C" fn wavmio__resolveTypedPreImage(
+pub unsafe extern "C" fn wavmio__resolveTypedPreimage(
     preimage_type: u8,
     hash_ptr: GuestPtr,
     offset: usize,

execution/interface.go

@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/offchainlabs/nitro/arbos/arbostypes"
 	"github.com/offchainlabs/nitro/arbutil"
 	"github.com/offchainlabs/nitro/validator"

system_tests/precompile_test.go

@@ -68,7 +68,7 @@ func TestCustomSolidityErrors(t *testing.T) {
 		Fatal(t, "customRevert call should have errored")
 	}
 	observedMessage := customError.Error()
-	expectedError := "Custom(1024, This spider family wards off bugs: /\\oo/\\ //\\(oo)/\\ /\\oo/\\, true)"
+	expectedError := "Custom(1024, This spider family wards off bugs: /\\oo/\\ //\\(oo)//\\ /\\oo/\\, true)"
 	// The first error is server side. The second error is client side ABI decoding.
 	expectedMessage := fmt.Sprintf("execution reverted: error %v: %v", expectedError, expectedError)
 	if observedMessage != expectedMessage {

wavmio/higher.go

@@ -70,7 +70,7 @@ func AdvanceInboxMessage() {
 func ResolveTypedPreimage(ty arbutil.PreimageType, hash common.Hash) ([]byte, error) {
 	return readBuffer(func(offset uint32, buf unsafe.Pointer) uint32 {
 		hashUnsafe := unsafe.Pointer(&hash[0])
-		return resolveTypedPreimage(uint8(ty), hashUnsafe, offset, buf)
+		return resolveTypedPreimage(uint32(ty), hashUnsafe, offset, buf)
 	}), nil
 }
 

wavmio/raw.go

@@ -27,4 +27,4 @@ func readInboxMessage(msgNum uint64, offset uint32, output unsafe.Pointer) uint3
 func readDelayedInboxMessage(seqNum uint64, offset uint32, output unsafe.Pointer) uint32
 
 //go:wasmimport wavmio resolveTypedPreimage
-func resolveTypedPreimage(ty uint8, hash unsafe.Pointer, offset uint32, output unsafe.Pointer) uint32
+func resolveTypedPreimage(ty uint32, hash unsafe.Pointer, offset uint32, output unsafe.Pointer) uint32