IA1.2.10 Update docker for OP proposer (#209)

* Working devnet

* Update dockers for l1 services

* Fix op-proposer

* Fix node js script

* Remove npm from script

* Install foundry

* Add op-deployer path

* Install dasel

* Fix reshape-allocs script

* Continue fixing reshape-allocs script

* Continue fixing reshape-allocs script

* Convert branch name

* Undo branch name change

* Fix typo

* Fix dockerfile for l1-genesis

* Update dockerfile for op-geth

* More conflicts

* More conflicts

* Fix l2-genesis

* Fix context path

* Fix deployer for terraform

* Fix path

* More fixes and rebuild

* Add preparation scripts to l2 CI

* Fix l1 rpc path

* Move l2-rollup command to dockerfile

* Add config path in docker for op-node

* Add preparation steps to op-node CI

* Add l2-config to CI

* Force jwt

* Remove newline

* Add image for batcher

* Add CI for batcher

* Restore servcie order

* Add image for proposer

* Copy deployer dir

* Add game address fix

* Combine duplicate image scripts

* Update to v4

* Restore login verison

* Fix deployment artifacts

* Add dependency

* Add file path

* Fix file copy

* UPdate init

* Update GAME_FACTORY to use proxy dispute game factory address

* Fix incorrect path string in GAME_FACTORY settings

* Add Espresso contract configs to prepare-allocs

The prepare-allocs.sh script doesn't currently have the Espresso Smart Contracts
enabled.

This change enables the contract and sets the preApprovedBatcherKey to work in
a non-TEE environment.

* Modify game-type for op-proposer

The default game type when the `game-type` parameter is unspecified is `0`.  By
default there does not seem to be a `Dispute Game` deployed for `game-type` `0`,
however, other game types do exist, including `game-type` `1`.

This change sets the `game-type` of the `op-proposer` to `1` for the
`docker-compose.yml` file.

* Specify a `create2Salt` value for espresso deployment

When the `op-deployer` performs the `apply` operation, it utilizes the values in the
`state.json` file to inform how it should behave.  Namely among these is the
`create2Salt` value.  The `op-deployer` utilizes the `create2` method for
performing deployments according to specifications.  This salt value is utilized and
helps to assist in determining the resulting contract addresses.  For convenience, it
would be nice to have some deterministic values to test against for repeatability.

This change modifies the `state.json` file before running `op-deployer` `apply`
in order to ensure that we can see deterministic contract address generation.

* Add dependency

* Copy deployment artifacts

* Add scripts for demo and documentation

* Fix syntax

* Remove another COPY

* Add exposed ports for more nodes in docker-compose

The `verifier`, `caff-node`, and `sequencer` all do not have their ports forwarded to
the host machine.  Having these ports exposed can make testing / debugging easier
by utilizing the optimism RPC API.

This change exposes these ports.

* Fix CAFF environment variables

The CAFF environment variables utilized in the `docker-compose.yml` need to have
a prefix of `OP_NODE_`, otherwise they will not apply.  These not applying causes
the `caff-node` to never make progress.

This change corrects the misconfigured `caff-node` environment variables, and
cleans up an unnecessary one.

* Set `caff.node` to `true` for `caff-node`

The `caff-node` is meant to be running a derivation based on information retrieved
from Espresso's network.  However, it needs to be enabled to do so.  This change
enables the `caff-node`'s mode by explicitly setting `caff.node` to `true` in the
launch configuration.

* Support alias and input check

* Undo changes to fix the build and make progress

* Fix CI

* Remove commented-out code

---------

Co-authored-by: Artemii Gerasimovich <[email protected]>
Co-authored-by: Theodore Schnepper <[email protected]>

Author: 3 people

.github/workflows/docker-images.yml

@@ -19,11 +19,10 @@ env:
   IMAGE_PREFIX: ghcr.io/${{ github.repository }}
 
 jobs:
-  build-l1-geth:
+  prepare-deployment:
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
+    outputs:
+      deployment-hash: ${{ steps.hash.outputs.hash }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -37,7 +36,7 @@ jobs:
           toolchain: stable
           override: true
 
-      - name: Setup Node.js
+      - name: Install Node.js
         uses: actions/setup-node@v4
         with:
           node-version: 20.x
@@ -68,6 +67,44 @@ jobs:
           cd espresso
           ./scripts/prepare-allocs.sh
 
+      - name: List generated files
+        run: |
+          echo "=== Generated deployment files ==="
+          find espresso/deployment -type f -name "*.json" -o -name "*.toml" | head -20
+          echo "=== L1 Config ==="
+          ls -la espresso/deployment/l1-config/ || echo "No l1-config directory"
+          echo "=== Deployer ==="
+          ls -la espresso/deployment/deployer/ || echo "No deployer directory"
+
+      - name: Generate deployment hash
+        id: hash
+        run: echo "hash=$(date +%s)" >> $GITHUB_OUTPUT
+
+      - name: Upload deployment artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: deployment-artifacts
+          path: |
+            op-deployer/bin/
+            espresso/deployment/
+            packages/contracts-bedrock/
+          retention-days: 1
+
+  build-l1-geth:
+    needs: prepare-deployment
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Download deployment artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: deployment-artifacts
+
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
@@ -98,6 +135,7 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
 
   build-op-geth:
+    needs: prepare-deployment
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -106,59 +144,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Install just
-        uses: extractions/setup-just@v2
-
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
+      - name: Download deployment artifacts
+        uses: actions/download-artifact@v4
         with:
-          toolchain: stable
-          override: true
-
-      - name: Install Foundry
-        uses: foundry-rs/foundry-toolchain@v1
-        with:
-          version: nightly
-
-      - name: Install dasel
-        run: |
-          curl -sSL "https://github.com/TomWright/dasel/releases/latest/download/dasel_linux_amd64" -o /tmp/dasel
-          sudo mv /tmp/dasel /usr/local/bin/dasel
-          sudo chmod +x /usr/local/bin/dasel
-
-      - name: Check for package.json
-        id: check-package
-        run: |
-          if [ -f "package.json" ]; then
-            echo "has-package=true" >> $GITHUB_OUTPUT
-          else
-            echo "has-package=false" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Setup Node.js
-        if: steps.check-package.outputs.has-package == 'true'
-        uses: actions/setup-node@v4
-        with:
-          node-version: '18'
-          cache: 'npm'
-
-      - name: Install dependencies
-        if: steps.check-package.outputs.has-package == 'true'
-        run: npm ci
-
-      - name: Build op-deployer
-        run: |
-          cd op-deployer
-          just
-          echo "$(pwd)/bin" >> $GITHUB_PATH
-
-      - name: Compile contracts
-        run: just compile-contracts
-
-      - name: Prepare allocations
-        run: |
-          cd espresso
-          ./scripts/prepare-allocs.sh
+          name: deployment-artifacts
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
@@ -190,6 +179,7 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
 
   build-op-node:
+    needs: prepare-deployment
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -198,59 +188,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Install just
-        uses: extractions/setup-just@v2
-
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          override: true
-
-      - name: Install Foundry
-        uses: foundry-rs/foundry-toolchain@v1
+      - name: Download deployment artifacts
+        uses: actions/download-artifact@v4
         with:
-          version: nightly
-
-      - name: Install dasel
-        run: |
-          curl -sSL "https://github.com/TomWright/dasel/releases/latest/download/dasel_linux_amd64" -o /tmp/dasel
-          sudo mv /tmp/dasel /usr/local/bin/dasel
-          sudo chmod +x /usr/local/bin/dasel
-
-      - name: Check for package.json
-        id: check-package
-        run: |
-          if [ -f "package.json" ]; then
-            echo "has-package=true" >> $GITHUB_OUTPUT
-          else
-            echo "has-package=false" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Setup Node.js
-        if: steps.check-package.outputs.has-package == 'true'
-        uses: actions/setup-node@v4
-        with:
-          node-version: '18'
-          cache: 'npm'
-
-      - name: Install dependencies
-        if: steps.check-package.outputs.has-package == 'true'
-        run: npm ci
-
-      - name: Build op-deployer
-        run: |
-          cd op-deployer
-          just
-          echo "$(pwd)/bin" >> $GITHUB_PATH
-
-      - name: Compile contracts
-        run: just compile-contracts
-
-      - name: Prepare allocations
-        run: |
-          cd espresso
-          ./scripts/prepare-allocs.sh
+          name: deployment-artifacts
 
       - name: Create l2-config directory
         run: |
@@ -293,6 +234,7 @@ jobs:
             TARGETARCH=amd64
 
   build-op-batcher:
+    needs: prepare-deployment
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -301,65 +243,77 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Install just
-        uses: extractions/setup-just@v2
-
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          override: true
-
-      - name: Install Foundry
-        uses: foundry-rs/foundry-toolchain@v1
+      - name: Download deployment artifacts
+        uses: actions/download-artifact@v4
         with:
-          version: nightly
+          name: deployment-artifacts
 
-      - name: Install dasel
+      - name: Copy config for op-batcher
         run: |
-          curl -sSL "https://github.com/TomWright/dasel/releases/latest/download/dasel_linux_amd64" -o /tmp/dasel
-          sudo mv /tmp/dasel /usr/local/bin/dasel
-          sudo chmod +x /usr/local/bin/dasel
+          mkdir -p packages/contracts-bedrock/lib/superchain-registry/ops/testdata/monorepo
+          # Copy any required config files here, or create placeholder
+          echo "Config prepared for op-batcher"
 
-      - name: Check for package.json
-        id: check-package
-        run: |
-          if [ -f "package.json" ]; then
-            echo "has-package=true" >> $GITHUB_OUTPUT
-          else
-            echo "has-package=false" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Setup Node.js
-        if: steps.check-package.outputs.has-package == 'true'
-        uses: actions/setup-node@v4
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
         with:
-          node-version: '18'
-          cache: 'npm'
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.IMAGE_PREFIX }}/op-batcher
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=sha,prefix={{branch}}-,enable={{is_default_branch}}
+            type=raw,value=latest,enable={{is_default_branch}}
+            type=raw,value=pr-${{ github.event.number }},enable=${{ github.event_name == 'pull_request' }}
 
