merge main

.env

@@ -22,24 +22,24 @@ ESPRESSO_ORCHESTRATOR_NEXT_VIEW_TIMEOUT=30s
 ESPRESSO_ORCHESTRATOR_MIN_TRANSACTIONS=50
 ESPRESSO_ORCHESTRATOR_MIN_PROPOSE_TIME=1s
 ESPRESSO_ORCHESTRATOR_MAX_PROPOSE_TIME=2s
-ESPRESSO_SEQUENCER_CDN_ENDPOINT=marshal:$ESPRESSO_CDN_SERVER_PORT
-ESPRESSO_SEQUENCER_ORCHESTRATOR_URL=http://orchestrator:$ESPRESSO_ORCHESTRATOR_PORT
+ESPRESSO_SEQUENCER_CDN_ENDPOINT=marshal:${ESPRESSO_CDN_SERVER_PORT}
+ESPRESSO_SEQUENCER_ORCHESTRATOR_URL=http://orchestrator:${ESPRESSO_ORCHESTRATOR_PORT}
 ESPRESSO_SEQUENCER_API_PORT=50000
 ESPRESSO_SEQUENCER1_API_PORT=50001
 ESPRESSO_SEQUENCER2_API_PORT=50002
 ESPRESSO_SEQUENCER3_API_PORT=50003
 ESPRESSO_SEQUENCER4_API_PORT=50004
-ESPRESSO_SEQUENCER_URL=http://sequencer0:$ESPRESSO_SEQUENCER_API_PORT
+ESPRESSO_SEQUENCER_URL=http://sequencer0:${ESPRESSO_SEQUENCER_API_PORT}
 ESPRESSO_SEQUENCER_STORAGE_PATH=/store/sequencer
 ESPRESSO_SEQUENCER_L1_PORT=8545
 ESPRESSO_SEQUENCER_L1_WS_PORT=8546
-ESPRESSO_SEQUENCER_L1_PROVIDER=http://demo-l1-network:$ESPRESSO_SEQUENCER_L1_PORT
+ESPRESSO_SEQUENCER_L1_PROVIDER=http://demo-l1-network:${ESPRESSO_SEQUENCER_L1_PORT}
 ESPRESSO_SEQUENCER_ETH_MNEMONIC="test test test test test test test test test test test junk"
 ESPRESSO_SEQUENCER_PREFUNDED_BUILDER_ACCOUNTS=0x23618e81E3f5cdF7f54C3d65f7FBc0aBf5B21E8f
 ESPRESSO_COMMITMENT_TASK_PORT=60000
 ESPRESSO_SEQUENCER_DB_PORT=5432
 ESPRESSO_STATE_RELAY_SERVER_PORT=40004
-ESPRESSO_STATE_RELAY_SERVER_URL=http://state-relay-server:$ESPRESSO_STATE_RELAY_SERVER_PORT
+ESPRESSO_STATE_RELAY_SERVER_URL=http://state-relay-server:${ESPRESSO_STATE_RELAY_SERVER_PORT}
 
 # Ethereum accounts (note 11-15 are used by the sequencer nodes)
 ESPRESSO_SEQUENCER_HOTSHOT_ACCOUNT_INDEX=5
@@ -87,6 +87,10 @@ ESPRESSO_STATE_SIGNATURE_WEIGHT_THRESHOLD=3
 ESPRESSO_PROVER_SERVICE_PORT=60001
 ESPRESSO_STATE_PROVER_UPDATE_INTERVAL=10m
 
+# Builder service
+ESPRESSO_BUILDER_SERVER_PORT=60003
+BUILDER_CHANNEL_CAPACITY=1024
+
 # Load generator
 ESPRESSO_SUBMIT_TRANSACTIONS_DELAY=1s
 ESPRESSO_SUBMIT_TRANSACTIONS_PORT=44010

.github/workflows/build.yml

@@ -69,6 +69,7 @@ jobs:
             target/release/reset-storage
             target/release/deploy
             target/release/keygen
+            target/release/permissionless-builder
             target/release/nasty-client
 
   build-arm:
@@ -110,6 +111,7 @@ jobs:
             target/release/reset-storage
             target/release/deploy
             target/release/keygen
+            target/release/permissionless-builder
             target/release/nasty-client
 
   build-dockers:
@@ -125,6 +127,7 @@ jobs:
       commitment-task-tag: ${{ steps.commitment-task.outputs.tags }}
       submit-transactions-tag: ${{ steps.submit-transactions.outputs.tags }}
       deploy-tag: ${{ steps.deploy.outputs.tags }}
+      builder-tag: ${{ steps.builder.outputs.tags }}
       nasty-client-tag: ${{ steps.nasty-client.outputs.tags }}
     steps:
       - name: Checkout Repository
@@ -209,6 +212,12 @@ jobs:
         with:
           images: ghcr.io/espressosystems/espresso-sequencer/deploy
 
+      - name: Generate builder metadata
+        uses: docker/metadata-action@v5
+        id: builder
+        with:
+          images: ghcr.io/espressosystems/espresso-sequencer/builder
+
       - name: Generate nasty-client metadata
         uses: docker/metadata-action@v5
         id: nasty-client
@@ -305,6 +314,16 @@ jobs:
           tags: ${{ steps.deploy.outputs.tags }}
           labels: ${{ steps.deploy.outputs.labels }}
 
+      - name: Build and push builder docker
+        uses: docker/build-push-action@v5
+        with:
+          context: ./
+          file: ./docker/permissionless-builder.Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.builder.outputs.tags }}
+          labels: ${{ steps.builder.outputs.labels }}
+
       - name: Build and push nasty-client docker
         uses: docker/build-push-action@v5
         with:
@@ -339,6 +358,7 @@ jobs:
           docker pull ${{ needs.build-dockers.outputs.commitment-task-tag }}
           docker pull ${{ needs.build-dockers.outputs.submit-transactions-tag }}
           docker pull ${{ needs.build-dockers.outputs.deploy-tag }}
+          docker pull ${{ needs.build-dockers.outputs.builder-tag }}
           docker pull ${{ needs.build-dockers.outputs.nasty-client-tag }}
       - name: Tag new docker images
         run: |
@@ -351,6 +371,7 @@ jobs:
           docker tag ${{ needs.build-dockers.outputs.commitment-task-tag }} ghcr.io/espressosystems/espresso-sequencer/commitment-task:main
           docker tag ${{ needs.build-dockers.outputs.submit-transactions-tag }} ghcr.io/espressosystems/espresso-sequencer/submit-transactions:main
           docker tag ${{ needs.build-dockers.outputs.deploy-tag }} ghcr.io/espressosystems/espresso-sequencer/deploy:main
+          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
 
       - name: Test docker demo

Cargo.toml

@@ -46,7 +46,7 @@ futures = "0.3"
 # Hotshot imports
 hotshot = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.32" }
 hotshot-orchestrator = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.32" }
-hotshot-query-service = { git = "https://github.com/EspressoSystems/hotshot-query-service", tag = "0.1.1" }
+hotshot-query-service = { git = "https://github.com/EspressoSystems/hotshot-query-service", tag = "0.1.2" }
 hotshot-stake-table = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.32" }
 hotshot-state-prover = { version = "0.1.0", path = "hotshot-state-prover" }
 hotshot-task = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.32" }