Skip to content
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.

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

builder API: remove blinded blob sidecar #13202

Merged
merged 15 commits into from
Nov 29, 2023
Merged

Conversation

james-prysm
Copy link
Contributor

@james-prysm james-prysm commented Nov 20, 2023

What type of PR is this?

Other

What does this PR do? Why is it needed?

  • Removes blinded blob sidecar
  • Removes signed blinded blob sidecar
  • Removes BlindedBlobsBundle
  • update builder api to use blindedblock instead of blindedblockcontents
  • updates Builder Bid to not use the bundle and use kzg commitments instead
  • updates unblinder
  • updates some tests to use util.GenerateTestDenebBlockWithSidecar
  • adds the PbDeneb() (*enginev1.ExecutionPayloadDeneb, error) to the execution data interface

Does not address proposer changes, Beacon API changes, and some deneb unit tests are commented out to be addressed in subsequent PRs

Which issues(s) does this PR fix?

Fixes #13201 and part of #13157,#13155

Addresses ethereum/builder-specs#90

Other notes for review

@james-prysm james-prysm added API Api related tasks Builder PR or issue that supports builder related work labels Nov 20, 2023

return sidecars, nil
}
//func blindBlobsBundleToSidecars(bundle *enginev1.BlindedBlobsBundle, blk interfaces.ReadOnlyBeaconBlock) ([]*ethpb.BlindedBlobSidecar, error) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can just delete these

proto/eth/v2/blobs.proto Outdated Show resolved Hide resolved
Comment on lines 47 to 48
// bidKzgCommitments holds the KZG commitments for a builder's beacon block.
var bidKzgCommitments [][]byte //TODO: possibly change the architecture here to not use this package variable
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's just remove these

// TODO: update this for blobBundle processing
//bidKzgCommitments = nil // Reset blind blobs bundle after use.
//if err != nil {
// return nil, status.Errorf(codes.Internal, "Could not convert blind blobs bundle to sidecar: %v", err)
//}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same, we can remove these for now

@james-prysm james-prysm marked this pull request as ready for review November 21, 2023 03:13
@james-prysm james-prysm requested a review from a team as a code owner November 21, 2023 03:13
@@ -112,36 +110,35 @@ func (u *unblinder) unblindBuilderBlock(ctx context.Context) (interfaces.SignedB
"txs": len(txs),
}).Info("Retrieved full payload from builder")

bundle, err := unblindBlobsSidecars(u.blobs, blobsBundle)
sidecars, err := unblindBlobsSidecars(u.b, blobsBundle)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should I replace this with buildBlobSidecars function? I would need to add the blobs bundle to the cache, perhaps I add it to the cache when I submit blinded block?

}

func unblindBlobsSidecars(blindSidecars []*ethpb.SignedBlindedBlobSidecar, bundle *enginev1.BlobsBundle) ([]*ethpb.SignedBlobSidecar, error) {
func unblindBlobsSidecars(block interfaces.SignedBeaconBlock, bundle *enginev1.BlobsBundle) ([]*ethpb.BlobSidecar, error) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I use buildBlobSidecars then I don't need this function

Copy link
Member

@terencechain terencechain left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@terencechain terencechain merged commit bc107a6 into develop Nov 29, 2023
17 checks passed
@terencechain terencechain deleted the builder-api-deneb-fix branch November 29, 2023 14:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
API Api related tasks Builder PR or issue that supports builder related work
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update builder API to using new blob sidecar
2 participants