feat(all): add default proposeBlockTxGasTipCap flag value for propo…

…sers (#110)
taikoxyz · Aug 6, 2023 · 6b084e2 · 6b084e2
1 parent 257ead9
commit 6b084e2
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/.env.sample b/.env.sample
@@ -46,6 +46,7 @@ L1_PROPOSER_PRIVATE_KEY=
 L2_SUGGESTED_FEE_RECIPIENT=
 # Gas limit for proposeBlock transactions
 PROPOSE_BLOCK_TX_GAS_LIMIT=800000
+PROPOSE_BLOCK_TX_GAS_TIP_CAP=10000000000
 
 # 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
@@ -48,6 +48,7 @@ L2_PROPOSER_PRIVATE_KEY=
 L3_SUGGESTED_FEE_RECIPIENT=
 # Gas limit for proposeBlock transactions
 PROPOSE_BLOCK_TX_GAS_LIMIT=800000
+PROPOSE_BLOCK_TX_GAS_TIP_CAP=50000000000
 
 # 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/script/l2/start-proposer.sh b/script/l2/start-proposer.sh
@@ -5,9 +5,9 @@ set -eou pipefail
 
 ARGS="--l1.ws ${L1_ENDPOINT_WS}
     --l2.http http://l2_execution_engine:8545
-    --taikoL1 ${TAIKO_L1_ADDRESS} 
-    --taikoL2 ${TAIKO_L2_ADDRESS} 
-    --l1.proposerPrivKey ${L1_PROPOSER_PRIVATE_KEY} 
+    --taikoL1 ${TAIKO_L1_ADDRESS}
+    --taikoL2 ${TAIKO_L2_ADDRESS}
+    --l1.proposerPrivKey ${L1_PROPOSER_PRIVATE_KEY}
     --l2.suggestedFeeRecipient ${L2_SUGGESTED_FEE_RECIPIENT}
     --minimalBlockGasLimit 5000000"
 
@@ -20,6 +20,10 @@ if [[ ! -z "$PROPOSE_BLOCK_TX_GAS_LIMIT" ]]; then
     ARGS="${ARGS} --proposeBlockTxGasLimit ${PROPOSE_BLOCK_TX_GAS_LIMIT}"
 fi
 
+if [[ ! -z "$PROPOSE_BLOCK_TX_GAS_TIP_CAP" ]]; then
+    ARGS="${ARGS} --proposeBlockTxGasTipCap ${PROPOSE_BLOCK_TX_GAS_TIP_CAP}"
+fi
+
 if [ "$ENABLE_PROPOSER" == "true" ]; then
     taiko-client proposer ${ARGS}
 else

diff --git a/script/l3/start-proposer.sh b/script/l3/start-proposer.sh
@@ -4,9 +4,9 @@ set -eou pipefail
 
 ARGS="--l1.ws ${L2_ENDPOINT_WS}
     --l2.http http://l3_execution_engine:8545
-    --taikoL1 ${TAIKO_L1_ADDRESS} 
-    --taikoL2 ${TAIKO_L2_ADDRESS} 
-    --l1.proposerPrivKey ${L2_PROPOSER_PRIVATE_KEY} 
+    --taikoL1 ${TAIKO_L1_ADDRESS}
+    --taikoL2 ${TAIKO_L2_ADDRESS}
+    --l1.proposerPrivKey ${L2_PROPOSER_PRIVATE_KEY}
     --l2.suggestedFeeRecipient ${L3_SUGGESTED_FEE_RECIPIENT}
     --minimalBlockGasLimit 5000000"
 
@@ -23,6 +23,10 @@ if [[ ! -z "$WAIT_RECEIPT_TIMEOUT" ]]; then
     ARGS="${ARGS} --rpc.waitReceiptTimeout ${WAIT_RECEIPT_TIMEOUT}"
 fi
 
+if [[ ! -z "$PROPOSE_BLOCK_TX_GAS_TIP_CAP" ]]; then
+    ARGS="${ARGS} --proposeBlockTxGasTipCap ${PROPOSE_BLOCK_TX_GAS_TIP_CAP}"
+fi
+
 if [ "$ENABLE_PROPOSER" == "true" ]; then
     taiko-client proposer ${ARGS}
 else