Merge branch 'zkvm/keccak/layout' into zkvm/keccak/witness

o1-labs · Oct 30, 2023 · 42d8ba1 · 42d8ba1
2 parents bd26c64 + 6a7d81b
commit 42d8ba1
Show file tree

Hide file tree

Showing 106 changed files with 5,948 additions and 2,302 deletions.
diff --git a/.github/workflows/benches.yml b/.github/workflows/benches.yml
@@ -7,7 +7,7 @@ on:
 
 env:
   OCAML_VERSION: "4.14.0"
-  RUST_TOOLCHAIN_VERSION: "1.67"
+  RUST_TOOLCHAIN_VERSION: "1.71"
 
 
 jobs:

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -2,8 +2,6 @@ name: CI
 
 on:
   push:
-    branches:
-      - master
   pull_request:
 
 env:

diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "optimism/ethereum-optimism"]
+	path = optimism/ethereum-optimism
+	url = https://github.com/ethereum-optimism/optimism.git
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ on: @@
     env:
       OCAML_VERSION: "4.14.0"
-      RUST_TOOLCHAIN_VERSION: "1.67"
+      RUST_TOOLCHAIN_VERSION: "1.71"
     jobs:
@@ Expand Down @@