Redo devnet reinit 1

.github/workflows/arbitrator-ci.yml

@@ -138,7 +138,7 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: clippy
-          args: --all --manifest-path arbitrator/Cargo.toml
+          args: --all --manifest-path arbitrator/Cargo.toml -- -D warnings
 
       - name: Run rust tests
         uses: actions-rs/cargo@v1

.github/workflows/ci.yml

@@ -136,7 +136,7 @@ jobs:
           skip-pkg-cache: true
 
       - name: run tests with race detection
-        run: gotestsum --format short-verbose --jsonfile test-output-withrace.json -- -race ./...
+        run: gotestsum --format short-verbose --jsonfile test-output-withrace.json -- ./... -race -parallel=1
 
       - name: Annotate tests with race detection
         if: always()
@@ -146,7 +146,7 @@ jobs:
 
       - name: run tests without race detection
         if: always()
-        run: gotestsum --format short-verbose --jsonfile test-output.json -- ./... -coverprofile=coverage.txt -covermode=atomic -coverpkg=./...,./go-ethereum/...
+        run: gotestsum --format short-verbose --jsonfile test-output.json -- ./... -coverprofile=coverage.txt -covermode=atomic -coverpkg=./...,./go-ethereum/... -parallel=1
 
       - name: Annotate tests without race detection
         if: always()

.gitignore

