Merge branch 'master' into feat/sp1

# Conflicts: # Cargo.lock
scroll-tech · Oct 10, 2024 · 5536cae · 5536cae
2 parents 9eb1dde + 2bafb0c
commit 5536cae
Show file tree

Hide file tree

Showing 7 changed files with 498 additions and 285 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -83,7 +83,7 @@ jobs:
       matrix:
         network: [ "mainnet" ]
         hardfork: [ "pre-bernoulli", "bernoulli", "curie", "darwin" ]
-        rust: [ "1.75", "nightly-2024-07-07" ]
+        rust: [ "1.81", "nightly-2024-07-07" ]
 
     steps:
       - uses: actions/checkout@v4