From 36a22083e16bfec9cf5483fbc055a8d7865e7a95 Mon Sep 17 00:00:00 2001
From: David <david@taiko.xyz>
Date: Fri, 12 Apr 2024 11:14:22 +0800
Subject: [PATCH 1/2] feat(rpc): improve `L2ParentByBlockID`

---
 .github/workflows/docker.yml |  2 +-
 pkg/rpc/methods.go           | 24 +++++++++++++++++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 1b1491c56..c553733dc 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-L2ParentByBlockID]
     tags:
       - "v*"
 
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.

From f234bb4e83779be02a11ba5580bae12fbb999842 Mon Sep 17 00:00:00 2001
From: David <david@taiko.xyz>
Date: Fri, 12 Apr 2024 11:14:27 +0800
Subject: [PATCH 2/2] feat(rpc): improve `L2ParentByBlockID`

---
 .github/workflows/docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index c553733dc..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-L2ParentByBlockID]
+    branches: [main]
     tags:
       - "v*"