@@ -19,6 +19,7 @@ contracts/cache/
 solgen/go/
 contracts/deployments/
 contracts/test/prover/proofs/*.json
+contracts/test/prover/spec-proofs/*.json
 .make/
 /cmd/statetransfer/statetransfer
 /reproducible-wasm/*.wasm

.gitmodules

@@ -13,3 +13,6 @@
 [submodule "blockscout"]
 	path = blockscout
         url = https://github.com/OffchainLabs/blockscout.git
+[submodule "arbitrator/wasm-testsuite/testsuite"]
+	path = arbitrator/wasm-testsuite/testsuite
+	url = https://github.com/WebAssembly/testsuite.git

Dockerfile

@@ -76,6 +76,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get install -y make && \
     cargo install --force cbindgen
 COPY arbitrator/Cargo.* arbitrator/cbindgen.toml arbitrator/
+COPY arbitrator/prover/Cargo.toml arbitrator/prover/
 COPY ./Makefile ./
 COPY arbitrator/prover arbitrator/prover
 RUN NITRO_BUILD_IGNORE_TIMESTAMPS=1 make build-prover-header

Makefile

@@ -118,8 +118,9 @@ clean:
 	rm -rf arbitrator/prover/test-cases/rust/target
 	rm -f arbitrator/prover/test-cases/*.wasm
 	rm -f arbitrator/prover/test-cases/go/main
+	rm -rf arbitrator/wasm-testsuite/tests
 	rm -rf $(output_root)
-	rm -f contracts/test/prover/proofs/*.json
+	rm -f contracts/test/prover/proofs/*.json contracts/test/prover/spec-proofs/*.json
 	rm -rf arbitrator/target
 	rm -rf arbitrator/wasm-libraries/target
 	rm -f arbitrator/wasm-libraries/soft-float/soft-float.wasm
@@ -214,62 +215,16 @@ $(output_root)/machines/latest/soft-float.wasm: $(DEP_PREDICATE) \
 		arbitrator/wasm-libraries/soft-float/bindings64.o \
 		arbitrator/wasm-libraries/soft-float/SoftFloat/build/Wasm-Clang/*.o \
 		--no-entry -o $@ \
-		--export wavm__f32_abs \
-		--export wavm__f32_neg \
-		--export wavm__f32_ceil \
-		--export wavm__f32_floor \
-		--export wavm__f32_trunc \
-		--export wavm__f32_nearest \
-		--export wavm__f32_sqrt \
-		--export wavm__f32_add \
-		--export wavm__f32_sub \
-		--export wavm__f32_mul \
-		--export wavm__f32_div \
-		--export wavm__f32_min \
-		--export wavm__f32_max \
-		--export wavm__f32_copysign \
-		--export wavm__f32_eq \
-		--export wavm__f32_ne \
-		--export wavm__f32_lt \
-		--export wavm__f32_le \
-		--export wavm__f32_gt \
-		--export wavm__f32_ge \
-		--export wavm__i32_trunc_f32_s \
-		--export wavm__i32_trunc_f32_u \
-		--export wavm__i64_trunc_f32_s \
-		--export wavm__i64_trunc_f32_u \
-		--export wavm__f32_convert_i32_s \
-		--export wavm__f32_convert_i32_u \
-		--export wavm__f32_convert_i64_s \
-		--export wavm__f32_convert_i64_u \
-		--export wavm__f64_abs \
-		--export wavm__f64_neg \
-		--export wavm__f64_ceil \
-		--export wavm__f64_floor \
-		--export wavm__f64_trunc \
-		--export wavm__f64_nearest \
-		--export wavm__f64_sqrt \
-		--export wavm__f64_add \
-		--export wavm__f64_sub \
-		--export wavm__f64_mul \
-		--export wavm__f64_div \
-		--export wavm__f64_min \
-		--export wavm__f64_max \
-		--export wavm__f64_copysign \
-		--export wavm__f64_eq \
-		--export wavm__f64_ne \
-		--export wavm__f64_lt \
-		--export wavm__f64_le \
-		--export wavm__f64_gt \
-		--export wavm__f64_ge \
-		--export wavm__i32_trunc_f64_s \
-		--export wavm__i32_trunc_f64_u \
-		--export wavm__i64_trunc_f64_s \
-		--export wavm__i64_trunc_f64_u \
-		--export wavm__f64_convert_i32_s \
-		--export wavm__f64_convert_i32_u \
-		--export wavm__f64_convert_i64_s \
-		--export wavm__f64_convert_i64_u \
+		$(patsubst %,--export wavm__f32_%, abs neg ceil floor trunc nearest sqrt add sub mul div min max) \
+		$(patsubst %,--export wavm__f32_%, copysign eq ne lt le gt ge) \
+		$(patsubst %,--export wavm__f64_%, abs neg ceil floor trunc nearest sqrt add sub mul div min max) \
+		$(patsubst %,--export wavm__f64_%, copysign eq ne lt le gt ge) \
+		$(patsubst %,--export wavm__i32_trunc_%,     f32_s f32_u f64_s f64_u) \
+		$(patsubst %,--export wavm__i32_trunc_sat_%, f32_s f32_u f64_s f64_u) \
+		$(patsubst %,--export wavm__i64_trunc_%,     f32_s f32_u f64_s f64_u) \
+		$(patsubst %,--export wavm__i64_trunc_sat_%, f32_s f32_u f64_s f64_u) \
+		$(patsubst %,--export wavm__f32_convert_%, i32_s i32_u i64_s i64_u) \
+		$(patsubst %,--export wavm__f64_convert_%, i32_s i32_u i64_s i64_u) \
 		--export wavm__f32_demote_f64 \
 		--export wavm__f64_promote_f32
 
@@ -323,6 +278,7 @@ contracts/test/prover/proofs/%.json: arbitrator/prover/test-cases/%.wasm $(arbit
 .make/fmt: $(DEP_PREDICATE) build-node-deps .make/yarndeps $(ORDER_ONLY_PREDICATE) .make
 	golangci-lint run --disable-all -E gofmt --fix
 	cargo fmt --all --manifest-path arbitrator/Cargo.toml -- --check
+	cargo fmt --all --manifest-path arbitrator/wasm-testsuite/Cargo.toml -- --check
 	yarn --cwd contracts prettier:solidity
 	@touch $@
 

arbitrator/Cargo.toml

@@ -1,6 +1,6 @@
 [workspace]
 members = [
-	"prover",
+        "prover",
 ]
 
 [profile.release]

arbitrator/prover/fuzz/fuzz_targets/osp.rs

@@ -187,6 +187,7 @@ fn fuzz_impl(data: &[u8]) -> Result<()> {
         &[],
         wavm_binary,
         true,
+        true,
         false,
         GlobalState::default(),
         Default::default(),

arbitrator/prover/src/binary.rs

@@ -66,7 +66,8 @@ pub enum FloatInstruction {
     UnOp(FloatType, FloatUnOp),
     BinOp(FloatType, FloatBinOp),
     RelOp(FloatType, FloatRelOp),
-    TruncIntOp(IntegerValType, FloatType, bool),
+    /// The bools represent (saturating, signed)
+    TruncIntOp(IntegerValType, FloatType, bool, bool),
     ConvertIntOp(FloatType, IntegerValType, bool),
     F32DemoteF64,
     F64PromoteF32,
@@ -80,7 +81,7 @@ impl FloatInstruction {
             FloatInstruction::RelOp(t, _) => {
                 FunctionType::new(vec![t.into(); 2], vec![ArbValueType::I32])
             }
-            FloatInstruction::TruncIntOp(i, f, _) => {
+            FloatInstruction::TruncIntOp(i, f, ..) => {
                 FunctionType::new(vec![f.into()], vec![i.into()])
             }
             FloatInstruction::ConvertIntOp(f, i, _) => {
@@ -171,12 +172,15 @@ impl FromStr for FloatInstruction {
             map(
                 all_consuming(tuple((
                     parse_int_type,
-                    tag("_trunc_"),
+                    alt((
+                        value(true, tag("_trunc_sat_")),
+                        value(false, tag("_trunc_")),
+                    )),
                     parse_fp_type,
                     tag("_"),
                     parse_signedness,
                 ))),
-                |(i, _, f, _, s)| FloatInstruction::TruncIntOp(i, f, s),
+                |(i, sat, f, _, s)| FloatInstruction::TruncIntOp(i, f, sat, s),
             ),
             map(
                 all_consuming(tuple((
@@ -230,9 +234,6 @@ pub struct Local {
 pub struct NameCustomSection {
     pub module: String,
     pub functions: HashMap<u32, String>,
-    // TODO: remove this when re-initializing the rollup
-    // this is kept around to deserialize old binaries
-    pub _locals_removed: HashMap<u32, HashMap<u32, String>>,
 }
 
 #[derive(Clone, Default)]

arbitrator/prover/src/console.rs

@@ -0,0 +1,85 @@
+// Copyright 2021-2022, Offchain Labs, Inc.
+// For license information, see https://github.com/nitro/blob/master/LICENSE
+
+#![allow(dead_code)]
+
+use std::fmt;
+
+pub struct Color;
+
+impl Color {
+    pub const RED: &'static str = "\x1b[31;1m";
+    pub const BLUE: &'static str = "\x1b[34;1m";
+    pub const YELLOW: &'static str = "\x1b[33;1m";
+    pub const PINK: &'static str = "\x1b[38;5;161;1m";
+    pub const MINT: &'static str = "\x1b[38;5;48;1m";
+    pub const GREY: &'static str = "\x1b[90m";
+    pub const RESET: &'static str = "\x1b[0;0m";
+
+    pub const LIME: &'static str = "\x1b[38;5;119;1m";
+    pub const LAVENDER: &'static str = "\x1b[38;5;183;1m";
+    pub const MAROON: &'static str = "\x1b[38;5;124;1m";
+    pub const ORANGE: &'static str = "\x1b[38;5;202;1m";
+
+    pub fn color<S: fmt::Display>(color: &str, text: S) -> String {
+        format!("{}{}{}", color, text, Color::RESET)
+    }
+
+    /// Colors text red.
+    pub fn red<S: fmt::Display>(text: S) -> String {
+        Color::color(Color::RED, text)
+    }
+
+    /// Colors text blue.
+    pub fn blue<S: fmt::Display>(text: S) -> String {
+        Color::color(Color::BLUE, text)
+    }
+
+    /// Colors text yellow.
+    pub fn yellow<S: fmt::Display>(text: S) -> String {
+        Color::color(Color::YELLOW, text)
+    }
+
+    /// Colors text pink.
+    pub fn pink<S: fmt::Display>(text: S) -> String {
+        Color::color(Color::PINK, text)
+    }
+
+    /// Colors text grey.
+    pub fn grey<S: fmt::Display>(text: S) -> String {
+        Color::color(Color::GREY, text)
+    }
+
+    /// Colors text lavender.
+    pub fn lavender<S: fmt::Display>(text: S) -> String {
+        Color::color(Color::LAVENDER, text)
+    }
+
+    /// Colors text mint.
+    pub fn mint<S: fmt::Display>(text: S) -> String {
+        Color::color(Color::MINT, text)
+    }
+
+    /// Colors text lime.
+    pub fn lime<S: fmt::Display>(text: S) -> String {
+        Color::color(Color::LIME, text)
+    }
+
+    /// Colors text orange.
+    pub fn orange<S: fmt::Display>(text: S) -> String {
+        Color::color(Color::ORANGE, text)
+    }
+
+    /// Colors text maroon.
+    pub fn maroon<S: fmt::Display>(text: S) -> String {
+        Color::color(Color::MAROON, text)
+    }
+
+    /// Color a bool one of two colors depending on its value.
+    pub fn color_if(cond: bool, true_color: &str, false_color: &str) -> String {
+        match cond {
+            true => Color::color(true_color, &format!("{}", cond)),
+            false => Color::color(false_color, &format!("{}", cond)),
+        }
+    }
+}

arbitrator/prover/src/lib.rs

@@ -1,17 +1,19 @@
 // Copyright 2021-2022, Offchain Labs, Inc.
 // For license information, see https://github.com/nitro/blob/master/LICENSE
 
-#![allow(clippy::missing_safety_doc)] // We have a lot of unsafe ABI
+#![allow(clippy::missing_safety_doc, clippy::too_many_arguments)]
 
 pub mod binary;
+/// cbindgen:ignore
+pub mod console;
 mod host;
 pub mod machine;
 /// cbindgen:ignore
 mod memory;
 mod merkle;
 mod reinterpret;
 pub mod utils;
-mod value;
+pub mod value;
 pub mod wavm;
 
 use crate::machine::{argument_data_to_inbox, Machine};
@@ -77,6 +79,7 @@ unsafe fn arbitrator_load_machine_impl(
     let mach = Machine::from_paths(
         &libraries,
         binary_path,
+        true,
         false,
         false,
         Default::default(),