From a48a793374e216db4787a4f06b5f6361fbc6dd7e Mon Sep 17 00:00:00 2001
From: Kristian Ray <kristianrayfolmos@gmail.com>
Date: Tue, 21 Jan 2025 08:07:24 +0100
Subject: [PATCH 1/2] script and env improvements

---
 .env.sample                          | 2 +-
 .env.sample.hekla                    | 4 ++--
 script/start-proposer-hekla.sh       | 4 ++--
 script/start-proposer.sh             | 8 ++++----
 script/start-prover-relayer-hekla.sh | 8 ++++----
 script/start-prover-relayer.sh       | 8 ++++----
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.env.sample b/.env.sample
index 64ee12c..4e11f0d 100644
--- a/.env.sample
+++ b/.env.sample
@@ -93,7 +93,7 @@ TX_NOT_IN_MEMPOOL_TIMEOUT=
 TX_NUM_CONFIRMATIONS=
 # Frequency to poll for receipts
 TX_RECEIPT_QUERY_INTERVAL=
-# Duration we will wait before resubmitting a transaction to L1
+# Duration we will wait before resubmitting a transaction to L1. Ex: 2s for 2 seconds
 TX_RESUBMISSION=
 # Number of ErrNonceTooLow observations required to give up on a tx at a particular nonce without receiving confirmation
 TX_SAFE_ABORT_NONCE_TOO_LOW=
diff --git a/.env.sample.hekla b/.env.sample.hekla
index 3f17574..8b3a483 100644
--- a/.env.sample.hekla
+++ b/.env.sample.hekla
@@ -54,7 +54,7 @@ PROVE_UNASSIGNED_BLOCKS=false
 # 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.
+# We recommend that this value is set no greater than 45min, default is 30min. Ex: 30m0s
 FORCE_BATCH_PROVING_INTERVAL=
 
 # If you want to be a proposer who proposes L2 execution engine's transactions in mempool to Taiko L1 protocol
@@ -98,7 +98,7 @@ TX_NOT_IN_MEMPOOL_TIMEOUT=
 TX_NUM_CONFIRMATIONS=
 # Frequency to poll for receipts
 TX_RECEIPT_QUERY_INTERVAL=
-# Duration we will wait before resubmitting a transaction to L1
+# Duration we will wait before resubmitting a transaction to L1. Ex: 2s for 2 seconds
 TX_RESUBMISSION=
 # Number of ErrNonceTooLow observations required to give up on a tx at a particular nonce without receiving confirmation
 TX_SAFE_ABORT_NONCE_TOO_LOW=
diff --git a/script/start-proposer-hekla.sh b/script/start-proposer-hekla.sh
index efaec41..5e77c86 100755
--- a/script/start-proposer-hekla.sh
+++ b/script/start-proposer-hekla.sh
@@ -69,8 +69,8 @@ if [ "$ENABLE_PROPOSER" = "true" ]; then
         ARGS="${ARGS} --tx.minTipCap ${TX_MIN_TIP_CAP}"
     fi
 
-    if [ -n "$TX_NOT_IN_MEMPOOL" ]; then
-        ARGS="${ARGS} --tx.notInMempoolTimeout ${TX_NOT_IN_MEMPOOL}"
+    if [ -n "$TX_NOT_IN_MEMPOOL_TIMEOUT" ]; then
+        ARGS="${ARGS} --tx.notInMempoolTimeout ${TX_NOT_IN_MEMPOOL_TIMEOUT}"
     fi
 
     if [ -n "$TX_NUM_CONFIRMATIONS" ]; then
diff --git a/script/start-proposer.sh b/script/start-proposer.sh
index fc5f1fd..98f6af8 100755
--- a/script/start-proposer.sh
+++ b/script/start-proposer.sh
@@ -61,16 +61,16 @@ if [ "$ENABLE_PROPOSER" = "true" ]; then
         ARGS="${ARGS} --tx.minTipCap ${TX_MIN_TIP_CAP}"
     fi
 
-    if [ -n "$TX_NOT_IN_MEMPOOL" ]; then
-        ARGS="${ARGS} --tx.notInMempoolTimeout ${TX_NOT_IN_MEMPOOL}"
+    if [ -n "$TX_NOT_IN_MEMPOOL_TIMEOUT" ]; then
+        ARGS="${ARGS} --tx.notInMempoolTimeout ${TX_NOT_IN_MEMPOOL_TIMEOUT}"
     fi
 
     if [ -n "$TX_NUM_CONFIRMATIONS" ]; then
         ARGS="${ARGS} --tx.numConfirmations ${TX_NUM_CONFIRMATIONS}"
     fi
 
-    if [ -n "$TX_RECEIPT_QUERY" ]; then
-        ARGS="${ARGS} --tx.receiptQueryInterval ${TX_RECEIPT_QUERY}"
+    if [ -n "$TX_RECEIPT_QUERY_INTERVAL" ]; then
+        ARGS="${ARGS} --tx.receiptQueryInterval ${TX_RECEIPT_QUERY_INTERVAL}"
     fi
 
     if [ -n "$TX_RESUBMISSION" ]; then
diff --git a/script/start-prover-relayer-hekla.sh b/script/start-prover-relayer-hekla.sh
index 4375cc7..6927f4c 100755
--- a/script/start-prover-relayer-hekla.sh
+++ b/script/start-prover-relayer-hekla.sh
@@ -67,16 +67,16 @@ if [ "$ENABLE_PROVER" = "true" ]; then
         ARGS="${ARGS} --tx.minTipCap ${TX_MIN_TIP_CAP}"
     fi
 
-    if [ -n "$TX_NOT_IN_MEMPOOL" ]; then
-        ARGS="${ARGS} --tx.notInMempoolTimeout ${TX_NOT_IN_MEMPOOL}"
+    if [ -n "$TX_NOT_IN_MEMPOOL_TIMEOUT" ]; then
+        ARGS="${ARGS} --tx.notInMempoolTimeout ${TX_NOT_IN_MEMPOOL_TIMEOUT}"
     fi
 
     if [ -n "$TX_NUM_CONFIRMATIONS" ]; then
         ARGS="${ARGS} --tx.numConfirmations ${TX_NUM_CONFIRMATIONS}"
     fi
 
-    if [ -n "$TX_RECEIPT_QUERY" ]; then
-        ARGS="${ARGS} --tx.receiptQueryInterval ${TX_RECEIPT_QUERY}"
+    if [ -n "$TX_RECEIPT_QUERY_INTERVAL" ]; then
+        ARGS="${ARGS} --tx.receiptQueryInterval ${TX_RECEIPT_QUERY_INTEERVAL}"
     fi
 
     if [ -n "$TX_RESUBMISSION" ]; then
diff --git a/script/start-prover-relayer.sh b/script/start-prover-relayer.sh
index 1591a21..79786fe 100755
--- a/script/start-prover-relayer.sh
+++ b/script/start-prover-relayer.sh
@@ -71,16 +71,16 @@ if [ "$ENABLE_PROVER" = "true" ]; then
         ARGS="${ARGS} --tx.minTipCap ${TX_MIN_TIP_CAP}"
     fi
 
-    if [ -n "$TX_NOT_IN_MEMPOOL" ]; then
-        ARGS="${ARGS} --tx.notInMempoolTimeout ${TX_NOT_IN_MEMPOOL}"
+    if [ -n "$TX_NOT_IN_MEMPOOL_TIMEOUT" ]; then
+        ARGS="${ARGS} --tx.notInMempoolTimeout ${TX_NOT_IN_MEMPOOL_TIMEOUT}"
     fi
 
     if [ -n "$TX_NUM_CONFIRMATIONS" ]; then
         ARGS="${ARGS} --tx.numConfirmations ${TX_NUM_CONFIRMATIONS}"
     fi
 
-    if [ -n "$TX_RECEIPT_QUERY" ]; then
-        ARGS="${ARGS} --tx.receiptQueryInterval ${TX_RECEIPT_QUERY}"
+    if [ -n "$TX_RECEIPT_QUERY_INTERVAL" ]; then
+        ARGS="${ARGS} --tx.receiptQueryInterval ${TX_RECEIPT_QUERY_INTERVAL}"
     fi
 
     if [ -n "$TX_RESUBMISSION" ]; then

From 6866bc6c60853e3da6dbf987ead0226cc06240d9 Mon Sep 17 00:00:00 2001
From: Kristian Ray <kristianrayfolmos@gmail.com>
Date: Tue, 21 Jan 2025 13:58:15 +0100
Subject: [PATCH 2/2] fixes

---
 script/start-proposer-hekla.sh       | 4 ++--
 script/start-prover-relayer-hekla.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/script/start-proposer-hekla.sh b/script/start-proposer-hekla.sh
index 5e77c86..aeb82ca 100755
--- a/script/start-proposer-hekla.sh
+++ b/script/start-proposer-hekla.sh
@@ -77,8 +77,8 @@ if [ "$ENABLE_PROPOSER" = "true" ]; then
         ARGS="${ARGS} --tx.numConfirmations ${TX_NUM_CONFIRMATIONS}"
     fi
 
-    if [ -n "$TX_RECEIPT_QUERY" ]; then
-        ARGS="${ARGS} --tx.receiptQueryInterval ${TX_RECEIPT_QUERY}"
+    if [ -n "$TX_RECEIPT_QUERY_INTERVAL" ]; then
+        ARGS="${ARGS} --tx.receiptQueryInterval ${TX_RECEIPT_QUERY_INTERVAL}"
     fi
 
     if [ -n "$TX_RESUBMISSION" ]; then
diff --git a/script/start-prover-relayer-hekla.sh b/script/start-prover-relayer-hekla.sh
index 6927f4c..90f38d1 100755
--- a/script/start-prover-relayer-hekla.sh
+++ b/script/start-prover-relayer-hekla.sh
@@ -76,7 +76,7 @@ if [ "$ENABLE_PROVER" = "true" ]; then
     fi
 
     if [ -n "$TX_RECEIPT_QUERY_INTERVAL" ]; then
-        ARGS="${ARGS} --tx.receiptQueryInterval ${TX_RECEIPT_QUERY_INTEERVAL}"
+        ARGS="${ARGS} --tx.receiptQueryInterval ${TX_RECEIPT_QUERY_INTERVAL}"
     fi
 
     if [ -n "$TX_RESUBMISSION" ]; then