Skip to content

Commit

Permalink
chore(prover,proposer,driver): upgrade client version to 0.43.0 on …
Browse files Browse the repository at this point in the history
…Hekla (#351)

* chore(hekla): upgrade client version to `0.43.0` on Hekla`

* remove deprecated config

* rm deprecated config & add new optional config

* remove deprecated config & add `l1.capacity` back on mainnet

* Update .env.sample.hekla

Co-authored-by: Roger <[email protected]>

---------

Co-authored-by: Roger <[email protected]>
  • Loading branch information
YoGhurt111 and RogerLamTd authored Jan 15, 2025
1 parent 4bd0a2a commit ff47aaf
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 27 deletions.
7 changes: 3 additions & 4 deletions .env.sample
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ P2P_SYNC_URL=https://rpc.mainnet.taiko.xyz
# If you are using a local Mainnet L1 node, you can refer to it as "http://host.docker.internal:8545" and "ws://host.docker.internal:8546", which refer to the default ports in the .env for an eth-docker L1 node.
# However, you may need to add this host to docker-compose.yml. If that does not work, you can try the private local ip address (e.g. http://192.168.1.15:8545). You can find that with `ip addr show` or a similar command.
# In addition, you can use your public ip address followed by the specific ports for http and ws (e.g. http://82.168.1.15:8545). You can find that with `hostname -I | awk '{print $1}'`.
L1_ENDPOINT_HTTP=
L1_ENDPOINT_WS=
# HTTP RPC endpoint of a L1 beacon node. Everything behind the top-level domain is ignored. Make sure you don't need to work with subdirectories. The path will always be /eth/v1...
# If you are using a local Mainnet L1 node, you can refer to it as "http://host.docker.internal:5052", which refer to the default REST port in the .env for an eth-docker L1 node.
Expand All @@ -43,16 +42,16 @@ L1_BEACON_HTTP=
ENABLE_PROVER=false
# SGX Raiko service endpoint, required if not running a guardian prover.
SGX_RAIKO_HOST=
# How many provers you want to run concurrently.
# How many provers you want to run concurrently.(Deprecated after version 0.43.0 of taiko-client)
PROVER_CAPACITY=1
# A L1 account private key (with a balance of TAIKO 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=
# Amount to approve TaikoL1 contracts for TaikoToken usage. i.e 250 TAIKO = 250
TOKEN_ALLOWANCE=
# Minimum ETH balance (in ETH) a prover wants to keep.
# Minimum ETH balance (in ETH) a prover wants to keep.(Deprecated after version 0.43.0 of taiko-client)
MIN_ETH_BALANCE=
# Minimum Taiko token balance (in ether) a prover wants to keep. i.e 250 TAIKO = 250
# Minimum Taiko token balance (in ether) a prover wants to keep. i.e 250 TAIKO = 250 (Deprecated after version 0.43.0 of taiko-client)
MIN_TAIKO_BALANCE=
# Whether to prove unassigned blocks or not (blocks that have expired their proof window
# without the original prover submitting a proof.).
Expand Down
17 changes: 10 additions & 7 deletions .env.sample.hekla
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ P2P_SYNC_URL=https://rpc.hekla.taiko.xyz
# If you are using a local Holesky L1 node, you can refer to it as "http://host.docker.internal:8545" and "ws://host.docker.internal:8546", which refer to the default ports in the .env for an eth-docker L1 node.
# However, you may need to add this host to docker-compose.yml. If that does not work, you can try the private local ip address (e.g. http://192.168.1.15:8545). You can find that with `ip addr show` or a similar command.
# In addition, you can use your public ip address followed by the specific ports for http and ws (e.g. http://82.168.1.15:8545). You can find that with `hostname -I | awk '{print $1}'`.
L1_ENDPOINT_HTTP=
L1_ENDPOINT_WS=
# HTTP RPC endpoint of a L1 beacon node. Everything behind the top-level domain is ignored. Make sure you don't need to work with subdirectories. The path will always be /eth/v1...
# If you are using a local Holesky L1 node, you can refer to it as "http://host.docker.internal:5052", which refer to the default REST port in the .env for an eth-docker L1 node.
Expand All @@ -43,20 +42,20 @@ L1_BEACON_HTTP=
ENABLE_PROVER=false
# SGX Raiko service endpoint, required if not running a guardian prover.
SGX_RAIKO_HOST=
# How many provers you want to run concurrently.
PROVER_CAPACITY=1
# A L1 account private key (with a balance of TTKOh 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=
# Amount to approve TaikoL1 contracts for TaikoToken usage. i.e 250 TTKOh = 250
TOKEN_ALLOWANCE=
# Minimum ETH balance (in ETH) a prover wants to keep.
MIN_ETH_BALANCE=
# Minimum Taiko token balance (in ether) a prover wants to keep. i.e 250 TTKOh = 250
MIN_TAIKO_BALANCE=
# Whether to prove unassigned blocks or not (blocks that have expired their proof window
# without the original prover submitting a proof.).
PROVE_UNASSIGNED_BLOCKS=false
# The size of batch sgx proofs. If set to 1, submits proof upon assignment, if x>1, submits a batch of proofs when x number of blocks are assigned.
# Setting this value to a number greater than 1 means you are enabling the proof aggregation functionality, please consult our documentation to understand the risks before doing so.
SGX_BATCH_SIZE=
# Time interval to prove blocks, even if the number of pending proofs does not exceed the batchSize, this flag only works when the proof aggregation is enabled.
# We recommend that this value is set no greater than 45min, default is 30min.
FORCE_BATCH_PROVING_INTERVAL=

# 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`.
Expand All @@ -76,6 +75,10 @@ PROVER_SET=

# 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=
# If set to true, the proposer will use calldata as DA when the blob fee is more expensive than using calldata.
FALLBACK_TO_CALLDATA=
# Enable revert protection. When you are not the first taiko proposer in current L1 block, you would revert.
REVERT_PROTECTION=

# Transaction Manager Flags (Leave blank if using default values.) These only affect Prover and Proposer.

Expand Down
6 changes: 3 additions & 3 deletions docker-compose-hekla.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ services:
- proposer

taiko_client_driver:
image: us-docker.pkg.dev/evmchain/images/taiko-client:taiko-client-v0.39.2
image: us-docker.pkg.dev/evmchain/images/taiko-client:taiko-alethia-client-v0.43.0
restart: unless-stopped
pull_policy: always
depends_on:
Expand All @@ -71,7 +71,7 @@ services:
- proposer

taiko_client_prover_relayer:
image: us-docker.pkg.dev/evmchain/images/taiko-client:taiko-client-v0.39.2
image: us-docker.pkg.dev/evmchain/images/taiko-client:taiko-alethia-client-v0.43.0
restart: unless-stopped
pull_policy: always
depends_on:
Expand All @@ -92,7 +92,7 @@ services:
- prover

taiko_client_proposer:
image: us-docker.pkg.dev/evmchain/images/taiko-client:taiko-client-v0.39.2
image: us-docker.pkg.dev/evmchain/images/taiko-client:taiko-alethia-client-v0.43.0
restart: unless-stopped
pull_policy: always
depends_on:
Expand Down
8 changes: 8 additions & 0 deletions script/start-proposer-hekla.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,14 @@ if [ "$ENABLE_PROPOSER" = "true" ]; then
ARGS="${ARGS} --l1.blobAllowed"
fi

if [ "$FALLBACK_TO_CALLDATA" == "true" ]; then
ARGS="${ARGS} --l1.fallbackToCalldata"
fi

if [ "$REVERT_PROTECTION" == "true" ]; then
ARGS="${ARGS} --l1.revertProtection"
fi

# TXMGR Settings
if [ -n "$TX_FEE_LIMIT_MULTIPLIER" ]; then
ARGS="${ARGS} --tx.feeLimitMultiplier ${TX_FEE_LIMIT_MULTIPLIER}"
Expand Down
14 changes: 6 additions & 8 deletions script/start-prover-relayer-hekla.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ if [ "$ENABLE_PROVER" = "true" ]; then
--taikoL2 ${TAIKO_L2_ADDRESS}
--taikoToken ${TAIKO_TOKEN_L1_ADDRESS}
--l1.proverPrivKey ${L1_PROVER_PRIVATE_KEY}
--prover.capacity ${PROVER_CAPACITY}
--raiko.host ${SGX_RAIKO_HOST}"

if [ -z "$SGX_RAIKO_HOST" ]; then
Expand All @@ -36,16 +35,15 @@ if [ "$ENABLE_PROVER" = "true" ]; then
ARGS="${ARGS} --prover.allowance ${TOKEN_ALLOWANCE}"
fi

if [ -n "$MIN_ETH_BALANCE" ]; then
ARGS="${ARGS} --prover.minEthBalance ${MIN_ETH_BALANCE}"
if [ "$PROVE_UNASSIGNED_BLOCKS" = "true" ]; then
ARGS="${ARGS} --prover.proveUnassignedBlocks"
fi

if [ -n "$MIN_TAIKO_BALANCE" ]; then
ARGS="${ARGS} --prover.minTaikoTokenBalance ${MIN_TAIKO_BALANCE}"
if [ -n "$SGX_BATCH_SIZE" ]; then
ARGS="${ARGS} --prover.sgx.batchSize ${SGX_BATCH_SIZE}"
fi

if [ "$PROVE_UNASSIGNED_BLOCKS" = "true" ]; then
ARGS="${ARGS} --prover.proveUnassignedBlocks"
if [ -n "$FORCE_BATCH_PROVING_INTERVAL" ]; then
ARGS="${ARGS} --prover.forceBatchProvingInterval ${FORCE_BATCH_PROVING_INTERVAL}"
fi

# TXMGR Settings
Expand Down
7 changes: 2 additions & 5 deletions script/start-prover-relayer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,6 @@ if [ "$ENABLE_PROVER" = "true" ]; then
exit 1
fi

if [ -z "$L1_ENDPOINT_HTTP" ]; then
echo "Error: L1_ENDPOINT_HTTP must be non-empty"
exit 1
fi

if [ -z "$L1_PROVER_PRIVATE_KEY" ]; then
echo "Error: L1_PROVER_PRIVATE_KEY must be non-empty"
exit 1
Expand All @@ -41,10 +36,12 @@ if [ "$ENABLE_PROVER" = "true" ]; then
ARGS="${ARGS} --prover.allowance ${TOKEN_ALLOWANCE}"
fi

# Deprecated after version 0.43.0 of taiko-client
if [ -n "$MIN_ETH_BALANCE" ]; then
ARGS="${ARGS} --prover.minEthBalance ${MIN_ETH_BALANCE}"
fi

# Deprecated after version 0.43.0 of taiko-client
if [ -n "$MIN_TAIKO_BALANCE" ]; then
ARGS="${ARGS} --prover.minTaikoTokenBalance ${MIN_TAIKO_BALANCE}"
fi
Expand Down

0 comments on commit ff47aaf

Please sign in to comment.