Merge branch 'master' into merge-back-to-master

.github/workflows/gh-page.yml

@@ -3,11 +3,13 @@ name: Deploy Specifications & Docs to GitHub Pages
 on:
   push:
     branches:
-      - master
+      - "*"
 
 env:
   OCAML_VERSION: "4.14.0"
-  RUST_TOOLCHAIN_VERSION: "nightly"
+  # This version has been chosen randomly. It seems that with 2023-11-16, it is
+  # broken. The compiler crashes. Feel free to pick any newer working version.
+  RUST_TOOLCHAIN_VERSION: "nightly-2023-10-10"
 
 jobs:
   release:
@@ -39,10 +41,11 @@ jobs:
           # https://github.com/ocaml/setup-ocaml/issues/211#issuecomment-1058882386
           # disable-cache: true
 
+      # This must be the same as in the section "Generate rustdoc locally" in the README.md
       - name: Build Rust Documentation
         run: |
           eval $(opam env)
-          RUSTDOCFLAGS="--enable-index-page -Zunstable-options" cargo +nightly doc --all --no-deps
+          RUSTDOCFLAGS="--enable-index-page -Zunstable-options" cargo doc --all --no-deps
 
       - name: Build the mdbook
         run: |
@@ -57,6 +60,7 @@ jobs:
 
       - name: Deploy
         uses: peaceiris/actions-gh-pages@v3
+        if: github.ref == 'refs/heads/master'
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./book/book/html

.gitignore

@@ -28,3 +28,11 @@ _build
 tools/srs
 
 .ignore
+optimism/*op-program-data-log.sh
+optimism/cpu.pprof
+optimism/meta.json
+optimism/out.json
+optimism/op-program-db*
+optimism/state.json
+meta.json
+state.json

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "optimism/ethereum-optimism"]
+	path = optimism/ethereum-optimism
+	url = https://github.com/ethereum-optimism/optimism.git