Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make txmgr aware of the txpool.ErrAlreadyReserved condition #9683

Conversation

roberto-bayardo
Copy link
Collaborator

@roberto-bayardo roberto-bayardo commented Feb 28, 2024

Description

With the introduction of blob transactions, the geth transaction pool will allow either a blob tx or a regular tx in the pool from a single account at any given time, but not both. This PR extends the txmgr so that it knows when it's trying to submit a transaction of incompatible type with some other pending transaction. Under this situation, it will immediately return ErrAlreadyReserved to the caller of Send(), making it the responsibility of the caller to determine how to best handle the stuck transaction.

Tests

Added unit test to confirm the AlreadyReserved error gets passed to the caller.

Additional context

Metadata

@roberto-bayardo roberto-bayardo marked this pull request as ready for review February 29, 2024 16:44
@roberto-bayardo roberto-bayardo requested a review from a team as a code owner February 29, 2024 16:44
Copy link
Contributor

coderabbitai bot commented Feb 29, 2024

Warning

Rate Limit Exceeded

@roberto-bayardo has exceeded the limit for the number of commits or files that can be reviewed per hour. Please wait 22 minutes and 56 seconds before requesting another review.

How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.
Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.
Please see our FAQ for further information.

Commits Files that changed from the base of the PR and between 3b5c2fc and 9760b48.

Walkthrough

The changes enhance the transaction manager (txmgr) in the operational service by introducing ErrAlreadyReserved error, updating error handling in various methods, adding logging and metrics for specific errors, tracking error status with a new field in the SendState struct, and including a test case for validating proper handling of the AlreadyReserved error.

Changes

Files Summary
op-service/txmgr/txmgr.go Introduced ErrAlreadyReserved, updated error handling in Send and sendTx methods, and added logging and metrics in publishTx.
op-service/txmgr/send_state.go Added alreadyReserved field and AlreadyReserved method in SendState to track and retrieve ErrAlreadyReserved status.
op-service/txmgr/txmgr_test.go Added TestAlreadyReserved to validate the handling of ErrAlreadyReserved during transaction sending.
op-service/txmgr/queue_test.go Reduced processing duration in the TestQueue_Send function from 3 seconds to 1 second.
op-service/txmgr/send_state_test.go Refactored package structure, updated declarations, and modified SendState struct and related functions for unqualified names within the package.

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

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>.
    • Generate unit-tests for this file.
  • 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 generate unit tests for this file.
    • @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 generate interesting stats about this repository from git and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit tests.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

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 as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • The JSON schema for the configuration file is available here.
  • 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/coderabbit-overrides.v2.json

CodeRabbit Discord Community

Join our Discord Community to get help, request features, and share feedback.

op-service/txmgr/send_state.go Outdated Show resolved Hide resolved
op-service/txmgr/txmgr.go Outdated Show resolved Hide resolved
@roberto-bayardo roberto-bayardo force-pushed the handle-already-reserved-error branch 3 times, most recently from 80fec72 to 53c390c Compare March 1, 2024 18:53
Copy link
Member

@sebastianst sebastianst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM ✨

@sebastianst sebastianst added this pull request to the merge queue Mar 1, 2024
Merged via the queue into ethereum-optimism:develop with commit ee21678 Mar 1, 2024
69 checks passed
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.

None yet

2 participants