fix(taiko-client): use correct value for LastBlockIDByBatchID (#21121)

Author: MatusKysel

go.mod

@@ -308,7 +308,7 @@ require (
 	lukechampine.com/blake3 v1.3.0 // indirect
 )
 
-replace github.com/ethereum/go-ethereum v1.15.5 => github.com/taikoxyz/taiko-geth v1.18.1-0.20260103011117-9602a0aa8936
+replace github.com/ethereum/go-ethereum v1.15.5 => github.com/taikoxyz/taiko-geth v1.18.1-0.20260107095638-6c3d362e5c02
 
 replace github.com/ethereum-optimism/optimism v1.7.4 => github.com/taikoxyz/optimism v0.0.0-20251229030244-37aa83d15a8f
 

go.sum

@@ -873,8 +873,8 @@ github.com/taikoxyz/hive v0.0.0-20240827015317-405b241dd082 h1:ymZR+Y88LOnA8i3Ke
 github.com/taikoxyz/hive v0.0.0-20240827015317-405b241dd082/go.mod h1:RHnIu3EFehrWX3JhFAMQSXD5uz7l0xaNroTzXrap7EQ=
 github.com/taikoxyz/optimism v0.0.0-20251229030244-37aa83d15a8f h1:7lZFtV7wip0wmcTquvmtSH5LRp1djzSiDkOeGpIuEN4=
 github.com/taikoxyz/optimism v0.0.0-20251229030244-37aa83d15a8f/go.mod h1:V0VCkKtCzuaJH6qcL75SRcbdlakM9LhurMEJUhO6VXA=
-github.com/taikoxyz/taiko-geth v1.18.1-0.20260103011117-9602a0aa8936 h1:zGuxCtdtHAIoIv7eNTAB9DedsruELa+DSq1sveLTEwc=
-github.com/taikoxyz/taiko-geth v1.18.1-0.20260103011117-9602a0aa8936/go.mod h1:1LG2LnMOx2yPRHR/S+xuipXH29vPr6BIH6GElD8N/fo=
+github.com/taikoxyz/taiko-geth v1.18.1-0.20260107095638-6c3d362e5c02 h1:IEOZjDg1zoUsbvZQ8C5GvicLcO3Bwwtojtvy0TQBxZE=
+github.com/taikoxyz/taiko-geth v1.18.1-0.20260107095638-6c3d362e5c02/go.mod h1:1LG2LnMOx2yPRHR/S+xuipXH29vPr6BIH6GElD8N/fo=
 github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
 github.com/testcontainers/testcontainers-go v0.40.0 h1:pSdJYLOVgLE8YdUY2FHQ1Fxu+aMnb6JfVz1mxk7OeMU=
 github.com/testcontainers/testcontainers-go v0.40.0/go.mod h1:FSXV5KQtX2HAMlm7U3APNyLkkap35zNLxukw9oBi/MY=

packages/eventindexer/pkg/http/server.go

@@ -123,6 +123,8 @@ func LogSkipper(c echo.Context) bool {
 func (srv *Server) configureMiddleware(corsOrigins []string) {
 	srv.echo.Use(middleware.RequestID())
 
+	// nolint:staticcheck
+	// Keep legacy logger format for now to avoid changing log consumers.
 	srv.echo.Use(middleware.LoggerWithConfig(middleware.LoggerConfig{
 		Skipper: LogSkipper,
 		Format: `{"time":"${time_rfc3339_nano}","level":"INFO","message":{"id":"${id}","remote_ip":"${remote_ip}",` + //nolint:lll

packages/relayer/pkg/http/server.go

@@ -163,6 +163,8 @@ func LogSkipper(c echo.Context) bool {
 func (srv *Server) configureMiddleware(corsOrigins []string) {
 	srv.echo.Use(middleware.RequestID())
 
+	// nolint:staticcheck
+	// Keep legacy logger format for now to avoid changing log consumers.
 	srv.echo.Use(middleware.LoggerWithConfig(middleware.LoggerConfig{
 		Skipper: LogSkipper,
 		Format: `{"time":"${time_rfc3339_nano}","level":"INFO","message":{"id":"${id}","remote_ip":"${remote_ip}",` + //nolint:lll

packages/taiko-client/driver/chain_syncer/event/blocks_inserter/shasta.go

@@ -94,8 +94,8 @@ func (i *Shasta) InsertBlocksWithManifest(
 	if coreState.LastFinalizedProposalId.Cmp(meta.GetEventData().Id) >= 0 {
 		blockID, err := i.rpc.L2.LastBlockIDByBatchID(ctx, coreState.LastFinalizedProposalId)
 		if err == nil {
-			if lastFinalizedHeader, err = i.rpc.L2.HeaderByNumber(ctx, blockID); err != nil {
-				return nil, fmt.Errorf("failed to fetch last finalized block header (%d): %w", blockID, err)
+			if lastFinalizedHeader, err = i.rpc.L2.HeaderByNumber(ctx, blockID.ToInt()); err != nil {
+				return nil, fmt.Errorf("failed to fetch last finalized block header (%d): %w", blockID.ToInt(), err)
 			}
 		} else {
 			log.Warn(

packages/taiko-client/driver/preconf_blocks/server.go

@@ -1185,7 +1185,7 @@ func (s *PreconfBlockAPIServer) handleShastaProposalReorg(ctx context.Context, l
 			header.Time,
 		),
 		PreconfChainReorged: true,
-		LastBlockID:         blockID.Uint64(),
+		LastBlockID:         blockID.ToInt().Uint64(),
 	})
 }
 

packages/taiko-client/pkg/rpc/methods.go

@@ -1520,9 +1520,9 @@ func (c *Client) GetProposalByIDShasta(
 		return nil, nil, fmt.Errorf("failed to get last block ID by batch ID %d: %w", proposalID, err)
 	}
 
-	block, err := c.L2.BlockByNumber(ctxWithTimeout, blockID)
+	block, err := c.L2.BlockByNumber(ctxWithTimeout, blockID.ToInt())
 	if err != nil {
-		return nil, nil, fmt.Errorf("failed to get L2 block by ID %d: %w", blockID, err)
+		return nil, nil, fmt.Errorf("failed to get L2 block by ID %d: %w", blockID.ToInt(), err)
 	}
 
 	_, anchorNumber, _, err := c.GetSyncedL1SnippetFromAnchor(block.Transactions()[0])