Merge pull request #321 from scroll-tech/chore-merge-upstream-bcbd2d64c

chore: merge upstream bcbd2d6

Author: frisitano

.github/workflows/lint.yml

@@ -122,7 +122,7 @@ jobs:
       - uses: rui314/setup-mold@v1
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: "1.86" # MSRV
+          toolchain: "1.88" # MSRV
       - uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: true
@@ -274,13 +274,15 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: nightly-2025-02-14
+          toolchain: nightly-2025-07-30
       - uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: true
-      - run: cargo install --locked --git http://github.com/openvm-org/openvm.git --tag v1.2.0 cargo-openvm
+      - run: cargo install --locked --git https://github.com/openvm-org/openvm.git --tag v1.4.0-rc.2 cargo-openvm
       - name: verify openvm compatibility
-        run: cargo openvm build --manifest-dir crates/scroll/openvm-compat
+        env:
+          OPENVM_RUST_TOOLCHAIN: nightly-2025-07-30
+        run: cargo openvm build --manifest-path crates/scroll/openvm-compat/Cargo.toml
 
   lint-success:
     name: lint success

.gitignore

@@ -69,3 +69,7 @@ links-report.json
 __pycache__/
 *.py[cod]
 *$py.class
+
+# direnv
+.envrc
+.direnv/