chore!: Refactor RecoverBlob to RecoverCellsAndProofs
#14160
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kevaundray
commented
Jun 28, 2024
kevaundray
requested review from
kasey,
rauljordan and
saolyn
and removed request for
a team
8 tasks
kevaundray
commented
Jul 3, 2024
Comment on lines
-215
to
-229
| // Compute cells and proofs. | ||
| cells := make([][kzg.CellsPerExtBlob]kzg.Cell, 0, blobsCount) | ||
| proofs := make([][kzg.CellsPerExtBlob]kzg.Proof, 0, blobsCount) | ||
|
|
||
| for i := range blobs { | ||
| blob := &blobs[i] | ||
| blobCells, blobProofs, err := kzg.ComputeCellsAndKZGProofs(blob) | ||
| if err != nil { | ||
| return nil, errors.Wrap(err, "compute cells and KZG proofs") | ||
| } | ||
|
|
||
| cells = append(cells, blobCells) | ||
| proofs = append(proofs, blobProofs) | ||
| } | ||
|
|
There was a problem hiding this comment.
This code has now been moved to recoverCellsAndProofs, so instead of computing the cells and proofs here, we now pass them to this method
kevaundray
commented
Jul 3, 2024
Comment on lines
224
to
233
| for rowIndex := 0; rowIndex < blobsCount; rowIndex++ { | ||
| cell := cells[rowIndex][columnIndex] | ||
| cellsForRow := cellsAndProofs[rowIndex].Cells | ||
| proofsForRow := cellsAndProofs[rowIndex].Proofs | ||
|
|
||
| cell := cellsForRow[columnIndex] | ||
| column = append(column, cell) | ||
|
|
||
| kzgProof := proofs[rowIndex][columnIndex] | ||
| kzgProof := proofsForRow[columnIndex] | ||
| kzgProofOfColumn = append(kzgProofOfColumn, kzgProof) | ||
| } |
There was a problem hiding this comment.
Just for my understanding; this code is iterating over each rowIndex(blobIndex) and getting the corresponding cells and proofs for that Blob. The code is then using the column index to fetch the cell and proof for that blob that corresponds to the column that we want
kevaundray
commented
Jul 3, 2024
Comment on lines
+80
to
+88
| blobCells, blobProofs, err := kzg.ComputeCellsAndKZGProofs(&recoveredBlob) | ||
| if err != nil { | ||
| return nil, errors.Wrapf(err, "compute cells and KZG proofs for blob %d", blobIndex) | ||
| } | ||
| recoveredCellsAndProofs = append(recoveredCellsAndProofs, kzg.CellsAndProofs{ | ||
| Cells: blobCells, | ||
| Proofs: blobProofs, | ||
| }) | ||
|
|
There was a problem hiding this comment.
This is essentially the code we removed from the DataColumnSideCarsForReconstruct method, ie:
// Compute cells and proofs.
cells := make([][kzg.CellsPerExtBlob]kzg.Cell, 0, blobsCount)
proofs := make([][kzg.CellsPerExtBlob]kzg.Proof, 0, blobsCount)
for i := range blobs {
blob := &blobs[i]
blobCells, blobProofs, err := kzg.ComputeCellsAndKZGProofs(blob)
if err != nil {
return nil, errors.Wrap(err, "compute cells and KZG proofs")
}
cells = append(cells, blobCells)
proofs = append(proofs, blobProofs)
}
Just that we are doing it in this method and passing the cells and proofs we computed, instead of passing the blobs and computing the cells and proofs over there
nalepae
pushed a commit
that referenced
this pull request
Jul 17, 2024
* change recoverBlobs to recoverCellsAndProofs * modify code to take in the cells and proofs for a particular blob instead of the blob itself * add CellsAndProofs structure * modify recoverCellsAndProofs to return `cellsAndProofs` structure * modify `DataColumnSidecarsForReconstruct` to accept the `cellsAndKZGProofs` structure * bazel run //:gazelle -- fix * use kzg abstraction for kzg method * move CellsAndProofs to kzg.go
nalepae
pushed a commit
that referenced
this pull request
Jul 17, 2024
* change recoverBlobs to recoverCellsAndProofs * modify code to take in the cells and proofs for a particular blob instead of the blob itself * add CellsAndProofs structure * modify recoverCellsAndProofs to return `cellsAndProofs` structure * modify `DataColumnSidecarsForReconstruct` to accept the `cellsAndKZGProofs` structure * bazel run //:gazelle -- fix * use kzg abstraction for kzg method * move CellsAndProofs to kzg.go
nisdas
pushed a commit
that referenced
this pull request
Jul 18, 2024
* change recoverBlobs to recoverCellsAndProofs * modify code to take in the cells and proofs for a particular blob instead of the blob itself * add CellsAndProofs structure * modify recoverCellsAndProofs to return `cellsAndProofs` structure * modify `DataColumnSidecarsForReconstruct` to accept the `cellsAndKZGProofs` structure * bazel run //:gazelle -- fix * use kzg abstraction for kzg method * move CellsAndProofs to kzg.go
nalepae
pushed a commit
that referenced
this pull request
Jul 18, 2024
* change recoverBlobs to recoverCellsAndProofs * modify code to take in the cells and proofs for a particular blob instead of the blob itself * add CellsAndProofs structure * modify recoverCellsAndProofs to return `cellsAndProofs` structure * modify `DataColumnSidecarsForReconstruct` to accept the `cellsAndKZGProofs` structure * bazel run //:gazelle -- fix * use kzg abstraction for kzg method * move CellsAndProofs to kzg.go
nalepae
pushed a commit
that referenced
this pull request
Jul 29, 2024
* change recoverBlobs to recoverCellsAndProofs * modify code to take in the cells and proofs for a particular blob instead of the blob itself * add CellsAndProofs structure * modify recoverCellsAndProofs to return `cellsAndProofs` structure * modify `DataColumnSidecarsForReconstruct` to accept the `cellsAndKZGProofs` structure * bazel run //:gazelle -- fix * use kzg abstraction for kzg method * move CellsAndProofs to kzg.go
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What type of PR is this?
Refactor
What does this PR do? Why is it needed?
The consensus-specs has recently changed to no longer expose recoverAllCells. Instead there is a new method named RecoverCellsAndProofs. This method essentially recovers a blob, then it computes the cells and proofs for it.
In this PR, I have modified the recoverBlob method to recover cells and proofs, so that when we switch to the newer method, we only need to replace the following three calls
RecoverAllCells, CellsToBlob, ComputeCellsAndKZGProofswithRecoverCellsAndProofsHere is a reference to that method: https://github.com/ethereum/consensus-specs/blob/dev/specs/_features/eip7594/polynomial-commitments-sampling.md#recover_cells_and_kzg_proofs
This was also brought up in #14136 where we defined the kzg abstraction layer -- This PR is not dependent on that one.
Which issues(s) does this PR fix?
Fixes #
Other notes for review