AtHeartEngineer/prysm
1
0
Fork 0
mirror of https://github.com/OffchainLabs/prysm.git synced 2026-01-09 21:38:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Electra v1.5.0-alpha.3 changes: Move consolidations from beacon block body to the execution payload header. (#14152)

Browse Source
This commit is contained in:
Preston Van Loon
2024-06-27 14:28:30 -05:00
committed by GitHub
parent 6d63dbe1af
commit 7898e65d4e
65 changed files with 1138 additions and 1907 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
consensus-types/blocks/proto.go
View File

@@ -531,7 +531,6 @@ func (b *BeaconBlockBody) Proto() (proto.Message, error) {
ExecutionPayloadHeader: ph,
BlsToExecutionChanges: b.blsToExecutionChanges,
BlobKzgCommitments: b.blobKzgCommitments,
Consolidations: b.signedConsolidations,
}, nil
}
var p *enginev1.ExecutionPayloadElectra
@@ -555,7 +554,6 @@ func (b *BeaconBlockBody) Proto() (proto.Message, error) {
ExecutionPayload: p,
BlsToExecutionChanges: b.blsToExecutionChanges,
BlobKzgCommitments: b.blobKzgCommitments,
Consolidations: b.signedConsolidations,
}, nil
default:
@@ -1158,7 +1156,6 @@ func initBlockBodyFromProtoElectra(pb *eth.BeaconBlockBodyElectra) (*BeaconBlock
executionPayload: p,
blsToExecutionChanges: pb.BlsToExecutionChanges,
blobKzgCommitments: pb.BlobKzgCommitments,
signedConsolidations: pb.Consolidations,
}
return b, nil
}
@@ -1187,7 +1184,6 @@ func initBlindedBlockBodyFromProtoElectra(pb *eth.BlindedBeaconBlockBodyElectra)
executionPayloadHeader: ph,
blsToExecutionChanges: pb.BlsToExecutionChanges,
blobKzgCommitments: pb.BlobKzgCommitments,
signedConsolidations: pb.Consolidations,
}
return b, nil
}