Skip to content

engine: Update BlobsBundle fields #123

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

Merged
merged 1 commit into from
Apr 24, 2023
Merged

engine: Update BlobsBundle fields #123

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 11 additions & 11 deletions beacon/engine/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ type payloadAttributesMarshaling struct {

// BlobsBundle holds the blobs of an execution payload
type BlobsBundle struct {
KZGs []types.KZGCommitment `json:"kzgs" gencodec:"required"`
Blobs []types.Blob `json:"blobs" gencodec:"required"`
Proofs []types.KZGProof `json:"proofs" gencodec:"required"`
Commitments []types.KZGCommitment `json:"commitments" gencodec:"required"`
Blobs []types.Blob `json:"blobs" gencodec:"required"`
Proofs []types.KZGProof `json:"proofs" gencodec:"required"`
}

//go:generate go run github.com/fjl/gencodec -type ExecutableData -field-override executableDataMarshaling -out gen_ed.go
Expand Down Expand Up @@ -250,20 +250,20 @@ type ExecutionPayloadBodyV1 struct {

func BlockToBlobData(block *types.Block) (*BlobsBundle, error) {
blobsBundle := &BlobsBundle{
Blobs: []types.Blob{},
KZGs: []types.KZGCommitment{},
Proofs: []types.KZGProof{},
Blobs: []types.Blob{},
Commitments: []types.KZGCommitment{},
Proofs: []types.KZGProof{},
}
for i, tx := range block.Transactions() {
if tx.Type() == types.BlobTxType {
versionedHashes, kzgs, blobs, proofs := tx.BlobWrapData()
if len(versionedHashes) != len(kzgs) || len(versionedHashes) != len(blobs) || len(blobs) != len(proofs) {
return nil, fmt.Errorf("tx %d in block %s has inconsistent blobs (%d) / kzgs (%d)"+
" / versioned hashes (%d) / proofs (%d)", i, block.Hash(), len(blobs), len(kzgs), len(versionedHashes), len(proofs))
versionedHashes, commitments, blobs, proofs := tx.BlobWrapData()
if len(versionedHashes) != len(commitments) || len(versionedHashes) != len(blobs) || len(blobs) != len(proofs) {
return nil, fmt.Errorf("tx %d in block %s has inconsistent blobs (%d) / commitments (%d)"+
" / versioned hashes (%d) / proofs (%d)", i, block.Hash(), len(blobs), len(commitments), len(versionedHashes), len(proofs))
}

blobsBundle.Blobs = append(blobsBundle.Blobs, blobs...)
blobsBundle.KZGs = append(blobsBundle.KZGs, kzgs...)
blobsBundle.Commitments = append(blobsBundle.Commitments, commitments...)
blobsBundle.Proofs = append(blobsBundle.Proofs, proofs...)
}
}
Expand Down