Merge pull request OffchainLabs#21 from EspressoSystems/sequencer-fixes

Updates from latest sequencer version

.env

@@ -24,10 +24,21 @@ ESPRESSO_SEQUENCER_L1_PROVIDER=http://geth:$ESPRESSO_SEQUENCER_L1_PORT
 ESPRESSO_SEQUENCER_L1_WS_PROVIDER=ws://geth:$ESPRESSO_SEQUENCER_L1_WS_PORT
 ESPRESSO_SEQUENCER_L1_USE_LATEST_BLOCK_TAG=true
 # A special account for `espresso-sequencer`, check `scripts/accounts.ts` for details.
-ESPRESSO_SEQUENCER_ETH_MNEMONIC="indoor dish desk flag debris potato excuse depart ticket judge file exit"
+ESPRESSO_COMMITMENT_ETH_MNEMONIC="indoor dish desk flag debris potato excuse depart ticket judge file exit"
+ESPRESSO_SEQUENCER_ETH_MNEMONIC="test test test test test test test test test test test junk"
 ESPRESSO_SEQUENCER_HOTSHOT_ACCOUNT_INDEX=5
 ESPRESSO_COMMITMENT_TASK_PORT=60000
 
 # Example sequencer demo private keys
 ESPRESSO_DEMO_SEQUENCER_PRIVATE_STAKING_KEY_0=BLS_SIGNING_KEY~lNDh4Pn-pTAyzyprOAFdXHwhrKhEwqwtMtkD3CZF4x3o
 ESPRESSO_DEMO_SEQUENCER_PRIVATE_STAKING_KEY_1=BLS_SIGNING_KEY~-DO72m_SFl6NQMYknm05FYpPEklkeqz-B3g2mFdbuS83
+
+ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_0=STATEKEY~YC2YwzvFypi98JLHHEydp6EGMkcSsEZBEnByNBnajgE-
+ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_1=STATEKEY~5JJJJ9OhX320me8TUKZ15iRTVHslYyULwlDm3FG5vAOk
+
+ESPRESSO_SEQUENCER_ETH_ACCOUNT_INDEX=8
+ESPRESSO_SEQUENCER_PREFUNDED_BUILDER_ACCOUNTS=0x23618e81E3f5cdF7f54C3d65f7FBc0aBf5B21E8f
+
+ESPRESSO_STATE_RELAY_SERVER_PORT=40004
+ESPRESSO_STATE_SIGNATURE_WEIGHT_THRESHOLD=3
+ESPRESSO_STATE_RELAY_SERVER_URL=http://state-relay-server:$ESPRESSO_STATE_RELAY_SERVER_PORT

docker-compose.yaml

@@ -387,9 +387,14 @@ services:
       - ESPRESSO_SEQUENCER_CONSENSUS_SERVER_URL
       - ESPRESSO_SEQUENCER_API_PORT
       - ESPRESSO_SEQUENCER_STORAGE_PATH
-      - ESPRESSO_SEQUENCER_L1_WS_PROVIDER
+      - ESPRESSO_SEQUENCER_L1_PROVIDER
       - ESPRESSO_SEQUENCER_L1_USE_LATEST_BLOCK_TAG
       - ESPRESSO_SEQUENCER_PRIVATE_STAKING_KEY=$ESPRESSO_DEMO_SEQUENCER_PRIVATE_STAKING_KEY_0
+      - ESPRESSO_SEQUENCER_PRIVATE_STATE_KEY=$ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_0
+      - ESPRESSO_STATE_RELAY_SERVER_URL
+      - ESPRESSO_SEQUENCER_ETH_MNEMONIC
+      - ESPRESSO_SEQUENCER_ETH_ACCOUNT_INDEX
+      - ESPRESSO_SEQUENCER_PREFUNDED_BUILDER_ACCOUNTS
       - RUST_LOG
       - RUST_LOG_FORMAT
     depends_on:
@@ -413,9 +418,14 @@ services:
       - ESPRESSO_SEQUENCER_CONSENSUS_SERVER_URL
       - ESPRESSO_SEQUENCER_API_PORT
       - ESPRESSO_SEQUENCER_STORAGE_PATH
-      - ESPRESSO_SEQUENCER_L1_WS_PROVIDER
+      - ESPRESSO_SEQUENCER_L1_PROVIDER
       - ESPRESSO_SEQUENCER_L1_USE_LATEST_BLOCK_TAG
       - ESPRESSO_SEQUENCER_PRIVATE_STAKING_KEY=$ESPRESSO_DEMO_SEQUENCER_PRIVATE_STAKING_KEY_1
+      - ESPRESSO_SEQUENCER_PRIVATE_STATE_KEY=$ESPRESSO_DEMO_SEQUENCER_STATE_PRIVATE_KEY_1
+      - ESPRESSO_SEQUENCER_ETH_MNEMONIC
+      - ESPRESSO_SEQUENCER_ETH_ACCOUNT_INDEX
+      - ESPRESSO_SEQUENCER_PREFUNDED_BUILDER_ACCOUNTS
+      - ESPRESSO_STATE_RELAY_SERVER_URL
       - RUST_LOG
       - RUST_LOG_FORMAT
     depends_on:
@@ -436,7 +446,7 @@ services:
     env_file:
       - espresso.env
     environment:
-      - ESPRESSO_SEQUENCER_ETH_MNEMONIC
+      - ESPRESSO_SEQUENCER_ETH_MNEMONIC=$ESPRESSO_COMMITMENT_ETH_MNEMONIC
       - ESPRESSO_SEQUENCER_HOTSHOT_ACCOUNT_INDEX
       - ESPRESSO_COMMITMENT_TASK_PORT
       - ESPRESSO_SEQUENCER_URL
@@ -454,6 +464,17 @@ services:
       geth:
         condition: service_started
 
+  state-relay-server:
+    image: ghcr.io/espressosystems/espresso-sequencer/state-relay-server:main
+    ports:
+      - "$ESPRESSO_STATE_RELAY_SERVER_PORT:$ESPRESSO_STATE_RELAY_SERVER_PORT"
+    environment:
+      - ESPRESSO_STATE_RELAY_SERVER_PORT
+      - ESPRESSO_STATE_SIGNATURE_WEIGHT_THRESHOLD
+      - RUST_LOG
+      - RUST_LOG_FORMAT
+
+
 volumes:
   l1data:
   consensus:

scripts/config.ts

@@ -173,7 +173,7 @@ function writeConfigs(argv: any) {
                 "enable": false,
                 "espresso": false,
                 "hotshot-url": "",
-                "espresso-namespace": 100,
+                "espresso-namespace": 412346,
             },
         },
         "node": {