Merge branch 'master' into s3-scensorship-resistant

Author: tsahee

.dockerignore

@@ -23,31 +23,29 @@ brotli/buildfiles/**/*
 nitro-testnode/**/*
 
 # Arbitrator ignores
-arbitrator/tools/module_roots
-arbitrator/tools/pricer
+crates/tools/module_roots
+crates/tools/pricer
 
 # Rust outputs
-arbitrator/target/**/*
-arbitrator/target
-arbitrator/stylus/tests/*/target/
-arbitrator/wasm-testsuite/target/
-arbitrator/wasm-libraries/target/
-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/
+crates/stylus/tests/*/target/
+crates/wasm-testsuite/target/
+crates/wasm-libraries/target/
+crates/tools/wasmer/target/
+crates/tools/wasm-tools/
+crates/tools/pricers/
+crates/tools/module_roots/
+crates/tools/stylus_benchmark
+crates/langs/rust/target/
+crates/langs/bf/target/
 
 # Compiled files
 **/*.o
 **/*.a
 *.wasm
 
 # Autogenerated test files
-arbitrator/prover/test-cases/**/*
-arbitrator/prover/test-cases
+crates/prover/test-cases/**/*
+crates/prover/test-cases
 
 # external tools and IDEs
 .vscode

.github/actions/ci-setup/action.yml

@@ -53,12 +53,12 @@ runs:
       with:
         path: |
           ~/.cargo/
-          arbitrator/target/
-          arbitrator/wasm-libraries/target/
-          arbitrator/wasm-libraries/soft-float/
+          target/
+          crates/wasm-libraries/target/
+          crates/wasm-libraries/soft-float/
           target/etc/initial-machine-cache/
           /home/runner/.rustup/toolchains/
-        key: ${{ runner.os }}-cargo-${{ steps.install-rust.outputs.version }}-${{ hashFiles('arbitrator/Cargo.lock') }}
+        key: ${{ runner.os }}-cargo-${{ steps.install-rust.outputs.version }}-${{ hashFiles('Cargo.lock') }}
 
     - name: Cache cbrotli
       id: cache-cbrotli

.github/workflows/_detect-changes.yml

@@ -4,9 +4,9 @@ name: detect-file-changes
 on:
   workflow_call:
     outputs:
-      arbitrator_changed:
-        description: 'True if Arbitrator or related files changed.'
-        value: ${{ jobs.changes.outputs.arbitrator_changed }}
+      rust_changed:
+        description: 'True if Rust files changed.'
+        value: ${{ jobs.changes.outputs.rust_changed }}
       bold_legacy_changed:
         description: 'True if Bold Legacy or related files changed.'
         value: ${{ jobs.changes.outputs.bold_legacy_changed }}
@@ -19,7 +19,7 @@ jobs:
     name: Detect file changes
     runs-on: ubuntu-4
     outputs:
-      arbitrator_changed: ${{ steps.changed.outputs.arbitrator_any_changed }}
+      rust_changed: ${{ steps.changed.outputs.rust_any_changed }}
       bold_legacy_changed: ${{ steps.changed.outputs.bold_legacy_any_changed }}
       changelog_added: ${{ steps.changed.outputs.changelog_added_files }}
 
@@ -36,11 +36,11 @@ jobs:
         uses: tj-actions/[email protected]
         with:
           files_yaml: |
-            arbitrator:
-              - 'arbitrator/**'
+            rust:
+              - 'crates/**'
               - 'contracts/**'
               - 'Makefile'
-              - '.github/workflows/_arbitrator.yml'
+              - '.github/workflows/_rust-tests.yml'
             bold_legacy:
               - 'bold/legacy/**'
               - '.github/workflows/_bold-legacy.yml'

.github/workflows/_arbitrator.yml .github/workflows/_rust-tests.yml.github/workflows/_arbitrator.yml renamed to .github/workflows/_rust-tests.yml

@@ -1,11 +1,11 @@
 ---
-name: nitro-arbitrator
+name: nitro-rust
 on:
   workflow_call:
 
 jobs:
-  arbitrator:
-    name: Run Arbitrator tests
+  rust:
+    name: Run Rust tests
     runs-on: arbitrator-ci
     env:
       RUST_BACKTRACE: 1
@@ -53,22 +53,21 @@ jobs:
         run: make -j wasm-ci-build
 
       - name: Clippy check
-        run: cargo clippy --all --manifest-path arbitrator/Cargo.toml -- -D warnings
+        run: cargo clippy --all -- -D warnings
 
       - name: Run rust tests
         id: run-rust-tests
         continue-on-error: true
         run: >-
           cargo nextest run -p arbutil -p prover -p jit -p stylus -p validator --release
