Skip to content

Update master to consensus-v50-rc.6#40

Draft
AnkushinDaniil wants to merge 8 commits intomasterfrom
update-master-to-v50-rc.6
Draft

Update master to consensus-v50-rc.6#40
AnkushinDaniil wants to merge 8 commits intomasterfrom
update-master-to-v50-rc.6

Conversation

@AnkushinDaniil
Copy link
Copy Markdown
Collaborator

Update Master Branch to consensus-v50-rc.6

Overview

Clean update of the master branch from v3.7.2 to consensus-v50-rc.6 with minimal changes.

Changes

  • ✅ Merged consensus-v50-rc.6 (428 commits, 479 files changed)
  • ✅ Updated submodules:
    • go-ethereum: → 57fe4b732 (consensus-v50 compatible)
    • nitro-testnode: → 88aa1f4ee
  • ✅ Resolved 2 merge conflicts (Dockerfile, cmd/nitro/init.go)
  • ✅ Build verification: ✅ Successful

Merge Strategy

  • Accepted upstream changes for all conflicts
  • Preserved existing GitHub Actions workflow (1 commit ahead)
  • Minimal divergence from upstream

Key Features in consensus-v50-rc.6

  • ArbOS 50: Multi-constraint gas pricing
  • New EIPs: 2537 (BLS12-381), 7825, 7910, 7883, 7823
  • BOLD Protocol: Enhanced challenge system
  • ReferenceDA: Full implementation
  • Multi-dimensional gas tracking

Build Status

✅ All packages compile successfully
✅ Solgen bindings generated
✅ No compilation errors (only macOS linker warnings - non-fatal)

Testing

  • Builds without errors
  • Integration tests (post-merge)

Risk Assessment

Low Risk: Master branch had minimal customization (1 commit ahead of v3.7.2), making this a straightforward upstream sync with only 2 trivial conflicts.

Rollback Plan

Backup branch: backup-master-pre-v50

References

  • Upstream tag: consensus-v50-rc.6 (commit: 475b033)
  • Previous version: v3.7.2

🤖 Generated with Claude Code

gligneul and others added 8 commits August 27, 2025 09:08
…ize-multigas-3.7.0-backport

Improve CPU performance when processing blocks
Also removed deprecated v42-rc.1 since no one should ever use it
…ckport

backport adding consensus v41 to Dockerfile
…3596)

* Test Genesis assertion on nitro init

* revert go.mod changes
- go-ethereum: → 57fe4b732
- nitro-testnode: → 88aa1f4ee
Minimal merge with only 2 conflicts resolved by accepting upstream changes.
@AnkushinDaniil AnkushinDaniil marked this pull request as draft November 3, 2025 11:16
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.

4 participants