-      - name: Install dependencies
-        if: steps.check-package.outputs.has-package == 'true'
-        run: npm ci
+      - name: Build and push OP Batcher
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: espresso/docker/op-stack/Dockerfile
+          target: op-batcher-target
+          platforms: linux/amd64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            TARGET_BASE_IMAGE=alpine:3.22
+            TARGETOS=linux
+            TARGETARCH=amd64
 
-      - name: Build op-deployer
-        run: |
-          cd op-deployer
-          just
-          echo "$(pwd)/bin" >> $GITHUB_PATH
+  build-op-proposer:
+    needs: prepare-deployment
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
 
-      - name: Compile contracts
-        run: just compile-contracts
+      - name: Download deployment artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: deployment-artifacts
 
-      - name: Prepare allocations
+      - name: Verify deployment files are present
         run: |
-          cd espresso
-          ./scripts/prepare-allocs.sh
+          echo "=== Verifying downloaded files ==="
+          ls -la espresso/deployment/ || echo "No deployment directory"
+          ls -la espresso/deployment/deployer/ || echo "No deployer directory"
+          ls -la packages/contracts-bedrock/ || echo "No contracts-bedrock directory"
 
-      - name: Copy config for op-batcher
+      - name: Copy config for op-proposer
         run: |
           mkdir -p packages/contracts-bedrock/lib/superchain-registry/ops/testdata/monorepo
