Skip to content

Commit 27177d2

Browse files
committed
crypto/kzg4844: change cell proof API to take non-pointer slice
1 parent b069645 commit 27177d2

File tree

6 files changed

+11
-14
lines changed

6 files changed

+11
-14
lines changed

core/txpool/validation.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -206,11 +206,7 @@ func validateBlobSidecarOsaka(sidecar *types.BlobTxSidecar, hashes []common.Hash
206206
if err := sidecar.ValidateBlobCommitmentHashes(hashes); err != nil {
207207
return err
208208
}
209-
var blobs []*kzg4844.Blob
210-
for _, blob := range sidecar.Blobs {
211-
blobs = append(blobs, &blob)
212-
}
213-
if err := kzg4844.VerifyCellProofs(blobs, sidecar.Commitments, sidecar.Proofs); err != nil {
209+
if err := kzg4844.VerifyCellProofs(sidecar.Blobs, sidecar.Commitments, sidecar.Proofs); err != nil {
214210
return err
215211
}
216212
return nil

crypto/kzg4844/kzg4844.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ func VerifyBlobProof(blob *Blob, commitment Commitment, proof Proof) error {
158158
// VerifyCellProofs verifies a batch of proofs corresponding to the blobs and commitments.
159159
// Expects length of blobs and commitments to be equal.
160160
// Expects length of proofs be 128 * length of blobs.
161-
func VerifyCellProofs(blobs []*Blob, commitments []Commitment, proofs []Proof) error {
161+
func VerifyCellProofs(blobs []Blob, commitments []Commitment, proofs []Proof) error {
162162
if useCKZG.Load() {
163163
return ckzgVerifyCellProofBatch(blobs, commitments, proofs)
164164
}

crypto/kzg4844/kzg4844_ckzg_cgo.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ func ckzgComputeCellProofs(blob *Blob) ([]Proof, error) {
151151
}
152152

153153
// ckzgVerifyCellProofs verifies that the blob data corresponds to the provided commitment.
154-
func ckzgVerifyCellProofBatch(blobs []*Blob, commitments []Commitment, cellProofs []Proof) error {
154+
func ckzgVerifyCellProofBatch(blobs []Blob, commitments []Commitment, cellProofs []Proof) error {
155155
ckzgIniter.Do(ckzgInit)
156156
var (
157157
proofs = make([]ckzg4844.Bytes48, len(cellProofs))
@@ -170,8 +170,8 @@ func ckzgVerifyCellProofBatch(blobs []*Blob, commitments []Commitment, cellProof
170170
}
171171
}
172172
// Compute the cells and cell indices
173-
for _, blob := range blobs {
174-
cellsI, err := ckzg4844.ComputeCells((*ckzg4844.Blob)(blob))
173+
for i := range blobs {
174+
cellsI, err := ckzg4844.ComputeCells((*ckzg4844.Blob)(&blobs[i]))
175175
if err != nil {
176176
return err
177177
}

crypto/kzg4844/kzg4844_ckzg_nocgo.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func ckzgVerifyBlobProof(blob *Blob, commitment Commitment, proof Proof) error {
6262
}
6363

6464
// ckzgVerifyCellProofBatch verifies that the blob data corresponds to the provided commitment.
65-
func ckzgVerifyCellProofBatch(blobs []*Blob, commitments []Commitment, proof []Proof) error {
65+
func ckzgVerifyCellProofBatch(blobs []Blob, commitments []Commitment, proof []Proof) error {
6666
panic("unsupported platform")
6767
}
6868

crypto/kzg4844/kzg4844_gokzg.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ func gokzgComputeCellProofs(blob *Blob) ([]Proof, error) {
116116
}
117117

118118
// gokzgVerifyCellProofs verifies that the blob data corresponds to the provided commitment.
119-
func gokzgVerifyCellProofBatch(blobs []*Blob, commitments []Commitment, cellProofs []Proof) error {
119+
func gokzgVerifyCellProofBatch(blobs []Blob, commitments []Commitment, cellProofs []Proof) error {
120120
gokzgIniter.Do(gokzgInit)
121121

122122
var (
@@ -136,8 +136,8 @@ func gokzgVerifyCellProofBatch(blobs []*Blob, commitments []Commitment, cellProo
136136
}
137137
}
138138
// Compute the cell and cell indices
139-
for _, blob := range blobs {
140-
cellsI, err := context.ComputeCells((*gokzg4844.Blob)(blob), 2)
139+
for i := range blobs {
140+
cellsI, err := context.ComputeCells((*gokzg4844.Blob)(&blobs[i]), 2)
141141
if err != nil {
142142
return err
143143
}

crypto/kzg4844/kzg4844_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,8 @@ func testKZGCells(t *testing.T, ckzg bool) {
225225
t.Fatalf("failed to create KZG proof at point: %v", err)
226226
}
227227
proofs := append(proofs1, proofs2...)
228-
if err := VerifyCellProofs([]*Blob{blob1, blob2}, []Commitment{commitment1, commitment2}, proofs); err != nil {
228+
blobs := []Blob{*blob1, *blob2}
229+
if err := VerifyCellProofs(blobs, []Commitment{commitment1, commitment2}, proofs); err != nil {
229230
t.Fatalf("failed to verify KZG proof at point: %v", err)
230231
}
231232
}

0 commit comments

Comments
 (0)