Sync main branch with dev

.github/workflows/docker-build.yaml

@@ -1,4 +1,3 @@
-# .github/workflows/docker-build.yml
 name: Build & Push Docker Images
 
 permissions:
@@ -8,9 +7,18 @@ permissions:
 on:
   push:
     branches:
+      - main
       - dev
-      - k8s
+      - staging
     paths:
+      - '.github/workflows/**'
+      - 'docker/eigenlayer/**'
+      - 'docker/ethereum/**'
+  pull_request:
+    branches:
+      - dev
+    paths:
+      - '.github/workflows/**'
       - 'docker/eigenlayer/**'
       - 'docker/ethereum/**'
   workflow_dispatch:
@@ -21,12 +29,34 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - name: Set up lowercase owner & short SHA
+      - name: Set build vars
+        id: vars
+        shell: sh
         run: |
-          echo "OWNER_LOWER=$(echo '${{ github.repository_owner }}' | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
-          echo "SHORT_SHA=${GITHUB_SHA:0:7}" >> $GITHUB_ENV
+          OWNER_LOWER="$(echo "${GITHUB_REPOSITORY_OWNER}" | tr '[:upper:]' '[:lower:]')"
+          SHORT_SHA="$(echo "${GITHUB_SHA}" | cut -c1-7)"
+
+          # Determine if this is a pull request
+          if [ "${{ github.event_name }}" = "pull_request" ]; then
+            # For PRs, use the branch name as the tag
+            BRANCH_NAME="${{ github.head_ref }}"
+            # Sanitize branch name for use as Docker tag (replace / with -)
+            CHANNEL_TAG="pr-$(echo "${BRANCH_NAME}" | sed 's/[^a-zA-Z0-9._-]/-/g')"
+          else
+            # For pushes, use channel tag from branch
+            case "${GITHUB_REF_NAME}" in
+              main)    CHANNEL_TAG="latest"  ;;
+              dev)     CHANNEL_TAG="dev"     ;;
+              staging) CHANNEL_TAG="staging" ;;
+              *) echo "Unsupported branch: ${GITHUB_REF_NAME}"; exit 1 ;;
+            esac
+          fi
+
+          echo "OWNER_LOWER=${OWNER_LOWER}"   >> "$GITHUB_ENV"
+          echo "SHORT_SHA=${SHORT_SHA}"       >> "$GITHUB_ENV"
+          echo "CHANNEL_TAG=${CHANNEL_TAG}"   >> "$GITHUB_ENV"
 
       - name: Detect which Dockerfiles changed
         id: changes
@@ -39,30 +69,70 @@ jobs:
               - 'docker/ethereum/**'
 
       - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build & Push Eigenlayer image
+      - name: Output image info for PR
+        if: github.event_name == 'pull_request'
+        shell: sh
+        run: |
+          echo "## Docker Images for this PR" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "Images will be built with the following tags:" >> $GITHUB_STEP_SUMMARY
+          echo "- \`ghcr.io/${OWNER_LOWER}/eigenlayer:${CHANNEL_TAG}\`" >> $GITHUB_STEP_SUMMARY
+          echo "- \`ghcr.io/${OWNER_LOWER}/eigenlayer:${CHANNEL_TAG}-${SHORT_SHA}\`" >> $GITHUB_STEP_SUMMARY
+          echo "- \`ghcr.io/${OWNER_LOWER}/ethereum:${CHANNEL_TAG}\`" >> $GITHUB_STEP_SUMMARY
+          echo "- \`ghcr.io/${OWNER_LOWER}/ethereum:${CHANNEL_TAG}-${SHORT_SHA}\`" >> $GITHUB_STEP_SUMMARY
+
+      # ---------- Eigenlayer ----------
+      - name: Build eigenlayer (multi-tag)
         if: steps.changes.outputs.eigenlayer == 'true'
-        uses: docker/build-push-action@v3
-        with:
-          context: docker/eigenlayer
-          file: docker/eigenlayer/Dockerfile.eigenlayer
-          push: true
-          tags: |
-            ghcr.io/${{ env.OWNER_LOWER }}/eigenlayer:${{ github.ref_name }}
-            ghcr.io/${{ env.OWNER_LOWER }}/eigenlayer:${{ github.ref_name }}-${{ env.SHORT_SHA }}
+        shell: sh
+        run: |
+          IMAGE="ghcr.io/${OWNER_LOWER}/eigenlayer"
+          echo "Building ${IMAGE}:${CHANNEL_TAG}"
+          docker build \
+            --label breadchaincoop.eigenlayer.image.revision="${GITHUB_SHA}" \
+            --label breadchaincoop.eigenlayer.image.source="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}" \
+            -t "${IMAGE}:${CHANNEL_TAG}" \
+            -t "${IMAGE}:${CHANNEL_TAG}-${SHORT_SHA}" \
+            -f docker/eigenlayer/Dockerfile \
+            .
 
