From 3d35923e3b886af1e21954228510807180239c4a Mon Sep 17 00:00:00 2001 From: David Date: Fri, 17 May 2024 19:02:20 +0800 Subject: [PATCH 1/2] feat(mainnet): update mainnet configs --- .env.sample | 12 ++++++------ docker-compose.yml | 9 ++++----- script/start-driver.sh | 2 +- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.env.sample b/.env.sample index 6370b323..37fe6622 100644 --- a/.env.sample +++ b/.env.sample @@ -1,6 +1,6 @@ ############################### DEFAULT ##################################### # Chain ID -CHAIN_ID=167009 +CHAIN_ID=167000 # Exposed ports PORT_L2_EXECUTION_ENGINE_HTTP=8547 @@ -12,13 +12,13 @@ PORT_PROMETHEUS=9091 PORT_GRAFANA=3001 # Comma separated L2 execution engine bootnode URLs for P2P discovery bootstrap -BOOT_NODES=enode://2f7ee605f84362671e7d7c6d47b69a3358b0d87e9ba4648befcae8b19453275ed19059db347c459384c1a3e5486419233c06bf6c4c6f489d81ace6f301a2a446@43.153.55.134:30303,enode://c067356146268d2855ad356c1ce36ba9f78c1633a72f9b7f686679c2ffe04bab6d24e48ef6eefb0e01aa00dff5024f7f94bc583da90b6027f40be4129bbbc5fd@43.153.90.191:30303,enode://acc2bdb6416feddff9734bee1e6de91e684e9df5aeb1d36698cc78b920600aed36a2871e4ad0cf4521afcdc2cde8e2cd410a57038767c356d4ce6c69b9107a5a@170.106.109.12:30303,enode://eb5079aae185d5d8afa01bfd2d349da5b476609aced2b57c90142556cf0ee4a152bcdd724627a7de97adfc2a68af5742a8f58781366e6a857d4bde98de6fe986@34.66.210.65:30303,enode://2294f526cbb7faa778192289c252307420532191438ce821d3c50232e019a797bda8c8f8541de0847e953bb03096123856935e32294de9814d15d120131499ba@34.72.186.213:30303 +BOOT_NODES=enode://57f4b29cd8b59dc8db74be51eedc6425df2a6265fad680c843be113232bbe632933541678783c2a5759d65eac2e2241c45a34e1c36254bccfe7f72e52707e561@104.197.107.1:30303,enode://87a68eef46cc1fe862becef1185ac969dfbcc050d9304f6be21599bfdcb45a0eb9235d3742776bc4528ac3ab631eba6816e9b47f6ee7a78cc5fcaeb10cd32574@35.232.246.122:30303 # Taiko protocol contract addresses -TAIKO_L1_ADDRESS=0x79C9109b764609df928d16fC4a91e9081F7e87DB -TAIKO_TOKEN_L1_ADDRESS=0x6490E12d480549D333499236fF2Ba6676C296011 -ASSIGNMENT_HOOK_L1_ADDRESS=0x9e640a6aadf4f664CF467B795c31332f44AcBe6c -TAIKO_L2_ADDRESS=0x1670090000000000000000000000000000010001 +TAIKO_L1_ADDRESS=0x06a9Ab27c7e2255df1815E6CC0168d7755Feb19a +TAIKO_TOKEN_L1_ADDRESS=0x10dea67478c5F8C5E2D90e5E9B26dBe60c54d800 +ASSIGNMENT_HOOK_L1_ADDRESS=0x537a2f0D3a5879b41BCb5A2afE2EA5c4961796F6 +TAIKO_L2_ADDRESS=0x1670000000000000000000000000000000010001 # P2P DISABLE_P2P_SYNC=false diff --git a/docker-compose.yml b/docker-compose.yml index 7d48a4d0..8c7dbe34 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,7 @@ x-logging: &logging services: l2_execution_engine: - image: us-docker.pkg.dev/evmchain/hekla/taiko-geth:hekla + image: us-docker.pkg.dev/evmchain/images/taiko-geth:sha-ac9ccc8 restart: unless-stopped pull_policy: always stop_grace_period: 3m @@ -24,7 +24,6 @@ services: --gcmode archive --datadir /data/taiko-geth --metrics - --metrics.expensive --metrics.addr "0.0.0.0" --bootnodes ${BOOT_NODES} --authrpc.addr "0.0.0.0" @@ -50,7 +49,7 @@ services: - proposer taiko_client_driver: - image: us-docker.pkg.dev/evmchain/hekla/taiko-client:hekla + image: us-docker.pkg.dev/evmchain/images/taiko-client:sha-5a9b0ec restart: unless-stopped pull_policy: always depends_on: @@ -71,7 +70,7 @@ services: - proposer taiko_client_prover_relayer: - image: us-docker.pkg.dev/evmchain/hekla/taiko-client:hekla + image: us-docker.pkg.dev/evmchain/images/taiko-client:sha-5a9b0ec restart: unless-stopped pull_policy: always depends_on: @@ -92,7 +91,7 @@ services: - prover taiko_client_proposer: - image: us-docker.pkg.dev/evmchain/hekla/taiko-client:hekla + image: us-docker.pkg.dev/evmchain/images/taiko-client:sha-5a9b0ec restart: unless-stopped pull_policy: always depends_on: diff --git a/script/start-driver.sh b/script/start-driver.sh index 39e2a191..aee38af6 100755 --- a/script/start-driver.sh +++ b/script/start-driver.sh @@ -12,7 +12,7 @@ if [ "$DISABLE_P2P_SYNC" = "false" ]; then --taikoL2 "${TAIKO_L2_ADDRESS}" \ --jwtSecret /data/taiko-geth/geth/jwtsecret \ --p2p.sync \ - --p2p.checkPointSyncUrl https://rpc.hekla.taiko.xyz + --p2p.checkPointSyncUrl https://rpc.mainnet.taiko.xyz else exec taiko-client driver \ --l1.ws "${L1_ENDPOINT_WS}" \ From 04dbc17fe8d03422fabb79e8b2d762235ccc79e1 Mon Sep 17 00:00:00 2001 From: David Date: Wed, 22 May 2024 14:49:02 +0800 Subject: [PATCH 2/2] feat: update tags --- docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 8c7dbe34..825abea6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,7 @@ x-logging: &logging services: l2_execution_engine: - image: us-docker.pkg.dev/evmchain/images/taiko-geth:sha-ac9ccc8 + image: us-docker.pkg.dev/evmchain/images/taiko-geth:sha-7874437 restart: unless-stopped pull_policy: always stop_grace_period: 3m @@ -49,7 +49,7 @@ services: - proposer taiko_client_driver: - image: us-docker.pkg.dev/evmchain/images/taiko-client:sha-5a9b0ec + image: us-docker.pkg.dev/evmchain/images/taiko-client:sha-c09d548 restart: unless-stopped pull_policy: always depends_on: @@ -70,7 +70,7 @@ services: - proposer taiko_client_prover_relayer: - image: us-docker.pkg.dev/evmchain/images/taiko-client:sha-5a9b0ec + image: us-docker.pkg.dev/evmchain/images/taiko-client:sha-c09d548 restart: unless-stopped pull_policy: always depends_on: @@ -91,7 +91,7 @@ services: - prover taiko_client_proposer: - image: us-docker.pkg.dev/evmchain/images/taiko-client:sha-5a9b0ec + image: us-docker.pkg.dev/evmchain/images/taiko-client:sha-c09d548 restart: unless-stopped pull_policy: always depends_on: