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

[DO NOT MERGE] 2.61 vs 2.60 #12479

Draft
wants to merge 89 commits into
base: release/2.60
Choose a base branch
from
Draft

[DO NOT MERGE] 2.61 vs 2.60 #12479

wants to merge 89 commits into from

Conversation

yperbasis
Copy link
Member

No description provided.

yperbasis and others added 30 commits October 1, 2024 14:34
@yperbasis
params: version 2.61.0-dev (#12149)
0291417
@yperbasis
Turn NoPruneContracts into DepositContract (#12150)
5c833c3 
Cherry pick #10062
@yperbasis @somnathb1
EIP-2935 Historical block hashes (#12152)
bf742a8 
Cherry pick #9991

Co-authored-by: Somnath <snb895@outlook.com>
@yperbasis @racytech
Implement EIP-7685 and EIP-6110 (#12153)
51b869d 
Cherry pick #10238

Co-authored-by: racytech <82003208+racytech@users.noreply.github.com>
@yperbasis @somnathb1
BLS: add more subgroup checks and finalized EIP-2537 tests (#12154)
ee01d5a 
Cherry pick #10367

Co-authored-by: Somnath Banerjee <snb895@outlook.com>
@yperbasis @racytech
add withdrawalRequests to execution payload (#12155)
61fb230 
Cherry pick #10369

Co-authored-by: racytech <82003208+racytech@users.noreply.github.com>
@yperbasis
add requests to grpc interfaces (#12156)
55e55db 
Cherry pick #10394
@yperbasis
Add some missing EIP-7685 wirings (#12157)
7af0551 
Cherry pick #10415
@yperbasis
Update EIP-2935: Adjust gas-costs for 2935 (#12158)
52685b4 
Cherry pick #10380
@yperbasis @somnathb1
Implement and add changes for EIPs 7002, 6110, 7685 (#12159)
9892c85 
Cherry pick #10533

---------

Co-authored-by: Somnath <snb895@outlook.com>
@yperbasis @somnathb1
core: Rename Deposit to DepositRequest for EIP-6110 (#12160)
02728ee 
Cherry pick #10648

Co-authored-by: Somnath <snb895@outlook.com>
@yperbasis @somnathb1
tests: Add prague exec test fixtures and rename requests tests (#12161)
2ce2204 
Cherry pick #10662

Co-authored-by: Somnath <snb895@outlook.com>
@yperbasis
Update EIP-2935 for Prague devnet1 (#12162)
98e72ff 
Cherry pick #10920
@yperbasis @somnathb1
Add EIP-7251 consolidation requests support (#12163)
3a9f381 
Cherry pick #10910

Co-authored-by: Somnath <snb895@outlook.com>
@yperbasis @somnathb1
tests: Undo skip EIP-7685 spec tests (#12164)
2e8775b 
Cherry pick #10978

Co-authored-by: Somnath <snb895@outlook.com>
@yperbasis
Fix compilation (#12171)
e1eab09
@yperbasis @somnathb1
engineapi: Add pectra engine api changes (#12172)
bc86e9f 
Cherry pick  #10963

Co-authored-by: Somnath <snb895@outlook.com>
@yperbasis @racytech
rlp: disallow trailing bytes in transactions (#10296) (#12175)
1fbc2fc 
Cherry pick #10296

Co-authored-by: racytech <82003208+racytech@users.noreply.github.com>
@yperbasis
Move bor_fee_log from core to polygon (#12176)
bc4bc69 
Cherry pick #10810
@yperbasis @sudeepdino008
Implement EIP-7702: set code tx (#12178)
27783b8 
Cherry pick #10812

Co-authored-by: sudeep <sudeepdino008@gmail.com>
@yperbasis @sudeepdino008
execution spec tests update for devnet-1 (#12179)
60684fe 
Cherry pick #11127

Co-authored-by: sudeep <sudeepdino008@gmail.com>
@yperbasis @somnathb1
engineapi: Fix req list check (#12180)
e5cc56f 
Cherry pick #11191

Co-authored-by: Somnath <snb895@outlook.com>
@yperbasis @sudeepdino008
txpool changes for set_code_tx support (#12181)
6853eff 
Cherry pick #11235

Co-authored-by: sudeep <sudeepdino008@gmail.com>
@yperbasis
Wire OverridePragueTime into txpool (#12185)
bc6cfb7 
Cherry pick #11234
@yperbasis @Giulio2002
Caplin: Added electra config support (#12186)
d0df1a2 
Cherry pick #11301

Co-authored-by: Giulio rebuffo <giulio.rebuffo@gmail.com>
@yperbasis @somnathb1
core/types: Fix JSON (un)marshalling of request types (#12187)
92d3354 
Cherry pick #11346

Co-authored-by: Somnath <snb895@outlook.com>
@yperbasis @somnathb1
engineapi: Update interface and Rpc conversion for EIP-7685 Requests (#…
e8f12eb 
…12188)

Cherry pick #11349

---------

Co-authored-by: Somnath <snb895@outlook.com>
@yperbasis @somnathb1
Fix json name for deposit contract address (#12189)
107ca9b 
Cherry pick  #11466

Co-authored-by: Somnath <snb895@outlook.com>
@yperbasis @somnathb1
engineapi: Only update req root for pectra+ (#12194)
7418eef 
Cherry pick #11467

Co-authored-by: Somnath <snb895@outlook.com>
@yperbasis @somnathb1
engineapi: Remove redundant nil check (#12195)
8ebcc8c 
Cherry pick  #11500

Co-authored-by: Somnath <snb895@outlook.com>
yperbasis and others added 17 commits October 24, 2024 13:12
@yperbasis @taratorio
headerdownload: fix OOM due to inifinitely growing children in link (#…
ab5af9f 
…12454)

Cherry pick #12405 into `release/2.61`

Co-authored-by: milen <94537774+taratorio@users.noreply.github.com>
@yperbasis @VBulikov
Added Changelog (#12455)
42c0d13 
Cherry pick #12427 into `release/2.61`

Co-authored-by: VBulikov <vlad.bulikov@gmail.com>
@yperbasis @somnathb1
Flatten EIP-7002 withdrawal requests encoding (#12456)
c9954b5 
Cherry pick #12138 into `release/2.61`

Co-authored-by: Somnath <snb895@outlook.com>
@yperbasis @somnathb1
Flatten EIP-7251 Consolidation Requests encoding (#12457)
ecf5a1a 
Cherry pick #12167 into `release/2.61`

Co-authored-by: Somnath <snb895@outlook.com>
@yperbasis @somnathb1
tests: Add pectra-devnet-4 tests (All Spec tests Disabled) (#12458)
4a2b0b5 
Cherry pick #12363 into `release/2.61` (Prague tests only)

Co-authored-by: Somnath <snb895@outlook.com>
@yperbasis @somnathb1
Rename requestsRoot to requestsHash in block header (#12460)
34d42e1 
Cherry pick #12369 into `release/2.61`

Co-authored-by: Somnath <snb895@outlook.com>
@yperbasis @AskAlexSharov
Block: use generic atomics (#12461)
7a65be6 
Cherry pick #11512 into `release/2.61`

Co-authored-by: Alex Sharov <AskAlexSharov@gmail.com>
@yperbasis @AskAlexSharov
Move atomic hash from Block to Header (#12462)
1502825 
Cherry pick #11513 into `release/2.61`

Co-authored-by: Alex Sharov <AskAlexSharov@gmail.com>
@yperbasis
Merge MiningResultPOSCh with MiningResultCh (#12463)
24d8d9b 
Cherry pick #11612 into `release/2.61`
@yperbasis @somnathb1
Remove EIP-7685 requests from body, block and exeution payload (#12467)
b37c6d4 
Cherry pick #12370 into `release/2.61`

Co-authored-by: Somnath <snb895@outlook.com>
@yperbasis @somnathb1
Engine API and type changes for flat requests in Pectra (#12468)
2342e39 
Cherry pick #12337 into `release/2.61`

Co-authored-by: Somnath <snb895@outlook.com>
@yperbasis
Don't pass requests to consensus Finalize (#12474)
b3b915d 
Cherry pick #12425 into `release/2.61`
@yperbasis
Remove remnants of requests from block body downloader (#12475)
6d92c11 
Cherry pick #12426 into `release/2.61`
@yperbasis @somnathb1
Simplify EIP-6110 Deposit requests (#12476)
3ba3e0a 
Cherry pick #12388 into `release/2.61`

Co-authored-by: Somnath <snb895@outlook.com>
@yperbasis @somnathb1
Modify EIP-7702 Txn impl per pectra-devnet-4 specs (#12478)
a96cbd5 
Cherry pick #12416 into `release/2.61`

Co-authored-by: Somnath <snb895@outlook.com>
@yperbasis @somnathb1
engineapi: Fix json unmarshal issue (#12482)
9638341 
Cherry pick #12465 into `release/2.61`

Co-authored-by: Somnath <snb895@outlook.com>
@yperbasis
Merge branch 'release/2.60' into release/2.61
9490e10
@yperbasis yperbasis added the do-not-merge PR that is in a merge-able state but is waiting for something else to take place before merging label Oct 25, 2024
yperbasis and others added 12 commits October 25, 2024 16:59
@yperbasis
Merge branch 'release/2.60' into release/2.61
223137e
@yperbasis
engine: Remove engine_getPayloadBodiesBy{Hash|Range}V2 (#12494)
b6ef47d 
Cherry pick #12487 into `release/2.61`
@yperbasis @somnathb1
params: Update depositContractAddress field in json's (#12528)
9599956 
Cherry pick #12526 into `release/2.61`

Co-authored-by: Somnath <snb895@outlook.com>
@somnathb1
Update dockerfile to golang 1.22 (#12543)
edf4149 
Cherry pick the commit from `pectra_e2`
@somnathb1
Fix multiple hive/EEST issues + wait condition loop before sending SY…
6935d08 
…NCING (#12544)

- Direct indexing of Requests list, instead of append
- Always put empty bytes rather than nil in requests list
- Add wait condition loop before sending SYNCING status
@yperbasis
trace API: commit state changes from InitializeBlockExecution (#12565)
7ffa0fd 
Duplicate #12559 into `release/2.61`
@somnathb1
Fix bug with sending empty requests list in pectra-devnet-4 (#12588)
de588af
@somnathb1
workflows: Add hive tests to e2 branches (#12590)
1fd75e3 
Copy hive tests workflow from `main`
@somnathb1
workflows: Add ethereum/eest separate workflow (#12599)
799f16f 
To add the `EEST-engine` tests from the Hive team. Essentially runs the
usual EEST tests that we do already run in `test-integration` but
through Engine-API. Important to run these to spot Engine-API specific
issues sometimes
@yperbasis
EIP-4844-pectra (collect blob gas fee) (#12611)
bcf5e29 
Cherry pick #12574 into `release/2.61`
@mriccobene
qa-tests: handle Erigon2 json rpc api improvements regarding the erro…
9ac79f4 
…r reason (v2.61) (#12629)

Same as #12547 but for branch
release/2.61
@yperbasis
[release/2.61] params: v2.61.0-beta1 (#12646)
5bc53cc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
do-not-merge PR that is in a merge-able state but is waiting for something else to take place before merging
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@yperbasis @mriccobene @JkLondon @AskAlexSharov @somnathb1