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

Ed/timeout hotfix merge #1872

Merged
merged 25 commits into from
Oct 10, 2023
Merged

Ed/timeout hotfix merge #1872

merged 25 commits into from
Oct 10, 2023

Conversation

elliedavidson
Copy link
Member

@elliedavidson elliedavidson commented Oct 9, 2023

Merges the changes in the 'ed/timeout-hotfix' branch into `main'
Also updates Nix flake for the new MacOS update

shenkeyao and others added 23 commits September 30, 2023 16:35
* Decrease network task polling frequency from 500ns to 100ms

* Fix format

* increase webserver test duration

---------

Co-authored-by: Rob <[email protected]>
Remove nonzero check for view sync indices
Subscribe to web server when starting view sync
Update consensus state even if missing parent info
{
// Validate the block commitment for non-genesis DAC.
if !cert.is_genesis() && cert.leaf_commitment() != proposal.block_commitment {
Copy link
Member

Choose a reason for hiding this comment

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

is_genesis always returns false so is redundant. But the fact that it always returns false might be an issue. I'll make a GH issue for further discussion/fix, so no need to change anything, just a heads-up. :)

@elliedavidson elliedavidson merged commit 6bd7452 into develop Oct 10, 2023
4 of 6 checks passed
@elliedavidson elliedavidson deleted the ed/timeout-hotfix-merge branch October 10, 2023 12:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants