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

Merge branch 'release/2.60' into 'release/2.61' #12808

Merged
merged 7 commits into from
Nov 20, 2024
Merged

Conversation

yperbasis
Copy link
Member

@yperbasis yperbasis commented Nov 20, 2024

Pick up PR #12628 (all other PRs are cherry-picked already)

yperbasis and others added 7 commits October 29, 2024 08:44
Cherry pick #12375 into `release/2.60`

Co-authored-by: Alex Sharov <[email protected]>
Prior to this PR in `callManyTransactions` (invoked by `trace_block`)
changes made by `InitializeBlockExecution` were discarded, leading to
issues like #12432. That was immaterial before since no much was
happening at the beginning of a block. But that changed in Dencun with
[EIP-4788](https://eips.ethereum.org/EIPS/eip-4788) – see `(s *Merge)
Initialize`.
…r reason (#12547)

Erigon2 v2.6x add correct **error reason** to some json rpc api
responses.
Previously, the expected reason for the error was "{}".

Affected apis are `debug_traceCall`, `debug_traceCallMany`,
`debug_traceTransaction`.

This PR uses a new branch of the rpc-tests repo that has been updated
with these changes.
changes:
-  7 chars for commit id
- match pattern *.*.* (for example -- it will match v2.60.9 or 2.60.9)
See #12661 for more details.
Changes:
- workflow will create git tag referencing to the last commit id in
"checkout_ref" (branch name as for now)
- in case of not successful build -- second job will start and will
remove git tag.
- workflow will now contain useful name which reflects released version,
branch used to build artifacts and person who run workflow.
- latest docker base images debian:12.8-slim
@yperbasis yperbasis changed the title Merge branch 'release/2.60' into merge2.60 Merge branch 'release/2.60' into 'release/2.61' Nov 20, 2024
@yperbasis yperbasis enabled auto-merge (squash) November 20, 2024 16:36
@yperbasis yperbasis merged commit 0273320 into release/2.61 Nov 20, 2024
5 checks passed
@yperbasis yperbasis deleted the merge2.60 branch November 20, 2024 19:47
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