feat(all): update configurations for alpha-5 testnet (#121)

* feat: update configs * feat: more configs * Update .env.sample Co-authored-by: wolfderechter <[email protected]> * Update docker-compose.yml Co-authored-by: wolfderechter <[email protected]> * feat: update bootnodes * chore: update configs * chore: update .env.sample bootnodes (#122) * feat: add `PROVER_ENDPOINTS` config * chore: remove more l3 stuff and respect default eth-docker ports (#123) * chore: add proposer fee flag to .env (#124) * add proposer fee flag to .env * actually use it * chore: update comment in env sample (#125) --------- Co-authored-by: wolfderechter <[email protected]> Co-authored-by: dave | d1onys1us <[email protected]>
taikoxyz · Sep 19, 2023 · 3f5347e · 3f5347e
1 parent d5f46aa
commit 3f5347e
Show file tree

Hide file tree

Showing 14 changed files with 39 additions and 391 deletions.
diff --git a/.env.sample b/.env.sample
@@ -1,20 +1,22 @@
 ############################### DEFAULT #####################################
 # Chain ID
-CHAIN_ID=167005
+CHAIN_ID=167007
 
 # Exposed ports
 PORT_L2_EXECUTION_ENGINE_HTTP=8547
 PORT_L2_EXECUTION_ENGINE_WS=8548
 PORT_L2_EXECUTION_ENGINE_METRICS=6060
 PORT_L2_EXECUTION_ENGINE_P2P=30306
+PORT_PROVER_SERVER=9876
 PORT_PROMETHEUS=9091
 PORT_GRAFANA=3001
 
 # Comma separated L2 execution engine bootnode URLs for P2P discovery bootstrap
-BOOT_NODES=enode://77310934db4b38255ea172c9c770cdf69da2090a542d840569a863760ce415837a8fb310d52070a3ee9c4a665008c677cfc3b8c0850e8b40e2ab0b5006f31de4@43.153.67.131:30303,enode://5751376186499ec96d01554785183005a4fa5f1022d750c684d3925b03185a344ef42652430739fba998408bbdf13e3200a096b15196764aabd4bcaa4e941232@49.51.71.216:30303,enode://5ab86d28b1d3488163d6f401dd914f2d49f4f7cfd7fa48a12871ce2caea5c4693bf22366da4a7fc741704bf0e46e159bb3cb0fe0257453ff576ed91c409e050a@170.106.116.179:30303,enode://4efd43b7fef961cb3853dbafa89f07406ad59e3b4fb9e01bd2e191da0350af2c1714ce968249fc240036c6b4969282c7d28b90300ac687e5e034cad83110612c@35.192.136.10:30303,enode://519eb790453d85b570061b18b4f02d5c251e1af6e37f237e19d8827aabaa51ded0b3fc0272fbcdb7ebbb4f81216f2728210772d673d704d57773164dabc55fe6@34.136.126.66:30303,enode://8dbdd915aeced3b4bbd4c7f761b9bc9c5ee4aadf52a2bc00473b80a3ef5f5b01189bda589b9081f7ccde427296e5ce13c3a7079a797e151546882f6747ea2ca7@35.226.15.64:30303
+BOOT_NODES=enode://2833d948c31b10a820ed76e652c49c5025ec5c01e8100b4f0b2b6d527c2bf5bdc093f0c8f8c1f63feebed96b00c0e1403d29a1a88a108ed8f3bbbe56fe9d583a@43.130.29.245:30303,enode://0c66c4f514f40247b96ff61ee6012d644cd75e30513b3b93526dec0c7668a8979bb06f8fe4e7f57e0de12a41d2844c6f3f8571f6c8009b9951b7de367270901f@43.153.11.70:30303,enode://c6d64b973649b62eaa261e6b02f27b0f5125518cb80d087dfa681d893cfc9336e1b3dc456e38ac0d8501d06e0cdebcb86b8f254d7305c62cb4c9b12a1e7e8aee@43.153.26.219:30303,enode://3a81fa59ea092344bfb7cb2ac2d8a4c32982eb072481ddb0f680efa150e282ac446a623ed3a3d90c4154408a3a0c77a9d0fd9f29f20bef7861081c294b715ec4@34.173.190.75:30303,enode://d863f9917f59202b46f3cacedfa8c1a3932e782940dbcc6da5692a183c678aef387bf360fbce8e3b4381923b83839ffbbe9762abe64818f762d03ecad6662a1c@34.30.123.17:30303,enode://c8f085360640c68e013a5a6ff6a1d03e5af57a2db599e862014b90439af4b09a3e28bfcc8bfe2082949a6a3f9bb1f5ec19526a4e25fb2e14b11d08a4a1e82eb4@35.224.11.87:30303
 
 # Taiko protocol contract addresses
-TAIKO_L1_ADDRESS=0x6375394335f34848b850114b66A49D6F47f2cdA8
+TAIKO_L1_ADDRESS=0x95fF8D3CE9dcB7455BEB7845143bEA84Fe5C4F6f
+TAIKO_TOKEN_L1_ADDRESS=0x75F94f04d2144cB6056CCd0CFF1771573d838974
 TAIKO_L2_ADDRESS=0x1000777700000000000000000000000000000001
 
 # P2P
@@ -33,11 +35,13 @@ L1_ENDPOINT_WS=
 ENABLE_PROVER=false
 # How many provers you want to run concurrently, note that each prover will cost ~8 cores / ~16 GB memory.
 ZKEVM_CHAIN_INSTANCES_NUM=1
-# A L1 account (with balance) private key which will send the TaikoL1.proveBlock transactions.
+# A L1 account private key (with a balance of TKO deposited on TaikoL1) which will be used to sign the bond for proving the block.
 # WARNING: only use a test account, pasting your private key in plain text here is not secure.
 L1_PROVER_PRIVATE_KEY=
 # Gas limit for proveBlock transactions (in gas)
-PROVE_BLOCK_TX_GAS_LIMIT=1000000
+PROVE_BLOCK_TX_GAS_LIMIT=2500000
+# Minimum accepted fee for accepting proving a block (in wei)
+MIN_ACCEPTABLE_PROOF_FEE=1
 
 # If you want to be a proposer who proposes L2 execution engine's transactions in mempool to Taiko L1 protocol
 # contract (be a "mining L2 node"), you need to change `ENABLE_PROPOSER` to true, then fill `L1_PROPOSER_PRIVATE_KEY`
@@ -48,9 +52,13 @@ L1_PROPOSER_PRIVATE_KEY=
 # A L2 account address who will be the tx fee beneficiary of the L2 blocks that you proposed
 L2_SUGGESTED_FEE_RECIPIENT=
 # Gas limit for proposeBlock transactions (in gas)
-PROPOSE_BLOCK_TX_GAS_LIMIT=800000
+PROPOSE_BLOCK_TX_GAS_LIMIT=2500000
 # Maximum gas tip used for proposeBlock transactions (in wei)
 PROPOSE_BLOCK_TX_GAS_TIP_CAP=10000000000
+# Fee sent to prover for the off-chain bond (in wei)
+BLOCK_PROPOSAL_FEE=1
+# Comma-delineated list of prover endpoints proposer should query when attempting to propose a block
+PROVER_ENDPOINTS=http://taiko_client_prover_relayer:9876
 
 # Comma-delimited local tx pool addresses you want to prioritize, useful to set your proposer to only propose blocks with your prover's transactions
 TXPOOL_LOCALS=

diff --git a/.env.sample.l3 b/.env.sample.l3
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,3 @@
 .env
-.env.l3
 .env*.bak
+
diff --git a/docker-compose.l3.yml b/docker-compose.l3.yml
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -7,7 +7,7 @@ x-logging: &logging
 
 services:
   l2_execution_engine:
-    image: gcr.io/evmchain/taiko-geth:grimsvotn
+    image: gcr.io/evmchain/taiko-geth:jolnir
     restart: unless-stopped
     pull_policy: always
     stop_grace_period: 3m
@@ -56,7 +56,7 @@ services:
     <<: *logging
 
   taiko_client_driver:
-    image: gcr.io/evmchain/taiko-client:grimsvotn
+    image: gcr.io/evmchain/taiko-client:jolnir
     restart: unless-stopped
     pull_policy: always
     depends_on:
@@ -65,33 +65,35 @@ services:
       - .env
     volumes:
       - l2_execution_engine_data:/data/taiko-geth
-      - ./script/l2:/script
+      - ./script:/script
     entrypoint:
       - /bin/sh
       - -c
       - "/script/start-driver.sh"
     <<: *logging
 
   taiko_client_prover_relayer:
-    image: gcr.io/evmchain/taiko-client:grimsvotn
+    image: gcr.io/evmchain/taiko-client:jolnir
     restart: unless-stopped
     pull_policy: always
     depends_on:
       - l2_execution_engine
       - taiko_client_driver
       - zkevm_chain_prover_rpcd
+    ports:
+      - "${PORT_PROVER_SERVER}:9876"
     env_file:
       - .env
     volumes:
-      - ./script/l2:/script
+      - ./script:/script
     entrypoint:
       - /bin/sh
       - -c
       - "/script/start-prover-relayer.sh"
     <<: *logging
 
   taiko_client_proposer:
-    image: gcr.io/evmchain/taiko-client:grimsvotn
+    image: gcr.io/evmchain/taiko-client:jolnir
     restart: unless-stopped
     pull_policy: always
     depends_on:
@@ -100,21 +102,21 @@ services:
     env_file:
       - .env
     volumes:
-      - ./script/l2:/script
+      - ./script:/script
     entrypoint:
       - /bin/sh
       - -c
       - "/script/start-proposer.sh"
     <<: *logging
 
   zkevm_chain_prover_rpcd:
-    image: gcr.io/evmchain/grimsvotn-proverd:latest
+    image: gcr.io/evmchain/jolnir-proverd:latest
     restart: unless-stopped
     pull_policy: always
     env_file:
       - .env
     volumes:
-      - ./script/l2:/script
+      - ./script:/script
       - zkevm_chain_prover_rpcd_data:/data
     entrypoint:
       - /bin/sh
@@ -124,7 +126,7 @@ services:
       replicas: ${ZKEVM_CHAIN_INSTANCES_NUM:-1}
       resources:
         limits:
-          memory: 16G
+          memory: 32G
     <<: *logging
 
   prometheus: