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

[Merged by Bors] - Upgrade to v1.4.0-beta.3 #4862

Closed
wants to merge 13 commits into from

Conversation

pawanjay176
Copy link
Member

@pawanjay176 pawanjay176 commented Oct 19, 2023

Issue Addressed

Makes lighthouse compliant with new kzg changes in https://github.com/ethereum/consensus-specs/releases/tag/v1.4.0-beta.3

Proposed Changes

  1. Adds new official trusted setup
  2. Refactors kzg to match upstream changes in Use official trusted setup ethereum/c-kzg-4844#377
  3. Updates pre-generated BlobBundle to work with official trusted setup. Using json here instead of ssz to account for different value of MaxBlobCommitmentsPerBlock in minimal and mainnet. By using json, we can just use one pre generated bundle for both minimal and mainnet. Size of 2 separate ssz bundles is approximately equal to one json bundle cc @jimmygchen
    Dunno what I was doing, ssz works without any issues
  4. Stores trusted_setup as just bytes in eth2_network_config so that we don't have kzg dependency in that lib and in lcli.

@pawanjay176 pawanjay176 added ready-for-review The code is ready for review deneb labels Oct 19, 2023
Copy link
Member

@realbigsean realbigsean left a comment

Choose a reason for hiding this comment

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

Nice! looks like we need to uodate consensus/types/presets/minimal/deneb.yaml

consensus/types/src/eth_spec.rs Outdated Show resolved Hide resolved
@realbigsean
Copy link
Member

the beacon chain tests are failing for me locally on this branch, not sure what changed here. looks like it's in the data availability overflow cache

@realbigsean
Copy link
Member

bors r+

bors bot pushed a commit that referenced this pull request Oct 20, 2023
## Issue Addressed

Makes lighthouse compliant with new kzg changes in https://github.com/ethereum/consensus-specs/releases/tag/v1.4.0-beta.3

## Proposed Changes

1. Adds new official trusted setup
2. Refactors kzg to match upstream changes in ethereum/c-kzg-4844#377
3. Updates pre-generated `BlobBundle` to work with official trusted setup. ~~Using json here instead of ssz to account for different value of `MaxBlobCommitmentsPerBlock` in minimal and mainnet. By using json, we can just use one pre generated bundle for both minimal and mainnet. Size of 2 separate ssz bundles is approximately equal to one json bundle cc @jimmygchen~~ 
Dunno what I was doing, ssz works without any issues  
4. Stores trusted_setup as just bytes in eth2_network_config so that we don't have kzg dependency in that lib and in lcli. 


Co-authored-by: realbigsean <[email protected]>
Co-authored-by: realbigsean <[email protected]>
@bors
Copy link

bors bot commented Oct 20, 2023

Build failed:

@realbigsean
Copy link
Member

bors retry

bors bot pushed a commit that referenced this pull request Oct 21, 2023
## Issue Addressed

Makes lighthouse compliant with new kzg changes in https://github.com/ethereum/consensus-specs/releases/tag/v1.4.0-beta.3

## Proposed Changes

1. Adds new official trusted setup
2. Refactors kzg to match upstream changes in ethereum/c-kzg-4844#377
3. Updates pre-generated `BlobBundle` to work with official trusted setup. ~~Using json here instead of ssz to account for different value of `MaxBlobCommitmentsPerBlock` in minimal and mainnet. By using json, we can just use one pre generated bundle for both minimal and mainnet. Size of 2 separate ssz bundles is approximately equal to one json bundle cc @jimmygchen~~ 
Dunno what I was doing, ssz works without any issues  
4. Stores trusted_setup as just bytes in eth2_network_config so that we don't have kzg dependency in that lib and in lcli. 


Co-authored-by: realbigsean <[email protected]>
Co-authored-by: realbigsean <[email protected]>
@bors
Copy link

bors bot commented Oct 21, 2023

Pull request successfully merged into unstable.

Build succeeded!

The publicly hosted instance of bors-ng is deprecated and will go away soon.

If you want to self-host your own instance, instructions are here.
For more help, visit the forum.

If you want to switch to GitHub's built-in merge queue, visit their help page.

@bors bors bot changed the title Upgrade to v1.4.0-beta.3 [Merged by Bors] - Upgrade to v1.4.0-beta.3 Oct 21, 2023
@bors bors bot closed this Oct 21, 2023
bors bot pushed a commit that referenced this pull request Oct 27, 2023
## Issue Addressed

resolves #4440

## Proposed Changes

restore our `cargo vendor` test in CI

changes to `c-kzg` here mean we no longer have to compile it twice and get duplicate source errors: #4862

Co-authored-by: realbigsean <[email protected]>
bors bot pushed a commit that referenced this pull request Oct 27, 2023
## Issue Addressed

resolves #4440

## Proposed Changes

restore our `cargo vendor` test in CI

changes to `c-kzg` here mean we no longer have to compile it twice and get duplicate source errors: #4862

Co-authored-by: realbigsean <[email protected]>
bors bot pushed a commit that referenced this pull request Oct 27, 2023
## Issue Addressed

resolves #4440

## Proposed Changes

restore our `cargo vendor` test in CI

changes to `c-kzg` here mean we no longer have to compile it twice and get duplicate source errors: #4862

Co-authored-by: realbigsean <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
deneb ready-for-review The code is ready for review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants