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

fix: sync: do not include incoming in return of syncFork #11541

Merged
merged 1 commit into from
Dec 19, 2023

Conversation

arajasek
Copy link
Contributor

Related Issues

Both @TippyFlitsUK and I ran into failures on this line when running latest master. This is due to a bug in #11533, which causes us to return one EXTRA tipset in the return. This return then gets folded into the blockSet, which includes the incoming tipset already, leading to us having a non-continuous "chain".

Proposed Changes

Only return incomingParents in this case.

Additional Info

Please don't merge until I've done some additional testing.

Checklist

Before you mark the PR ready for review, please make sure that:

  • Commits have a clear commit message.
  • PR title is in the form of of <PR type>: <area>: <change being made>
    • example: fix: mempool: Introduce a cache for valid signatures
    • PR type: fix, feat, build, chore, ci, docs, perf, refactor, revert, style, test
    • area, e.g. api, chain, state, market, mempool, multisig, networking, paych, proving, sealing, wallet, deps
  • If the PR affects users (e.g., new feature, bug fix, system requirements change), update the CHANGELOG.md and add details to the UNRELEASED section.
  • New features have usage guidelines and / or documentation updates in
  • Tests exist for new functionality or change in behavior
  • CI is green

@arajasek arajasek requested a review from a team as a code owner December 19, 2023 20:10
@Stebalien Stebalien merged commit bfc26cd into master Dec 19, 2023
89 checks passed
@Stebalien Stebalien deleted the asr/fix-syncfork branch December 19, 2023 21:39
@rjan90 rjan90 mentioned this pull request Jan 4, 2024
8 tasks
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.

None yet

2 participants