-          --manifest-path arbitrator/prover/Cargo.toml
           --profile ci --config-file nextest.toml
 
       - name: Upload rust test results
         if: always()
         uses: actions/upload-artifact@v6
         with:
           name: junit-reports-rust
-          path: ./arbitrator/target/nextest/ci/junit.xml
+          path: ./target/nextest/ci/junit.xml
 
       - name: Fail if rust tests failed
         if: steps.run-rust-tests.outcome == 'failure'
@@ -77,13 +76,13 @@ jobs:
           exit 1
 
       - name: Check stylus_bechmark
-        run: cargo check --manifest-path arbitrator/tools/stylus_benchmark/Cargo.toml
+        run: cargo check --manifest-path crates/tools/stylus_benchmark/Cargo.toml
 
       - name: Rustfmt
-        run: cargo fmt -p arbutil -p prover -p jit -p stylus -p validator --manifest-path arbitrator/Cargo.toml -- --check
+        run: cargo fmt -p arbutil -p prover -p jit -p stylus -p validator -- --check
 
       - name: Rustfmt - tools/stylus_benchmark
-        run: cargo fmt --all --manifest-path arbitrator/tools/stylus_benchmark/Cargo.toml -- --check
+        run: cargo fmt --all --manifest-path crates/tools/stylus_benchmark/Cargo.toml -- --check
 
       - name: Make proofs from test cases
         run: make -j test-gen-proofs

.github/workflows/automated-changelog.yml

@@ -0,0 +1,45 @@
+name: Changelog fragments for automated PRs
+
+on:
+  pull_request:
+    types: [opened]
+
+jobs:
+  add-changelog:
+    # Only run if the PR is opened by dependabot
+    if: github.actor == 'dependabot[bot]'
+    runs-on: ubuntu-4
+    permissions:
+      contents: write
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v6
+
+      - name: Create Changelog File
+        uses: actions/github-script@v8
+        with:
+          script: |
+            const fs = require('fs');
+            const path = require('path');
+            
+            const dir = 'changelog';
+            
+            // Find the next available number
+            let x = 1;
+            while (fs.existsSync(path.join(dir, `dependabot-${x}.md`))) {
+              x++;
+            }
+
+            const filename = path.join(dir, `dependabot-${x}.md`);
+            const title = context.payload.pull_request.title;
+            const content = `### Ignored\n- ${title}\n`;
+
+            fs.writeFileSync(filename, content);
+            console.log(`Created ${filename} for PR: ${title}`);
+
+      - name: Commit and Push
+        uses: stefanzweifel/git-auto-commit-action@v7
+        with:
+          commit_message: "Add a changelog entry for dependabot update"
+          file_pattern: 'changelog/dependabot-*.md'

.github/workflows/ci.yml

@@ -21,11 +21,11 @@ jobs:
     uses: ./.github/workflows/_fast.yml
     secrets: inherit
 
-  # --- Run Arbitrator tests (not required by can_proceed) ---
-  arbitrator:
+  # --- Run Rust tests (not required by can_proceed) ---
+  rust-tests:
     needs: changes
-    if: needs.changes.outputs.arbitrator_changed == 'true'
-    uses: ./.github/workflows/_arbitrator.yml
+    if: needs.changes.outputs.rust_changed == 'true'
+    uses: ./.github/workflows/_rust-tests.yml
     secrets: inherit
 
   # --- Run Bold Legacy challenge tests (not required by can_proceed) ---
@@ -42,7 +42,7 @@ jobs:
 
   # --- Summarize test results (not required by can_proceed) ---
   codecov:
-    needs: [go-tests, arbitrator]
+    needs: [go-tests, rust-tests]
     if: always()
     uses: ./.github/workflows/_codecov.yml
     secrets: inherit

.github/workflows/merge.yml

@@ -16,11 +16,11 @@ jobs:
     uses: ./.github/workflows/_fast.yml
     secrets: inherit
 
-  # --- Run Arbitrator tests ---
-  arbitrator:
+  # --- Run Rust tests ---
+  rust-tests:
     needs: changes
-    if: needs.changes.outputs.arbitrator_changed == 'true'
-    uses: ./.github/workflows/_arbitrator.yml
+    if: needs.changes.outputs.rust_changed == 'true'
+    uses: ./.github/workflows/_rust-tests.yml
     secrets: inherit
 
   # --- Run Bold Legacy challenge tests ---
@@ -37,7 +37,7 @@ jobs:
 
   # --- Summarize test results ---
   codecov:
