From 036f8e643b09c0125a7cf4a0da265463289596df Mon Sep 17 00:00:00 2001
From: David <david@taiko.xyz>
Date: Fri, 12 Apr 2024 11:52:07 +0800
Subject: [PATCH] feat(rpc): improve `L2ParentByBlockID` (#715)

---
 pkg/rpc/methods.go | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/pkg/rpc/methods.go b/pkg/rpc/methods.go
index 627fcba0f..74a986b45 100644
--- a/pkg/rpc/methods.go
+++ b/pkg/rpc/methods.go
@@ -167,7 +167,10 @@ func (c *Client) L2ParentByBlockID(ctx context.Context, blockID *big.Int) (*type
 	ctxWithTimeout, cancel := ctxWithTimeoutOrDefault(ctx, defaultTimeout)
 	defer cancel()
 
-	parentBlockID := new(big.Int).Sub(blockID, common.Big1)
+	var (
+		parentHash    common.Hash
+		parentBlockID = new(big.Int).Sub(blockID, common.Big1)
+	)
 
 	log.Debug("Get parent block by block ID", "parentBlockID", parentBlockID)
 
@@ -177,12 +180,27 @@ func (c *Client) L2ParentByBlockID(ctx context.Context, blockID *big.Int) (*type
 
 	l1Origin, err := c.L2.L1OriginByID(ctxWithTimeout, parentBlockID)
 	if err != nil {
-		return nil, err
+		if err.Error() != ethereum.NotFound.Error() {
+			return nil, err
+		}
+
+		// In some cases, the L1Origin data is not found in the L2 execution engine, we will try to fetch the parent
+		// by the parent block ID.
+		log.Warn("L1Origin not found, try to fetch parent by ID", "blockID", parentBlockID)
+
+		parent, err := c.L2.BlockByNumber(ctxWithTimeout, parentBlockID)
+		if err != nil {
+			return nil, err
+		}
+
+		parentHash = parent.Hash()
+	} else {
+		parentHash = l1Origin.L2BlockHash
 	}
 
 	log.Debug("Parent block L1 origin", "l1Origin", l1Origin, "parentBlockID", parentBlockID)
 
-	return c.L2.HeaderByHash(ctxWithTimeout, l1Origin.L2BlockHash)
+	return c.L2.HeaderByHash(ctxWithTimeout, parentHash)
 }
 
 // WaitL1Origin keeps waiting until the L1Origin with given block ID appears on the L2 execution engine.