Merge branch 'integration' into aws-nitro-support

Author: Zaptoss

.dockerignore

@@ -36,6 +36,7 @@ arbitrator/tools/wasmer/target/
 arbitrator/tools/wasm-tools/
 arbitrator/tools/pricers/
 arbitrator/tools/module_roots/
+arbitrator/tools/stylus_benchmark
 arbitrator/langs/rust/target/
 arbitrator/langs/bf/target/
 

.github/workflows/arbitrator-ci.yml

@@ -44,9 +44,14 @@ jobs:
       - name: Install Ubuntu dependencies
         run: |
           sudo apt-get update && sudo apt-get install -y \
-            build-essential cmake lld-14 libudev-dev
+            build-essential lld-14 libudev-dev
           sudo ln -s /usr/bin/wasm-ld-14 /usr/local/bin/wasm-ld
 
+      - name: Install cmake
+        uses: jwlawson/actions-setup-cmake@v2
+        with:
+          cmake-version: '3.31.6'
+
       - name: Install go
         uses: actions/setup-go@v4
         with:
@@ -66,12 +71,6 @@ jobs:
           cache: 'yarn'
           cache-dependency-path: '**/yarn.lock'
 
-      - name: Install rust stable
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          toolchain: 'stable'
-          components: 'llvm-tools-preview, rustfmt, clippy'
-
       - name: Install rust nightly
         uses: dtolnay/rust-toolchain@nightly
         id: install-rust-nightly
@@ -80,6 +79,14 @@ jobs:
           targets: 'wasm32-wasi, wasm32-unknown-unknown'
           components: 'rust-src, rustfmt, clippy'
 
+      - name: Install rust stable
+        id: install-rust
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: '1.80.1'
+          targets: 'wasm32-wasi, wasm32-unknown-unknown'
+          components: 'llvm-tools-preview, rustfmt, clippy'
+
       - name: Set STYLUS_NIGHTLY_VER environment variable
         run: echo "STYLUS_NIGHTLY_VER=+$(rustup toolchain list | grep '^nightly' | head -n1 | cut -d' ' -f1)" >> "$GITHUB_ENV"
 
@@ -167,12 +174,18 @@ jobs:
       - name: Run rust tests
         run: cargo test -p arbutil -p prover -p jit -p stylus --release --manifest-path arbitrator/prover/Cargo.toml
 
+      - name: Check stylus_bechmark
+        run: cargo check --manifest-path arbitrator/tools/stylus_benchmark/Cargo.toml
+
       - name: Rustfmt
         run: cargo fmt -p arbutil -p prover -p jit -p stylus --manifest-path arbitrator/Cargo.toml -- --check
 
       - name: Rustfmt - langs/rust
         run: cargo fmt --all --manifest-path arbitrator/langs/rust/Cargo.toml -- --check
 
+      - name: Rustfmt - tools/stylus_benchmark
+        run: cargo fmt --all --manifest-path arbitrator/tools/stylus_benchmark/Cargo.toml -- --check
+
       - name: Make proofs from test cases
         run: make -j test-gen-proofs
 

.github/workflows/ci.yml

@@ -43,7 +43,7 @@ jobs:
       - name: Make more disk space available on public runner
         run: |
           # rmz seems to be faster at deleting files than rm
-          cargo binstall -y rmz
+          cargo binstall -y --version 2.2.0 rmz
           sudo mv /home/runner/.cargo/bin/rmz /usr/local/bin/rmz
 
           echo "Available storage before:"
@@ -64,14 +64,26 @@ jobs:
           echo
 
       - name: Install dependencies
-        run: sudo apt update && sudo apt install -y wabt gotestsum
+        run: >
+          sudo apt update && sudo apt install -y wabt
+          build-essential bison golang clang make
+
+      - name: Install cmake
+        uses: jwlawson/actions-setup-cmake@v2
+        with:
+          cmake-version: "3.31.6"
+
+      - name: Install latest gotestsum
+        uses: autero1/[email protected]
+        with:
+          gotestsum_version: v1.12.0
 
       - name: Setup nodejs
         uses: actions/setup-node@v3
         with:
-          node-version: '18'
-          cache: 'yarn'
-          cache-dependency-path: '**/yarn.lock'
+          node-version: "18"
+          cache: "yarn"
+          cache-dependency-path: "**/yarn.lock"
 
       - name: Install go
         uses: actions/setup-go@v4
@@ -85,18 +97,19 @@ jobs:
 
       - name: Install rust stable
         uses: dtolnay/rust-toolchain@stable
+        id: install-rust
         with:
-          toolchain: '1.81.0'
-          targets: 'wasm32-wasi, wasm32-unknown-unknown'
-          components: 'llvm-tools-preview, rustfmt, clippy'
+          toolchain: "1.81.0"
+          targets: "wasm32-wasi, wasm32-unknown-unknown"
+          components: "llvm-tools-preview, rustfmt, clippy"
 
       - name: Install rust nightly
         uses: dtolnay/rust-toolchain@nightly
         id: install-rust-nightly
         with:
