Upstream v2.60.1 #184
Merged
Upstream v2.60.1 #184
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…0396) Cherry-pick: erigontech@bc5fa6f Need this to get PR CI green for v2.60.1 patches, e.g. - erigontech#10390 Co-authored-by: Andrew Ashikhmin <[email protected]>
…ntech#10420) Cherry-pick: erigontech@be889f6 Co-authored-by: Giulio rebuffo <[email protected]>
Cherry pick PR erigontech#10451 into the release branch Co-authored-by: mars <[email protected]>
Copy PR erigontech#10495 into the release branch
Cherry pick PR erigontech#10281 into the release branch Co-authored-by: Mark Holt <[email protected]> Co-authored-by: alex.sharov <[email protected]>
…#9090 (erigontech#10502) Cherry pick PR erigontech#10401 into the release branch Co-authored-by: mars <[email protected]>
Cherry pick PR erigontech#10449 into the release branch
Cherry pick PR erigontech#10460 into the release branch Co-authored-by: Willian Mitsuda <[email protected]>
…BlobGas (erigontech#10506) Cherry pick PR erigontech#10452 into the release branch Co-authored-by: mars <[email protected]>
Otherwise: if start after `kill -9` in the middle of merge - may remove small files of 1 type of file, but leave small files of another type of files (which merge was not finished) - and leave node in un-mergable state: erigontech#10485 --------- Co-authored-by: awskii <[email protected]>
Cherry pick PR erigontech#10468 into the release branch Co-authored-by: Mark Holt <[email protected]>
…rigontech#10523) cherry-pick erigontech#10494 to release/2.60
Cherry pick PR erigontech#10493 into the release branch Co-authored-by: Mark Holt <[email protected]>
Fixes a recent regression causing unwinds due to checkpoints having zero root hash: ``` [WARN] [05-18|23:58:54.662] [bor] Root hash mismatch while whitelisting checkpoint expected=ac1c57270479250af3ce8eee90075cd8b2ba1bac55353105e063d9a4c87c743e got=0000000000000000000000000000000000000000000000000000000000000000 [WARN] [05-18|23:58:54.662] [bor] Rewinding chain due to checkpoint root hash mismatch number=57125727 ``` Note this has already been fixed on Erigon 3 branch but as part of a non-related PR - https://github.com/ledgerwatch/erigon/pull/10124/files#diff-47d4532f399f2d6a45e6f19944a45c80bac573b4d1b5cb51485d0254229d1b16
Cherry pick PR erigontech#10528 into the release branch Co-authored-by: Shoham Chakraborty <[email protected]>
…t value (erigontech#10370) requested by erigontech#9549 port of ethereum/go-ethereum#26632
Cherry pick PR erigontech#10551 into the release branch
Cherry pick PR erigontech#10546 into the release branch Co-authored-by: Giulio rebuffo <[email protected]>
…racters (erigontech#10578) Cherry pick PR erigontech#10512 into the release branch Co-authored-by: Giulio rebuffo <[email protected]>
…rigontech#10580) Cherry pick PR erigontech#10576 into the release branch Co-authored-by: Giulio rebuffo <[email protected]>
Problem: `+1` was added to maxBlockNum instead of minBlockNum for: erigontech#10554
mininny
commented
Jun 4, 2024
Comment on lines
+157
to
+167
| chainConfig, err := api.chainConfig(ctx, dbtx) | ||
| if err != nil { | ||
| return 0, fmt.Errorf("read chain config: %v", err) | ||
| } | ||
|
|
||
| // Handle pre-bedrock blocks | ||
| blockNum, err := api.blockNumberFromBlockNumberOrHash(dbtx, &bNrOrHash) | ||
| latestCanBlockNumber, latestCanHash, isLatest, err := rpchelper.GetCanonicalBlockNumber(latestNumOrHash, dbtx, api.filters) // DoCall cannot be executed on non-canonical blocks | ||
| if err != nil { | ||
| return 0, err | ||
| } | ||
| chainConfig, err := api.chainConfig(ctx, dbtx) | ||
| if err != nil { | ||
| return 0, fmt.Errorf("read chain config: %v", err) | ||
| } | ||
| if chainConfig.IsOptimismPreBedrock(blockNum) { | ||
|
|
||
| if chainConfig.IsOptimismPreBedrock(latestCanBlockNumber) { |
There was a problem hiding this comment.
Upstream change of getting the block number from dbtx
|
@mininny 👍 please resolve the CI failure |
ImTei
approved these changes
Jun 5, 2024
|
Added the op-erigon version bump up to 0.6.1: ebeb01d |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Sync upstream v2.60.1 https://github.com/ledgerwatch/erigon/releases/tag/2.60.1