change l2watcher from w.GetBlockByNumberOrHash to BlockByNumber #1715

georgehao · 2025-07-31T10:15:49Z

Purpose or design rationale of this PR

Describe your change. Make sure to answer these three questions: What does this PR do? Why does it do it? How does it do it?

2025-07-31T09:53:10.044599405Z ERROR[07-31|09:53:10.044|scroll-tech/rollup/internal/controller/watcher/l2_watcher.go:79]       fail to getAndStoreBlockTraces           from=17,114,024 to=17,114,033 err="failed to GetBlockByNumberOrHash: Method not found. number: 17114024"

Since reth don't implement scroll_* api, so change getBlock method

PR title

Your PR title must follow conventional commits (as we are doing squash merge for each PR), so it must start with one of the following types:

build: Changes that affect the build system or external dependencies (example scopes: yarn, eslint, typescript)
ci: Changes to our CI configuration files and scripts (example scopes: vercel, github, cypress)
docs: Documentation-only changes
feat: A new feature
fix: A bug fix
perf: A code change that improves performance
refactor: A code change that doesn't fix a bug, or add a feature, or improves performance
style: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
test: Adding missing tests or correcting existing tests

Deployment tag versioning

Has tag in common/version.go been updated or have you added bump-version label to this PR?

No, this PR doesn't involve a new deployment, git tag, docker image tag
Yes

Breaking change label

Does this PR have the breaking-change label?

No, this PR is not a breaking change
Yes

Summary by CodeRabbit

Bug Fixes
- Improved block retrieval logic for more consistent performance during block synchronization.
Chores
- Updated version number to v4.5.37.

coderabbitai · 2025-07-31T10:15:55Z

Walkthrough

The version string in the codebase was incremented from "v4.5.36" to "v4.5.37". Additionally, the L2WatcherClient's block retrieval logic was updated to use the BlockByNumber method instead of GetBlockByNumberOrHash, with corresponding updates to error messages.

Changes

Cohort / File(s)	Change Summary
Version Bump `common/version/version.go`	Updated the version tag string from "v4.5.36" to "v4.5.37".
L2 Watcher Block Retrieval `rollup/internal/controller/watcher/l2_watcher.go`	Replaced `GetBlockByNumberOrHash` with `BlockByNumber` in `getAndStoreBlocks`; updated error message.

Sequence Diagram(s)

sequenceDiagram
    participant Client as L2WatcherClient
    participant Node as L2 Node

    loop For each block number
        Client->>Node: BlockByNumber(blockNum)
        Node-->>Client: Block data or error
        Client->>Client: Process block and store transactions
    end

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~6 minutes

Suggested labels

bump-version

Suggested reviewers

colinlyguo

Poem

A version hops from six to seven,
The watcher’s gaze now more in line,
Blocks by number, crisp and clever—
Code marches on, in perfect time.
With every change, a rabbit cheers,
For tidy code and bug-free years! 🐇✨

Note

⚡️ Unit Test Generation is now available in beta!

Learn more here, or try it out under "Finishing Touches" below.

📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between fc75299 and b992020.

📒 Files selected for processing (2)

common/version/version.go (1 hunks)
rollup/internal/controller/watcher/l2_watcher.go (1 hunks)

🧰 Additional context used

🧠 Learnings (1)

rollup/internal/controller/watcher/l2_watcher.go (1)

Learnt from: colinlyguo
PR: #1714
File: rollup/internal/controller/relayer/l2_relayer.go:1548-1555
Timestamp: 2025-07-29T16:38:24.647Z
Learning: In rollup/internal/controller/relayer/l2_relayer.go, the validateBatchFields function should error out when GetBatchByHash fails to find a parent batch. This is intentional behavior - missing parent batches represent genuine error conditions that should halt batch submission processing. Genesis batch handling occurs separately from normal batch validation flow.

⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (3)

GitHub Check: tests
GitHub Check: tests
GitHub Check: check

🔇 Additional comments (2)

common/version/version.go (1)

8-8: LGTM: Version bump aligns with the bug fix.

The patch version increment from v4.5.36 to v4.5.37 appropriately reflects the reth client compatibility fix implemented in this PR.

rollup/internal/controller/watcher/l2_watcher.go (1)

91-93: ✅ Compatibility update is consistent across the codebase.

All references to GetBlockByNumberOrHash have been removed and replaced with BlockByNumber, and no remaining usages of the old method were found. BlockByNumber is already used elsewhere (e.g. in proposer_tool.go, l2_watcher.go, and utils.go), confirming consistency.

