From c009e550a16778f1d6ef205ab384e672e7b1d58f Mon Sep 17 00:00:00 2001
From: David <david@taiko.xyz>
Date: Thu, 19 Oct 2023 13:16:57 +0800
Subject: [PATCH 1/3] feat(prover): increase the assignment expiration waiting
 time

---
 .github/workflows/docker.yml           |  2 +-
 driver/chain_syncer/calldata/syncer.go |  8 ++++----
 prover/prover.go                       | 13 +++++++------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 1b1491c56..63c9ee00e 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -2,7 +2,7 @@ name: "Push docker image to GCR"
 
 on:
   push:
-    branches: [main]
+    branches: [main,update-expired-time]
     tags:
       - "v*"
 
diff --git a/driver/chain_syncer/calldata/syncer.go b/driver/chain_syncer/calldata/syncer.go
index 33a2c60c7..592865932 100644
--- a/driver/chain_syncer/calldata/syncer.go
+++ b/driver/chain_syncer/calldata/syncer.go
@@ -199,10 +199,10 @@ func (s *Syncer) onBlockProposed(
 
 	log.Info(
 		"New BlockProposed event",
-		"L1Height", event.Raw.BlockNumber,
-		"L1Hash", event.Raw.BlockHash,
-		"BlockID", event.BlockId,
-		"Removed", event.Raw.Removed,
+		"l1Height", event.Raw.BlockNumber,
+		"l1Hash", event.Raw.BlockHash,
+		"blockID", event.BlockId,
+		"removed", event.Raw.Removed,
 	)
 
 	// Fetch the L2 parent block.
diff --git a/prover/prover.go b/prover/prover.go
index 14552de0f..6ab60bef7 100644
--- a/prover/prover.go
+++ b/prover/prover.go
@@ -436,10 +436,10 @@ func (p *Prover) onBlockProposed(
 
 	log.Info(
 		"Proposed block",
-		"L1Height", event.Raw.BlockNumber,
-		"L1Hash", event.Raw.BlockHash,
-		"BlockID", event.BlockId,
-		"Removed", event.Raw.Removed,
+		"l1Height", event.Raw.BlockNumber,
+		"l1Hash", event.Raw.BlockHash,
+		"blockID", event.BlockId,
+		"removed", event.Raw.Removed,
 	)
 	metrics.ProverReceivedProposedBlockGauge.Update(event.BlockId.Int64())
 
@@ -531,8 +531,9 @@ func (p *Prover) onBlockProposed(
 				)
 
 				if p.cfg.ProveUnassignedBlocks {
-					log.Info("Add proposed block to wait for proof window expiration", "blockID", event.BlockId)
-					time.AfterFunc(timeToExpire, func() { p.proofWindowExpiredCh <- event })
+					log.Info(
+						"Add proposed block to wait for proof window expiration", "blockID", event.BlockId)
+					time.AfterFunc(timeToExpire+12*time.Second, func() { p.proofWindowExpiredCh <- event })
 				}
 
 				return nil

From 88548c515b6cd468a3fa428ec5663c6132e38958 Mon Sep 17 00:00:00 2001
From: David <david@taiko.xyz>
Date: Thu, 19 Oct 2023 13:29:53 +0800
Subject: [PATCH 2/3] feat: update logs

---
 .github/workflows/docker.yml | 2 +-
 prover/prover.go             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 63c9ee00e..1b1491c56 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -2,7 +2,7 @@ name: "Push docker image to GCR"
 
 on:
   push:
-    branches: [main,update-expired-time]
+    branches: [main]
     tags:
       - "v*"
 
diff --git a/prover/prover.go b/prover/prover.go
index 6ab60bef7..2323ac3c4 100644
--- a/prover/prover.go
+++ b/prover/prover.go
@@ -424,7 +424,7 @@ func (p *Prover) onBlockProposed(
 			"L1 block hash mismatch due to L1 reorg",
 			"height", event.Meta.L1Height,
 			"currentL1OriginHeader", currentL1OriginHeader.Hash(),
-			"L1HashInEvent", event.Meta.L1Hash,
+			"l1HashInEvent", event.Meta.L1Hash,
 		)
 
 		return fmt.Errorf(

From 183078c4607928dd919a205fd4706526acdec969 Mon Sep 17 00:00:00 2001
From: David <david@taiko.xyz>
Date: Thu, 19 Oct 2023 13:32:40 +0800
Subject: [PATCH 3/3] feat: update comments

---
 prover/prover.go | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/prover/prover.go b/prover/prover.go
index 2323ac3c4..2ecf354ee 100644
--- a/prover/prover.go
+++ b/prover/prover.go
@@ -532,8 +532,14 @@ func (p *Prover) onBlockProposed(
 
 				if p.cfg.ProveUnassignedBlocks {
 					log.Info(
-						"Add proposed block to wait for proof window expiration", "blockID", event.BlockId)
-					time.AfterFunc(timeToExpire+12*time.Second, func() { p.proofWindowExpiredCh <- event })
+						"Add proposed block to wait for proof window expiration",
+						"blockID", event.BlockId,
+					)
+					time.AfterFunc(
+						// Add another 12 seconds, to ensure one more L1 block will be mined before the proof submission
+						timeToExpire+12*time.Second,
+						func() { p.proofWindowExpiredCh <- event },
+					)
 				}
 
 				return nil