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

Trace full SelectView when changing chain (including tiebreaker VRF) #5502

Closed
wants to merge 2 commits into from

Conversation

amesgen
Copy link
Member

@amesgen amesgen commented Oct 10, 2023

Description

Demo for integrating IntersectMBO/ouroboros-consensus#384 (and IntersectMBO/ouroboros-consensus#398) into the next node release (8.6).

These commits can be cherry-picked onto the 8.6 integration branch.

Checklist

  • Commit sequence broadly makes sense and commits have useful messages
  • New tests are added if needed and existing tests are updated. These may include:
    • golden tests
    • property tests
    • roundtrip tests
    • integration tests
      See Runnings tests for more details
  • Any changes are noted in the CHANGELOG.md for affected package
  • The version bounds in .cabal files are updated
  • CI passes. See note on CI. The following CI checks are required:
    • Code is linted with hlint. See .github/workflows/check-hlint.yml to get the hlint version
    • Code is formatted with stylish-haskell. See .github/workflows/stylish-haskell.yml to get the stylish-haskell version
    • Code builds on Linux, MacOS and Windows for ghc-8.10.7 and ghc-9.2.7
  • Self-reviewed the diff

Note on CI

If your PR is from a fork, the necessary CI jobs won't trigger automatically for security reasons.
You will need to get someone with write privileges. Please contact IOG node developers to do this
for you.

@amesgen amesgen force-pushed the amesgen/trace-selectview branch from df0f182 to 741862b Compare October 10, 2023 13:14
@teodanciu teodanciu force-pushed the amesgen/trace-selectview branch from c92f13f to 741862b Compare October 19, 2023 19:31
@teodanciu
Copy link
Contributor

Sorry, wanted to update from master and forgot to select "Rebase" instead of "Merge", so force-pushed again with the previous version before the update ( 741862b ) .

In particular, this will trace the tiebreaker VRF, which is often useful for
diagnostics/investigations.
@teodanciu teodanciu force-pushed the amesgen/trace-selectview branch from 741862b to 1115497 Compare October 19, 2023 19:32
@teodanciu
Copy link
Contributor

teodanciu commented Oct 19, 2023

Rebased on master, in order to integrate it for 8.6

EDIT: After reading the description about cherry-picking the commits on the release branch, I now have doubts whether this should have been rebased, sorry.
I can change it back to the commit before the rebase ( 741862b ) , if you can let me know @amesgen .

@amesgen
Copy link
Member Author

amesgen commented Oct 20, 2023

EDIT: After reading the description about cherry-picking the commits on the release branch, I now have doubts whether this should have been rebased, sorry.
I can change it back to the commit before the rebase ( 741862b ) , if you can let me know @amesgen .

No problem, cherry-picking was just one possible option, feel free to rebase this branch or cherry-pick the commits on a dedicated one, whatever is more convenient for you!

@amesgen
Copy link
Member Author

amesgen commented Nov 23, 2023

Has been integrated in #5516

@amesgen amesgen closed this Nov 23, 2023
@amesgen amesgen deleted the amesgen/trace-selectview branch November 23, 2023 09:34
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.

2 participants