-          # Copy any required config files here, or create placeholder
-          echo "Config prepared for op-batcher"
+          echo "Config prepared for op-proposer"
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
@@ -372,20 +326,20 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ env.IMAGE_PREFIX }}/op-batcher
+          images: ${{ env.IMAGE_PREFIX }}/op-proposer
           tags: |
             type=ref,event=branch
             type=ref,event=pr
             type=sha,prefix={{branch}}-,enable={{is_default_branch}}
             type=raw,value=latest,enable={{is_default_branch}}
             type=raw,value=pr-${{ github.event.number }},enable=${{ github.event_name == 'pull_request' }}
 
-      - name: Build and push OP Batcher
+      - name: Build and push OP Proposer
         uses: docker/build-push-action@v5
         with:
           context: .
           file: espresso/docker/op-stack/Dockerfile
-          target: op-batcher-target
+          target: op-proposer-target
           platforms: linux/amd64
           push: true
           tags: ${{ steps.meta.outputs.tags }}

espresso/docker-compose.yml

@@ -311,10 +311,12 @@ services:
       target: op-proposer-target
     image: op-proposer:espresso
     depends_on:
-      op-node-sequencer:
-        condition: service_started
       l2-rollup:
         condition: service_completed_successfully
+      op-node-sequencer:
+        condition: service_started
+      op-batcher:
+        condition: service_started
     environment:
       OP_PROPOSER_L1_ETH_RPC: http://l1-geth:${L1_HTTP_PORT}
       OP_PROPOSER_ROLLUP_RPC: http://op-node-sequencer:${ROLLUP_PORT}

espresso/docker/l1-geth/Dockerfile

@@ -83,11 +83,12 @@ COPY --from=builder /go/bin/eth2-val-tools /usr/local/bin/eth2-val-tools
 # Create data and templates directories
 RUN mkdir -p /data /templates
 
-# Include the initialization scripts for the L1 services.
+# Include the deployment artifacts and the initialization scripts for the L1 services.
 COPY espresso/docker/l1-geth/beacon-config.yaml /templates/
 COPY espresso/docker/l1-geth/devnet-genesis-template.json /templates/
 COPY espresso/docker/l1-geth/mnemonics.yaml /templates/
 COPY espresso/docker/l1-geth/l1-geth-init.sh /l1-geth-init.sh
+COPY espresso/deployment/ /deployment/
 
 # Run the initialization script.
 RUN chmod +x /l1-geth-init.sh