-
Notifications
You must be signed in to change notification settings - Fork 53
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
Merge develop into main #2133
Merge develop into main #2133
Conversation
Bumps [commit](https://github.com/EspressoSystems/commit) from `5f1c28f` to `737c5b2`. - [Release notes](https://github.com/EspressoSystems/commit/releases) - [Commits](EspressoSystems/commit@5f1c28f...737c5b2) --- updated-dependencies: - dependency-name: commit dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Bump jf-utils from `c0b8842` to `d99c22d` Bumps [jf-utils](https://github.com/espressosystems/jellyfish) from `c0b8842` to `d99c22d`. - [Release notes](https://github.com/espressosystems/jellyfish/releases) - [Commits](EspressoSystems/jellyfish@c0b8842...d99c22d) --- updated-dependencies: - dependency-name: jf-utils dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * hardcode to 8 chunks --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Rob <[email protected]>
* Bump jf-relation from `c0b8842` to `d99c22d` Bumps [jf-relation](https://github.com/EspressoSystems/jellyfish) from `c0b8842` to `d99c22d`. - [Release notes](https://github.com/EspressoSystems/jellyfish/releases) - [Commits](EspressoSystems/jellyfish@c0b8842...d99c22d) --- updated-dependencies: - dependency-name: jf-relation dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * num_storage_nodes to 8 --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Rob <[email protected]>
* Bump serde_json from 1.0.107 to 1.0.108 Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.107 to 1.0.108. - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](serde-rs/json@v1.0.107...v1.0.108) --- updated-dependencies: - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * fix lint --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Rob <[email protected]>
Bumps [arbitrary](https://github.com/rust-fuzz/arbitrary) from 1.3.1 to 1.3.2. - [Changelog](https://github.com/rust-fuzz/arbitrary/blob/main/CHANGELOG.md) - [Commits](https://github.com/rust-fuzz/arbitrary/compare/[email protected]) --- updated-dependencies: - dependency-name: arbitrary dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Remove DummyBlock
…into vec-stake-table
Sishan/scripts gen keypair
…into vec-stake-table
…r_onboarding_after_pull
Bumps [jf-relation](https://github.com/EspressoSystems/jellyfish) from `756d404` to `265eaaa`. - [Release notes](https://github.com/EspressoSystems/jellyfish/releases) - [Commits](EspressoSystems/jellyfish@756d404...265eaaa) --- updated-dependencies: - dependency-name: jf-relation dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [clap](https://github.com/clap-rs/clap) from 4.4.8 to 4.4.10. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](clap-rs/clap@v4.4.8...v4.4.10) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Remove commitment computation from payload and fix DA proposal
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I reviewed only the files you listed that had manual conflicts (since there are a lot of files).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good! The examples and all on this branch work as expected
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM! I reviewed the part I've updated (hotshot-signature-key, metrics, validator config).
49ffd9c
Closes #2006.
This PR:
develop
branch intomain
.toml
dependencies inmain.
Key places to review:
Files with conflicts that I manually resolved: