feat(proposer): rm tier fee (#310)

* feat(proposer): rm tier fee * refactor: rm tier fee related env * refactor(proposer): rm PROVER_ENDPOINT * feat: rm flags and upgrade version
taikoxyz · Jul 8, 2024 · aaf2ce0 · aaf2ce0
1 parent f11e6be
commit aaf2ce0
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 54 deletions.
diff --git a/.env.sample b/.env.sample
@@ -48,8 +48,6 @@ 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=
-# Minimum accepted fee for accepting proving a block (in Gwei).
-MIN_ACCEPTABLE_PROOF_FEE=1
 # 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.
@@ -67,14 +65,8 @@ ENABLE_PROPOSER=false
 L1_PROPOSER_PRIVATE_KEY=
 # Address of the proposed block's suggested L2 fee recipient.
 L2_SUGGESTED_FEE_RECIPIENT=
-# Fee sent to prover for the off-chain bond (in Gwei).
-BLOCK_PROPOSAL_FEE=1
-# If nobody accepts block at initial tier fee, how many iterations to increase tier fee before giving up.
-MAX_TIER_FEE_BUMPS=
 # Comma-delineated list (no spaces) of prover endpoints proposer should query when attempting to propose a block
 # If you keep this default value you must also enable a prover by setting ENABLE_PROVER=true.
-# If you start only proposer - add provers endpoint from provers maklet site: https://dojonode.xyz/tatami (wait for load and click "copy All" and paste instead of http://taiko_client_prover_relayer:9876)
-PROVER_ENDPOINTS=http://taiko_client_prover_relayer:9876
 # Whether to send EIP-4844 blob transactions when proposing blocks.
 BLOB_ALLOWED=true
 # Comma-delimited local tx pool addresses you want to prioritize, useful to set your proposer to only propose blocks with your prover's transactions.

diff --git a/.env.sample.hekla b/.env.sample.hekla
@@ -48,8 +48,6 @@ 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=
-# Minimum accepted fee for accepting proving a block (in Gwei).
-MIN_ACCEPTABLE_PROOF_FEE=1
 # 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.
@@ -67,14 +65,8 @@ ENABLE_PROPOSER=false
 L1_PROPOSER_PRIVATE_KEY=
 # Address of the proposed block's suggested L2 fee recipient.
 L2_SUGGESTED_FEE_RECIPIENT=
-# Fee sent to prover for the off-chain bond (in Gwei).
-BLOCK_PROPOSAL_FEE=1
-# If nobody accepts block at initial tier fee, how many iterations to increase tier fee before giving up.
-MAX_TIER_FEE_BUMPS=
 # Comma-delineated list (no spaces) of prover endpoints proposer should query when attempting to propose a block
 # If you keep this default value you must also enable a prover by setting ENABLE_PROVER=true.
-# If you start only proposer - add provers endpoint from provers maklet site: https://dojonode.xyz/tatami (wait for load and click "copy All" and paste instead of http://taiko_client_prover_relayer:9876)
-PROVER_ENDPOINTS=http://taiko_client_prover_relayer:9876
 # Whether to send EIP-4844 blob transactions when proposing blocks.
 BLOB_ALLOWED=true
 # ProverSet Address: We highly recommend you consult the deploy a proverset guide and use separate EOAs for prover and proposer to prevent nonce issues.

diff --git a/docker-compose-hekla.yml b/docker-compose-hekla.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:v1.4.0
     restart: unless-stopped
     pull_policy: always
     stop_grace_period: 3m
@@ -50,7 +50,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:taiko-client-v0.29.0
     restart: unless-stopped
     pull_policy: always
     depends_on:
@@ -71,7 +71,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:taiko-client-v0.29.0
     restart: unless-stopped
     pull_policy: always
     depends_on:
@@ -92,7 +92,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:taiko-client-v0.29.0
     restart: unless-stopped
     pull_policy: always
     depends_on:

diff --git 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:v1.3.0
+    image: us-docker.pkg.dev/evmchain/images/taiko-geth:v1.4.0
     restart: unless-stopped
     pull_policy: always
     env_file:
@@ -51,7 +51,7 @@ services:
       - proposer
 
   taiko_client_driver:
-    image: us-docker.pkg.dev/evmchain/images/taiko-client:taiko-client-v0.28.0
+    image: us-docker.pkg.dev/evmchain/images/taiko-client:taiko-client-v0.29.0
     restart: unless-stopped
     pull_policy: always
     depends_on:
@@ -72,7 +72,7 @@ services:
       - proposer
 
   taiko_client_prover_relayer:
-    image: us-docker.pkg.dev/evmchain/images/taiko-client:taiko-client-v0.28.0
+    image: us-docker.pkg.dev/evmchain/images/taiko-client:taiko-client-v0.29.0
     restart: unless-stopped
     pull_policy: always
     depends_on:
@@ -93,7 +93,7 @@ services:
       - prover
 
   taiko_client_proposer:
-    image: us-docker.pkg.dev/evmchain/images/taiko-client:taiko-client-v0.28.0
+    image: us-docker.pkg.dev/evmchain/images/taiko-client:taiko-client-v0.29.0
     restart: unless-stopped
     pull_policy: always
     depends_on:

diff --git a/script/start-proposer-hekla.sh b/script/start-proposer-hekla.sh
@@ -12,9 +12,6 @@ if [ "$ENABLE_PROPOSER" = "true" ]; then
         --jwtSecret /data/taiko-geth/geth/jwtsecret
         --l1.proposerPrivKey ${L1_PROPOSER_PRIVATE_KEY}
         --l2.suggestedFeeRecipient ${L2_SUGGESTED_FEE_RECIPIENT}
-        --proverEndpoints ${PROVER_ENDPOINTS}
-        --tierFee.optimistic ${BLOCK_PROPOSAL_FEE}
-        --tierFee.sgx ${BLOCK_PROPOSAL_FEE}"
 
     if [ -z "$L1_ENDPOINT_WS" ]; then
         echo "Error: L1_ENDPOINT_WS must be non-empty"
@@ -25,11 +22,6 @@ if [ "$ENABLE_PROPOSER" = "true" ]; then
         echo "Error: L1_PROPOSER_PRIVATE_KEY must be non-empty"
         exit 1
     fi
-
-    if [ -z "$PROVER_ENDPOINTS" ]; then
-        echo "Warning: PROVER_ENDPOINTS must be non-empty"
-        exit 1
-    fi
     
     if [ -n "$PROVER_SET" ]; then
         ARGS="${ARGS} --proverSet ${PROVER_SET}"
@@ -40,10 +32,6 @@ if [ "$ENABLE_PROPOSER" = "true" ]; then
         ARGS="${ARGS} --txPool.locals ${TXPOOL_LOCALS}"
     fi
 
-    if [ -n "$MAX_TIER_FEE_BUMPS" ]; then
-        ARGS="${ARGS} --tierFee.maxPriceBumps ${MAX_TIER_FEE_BUMPS}"
-    fi
-
     if [ "$BLOB_ALLOWED" == "true" ]; then
         ARGS="${ARGS} --l1.blobAllowed"
     fi

diff --git a/script/start-proposer.sh b/script/start-proposer.sh
@@ -12,9 +12,6 @@ if [ "$ENABLE_PROPOSER" = "true" ]; then
         --jwtSecret /data/taiko-geth/geth/jwtsecret
         --l1.proposerPrivKey ${L1_PROPOSER_PRIVATE_KEY}
         --l2.suggestedFeeRecipient ${L2_SUGGESTED_FEE_RECIPIENT}
-        --proverEndpoints ${PROVER_ENDPOINTS}
-        --tierFee.optimistic ${BLOCK_PROPOSAL_FEE}
-        --tierFee.sgx ${BLOCK_PROPOSAL_FEE}"
 
     if [ -z "$L1_ENDPOINT_WS" ]; then
         echo "Error: L1_ENDPOINT_WS must be non-empty"
@@ -26,11 +23,6 @@ if [ "$ENABLE_PROPOSER" = "true" ]; then
         exit 1
     fi
 
-    if [ -z "$PROVER_ENDPOINTS" ]; then
-        echo "Warning: PROVER_ENDPOINTS must be non-empty"
-        exit 1
-    fi
-
     if [ -n "$PROVER_SET" ]; then
         ARGS="${ARGS} --proverSet ${PROVER_SET}"
     fi
@@ -40,10 +32,6 @@ if [ "$ENABLE_PROPOSER" = "true" ]; then
         ARGS="${ARGS} --txPool.locals ${TXPOOL_LOCALS}"
     fi
 
-    if [ -n "$MAX_TIER_FEE_BUMPS" ]; then
-        ARGS="${ARGS} --tierFee.maxPriceBumps ${MAX_TIER_FEE_BUMPS}"
-    fi
-
     if [ "$BLOB_ALLOWED" == "true" ]; then
         ARGS="${ARGS} --l1.blobAllowed"
     fi

diff --git a/script/start-prover-relayer-hekla.sh b/script/start-prover-relayer-hekla.sh
@@ -13,9 +13,6 @@ if [ "$ENABLE_PROVER" = "true" ]; then
         --l1.proverPrivKey ${L1_PROVER_PRIVATE_KEY}
         --prover.capacity ${PROVER_CAPACITY}
         --raiko.host ${SGX_RAIKO_HOST}
-        --minTierFee.optimistic ${MIN_ACCEPTABLE_PROOF_FEE}
-        --minTierFee.sgx ${MIN_ACCEPTABLE_PROOF_FEE}
-        --minTierFee.sgxAndZkvm ${MIN_ACCEPTABLE_PROOF_FEE}"
 
     if [ -z "$SGX_RAIKO_HOST" ]; then
         echo "Error: SGX_RAIKO_HOST must be non-empty"

diff --git a/script/start-prover-relayer.sh b/script/start-prover-relayer.sh
@@ -13,9 +13,6 @@ if [ "$ENABLE_PROVER" = "true" ]; then
         --l1.proverPrivKey ${L1_PROVER_PRIVATE_KEY}
         --prover.capacity ${PROVER_CAPACITY}
         --raiko.host ${SGX_RAIKO_HOST}
-        --minTierFee.optimistic ${MIN_ACCEPTABLE_PROOF_FEE}
-        --minTierFee.sgx ${MIN_ACCEPTABLE_PROOF_FEE}
-        --minTierFee.sgxAndZkvm ${MIN_ACCEPTABLE_PROOF_FEE}"
 
     if [ -z "$SGX_RAIKO_HOST" ]; then
         echo "Error: SGX_RAIKO_HOST must be non-empty"