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.

Sign up for GitHub

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

Jump to bottom

Merge v1.13.6 #2237

Merged
merged 8 commits into from
Apr 27, 2024
Merged

Merge v1.13.6 #2237

merged 8 commits into from
Apr 27, 2024

Conversation

ganeshvanahalli
Copy link
Contributor

Pulls in geth fork with v1.13.6 merged in from upstream.

  • estimateGas now runs faster but gives estimation with 1.5% of error-margin, nitro tests are updated to handle this change
  • Logging was refactored to work with geth’s change to use slog instead of a fork of log15

geth PR: OffchainLabs/go-ethereum#304
Resolves NIT-2394

@cla-bot cla-bot bot added the s Automatically added by the CLA bot if the creator of a PR is registered as having signed the CLA. label Apr 18, 2024
@ganeshvanahalli ganeshvanahalli marked this pull request as ready for review April 18, 2024 21:55
@ganeshvanahalli ganeshvanahalli mentioned this pull request Apr 18, 2024
Merged
@Tristan-Wilson Tristan-Wilson self-requested a review April 26, 2024 17:58
Tristan-Wilson
Tristan-Wilson approved these changes Apr 26, 2024
View reviewed changes
Copy link
Member

@Tristan-Wilson Tristan-Wilson left a comment

Choose a reason for hiding this comment

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

LGTM, I had a comment about the synchronization around the file logger to make it clearer but I think the current code works, so we can come back to it later.

cmd/genericconf/logging.go Show resolved Hide resolved
cmd/genericconf/logging.go Show resolved Hide resolved
@ganeshvanahalli ganeshvanahalli merged commit 6958bea into master Apr 27, 2024
8 checks passed
@ganeshvanahalli ganeshvanahalli deleted the update-gethpin-v1.13.6 branch April 27, 2024 01:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Tristan-Wilson Tristan-Wilson Tristan-Wilson approved these changes

Assignees
No one assigned
Labels
s Automatically added by the CLA bot if the creator of a PR is registered as having signed the CLA.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@ganeshvanahalli @Tristan-Wilson