-      - name: Build & Push Ethereum image
+      - name: Push eigenlayer tags
+        if: steps.changes.outputs.eigenlayer == 'true'
+        shell: sh
+        run: |
+          IMAGE="ghcr.io/${OWNER_LOWER}/eigenlayer"
+          for TAG in "${CHANNEL_TAG}" "${CHANNEL_TAG}-${SHORT_SHA}"; do
+            echo "Pushing ${IMAGE}:${TAG}"
+            docker push "${IMAGE}:${TAG}"
+          done
+
+      # ---------- Ethereum ----------
+      - name: Build ethereum (multi-tag)
         if: steps.changes.outputs.ethereum == 'true'
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: docker/ethereum/Dockerfile.ethereum
-          push: true
-          tags: |
-            ghcr.io/${{ env.OWNER_LOWER }}/ethereum:${{ github.ref_name }}
-            ghcr.io/${{ env.OWNER_LOWER }}/ethereum:${{ github.ref_name }}-${{ env.SHORT_SHA }}
+        shell: sh
+        run: |
+          IMAGE="ghcr.io/${OWNER_LOWER}/ethereum"
+          echo "Building ${IMAGE}:${CHANNEL_TAG}"
+          docker build \
+            --label breadchaincoop.ethereum.image.revision="${GITHUB_SHA}" \
+            --label breadchaincoop.ethereum.image.source="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}" \
+            -t "${IMAGE}:${CHANNEL_TAG}" \
+            -t "${IMAGE}:${CHANNEL_TAG}-${SHORT_SHA}" \
+            -f docker/ethereum/Dockerfile \
+            .
+
+      - name: Push ethereum tags
+        if: steps.changes.outputs.ethereum == 'true'
+        shell: sh
+        run: |
+          IMAGE="ghcr.io/${OWNER_LOWER}/ethereum"
+          for TAG in "${CHANNEL_TAG}" "${CHANNEL_TAG}-${SHORT_SHA}"; do
+            echo "Pushing ${IMAGE}:${TAG}"
+            docker push "${IMAGE}:${TAG}"
+          done

README.md

@@ -9,7 +9,7 @@ Relies on [BLS-middleware](https://github.com/BreadchainCoop/bls-middleware)
 
 ## Setup
 
-2. Create a `.env` file in the root directory and add the following environment variables:
+1. Create a `.env` file in the root directory and add the following environment variables:
    ```
    cp example.env .env
    ```
@@ -54,7 +54,7 @@ Relies on [BLS-middleware](https://github.com/BreadchainCoop/bls-middleware)
    RUST_LOG=debug              # Set Rust logging level
    ```
 
-3. Build and start the services:
+2. Build and start the services:
    ```
    # First, build the services with no cache
    docker-compose build --no-cache

docker-compose.yml

@@ -1,23 +1,27 @@
 services:
   ethereum:
     platform: linux/amd64
-    image: ghcr.io/breadchaincoop/ethereum:dev
+    build:
+      context: .
+      dockerfile: docker/ethereum/Dockerfile
     env_file:
       - .env
     ports:
       - "8545:8545"
-  
+
   eigenlayer:
     platform: linux/amd64
-    image: ghcr.io/breadchaincoop/eigenlayer:dev
+    build:
+      context: .
+      dockerfile: docker/eigenlayer/Dockerfile
     depends_on:
       - ethereum
     env_file:
       - .env
     volumes:
       - ./.nodes:/root/.nodes
       - ./docker/eigenlayer/config.json:/bls-middleware/contracts/docker/eigenlayer/config.json
-  
+
   signer:
     image: ghcr.io/layr-labs/cerberus:0.0.2
     platform: linux/amd64

docker/eigenlayer/Dockerfile

@@ -0,0 +1,51 @@
+# ============================================================================
+# Multi-stage Docker build for EigenLayer BLS Local Setup
+# ============================================================================
+
+# Go Builder Stage - Install Go tools
+FROM golang:1.21 AS go-builder
+
+# Install EigenLayer CLI
+RUN go install github.com/Layr-Labs/eigenlayer-cli/cmd/eigenlayer@v0.10.3
+
+# Install gRPC tools
+RUN go install github.com/fullstorydev/grpcurl/cmd/grpcurl@latest
+
+# Foundry Stage - Main application container
+FROM ghcr.io/foundry-rs/foundry:stable
+
+# Switch to root user for package installation
+USER root
+
+# Install system dependencies
+RUN apt-get update && apt-get install -y \
+    lsof \
+    jq \
+    tmux \
+    bash \
+    && rm -rf /var/lib/apt/lists/*
+
+# Copy Go binaries from builder stage
+COPY --from=go-builder /go/bin/eigenlayer /usr/local/bin/
+COPY --from=go-builder /go/bin/grpcurl /usr/local/bin/
+
+# Clone and build BLS middleware contracts
+RUN git clone --recurse-submodules https://github.com/BreadchainCoop/bls-middleware.git && \
+    cd bls-middleware/contracts && \
+    forge build
+
+# Set working directory to root (scripts handle navigation internally)
+WORKDIR /
+
+# Copy and setup application scripts
+COPY docker/eigenlayer/main.sh /main.sh
+RUN chmod +x /main.sh
+
+COPY docker/eigenlayer/register.sh /register.sh
+RUN chmod +x /register.sh
+
+COPY docker/eigenlayer/eject.sh /eject.sh
+RUN chmod +x /eject.sh
+
+# Set entrypoint
+ENTRYPOINT ["/main.sh"]

docker/eigenlayer/eject.sh

@@ -1,4 +1,5 @@
 #!/bin/sh
+
 if [ -z "$REGISTRY_COORDINATOR_ADDRESS" ]; then
   echo "Error: REGISTRY_COORDINATOR_ADDRESS is not set in the environment variables."
   exit 1