Merge branch 'master' into add-blockexecutiontime-metric

OffchainLabs · Jan 11, 2025 · 40f2b37 · 40f2b37
2 parents fe7ee6e + 93841ce
commit 40f2b37
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 32 deletions.
diff --git a/.github/workflows/arbitrator-ci.yml b/.github/workflows/arbitrator-ci.yml
@@ -82,13 +82,6 @@ jobs:
           targets: 'wasm32-wasi, wasm32-unknown-unknown'
           components: 'llvm-tools-preview, rustfmt, clippy'
 
-      - name: Install rust stable
-        id: install-rust
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          toolchain: '1.80.1'
-          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"
 

diff --git a/arbitrator/Cargo.lock b/arbitrator/Cargo.lock
diff --git a/arbitrator/tools/wasmer b/arbitrator/tools/wasmer
diff --git a/arbitrator/wasm-libraries/Cargo.lock b/arbitrator/wasm-libraries/Cargo.lock