Skip to content

Rename response field of GetBlobsV2 from kzgProofs to proofs #15168

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

Closed
mininny wants to merge 2 commits into from
Closed

Rename response field of GetBlobsV2 from kzgProofs to proofs #15168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3479fe5
Rename kzgProofs response field of GetBlobsV2 to proofs
mininny Apr 13, 2025
c17fe7c
Rename BlobAndProofV2Json payload from KzgProofs to Proofs
mininny Apr 13, 2025
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
4 changes: 2 additions & 2 deletions beacon-chain/execution/engine_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,8 +687,8 @@ func (s *Service) ReconstructDataColumnSidecars(ctx context.Context, block inter
return nil, wrapWithBlockRoot(err, blockRoot, "could not compute cells")
}

proofs := make([]kzg.Proof, len(blobAndProof.KzgProofs))
for i, proof := range blobAndProof.KzgProofs {
proofs := make([]kzg.Proof, len(blobAndProof.Proofs))
for i, proof := range blobAndProof.Proofs {
proofs[i] = kzg.Proof(proof)
}
cellsAndProofs = append(cellsAndProofs, kzg.CellsAndProofs{
Expand Down
6 changes: 3 additions & 3 deletions beacon-chain/execution/engine_client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2586,12 +2586,12 @@ func createBlobServerV2(t *testing.T, numBlobs int, blobMasks []bool) *httptest.
}

blobAndCellProofs[i] = &pb.BlobAndProofV2Json{
Blob: []byte("0xblob"),
KzgProofs: []hexutil.Bytes{},
Blob: []byte("0xblob"),
Proofs: []hexutil.Bytes{},
}
for j := 0; j < int(params.BeaconConfig().NumberOfColumns); j++ {
cellProof := make([]byte, 48)
blobAndCellProofs[i].KzgProofs = append(blobAndCellProofs[i].KzgProofs, cellProof)
blobAndCellProofs[i].Proofs = append(blobAndCellProofs[i].Proofs, cellProof)
}
}

Expand Down
37 changes: 18 additions & 19 deletions proto/engine/v1/execution_engine_eip7594.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion proto/engine/v1/execution_engine_eip7594.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ option php_namespace = "Ethereum\\Engine\\v1";
// It is introduced in Fulu network upgrade.
message BlobAndProofV2 {
bytes blob = 1 [ (ethereum.eth.ext.ssz_size) = "blob.size" ];
repeated bytes kzg_proofs = 2 [
repeated bytes proofs = 2 [
(ethereum.eth.ext.ssz_size) = "48",
(ethereum.eth.ext.ssz_max) = "max_cell_proofs_length.size"
];
Expand Down
10 changes: 5 additions & 5 deletions proto/engine/v1/json_marshal_unmarshal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1284,8 +1284,8 @@ func (b *BlobAndProof) UnmarshalJSON(enc []byte) error {
}

type BlobAndProofV2Json struct {
Blob hexutil.Bytes `json:"blob"`
KzgProofs []hexutil.Bytes `json:"proofs"`
Blob hexutil.Bytes `json:"blob"`
Proofs []hexutil.Bytes `json:"proofs"`
}

func (b *BlobAndProofV2) UnmarshalJSON(enc []byte) error {
Expand All @@ -1298,12 +1298,12 @@ func (b *BlobAndProofV2) UnmarshalJSON(enc []byte) error {
copy(blob, dec.Blob)
b.Blob = blob

proofs := make([][]byte, len(dec.KzgProofs))
for i, proof := range dec.KzgProofs {
proofs := make([][]byte, len(dec.Proofs))
for i, proof := range dec.Proofs {
p := proof
proofs[i] = bytesutil.PadTo(p[:], fieldparams.BLSPubkeyLength)
}
b.KzgProofs = proofs
b.Proofs = proofs

return nil
}
Loading