Merge pull request #223 from EspressoSystems/ma/deploy-to-sequencer

Deploy polygon zkevm to existing sequencer

.env

@@ -27,15 +27,15 @@ ESPRESSO_SEQUENCER_URL=http://sequencer0:$ESPRESSO_SEQUENCER_API_PORT
 ESPRESSO_SEQUENCER_STORAGE_PATH=/store/sequencer
 
 ESPRESSO_ZKEVM_L1_PORT=8545
-ESPRESSO_ZKEVM_L1_PROVIDER=http://zkevm-mock-l1-network:$ESPRESSO_ZKEVM_L1_PORT
+ESPRESSO_ZKEVM_L1_PROVIDER=http://demo-l1-network:$ESPRESSO_ZKEVM_L1_PORT
 ESPRESSO_ZKEVM_L1_BLOCK_PERIOD=1
 
 # Hotshot commitment task
 ESPRESSO_SEQUENCER_HOTSHOT_ADDRESS=0x5fbdb2315678afecb367f032d93f642f64180aa3
 ESPRESSO_SEQUENCER_ETH_MNEMONIC="test test test test test test test test test test test junk"
 # Use a different account than the L2 aggregators use, to avoid nonce collisions.
 ESPRESSO_SEQUENCER_ETH_ACCOUNT_INDEX=1
-ESPRESSO_SEQUENCER_L1_PROVIDER=http://zkevm-mock-l1-network:$ESPRESSO_ZKEVM_L1_PORT
+ESPRESSO_SEQUENCER_L1_PROVIDER=$ESPRESSO_ZKEVM_L1_PROVIDER
 ESPRESSO_SEQUENCER_QUERY_SERVICE_URL=http://sequencer0:$ESPRESSO_SEQUENCER_API_PORT
 
 # Config shared between both zkevm-nodes
@@ -71,39 +71,11 @@ ESPRESSO_ZKEVM_1_GENESIS_BLOCK_NUMBER=16
 ESPRESSO_ZKEVM_1_FAUCET_PORT=18111
 ESPRESSO_ZKEVM_1_FAUCET_WEB3_PROVIDER_URL_WS=ws://zkevm-1-permissionless-node:$ESPRESSO_ZKEVM_1_L2_PORT_WS
 ESPRESSO_ZKEVM_1_FAUCET_WEB3_PROVIDER_URL_HTTP=http://zkevm-1-permissionless-node:$ESPRESSO_ZKEVM_1_L2_PORT
-ESPRESSO_ZKEVM_1_GENESIS_HOTSHOT_BLOCK_NUMBER="UNSET"
+ESPRESSO_ZKEVM_1_GENESIS_HOTSHOT_BLOCK_NUMBER=0
 
 # zkevm-preconfirmations-node 1
 ESPRESSO_ZKEVM_1_PRECONFIRMATIONS_L2_PORT=18127
 ESPRESSO_ZKEVM_1_PRECONFIRMATIONS_L2_PORT_WS=18134
 ESPRESSO_ZKEVM_1_PRECONFIRMATIONS_SYNC_INTERVAL=1s
 ESPRESSO_ZKEVM_1_PRECONFIRMATIONS_MTCLIENT_URI=zkevm-1-preconfirmations-prover:50061
 ESPRESSO_ZKEVM_1_PRECONFIRMATIONS_EXECUTOR_URI=zkevm-1-preconfirmations-prover:50071
