Merge branch 'release-testing' of github.com:OffchainLabs/nitro into …

…release-testing

.github/workflows/arbitrator-ci.yml

@@ -96,6 +96,9 @@ jobs:
           make -j
           make install
 
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+
       - name: Cache cbrotli
         uses: actions/cache@v3
         id: cache-cbrotli
@@ -158,4 +161,5 @@ jobs:
           cd contracts
           yarn install
           yarn build
+          yarn build:forge:yul
           yarn hardhat --network localhost test test/prover/*.ts

.github/workflows/ci.yml

@@ -58,6 +58,9 @@ jobs:
         with:
           targets: 'wasm32-unknown-unknown, wasm32-wasi'
 
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+
       - name: Cache Build Products
         uses: actions/cache@v3
         with:

.github/workflows/codeql-analysis.yml

@@ -75,6 +75,9 @@ jobs:
     - name: Install rust stable
       uses: dtolnay/rust-toolchain@stable
 
+    - name: Install Foundry
+      uses: foundry-rs/foundry-toolchain@v1
+
     - name: Cache Rust Build Products
       uses: actions/cache@v3
       with:

Dockerfile

@@ -26,13 +26,14 @@ COPY --from=brotli-library-builder /workspace/install/ /
 
 FROM node:16-bookworm-slim as contracts-builder
 RUN apt-get update && \
-    apt-get install -y git python3 make g++
+    apt-get install -y git python3 make g++ curl
+RUN curl -L https://foundry.paradigm.xyz | bash && . ~/.bashrc && ~/.foundry/bin/foundryup
 WORKDIR /workspace
 COPY contracts/package.json contracts/yarn.lock contracts/
 RUN cd contracts && yarn install
 COPY contracts contracts/
 COPY Makefile .
-RUN NITRO_BUILD_IGNORE_TIMESTAMPS=1 make build-solidity
+RUN . ~/.bashrc && NITRO_BUILD_IGNORE_TIMESTAMPS=1 make build-solidity
 
 FROM debian:bookworm-20231218 as wasm-base
 WORKDIR /workspace
@@ -181,6 +182,7 @@ COPY fastcache/go.mod fastcache/go.sum fastcache/
 RUN go mod download
 COPY . ./
 COPY --from=contracts-builder workspace/contracts/build/ contracts/build/
+COPY --from=contracts-builder workspace/contracts/out/ contracts/out/
 COPY --from=contracts-builder workspace/contracts/node_modules/@offchainlabs/upgrade-executor/build/contracts/src/UpgradeExecutor.sol/UpgradeExecutor.json contracts/node_modules/@offchainlabs/upgrade-executor/build/contracts/src/UpgradeExecutor.sol/
 COPY --from=contracts-builder workspace/.make/ .make/
 COPY --from=prover-header-export / target/

Makefile

@@ -335,6 +335,7 @@ contracts/test/prover/proofs/%.json: $(arbitrator_cases)/%.wasm $(arbitrator_pro
 
 .make/solidity: $(DEP_PREDICATE) contracts/src/*/*.sol .make/yarndeps $(ORDER_ONLY_PREDICATE) .make
 	yarn --cwd contracts build
+	yarn --cwd contracts build:forge:yul
 	@touch $@
 
 .make/yarndeps: $(DEP_PREDICATE) contracts/package.json contracts/yarn.lock $(ORDER_ONLY_PREDICATE) .make

arbitrator/jit/src/wavmio.rs

@@ -193,8 +193,8 @@ pub fn resolve_preimage_impl(
     };
 
     let offset = match u32::try_from(offset) {
-        Ok(offset) => offset as usize,
-        Err(_) => error!("bad offset {offset} in {name}"),
+        Ok(offset) if offset % 32 == 0 => offset as usize,
+        _ => error!("bad offset {offset} in {name}"),
     };
 
     let len = std::cmp::min(32, preimage.len().saturating_sub(offset));

arbitrator/prover/src/lib.rs

@@ -19,7 +19,6 @@ use crate::machine::{argument_data_to_inbox, Machine};
 use arbutil::PreimageType;
 use eyre::Result;
 use machine::{get_empty_preimage_resolver, GlobalState, MachineStatus, PreimageResolver};
-use sha3::{Digest, Keccak256};
 use static_assertions::const_assert_eq;
 use std::{
     ffi::CStr,
@@ -303,13 +302,18 @@ pub unsafe extern "C" fn arbitrator_set_preimage_resolver(
                 return None;
             }
             let data = CBytes::from_raw_parts(res.ptr, res.len as usize);
-            let have_hash = Keccak256::digest(&data);
-            if have_hash.as_slice() != *hash {
-                panic!(
-                    "Resolved incorrect data for hash {}: got {}",
+            #[cfg(debug_assertions)]
+            match crate::utils::hash_preimage(&data, ty) {
+                Ok(have_hash) if have_hash.as_slice() == *hash => {}
+                Ok(got_hash) => panic!(
+                    "Resolved incorrect data for hash {} (rehashed to {})",
                     hash,
-                    hex::encode(data),
-                );
+                    Bytes32(got_hash),
+                ),
+                Err(err) => panic!(
+                    "Failed to hash preimage from resolver (expecting hash {}): {}",
+                    hash, err,
+                ),
             }
             Some(data)
         },

arbitrator/prover/test-cases/rust/src/bin/host-io.rs

@@ -29,24 +29,29 @@ fn main() {
         let mut bytebuffer = Bytes32([0x0; 32]);
         // in delayed inbox - we're skipping the "kind" byte
         println!("delayed inbox message 0");
+        let mut expected_buffer = bytebuffer.0;
         let len = wavm_read_delayed_inbox_message(0, bytebuffer.0.as_mut_ptr(), DELAYED_HEADER_LEN);
-        assert_eq!(len, 2);
-        assert_eq!(bytebuffer.0[1], 0xaa);
+        assert_eq!(len, 3);
+        expected_buffer[2] = 0xaa;
+        assert_eq!(bytebuffer.0, expected_buffer);
         println!("delayed inbox message 1");
         let len = wavm_read_delayed_inbox_message(1, bytebuffer.0.as_mut_ptr(), DELAYED_HEADER_LEN);
         assert_eq!(len, 32);
-        for j in 1..31 {
-            assert_eq!(bytebuffer.0[j], (j as u8));
+        for j in 1..32 {
+            assert_eq!(bytebuffer.0[j], (j as u8) - 1);
         }
         println!("inbox message 0");
+        expected_buffer = bytebuffer.0;
         let len = wavm_read_inbox_message(0, bytebuffer.0.as_mut_ptr(), INBOX_HEADER_LEN);
-        assert_eq!(len, 1);
-        assert_eq!(bytebuffer.0[0], 0xaa);
+        expected_buffer[0] = 0;
+        expected_buffer[1] = 0xaa;
+        assert_eq!(len, 2);
+        assert_eq!(bytebuffer.0, expected_buffer);
         println!("inbox message 1");
         let len = wavm_read_inbox_message(1, bytebuffer.0.as_mut_ptr(), INBOX_HEADER_LEN);
         assert_eq!(len, 32);
         for j in 0..32 {
-            assert_eq!(bytebuffer.0[j], (j as u8) + 1);
+            assert_eq!(bytebuffer.0[j], (j as u8));
         }
 
         let keccak_hash = hex!("47173285a8d7341e5e972fc677286384f802f8ef42a5ec5f03bbfa254cb01fad");