-          toolchain: 'nightly-2024-10-06'
-          targets: 'wasm32-wasi, wasm32-unknown-unknown'
-          components: 'rust-src, rustfmt, clippy'
+          toolchain: "nightly-2024-10-06"
+          targets: "wasm32-wasi, wasm32-unknown-unknown"
+          components: "rust-src, rustfmt, clippy"
 
       - name: Install cbindgen
         run: cargo install cbindgen
@@ -107,6 +120,9 @@ jobs:
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
 
+      - name: Install cbindgen
+        run: cargo install --force cbindgen
+
       - name: Cache Build Products
         uses: actions/cache@v3
         with:
@@ -172,6 +188,7 @@ jobs:
           echo "GOMEMLIMIT=6GiB" >> "$GITHUB_ENV"
           echo "GOGC=80" >> "$GITHUB_ENV"
           echo "GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}" >> "$GITHUB_ENV"
+          echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$GITHUB_WORKSPACE/target/lib" >> "$GITHUB_ENV"
 
       - name: run tests without race detection and path state scheme
         if: matrix.test-mode == 'defaults'
@@ -211,13 +228,11 @@ jobs:
         if: matrix.test-mode == 'defaults'
         run: |
           gotestsum --format short-verbose -- -run TestProgramStorage$ ./system_tests/... --count 1 --recordBlockInputs.WithBaseDir="${{ github.workspace }}/target" --recordBlockInputs.WithTimestampDirEnabled=false --recordBlockInputs.WithBlockIdInFileNameEnabled=false
-
       - name: run arbitrator prover on block input json
         if: matrix.test-mode == 'defaults'
         run: |
           make build-prover-bin
           target/bin/prover target/machines/latest/machine.wavm.br -b --json-inputs="${{ github.workspace }}/target/TestProgramStorage/block_inputs.json"
-
       - name: run jit prover on block input json
         if: matrix.test-mode == 'defaults'
         run: |

.github/workflows/codeql-analysis.yml

@@ -83,12 +83,14 @@ jobs:
       with:
         version: nightly
 
+    - name: Install cbindgen
+      run: cargo install --force cbindgen
+
     - name: Cache Rust Build Products
       uses: actions/cache@v3
       with:
         path: |
-          ~/.cargo/registry/
-          ~/.cargo/git/
+          ~/.cargo/
           arbitrator/target/
           arbitrator/wasm-libraries/target/
           arbitrator/wasm-libraries/soft-float/SoftFloat/build

.github/workflows/create-asana-attachment.yaml

@@ -0,0 +1,16 @@
+on:
+  pull_request:
+    types: [opened, reopened]
+
+jobs:
+  create-asana-attachment-job:
+    runs-on: ubuntu-latest
+    name: Create pull request attachments on Asana tasks
+    steps:
+      - name: Create pull request attachments
+        uses: Asana/create-app-attachment-github-action@latest
+        id: postAttachment
+        with:
+          asana-secret: ${{ secrets.ASANA_TOKEN }}
+      - name: Log output status
+        run: echo "Status is ${{ steps.postAttachment.outputs.status }}"

.github/workflows/docker.yml

@@ -81,7 +81,7 @@ jobs:
           echo -e "\x1b[1;34mWAVM module root:\x1b[0m $module_root"
 
       - name: Upload WAVM machine as artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: wavm-machine-${{ steps.module-root.outputs.module-root }}
           path: target/machines/latest/*

.github/workflows/espresso-docker.yml

@@ -46,7 +46,7 @@ jobs:
         if: ${{ runner.arch != 'ARM64' }}
         run: |
           # rmz seems to be faster at deleting files than rm
-          cargo binstall -y rmz
+          cargo binstall -y --version 2.2.0 rmz
           sudo mv /home/runner/.cargo/bin/rmz /usr/local/bin/rmz
 
           echo "Available storage before:"

.github/workflows/espresso-e2e.yml

@@ -27,7 +27,12 @@ jobs:
       - name: Install dependencies
         run: >
           sudo apt update && sudo apt install -y wabt
-          cmake build-essential bison golang clang make wabt
+          build-essential bison golang clang make
+
+      - name: Install cmake
+        uses: jwlawson/actions-setup-cmake@v2
+        with:
+          cmake-version: '3.31.6'
 
       - name: Install latest gotestsum
         uses: autero1/[email protected]

.github/workflows/submodule-pin-check.yml

@@ -25,20 +25,20 @@ jobs:
         run: |
           status_state="pending"
           declare -Ar exceptions=(
-            [contracts]=origin/develop
+            [contracts]=origin/pre-bold
             [nitro-testnode]=origin/master
-            
+
             #TODO Rachel to check these are the intended branches.
             [arbitrator/langs/c]=origin/vm-storage-cache
-            [arbitrator/tools/wasmer]=origin/adopt-v4.2.8
+            [arbitrator/tools/wasmer]=origin/stylus
           )
           divergent=0
           for mod in `git submodule --quiet foreach 'echo $name'`; do
             branch=origin/HEAD
             if [[ -v exceptions[$mod] ]]; then
               branch=${exceptions[$mod]}
             fi
-            
+
             if ! git -C $mod merge-base --is-ancestor HEAD $branch; then
               echo $mod diverges from $branch
               divergent=1

.gitignore

@@ -23,3 +23,5 @@ system_tests/test-data/*
 .configs/
 system_tests/testdata/*
 arbos/testdata/*
+
+/.pre-commit-config.yaml