-
-# zkevm-node 2
-ESPRESSO_ZKEVM_2_L2_PORT=28126
-ESPRESSO_ZKEVM_2_L2_PORT_WS=28133
-ESPRESSO_ZKEVM_2_VERIFIER_ADDRESS=0x2279b7a0a67db372996a5fab50d91eaa73d2ebe6
-ESPRESSO_ZKEVM_2_MATIC_ADDRESS=0x8a791620dd6260079bf849dc5567adc3f2fdc318
-ESPRESSO_ZKEVM_2_GER_ADDRESS=0x610178da211fef7d417bc0e6fed39f05609ad788
-ESPRESSO_ZKEVM_2_BRIDGE_ADDRESS=0xb7f8bc63bbcad18155201308c8f3540b07f84f5e
-ESPRESSO_ZKEVM_2_ROLLUP_ADDRESS=0xa51c1fc2f0d1a1b8494ed1fe312d7c3a78ed91c0
-ESPRESSO_ZKEVM_2_MTCLIENT_URI=zkevm-2-prover:50061
-ESPRESSO_ZKEVM_2_EXECUTOR_URI=zkevm-2-prover:50071
-ESPRESSO_ZKEVM_2_SEQUENCER_MNEMONIC="test test test test test test test test test test test junk"
-ESPRESSO_ZKEVM_2_ADAPTOR_RPC_PORT=28130
-ESPRESSO_ZKEVM_2_ADAPTOR_RPC_URL=http://polygon-zkevm-2-adaptor:$ESPRESSO_ZKEVM_2_ADAPTOR_RPC_PORT
-ESPRESSO_ZKEVM_2_ADAPTOR_QUERY_PORT=50200
-ESPRESSO_ZKEVM_2_ADAPTOR_QUERY_URL=http://polygon-zkevm-2-adaptor:$ESPRESSO_ZKEVM_2_ADAPTOR_QUERY_PORT
-ESPRESSO_ZKEVM_2_GENESIS_BLOCK_NUMBER=30
-ESPRESSO_ZKEVM_2_FAUCET_PORT=28111
-ESPRESSO_ZKEVM_2_FAUCET_WEB3_PROVIDER_URL_WS=ws://zkevm-2-permissionless-node:$ESPRESSO_ZKEVM_2_L2_PORT_WS
-ESPRESSO_ZKEVM_2_FAUCET_WEB3_PROVIDER_URL_HTTP=http://zkevm-2-permissionless-node:$ESPRESSO_ZKEVM_2_L2_PORT
-ESPRESSO_ZKEVM_2_GENESIS_HOTSHOT_BLOCK_NUMBER="UNSET"
-
-# zkevm-preconfirmations-node 2
-ESPRESSO_ZKEVM_2_PRECONFIRMATIONS_L2_PORT=28127
-ESPRESSO_ZKEVM_2_PRECONFIRMATIONS_L2_PORT_WS=28134
-ESPRESSO_ZKEVM_2_PRECONFIRMATIONS_SYNC_INTERVAL=1s
-ESPRESSO_ZKEVM_2_PRECONFIRMATIONS_MTCLIENT_URI=zkevm-2-preconfirmations-prover:50061
-ESPRESSO_ZKEVM_2_PRECONFIRMATIONS_EXECUTOR_URI=zkevm-2-preconfirmations-prover:50071

.github/workflows/build.yml

@@ -58,7 +58,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Pull all docker compose images
-        run: docker-compose -f docker-compose.yaml -f docker-compose-anvil.yaml -f permissionless-docker-compose.yaml pull
+        run: docker compose -f standalone-docker-compose.yaml -f docker-compose-anvil.yaml pull
 
       - uses: Swatinem/rust-cache@v2
         name: Enable Rust Caching

README.md

@@ -176,8 +176,8 @@ simultaneous L2s but don't want the overhead of the secondary preconfirmations n
 To know more about the environment check out the following files
 
 - [.env](.env): Environment variables
-- [docker-compose.yaml](docker-compose.yaml): Espresso Sequencer services
-- [permissionless-docker-compose.yaml](permissionless-docker-compose.yaml): Polygon zkEVM services
+- [docker-compose.yaml](docker-compose.yaml): Polygon zkEVM services
+- [standalone-docker-compose.yaml](standalone-docker-compose.yaml): Espresso Sequencer services
 
 Another good place to start is the end-to-end test in [polygon-zkevm-adaptor/tests/end_to_end.rs](polygon-zkevm-adaptor/tests/end_to_end.rs).
 

docker-compose-anvil.yaml

@@ -1,6 +1,6 @@
 version: "3"
 services:
-  zkevm-mock-l1-network:
+  demo-l1-network:
     image: ghcr.io/foundry-rs/foundry:latest
     ports:
       - $ESPRESSO_ZKEVM_L1_PORT:$ESPRESSO_ZKEVM_L1_PORT
@@ -17,4 +17,4 @@ services:
 
     stop_signal: SIGKILL
     healthcheck:
-      test: ["CMD", "cast", "chain-id"]
+      test: ["CMD", "cast", "chain-id"]

docker-compose-geth.yaml

@@ -1,6 +1,6 @@
 version: "3"
 services:
-  zkevm-mock-l1-network:
+  demo-l1-network:
     # This image is pinned because the deployment step is not deterministic. The
     # block number at which the contracts are deployed changes between runs.
     # image: ghcr.io/espressosystems/espresso-polygon-zkevm-demo/geth-with-contracts@sha256:8dfb508b77af42e511553e609fa6e0ef68818852737085f40cc5c769dc0ccf96