Merge branch 'main' into 1706-improve-versioning-for-the-light-client…

…-contract
EspressoSystems · Jul 31, 2024 · cdbe464 · cdbe464
2 parents 60a6db4 + ac42ca0
commit cdbe464
Show file tree

Hide file tree

Showing 62 changed files with 1,899 additions and 541 deletions.
diff --git a/.env b/.env
@@ -43,6 +43,8 @@ ESPRESSO_SEQUENCER_ETH_MNEMONIC="test test test test test test test test test te
 ESPRESSO_COMMITMENT_TASK_PORT=30010
 ESPRESSO_SEQUENCER0_DB_PORT=5432
 ESPRESSO_SEQUENCER1_DB_PORT=5433
+MARKETPLACE_SOLVER_POSTGRES_PORT=5434
+ESPRESSO_MARKETPLACE_SOLVER_API_PORT=25000
 ESPRESSO_STATE_RELAY_SERVER_PORT=30011
 ESPRESSO_STATE_RELAY_SERVER_URL=http://state-relay-server:${ESPRESSO_STATE_RELAY_SERVER_PORT}
 ESPRESSO_BLOCK_EXPLORER_PORT=3000

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -80,6 +80,7 @@ jobs:
             target/release/espresso-dev-node
             target/release/pub-key
             target/release/espresso-bridge
+            target/release/marketplace-solver
 
   build-arm:
     runs-on: buildjet-4vcpu-ubuntu-2204-arm
@@ -131,6 +132,7 @@ jobs:
             target/release/espresso-dev-node
             target/release/pub-key
             target/release/espresso-bridge
+            target/release/marketplace-solver
 
   build-dockers:
     runs-on: ubuntu-latest
@@ -150,6 +152,7 @@ jobs:
       nasty-client-tag: ${{ steps.nasty-client.outputs.tags }}
       espresso-dev-node-tag: ${{ steps.espresso-dev-node.outputs.tags }}
       bridge-tag: ${{ steps.bridge.outputs.tags }}
+      marketplace-solver-tag: ${{ steps.marketplace-solver.outputs.tags }}
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
@@ -263,6 +266,12 @@ jobs:
         with:
           images: ghcr.io/espressosystems/espresso-sequencer/bridge
 
+      - name: Generate marketplace-solver metadata
+        uses: docker/metadata-action@v5
+        id: marketplace-solver
+        with:
+          images: ghcr.io/espressosystems/espresso-sequencer/marketplace-solver
+
       - name: Build and push sequencer docker
         uses: docker/build-push-action@v6
         with:
@@ -402,6 +411,16 @@ jobs:
           tags: ${{ steps.bridge.outputs.tags }}
           labels: ${{ steps.bridge.outputs.labels }}
 
+      - name: Build and push marketplace-solver docker
+        uses: docker/build-push-action@v6
+        with:
+          context: ./
+          file: ./docker/marketplace-solver.Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.marketplace-solver.outputs.tags }}
+          labels: ${{ steps.marketplace-solver.outputs.labels }}
+
   test-demo:
     if: ${{ github.event_name != 'pull_request' }}
     runs-on: ubuntu-latest
@@ -430,6 +449,8 @@ jobs:
           docker pull ${{ needs.build-dockers.outputs.builder-tag }}
           docker pull ${{ needs.build-dockers.outputs.nasty-client-tag }}
           docker pull ${{ needs.build-dockers.outputs.bridge-tag }}
+          docker pull ${{ needs.build-dockers.outputs.marketplace-solver-tag }}
+          
       - name: Tag new docker images
         run: |
           docker tag ${{ needs.build-dockers.outputs.sequencer-tag }} ghcr.io/espressosystems/espresso-sequencer/sequencer:main
@@ -445,6 +466,7 @@ jobs:
           docker tag ${{ needs.build-dockers.outputs.builder-tag }} ghcr.io/espressosystems/espresso-sequencer/builder:main
           docker tag ${{ needs.build-dockers.outputs.nasty-client-tag }} ghcr.io/espressosystems/espresso-sequencer/nasty-client:main
           docker tag ${{ needs.build-dockers.outputs.bridge-tag }} ghcr.io/espressosystems/espresso-sequencer/bridge:main
+          docker tag ${{ needs.build-dockers.outputs.marketplace-solver-tag }} ghcr.io/espressosystems/espresso-sequencer/marketplace-solver:main
 
       - name: Test docker demo
         run: |

diff --git a/.github/workflows/build_static.yml b/.github/workflows/build_static.yml
@@ -91,6 +91,7 @@ jobs:
             ${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/pub-key
             ${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/espresso-bridge
             ${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/espresso-dev-node
+             ${{ env.CARGO_TARGET_DIR }}/${{ env.TARGET_TRIPLET }}/release/marketplace-solver
 
   static-dockers:
     runs-on: ubuntu-latest
@@ -208,6 +209,13 @@ jobs:
           images: ghcr.io/espressosystems/espresso-sequencer/bridge
           flavor: suffix=musl
 
+      - name: Generate marketplace-solver metadata
+        uses: docker/metadata-action@v5
+        id: marketplace-solver
+        with:
+          images: ghcr.io/espressosystems/espresso-sequencer/marketplace-solver
+          flavor: suffix=musl
+
       - name: Build and push sequencer docker
         uses: docker/build-push-action@v6
         with:
@@ -327,3 +335,13 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.bridge.outputs.tags }}
           labels: ${{ steps.bridge.outputs.labels }}
+
+      - name: Build and push marketplace-solver docker
+        uses: docker/build-push-action@v6
+        with:
+          context: ./
+          file: ./docker/marketplace-solver.Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.marketplace-solver.outputs.tags }}
+          labels: ${{ steps.marketplace-solver.outputs.labels }}