-    needs: [go-tests, arbitrator]
+    needs: [go-tests, rust-tests]
     if: always()
     uses: ./.github/workflows/_codecov.yml
     secrets: inherit
@@ -49,14 +49,14 @@ jobs:
 
   can_proceed:
     runs-on: ubuntu-4
-    needs: [fast, arbitrator, bold-legacy, go-tests]
+    needs: [fast, rust-tests, bold-legacy, go-tests]
     if: always()
     steps:
       - name: Aggregate results
         run: |
           fast_result="${{ needs.fast.result }}"
           go_tests_result="${{ needs['go-tests'].result }}"
-          arbitrator_result="${{ needs.arbitrator.result }}"
+          rust_tests_result="${{ needs['rust-tests'].result }}"
           bold_legacy_result="${{ needs['bold-legacy'].result }}"
           ok=1
           if [ "$fast_result" != "success" ]; then
@@ -67,9 +67,9 @@ jobs:
             ok=0
             echo "Go tests job failed or was skipped"
           fi
-          if [ "$arbitrator_result" != "success" ] && [ "$arbitrator_result" != "skipped" ]; then
+          if [ "$rust_tests_result" != "success" ] && [ "$rust_tests_result" != "skipped" ]; then
             ok=0
-            echo "Arbitrator job failed"
+            echo "Rust job failed"
           fi
           if [ "$bold_legacy_result" != "success" ] && [ "$bold_legacy_result" != "skipped" ]; then
             ok=0

.github/workflows/shellcheck-ci.yml

@@ -28,4 +28,4 @@ jobs:
             ./go-ethereum/**
             ./nitro-testnode/**
             ./brotli/**
-            ./arbitrator/**
+            ./crates/**

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

@@ -41,8 +41,9 @@ jobs:
             [nitro-testnode]=origin/master
             [bold]=origin/main
             [safe-smart-account]=origin/release/v1.5.0
-            [arbitrator/langs/c]=origin/vm-storage-cache
-            [arbitrator/tools/wasmer]=origin/stylus
+            [crates/langs/bf]=origin/main
+            [crates/langs/c]=origin/main
+            [crates/tools/wasmer]=origin/stylus
             [contracts-local/lib/openzeppelin-contracts]=origin/release-v4.7
           )
           divergent=0

.gitmodules

@@ -1,8 +1,8 @@
 [submodule "go-ethereum"]
 	path = go-ethereum
 	url = https://github.com/OffchainLabs/go-ethereum.git
-[submodule "arbitrator/wasm-libraries/soft-float/SoftFloat"]
-	path = arbitrator/wasm-libraries/soft-float/SoftFloat
+[submodule "crates/wasm-libraries/soft-float/SoftFloat"]
+	path = crates/wasm-libraries/soft-float/SoftFloat
 	url = https://github.com/OffchainLabs/SoftFloat.git
 [submodule "brotli"]
 	path = brotli
@@ -11,23 +11,23 @@
 	path = contracts
 	url = https://github.com/OffchainLabs/nitro-contracts.git
 	branch = develop
-[submodule "arbitrator/wasm-testsuite/testsuite"]
-	path = arbitrator/wasm-testsuite/testsuite
+[submodule "crates/wasm-testsuite/testsuite"]
+	path = crates/wasm-testsuite/testsuite
 	url = https://github.com/WebAssembly/testsuite.git
-[submodule "arbitrator/tools/wasmer"]
-	path = arbitrator/tools/wasmer
+[submodule "crates/tools/wasmer"]
+	path = crates/tools/wasmer
 	url = https://github.com/OffchainLabs/wasmer.git
 [submodule "nitro-testnode"]
 	path = nitro-testnode
 	url = https://github.com/OffchainLabs/nitro-testnode.git
-[submodule "arbitrator/langs/rust"]
-	path = arbitrator/langs/rust
+[submodule "crates/langs/rust"]
+	path = crates/langs/rust
 	url = https://github.com/OffchainLabs/stylus-sdk-rs.git
-[submodule "arbitrator/langs/c"]
-	path = arbitrator/langs/c
+[submodule "crates/langs/c"]
+	path = crates/langs/c
 	url = https://github.com/OffchainLabs/stylus-sdk-c.git
-[submodule "arbitrator/langs/bf"]
-	path = arbitrator/langs/bf
+[submodule "crates/langs/bf"]
+	path = crates/langs/bf
 	url = https://github.com/OffchainLabs/stylus-sdk-bf.git
 [submodule "safe-smart-account"]
 	path = safe-smart-account