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

Geth: Cherry pick emergency geth upgrade from release branch #1771 #1772

Merged
merged 5 commits into from
Feb 7, 2024

Conversation

BedrockSquirrel
Copy link
Collaborator

Why this change is needed

We need geth update to handle breaking change after sepolia fork #1771

PR checks pre-merging

Please indicate below by ticking the checkbox that you have read and performed the required
PR checks

  • PR checks reviewed and performed

Copy link

coderabbitai bot commented Feb 2, 2024

Walkthrough

The recent modifications streamline the interaction with Ethereum-like blockchains by adjusting how transactions and state tries are managed. Notably, the updates simplify the configuration of the trie database by removing cache settings and enhancing preimage handling. Additionally, transaction handling in the transaction pool and during batch processing is refined by using a more standardized transaction type. These changes collectively aim to improve performance and compatibility with the Ethereum ecosystem.

Changes

File Path Change Summary
.../l1_blockchain.go Modified to use trie.NewDatabase without cache configuration, adding Preimages configuration.
.../sequencer.go Updated to accept tx directly in AcceptTransaction, impacting transaction processing.
.../storage.go Removed Cache field initialization in trie.Config, affecting state database configuration.
.../txpool.go Imported types from Ethereum and modified Add method to use types.Transaction.

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.

Copy link
Collaborator

@tudor-malene tudor-malene left a comment

Choose a reason for hiding this comment

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

lgtm

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Review Status

Actionable comments generated: 0

Configuration used: CodeRabbit UI

Commits Files that changed from the base of the PR and between 22b397d and 3b47b61.
Files ignored due to path filters (2)
  • go.mod is excluded by: !**/*.mod
  • go.sum is excluded by: !**/*.sum
Files selected for processing (4)
  • go/enclave/l2chain/l1_blockchain.go (1 hunks)
  • go/enclave/nodetype/sequencer.go (1 hunks)
  • go/enclave/storage/storage.go (1 hunks)
  • go/enclave/txpool/txpool.go (2 hunks)
Additional comments: 4
go/enclave/txpool/txpool.go (1)
  • 69-69: The change to use types.Transaction from github.com/ethereum/go-ethereum/core/types in the Add method aligns with standardizing transaction types across the codebase. Ensure that all references and usages of gethtxpool.Transaction have been updated accordingly to prevent type mismatches.
go/enclave/l2chain/l1_blockchain.go (1)
  • 64-64: The modification to use trie.NewDatabase with the Preimages configuration in createTrie function is a significant change. Ensure that the removal of the Cache configuration parameter and the addition of Preimages is aligned with the intended database optimization and performance goals. It's crucial to verify that this change does not negatively impact the trie database's efficiency or functionality.
go/enclave/nodetype/sequencer.go (1)
  • 213-221: The update in the createNewHeadBatch method to directly accept tx in the AcceptTransaction method call simplifies transaction handling. This change should make the transaction processing more straightforward. However, ensure that this modification is thoroughly tested to confirm that it does not affect the accuracy or efficiency of transaction inclusion in new blocks.
go/enclave/storage/storage.go (1)
  • 94-99: > 📝 NOTE

This review was outside the diff hunks, and no overlapping diff hunk was found. Original lines [69-69]

The removal of the Cache field initialization in the trie.Config struct within the NewStorage function suggests a configuration change for the state database. While this could streamline the configuration, it's essential to evaluate the impact on database performance and memory usage. Ensure that this change is in line with the intended optimizations and does not adversely affect the system's overall performance.

@BedrockSquirrel BedrockSquirrel merged commit f8b3b76 into main Feb 7, 2024
2 checks passed
@BedrockSquirrel BedrockSquirrel deleted the matt/merge-pedro-geth-upgrade branch February 7, 2024 16:40
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.

3 participants