From 1db457afc536158728fc84e64c2ae3efd1d2ece7 Mon Sep 17 00:00:00 2001
From: Jeffery Walsh <cyberhorsey@gmail.com>
Date: Fri, 1 Dec 2023 13:22:50 -0800
Subject: [PATCH 1/2] guardian prover api fix

---
 prover/prover.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prover/prover.go b/prover/prover.go
index 7a69d51dd..3e49317e8 100644
--- a/prover/prover.go
+++ b/prover/prover.go
@@ -229,7 +229,7 @@ func InitFromConfig(ctx context.Context, p *Prover, cfg *Config) (err error) {
 	// levelDB
 	var db ethdb.KeyValueStore
 	if cfg.DatabasePath != "" {
-		db, err := leveldb.New(cfg.DatabasePath, int(cfg.DatabaseCacheSize), 1, "taiko", false)
+		db, err = leveldb.New(cfg.DatabasePath, int(cfg.DatabaseCacheSize), 1, "taiko", false)
 		if err != nil {
 			return err
 		}

From f5327b86fe2299452cef0459e14a3933c470c61f Mon Sep 17 00:00:00 2001
From: Jeffery Walsh <cyberhorsey@gmail.com>
Date: Fri, 1 Dec 2023 23:28:29 -0800
Subject: [PATCH 2/2] wait for latest block to exist in chain head before
 trying to get hash

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

diff --git a/prover/prover.go b/prover/prover.go
index 3e49317e8..2bbedd9b6 100644
--- a/prover/prover.go
+++ b/prover/prover.go
@@ -425,8 +425,7 @@ func (p *Prover) Close(ctx context.Context) {
 	p.wg.Wait()
 }
 
-// proveOp performs a proving operation, find current unproven blocks, then
-// request generating proofs for them.
+// proveOp iterates through BlockProposed events
 func (p *Prover) proveOp() error {
 	firstTry := true
 
@@ -459,6 +458,16 @@ func (p *Prover) onBlockProposed(
 	event *bindings.TaikoL1ClientBlockProposed,
 	end eventIterator.EndBlockProposedEventIterFunc,
 ) error {
+	// if we are operating as a guardian prover,
+	// we should sign all seen proposed blocks as soon as possible.
+	go func() {
+		if p.IsGuardianProver() {
+			if err := p.signBlock(ctx, event.BlockId); err != nil {
+				log.Error("guardian prover unable to sign block", "blockID", event.BlockId)
+			}
+		}
+	}()
+
 	// If there are newly generated proofs, we need to submit them as soon as possible.
 	if len(p.proofGenerationCh) > 0 {
 		log.Info("onBlockProposed early return", "proofGenerationChannelLength", len(p.proofGenerationCh))
@@ -546,14 +555,6 @@ func (p *Prover) onBlockProposed(
 	)
 	metrics.ProverReceivedProposedBlockGauge.Update(event.BlockId.Int64())
 
-	// guardian prover must sign each new block and store in database, to be exposed
-	// via API for liveness checks.
-	if p.IsGuardianProver() {
-		if err := p.signBlock(ctx, event.BlockId); err != nil {
-			return fmt.Errorf("failed to sign block data (eventID %d): %w", event.BlockId, err)
-		}
-	}
-
 	handleBlockProposedEvent := func() error {
 		defer func() { <-p.proposeConcurrencyGuard }()
 
@@ -1262,6 +1263,34 @@ func (p *Prover) signBlock(ctx context.Context, blockID *big.Int) error {
 
 	log.Info("guardian prover signing block", "blockID", blockID.Uint64())
 
+	exists, err := p.db.Has(db.BuildBlockKey(blockID.String()))
+	if err != nil {
+		return err
+	}
+
+	if exists {
+		log.Info("guardian prover already signed block", "blockID", blockID.Uint64())
+		return nil
+	}
+
+	latest, err := p.rpc.L2.BlockByNumber(ctx, nil)
+	if err != nil {
+		return err
+	}
+
+	for latest.Number().Uint64() < blockID.Uint64() {
+		log.Info("guardian prover block signing waiting for chain",
+			"latestBlock", latest.Number().Uint64(),
+			"eventBlockID", blockID.Uint64(),
+		)
+		time.Sleep(6 * time.Second)
+	}
+
+	log.Info("guardian prover block signing caught up",
+		"latestBlock", latest.Number().Uint64(),
+		"eventBlockID", blockID.Uint64(),
+	)
+
 	block, err := p.rpc.L2.BlockByNumber(ctx, blockID)
 	if err != nil {
 		return err