No further changes required.

✨ Finishing Touches

📝 Generate Docstrings

🧪 Generate unit tests

Create PR with unit tests
Post copyable unit tests in a comment
Commit unit tests in branch feat/change_l2watcher_getBlock

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

Review comments: Directly reply to a review comment made by CodeRabbit. Example:
- I pushed a fix in commit <commit_id>, please review it.
- Explain this complex logic.
- Open a follow-up GitHub issue for this discussion.
Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
- @coderabbitai explain this code block.
- @coderabbitai modularize this function.
PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
- @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
- @coderabbitai read src/utils.ts and explain its main purpose.
- @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
- @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

@coderabbitai pause to pause the reviews on a PR.
@coderabbitai resume to resume the paused reviews.
@coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
@coderabbitai full review to do a full review from scratch and review all the files again.
@coderabbitai summary to regenerate the summary of the PR.
@coderabbitai generate docstrings to generate docstrings for this PR.
@coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
@coderabbitai generate unit tests to generate unit tests for this PR.
@coderabbitai resolve resolve all the CodeRabbit review comments.
@coderabbitai configuration to show the current CodeRabbit configuration for the repository.
@coderabbitai help to get help.

Other keywords and placeholders

Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (`.coderabbit.yaml`)

You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
Please see the configuration documentation for more information.
If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

Visit our Documentation for detailed information on how to use CodeRabbit.
Join our Discord Community to get help, request features, and share feedback.
Follow us on X/Twitter for updates and announcements.

codecov-commenter · 2025-07-31T10:27:04Z

Codecov Report

❌ Patch coverage is 0% with 2 lines in your changes missing coverage. Please review.
✅ Project coverage is 39.59%. Comparing base (fc75299) to head (b992020).

Files with missing lines	Patch %	Lines
rollup/internal/controller/watcher/l2_watcher.go	0.00%	2 Missing ⚠️

Additional details and impacted files

@@           Coverage Diff            @@
##           develop    #1715   +/-   ##
========================================
  Coverage    39.59%   39.59%           
========================================
  Files          237      237           
  Lines        19062    19062           
========================================
  Hits          7547     7547           
  Misses       10771    10771           
  Partials       744      744

Flag	Coverage Δ
rollup	`45.45% <0.00%> (ø)`

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

change l2watcher from w.GetBlockByNumberOrHash to BlockByNumber

b992020

georgehao requested a review from colinlyguo July 31, 2025 10:15

colinlyguo approved these changes Jul 31, 2025

View reviewed changes

yiweichi self-requested a review July 31, 2025 10:21

yiweichi approved these changes Jul 31, 2025

View reviewed changes

georgehao merged commit d21fa36 into develop Jul 31, 2025
6 checks passed

georgehao deleted the feat/change_l2watcher_getBlock branch July 31, 2025 10:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

change l2watcher from w.GetBlockByNumberOrHash to BlockByNumber #1715

change l2watcher from w.GetBlockByNumberOrHash to BlockByNumber #1715

Uh oh!

georgehao commented Jul 31, 2025 •

edited by coderabbitai bot

Loading

Uh oh!

coderabbitai bot commented Jul 31, 2025 •

edited

Loading

Chat

Support

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (`.coderabbit.yaml`)

Documentation and Community

Uh oh!

codecov-commenter commented Jul 31, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

change l2watcher from w.GetBlockByNumberOrHash to BlockByNumber #1715

change l2watcher from w.GetBlockByNumberOrHash to BlockByNumber #1715

Uh oh!

Conversation

georgehao commented Jul 31, 2025 • edited by coderabbitai bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Purpose or design rationale of this PR

PR title

Deployment tag versioning

Breaking change label

Summary by CodeRabbit

Uh oh!

coderabbitai bot commented Jul 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

Sequence Diagram(s)

Estimated code review effort

Suggested labels

Suggested reviewers

Poem

Chat

Support

CodeRabbit Commands (Invoked using PR comments)

Other keywords and placeholders

CodeRabbit Configuration File (.coderabbit.yaml)

Documentation and Community

Uh oh!

codecov-commenter commented Jul 31, 2025

Codecov Report

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

georgehao commented Jul 31, 2025 •

edited by coderabbitai bot

Loading

coderabbitai bot commented Jul 31, 2025 •

edited

Loading

CodeRabbit Configuration File (`.coderabbit.yaml`)