Skip to content

Conversation

@lucca30
Copy link
Contributor

@lucca30 lucca30 commented Feb 3, 2025

Description

Usptream merge from Geth.

Releases Included: Aegis (v1.14.9) and Kopis (v1.14.10)

Points of attention:

  • core/blockchain.go is a critical file in this upmerge. There was a lot of changes on it. So reviewer, please double check on this
  • PR 29179
    • This one I reverted since it removes forkChoicer which is an essential part of bor
  • PR 30125
    • This one I reverted since it fixes a scenario for blob transactions (not supported by us) but also break some of our tests
  • Some eth/catalyst tests were also skipped following the behaviour we already did on past upstream merges

Changes

  • Bugfix (non-breaking change that solves an issue)
  • Hotfix (change that solves an urgent issue, and requires immediate attention)
  • New feature (non-breaking change that adds functionality)
  • Breaking change (change that is not backwards-compatible and/or changes current functionality)
  • Changes only for a subset of nodes

Checklist

  • I have added at least 2 reviewer or the whole pos-v1 team
  • I have added sufficient documentation in code
  • I will be resolving comments - if any - by pushing each fix in a separate commit and linking the commit hash in the comment reply
  • Created a task in Jira and informed the team for implementation in Erigon client (if applicable)
  • Includes RPC methods changes, and the Notion documentation has been updated

Cross repository changes

  • This PR requires changes to heimdall
    • In case link the PR here:
  • This PR requires changes to matic-cli
    • In case link the PR here:

Testing

  • I have added unit tests
  • I have added tests to CI
  • I have tested this code manually on local environment
  • I have tested this code manually on remote devnet using express-cli
  • I have tested this code manually on mumbai/amoy
  • I have created new e2e tests into express-cli

@lucca30 lucca30 requested a review from a team February 3, 2025 18:32
@lucca30 lucca30 changed the base branch from develop to upstream_merge_v1.14.8 February 4, 2025 06:06
@lucca30 lucca30 closed this Feb 4, 2025
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.

2 participants