Skip to content

Conversation

@colinlyguo
Copy link
Contributor

@colinlyguo colinlyguo commented Jun 5, 2025

Purpose or design rationale of this PR

The following error will occur if commitGenesisBatch or other db updates fail; this PR aims to address this issue.

CRIT [06-05|12:04:16.787|scroll-tech/rollup/cmd/rollup_relayer/app/app.go:102]             failed to create l2 relayer              config file=/rollup-relayer/config.json error="failed to initialize and commit genesis batch, err: update genesis transaction failed: failed to insert genesis block: L2Block.InsertL2Blocks error: ERROR: duplicate key value violates unique constraint \"l2_block_hash_uindex\" (SQLSTATE 23505)"

The root cause of this specific issue (to open this PR) is due to not updating the submodule commit:

CRIT [06-05|13:38:04.896|scroll-tech/rollup/cmd/rollup_relayer/app/app.go:102]             failed to create l2 relayer              config file=/rollup-relayer/config.json error="failed to initialize and commit genesis batch, err: update genesis transaction failed: failed to insert batch: Batch.InsertBatch error: ERROR: column \"challenge_digest\" of relation \"batch\" does not exist (SQLSTATE 42703)"

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:

  • fix: A bug fix

Deployment tag versioning

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

  • Yes

Breaking change label

Does this PR have the breaking-change label?

  • No, this PR is not a breaking change

Summary by CodeRabbit

  • Chores

    • Updated version number to v4.5.21.
  • Refactor

    • Improved database transaction handling for inserting L2 blocks, ensuring more consistent operations within transaction contexts. No user-facing functionality has changed.

@coderabbitai
Copy link

coderabbitai bot commented Jun 5, 2025

Walkthrough

This update modifies the version string in the codebase and enhances the InsertL2Blocks method to support an optional database transaction parameter. The method is now invoked with the transaction object in the relayer, ensuring L2 block insertions occur within the correct transaction context.

Changes

File(s) Change Summary
common/version/version.go Updated the version tag from "v4.5.20" to "v4.5.21".
rollup/internal/orm/l2_block.go Modified InsertL2Blocks to accept an optional *gorm.DB transaction parameter and use it if provided.
rollup/internal/controller/relayer/l2_relayer.go Updated call to InsertL2Blocks to pass the current transaction object (dbTX) as an argument.

Sequence Diagram(s)

sequenceDiagram
    participant Relayer
    participant ORM
    participant DB

    Relayer->>ORM: InsertL2Blocks(ctx, blocks, dbTX)
    ORM->>DB: Use dbTX if provided, else use default DB
    ORM->>DB: Insert L2 blocks within transaction context
Loading

Possibly related PRs

Suggested labels

bump-version

Suggested reviewers

  • georgehao
  • 0xmountaintop

Poem

A hop, a skip, a version bump,
New blocks now land with a transactional thump.
With context in hand and a DB in tow,
The relayer ensures data’s ready to flow.
v4.5.21 is here, let’s cheer—
More robust and tidy, from front to rear! 🐇✨

Warning

There were issues while running some tools. Please review the errors and either fix the tool's configuration or disable the tool if it's a critical failure.

🔧 golangci-lint (1.64.8)

level=warning msg="[runner] Can't run linter goanalysis_metalinter: buildir: failed to load package zstd: could not load export data: no export data for "github.com/scroll-tech/da-codec/encoding/zstd""
level=error msg="Running error: can't run linter goanalysis_metalinter\nbuildir: failed to load package zstd: could not load export data: no export data for "github.com/scroll-tech/da-codec/encoding/zstd""


📜 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 5204ad5 and 5cfdf9e.

📒 Files selected for processing (3)
  • common/version/version.go (1 hunks)
  • rollup/internal/controller/relayer/l2_relayer.go (1 hunks)
  • rollup/internal/orm/l2_block.go (2 hunks)
🧰 Additional context used
🧬 Code Graph Analysis (1)
rollup/internal/orm/l2_block.go (1)
coordinator/internal/orm/l2_block.go (2)
  • L2Block (17-40)
  • L2Block (48-50)
⏰ Context from checks skipped due to timeout of 90000ms (3)
  • GitHub Check: tests
  • GitHub Check: tests
  • GitHub Check: check
🔇 Additional comments (4)
common/version/version.go (1)

8-8: LGTM: Version bump appropriately reflects the transaction support changes.

The version increment from "v4.5.20" to "v4.5.21" correctly marks this as a patch release containing the database transaction fixes.

rollup/internal/controller/relayer/l2_relayer.go (1)

223-223: Excellent fix: Transaction support properly implemented for genesis block insertion.

The addition of dbTX parameter ensures that L2 block insertion occurs within the same database transaction as other genesis operations, directly addressing the SQLSTATE 23505 duplicate key violation mentioned in the PR objectives. This atomicity prevents partial state corruption that could cause failures on retry attempts.

rollup/internal/orm/l2_block.go (2)

176-176: Well-designed API enhancement: Optional transaction parameter maintains backward compatibility.

The variadic parameter approach elegantly adds transaction support while preserving backward compatibility for existing callers.


206-210: Solid implementation: Transaction handling follows established patterns.

The conditional database assignment logic is clean and consistent with the existing UpdateChunkHashInRange method pattern in this file. This ensures that L2 block insertions can participate in broader database transactions, directly addressing the duplicate key violation issue described in the PR objectives.

✨ Finishing Touches
  • 📝 Generate Docstrings

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 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
Copy link

Codecov Report

Attention: Patch coverage is 42.85714% with 4 lines in your changes missing coverage. Please review.

Project coverage is 40.86%. Comparing base (5204ad5) to head (5cfdf9e).

Files with missing lines Patch % Lines
rollup/internal/orm/l2_block.go 50.00% 2 Missing and 1 partial ⚠️
rollup/internal/controller/relayer/l2_relayer.go 0.00% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #1674      +/-   ##
===========================================
- Coverage    40.87%   40.86%   -0.01%     
===========================================
  Files          225      225              
  Lines        18071    18075       +4     
===========================================
+ Hits          7386     7387       +1     
- Misses        9968     9970       +2     
- Partials       717      718       +1     
Flag Coverage Δ
rollup 49.80% <42.85%> (-0.03%) ⬇️

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.

@jonastheis jonastheis merged commit 82fb15d into develop Jun 5, 2025
6 checks passed
@jonastheis jonastheis deleted the fix-add-transaction-support-to-insert-l2-blocks branch June 5, 2025 13:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants