forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 02:12:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

beacon/engine,eth/catalyst: ensure RequestsHash is passed to newPayload in engine tests

Browse source
This commit is contained in:
lightclient 2024-10-02 10:53:36 -06:00
parent ded9d6b666
commit 168d3eb921
No known key found for this signature in database
GPG key ID: 75C916AFEE20183E
2 changed files with 30 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
beacon/engine/types.go
View file

@ -112,6 +112,16 @@ type ExecutionPayloadEnvelope struct {
Witness *hexutil.Bytes `json:"witness"` Witness *hexutil.Bytes `json:"witness"`
} }
// RequestsHash computes the hash of the requests contained in the envelope or
// returns nil if the list of requests is also nil.
func (e *ExecutionPayloadEnvelope) RequestsHash() *common.Hash {
if e.Requests != nil {
h := types.CalcRequestsHash(e.Requests)
return &h
}
return nil
}
type BlobsBundleV1 struct { type BlobsBundleV1 struct {
Commitments []hexutil.Bytes `json:"commitments"` Commitments []hexutil.Bytes `json:"commitments"`
Proofs []hexutil.Bytes `json:"proofs"` Proofs []hexutil.Bytes `json:"proofs"`

27
eth/catalyst/api_test.go
View file

@ -507,14 +507,15 @@ func setupBlocks(t *testing.T, ethservice *eth.Ethereum, n int, parent *types.He
h = &beaconRoots[i] h = &beaconRoots[i]
} }
payload := getNewPayload(t, api, parent, w, h) envelope := getNewEnvelope(t, api, parent, w, h)
execResp, err := api.newPayload(*payload, []common.Hash{}, h, nil, false) execResp, err := api.newPayload(*envelope.ExecutionPayload, []common.Hash{}, h, envelope.RequestsHash(), false)
if err != nil { if err != nil {
t.Fatalf("can't execute payload: %v", err) t.Fatalf("can't execute payload: %v", err)
} }
if execResp.Status != engine.VALID { if execResp.Status != engine.VALID {
t.Fatalf("invalid status: %v %s", execResp.Status, *execResp.ValidationError) t.Fatalf("invalid status: %v %s", execResp.Status, *execResp.ValidationError)
} }
payload := envelope.ExecutionPayload
fcState := engine.ForkchoiceStateV1{ fcState := engine.ForkchoiceStateV1{
HeadBlockHash: payload.BlockHash, HeadBlockHash: payload.BlockHash,
SafeBlockHash: payload.ParentHash, SafeBlockHash: payload.ParentHash,
@ -676,7 +677,7 @@ func TestNewPayloadOnInvalidChain(t *testing.T) {
} }
} }
func assembleBlock(api *ConsensusAPI, parentHash common.Hash, params *engine.PayloadAttributes) (*engine.ExecutableData, error) { func assembleEnvelope(api *ConsensusAPI, parentHash common.Hash, params *engine.PayloadAttributes) (*engine.ExecutionPayloadEnvelope, error) {
args := &miner.BuildPayloadArgs{ args := &miner.BuildPayloadArgs{
Parent: parentHash, Parent: parentHash,
Timestamp: params.Timestamp, Timestamp: params.Timestamp,
@ -689,7 +690,15 @@ func assembleBlock(api *ConsensusAPI, parentHash common.Hash, params *engine.Pay
if err != nil { if err != nil {
return nil, err return nil, err
} }
return payload.ResolveFull().ExecutionPayload, nil return payload.ResolveFull(), nil
}
func assembleBlock(api *ConsensusAPI, parentHash common.Hash, params *engine.PayloadAttributes) (*engine.ExecutableData, error) {
envelope, err := assembleEnvelope(api, parentHash, params)
if err != nil {
return nil, err
}
return envelope.ExecutionPayload, nil
} }
func TestEmptyBlocks(t *testing.T) { func TestEmptyBlocks(t *testing.T) {
@ -752,7 +761,7 @@ func TestEmptyBlocks(t *testing.T) {
} }
} }
func getNewPayload(t *testing.T, api *ConsensusAPI, parent *types.Header, withdrawals []*types.Withdrawal, beaconRoot *common.Hash) *engine.ExecutableData { func getNewEnvelope(t *testing.T, api *ConsensusAPI, parent *types.Header, withdrawals []*types.Withdrawal, beaconRoot *common.Hash) *engine.ExecutionPayloadEnvelope {
params := engine.PayloadAttributes{ params := engine.PayloadAttributes{
Timestamp: parent.Time + 1, Timestamp: parent.Time + 1,
Random: crypto.Keccak256Hash([]byte{byte(1)}), Random: crypto.Keccak256Hash([]byte{byte(1)}),
@ -761,11 +770,15 @@ func getNewPayload(t *testing.T, api *ConsensusAPI, parent *types.Header, withdr
BeaconRoot: beaconRoot, BeaconRoot: beaconRoot,
} }
payload, err := assembleBlock(api, parent.Hash(), &params) envelope, err := assembleEnvelope(api, parent.Hash(), &params)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
return payload return envelope
}
func getNewPayload(t *testing.T, api *ConsensusAPI, parent *types.Header, withdrawals []*types.Withdrawal, beaconRoot *common.Hash) *engine.ExecutableData {
return getNewEnvelope(t, api, parent, withdrawals, beaconRoot).ExecutionPayload
} }
// setBlockhash sets the blockhash of a modified ExecutableData. // setBlockhash sets the blockhash of a modified ExecutableData.