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

Engine API and type changes for flat requests in Pectra #12337

Merged
merged 20 commits into from
Oct 23, 2024
Merged

Engine API and type changes for flat requests in Pectra #12337

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
163f729
Rename requestsRoot to requestsHash
somnathb1 Oct 18, 2024
bbfd5bb
Go mod tidy
somnathb1 Oct 18, 2024
793c6cb
Remove requests from body, block and exeution payload
somnathb1 Oct 18, 2024
b42189c
Lint
somnathb1 Oct 18, 2024
a29c2f1
Revert unnecessary
somnathb1 Oct 18, 2024
9f26d39
Remove reqs from stEnv
somnathb1 Oct 18, 2024
460a971
Add flat request hash and engine api sidecar
somnathb1 Oct 18, 2024
bcffdd5
Add exec spec tests back
somnathb1 Oct 18, 2024
22a297b
Change FlatRequests to slice rather than ptr
somnathb1 Oct 18, 2024
4969caf
Merge branch 'som/flat_requests' into som/pectra4_engine_api
somnathb1 Oct 18, 2024
8faeab7
Merge branch 'main' into som/remove_req_from_body
somnathb1 Oct 18, 2024
d374c62
Merge branch 'main' into som/rename_req_root
somnathb1 Oct 18, 2024
495debd
Merge branch 'som/rename_req_root' into som/remove_req_from_body
somnathb1 Oct 18, 2024
8c183cd
Merge branch 'som/remove_req_from_body' into som/pectra4_engine_api
somnathb1 Oct 18, 2024
1991a12
Modify Flat reqs a bit
somnathb1 Oct 20, 2024
8d6ea72
Remove rlp encoding methods from deposit req
somnathb1 Oct 20, 2024
c2fe612
Merge branch 'main' into som/remove_req_from_body
somnathb1 Oct 22, 2024
ff5581b
Merge branch 'som/remove_req_from_body' into som/pectra4_engine_api
somnathb1 Oct 22, 2024
2ceb3af
Remove depoist req RLP encode
somnathb1 Oct 22, 2024
43dfa5e
Merge branch 'main' into som/pectra4_engine_api
somnathb1 Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'main' into som/pectra4_engine_api
  • Loading branch information
@somnathb1
somnathb1 authored Oct 23, 2024
commit 43dfa5edd27754563ad4b6913adda4f94961cf6b
1 change: 1 addition & 0 deletions cmd/state/commands/opcode_tracer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,6 +741,7 @@ func runBlock(engine consensus.Engine, ibs *state.IntraBlockState, txnWriter sta
// Finalize the block, applying any consensus engine specific extras (e.g. block rewards)
tx := block.Transactions()
if _, _, _, _, err := engine.FinalizeAndAssemble(chainConfig, header, ibs, tx, block.Uncles(), receipts, block.Withdrawals(), nil, nil, nil, nil, logger); err != nil {

return nil, fmt.Errorf("finalize of block %d failed: %w", block.NumberU64(), err)
}

Expand Down
2 changes: 1 addition & 1 deletion erigon-lib/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/erigontech/erigon-lib
go 1.22.0

require (
github.com/erigontech/erigon-snapshot v1.3.1-0.20240814160410-2ce37904b978
github.com/erigontech/erigon-snapshot v1.3.1-0.20241023024258-f64407a77e8e
github.com/erigontech/interfaces v0.0.0-20241018080256-33c46aae5357
github.com/erigontech/mdbx-go v0.38.4
github.com/erigontech/secp256k1 v1.1.0
Expand Down
4 changes: 2 additions & 2 deletions erigon-lib/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,10 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/erigontech/erigon-snapshot v1.3.1-0.20240814160410-2ce37904b978 h1:7ECOf7Us3+/706WGZXIX84qQc6zmxQby8fGbFLiqFlU=
github.com/erigontech/erigon-snapshot v1.3.1-0.20240814160410-2ce37904b978/go.mod h1:ooHlCl+eEYzebiPu+FP6Q6SpPUeMADn8Jxabv3IKb9M=
github.com/erigontech/interfaces v0.0.0-20241018080256-33c46aae5357 h1:bOHNyy/URcrQoN+BC3aUCQ3UXCZ6/52oIZ0UZM++JZw=
github.com/erigontech/interfaces v0.0.0-20241018080256-33c46aae5357/go.mod h1:N7OUkhkcagp9+7yb4ycHsG2VWCOmuJ1ONBecJshxtLE=
github.com/erigontech/erigon-snapshot v1.3.1-0.20241023024258-f64407a77e8e h1:ZpIO6HeopuZPYDLldL6zR0qyRezj80kQrDOGEF779ts=
github.com/erigontech/erigon-snapshot v1.3.1-0.20241023024258-f64407a77e8e/go.mod h1:ooHlCl+eEYzebiPu+FP6Q6SpPUeMADn8Jxabv3IKb9M=
github.com/erigontech/mdbx-go v0.38.4 h1:S9T7mTe9KPcFe4dOoOtVdI6gPzht9y7wMnYfUBgrQLo=
github.com/erigontech/mdbx-go v0.38.4/go.mod h1:IcOLQDPw3VM/asP6T5JVPPN4FHHgJtY16XfYjzWKVNI=
github.com/erigontech/secp256k1 v1.1.0 h1:mO3YJMUSoASE15Ya//SoHiisptUhdXExuMUN1M0X9qY=
Expand Down
5 changes: 0 additions & 5 deletions turbo/engineapi/engine_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,11 +625,6 @@ func extractPayloadBodyFromBody(body *types.RawBody, version clparams.StateVersi
}

ret := &engine_types.ExecutionPayloadBody{Transactions: bdTxs, Withdrawals: body.Withdrawals}
// if version >= clparams.ElectraVersion && body.Requests != nil {
// ret.DepositRequests = body.Requests.Deposits()
// ret.WithdrawalRequests = body.Requests.Withdrawals()
// ret.ConsolidationRequests = body.Requests.Consolidations()
// }
return ret
}

Expand Down
1 change: 0 additions & 1 deletion turbo/execution/eth1/block_building.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ import (
"github.com/erigontech/erigon/rpc"
"github.com/erigontech/erigon/turbo/builder"
"github.com/erigontech/erigon/turbo/engineapi/engine_helpers"
// "github.com/erigontech/erigon/turbo/engineapi/engine_types"
"github.com/erigontech/erigon/turbo/execution/eth1/eth1_utils"
)

Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.