Skip to content

Instantly share code, notes, and snippets.

@noamnelke

noamnelke/End of 2020 merge plan.md

Last active December 29, 2020 17:19
Show Gist options
  • Save noamnelke/d20c4db010028c0097a731933d1c29fb to your computer and use it in GitHub Desktop.
Save noamnelke/d20c4db010028c0097a731933d1c29fb to your computer and use it in GitHub Desktop.
Download ZIP
End of 2020 merge plan
Raw
End of 2020 merge plan.md

Pending PRs (20)

PR Owner Comments
work parallel worker queue work Anton Fixes test issues - should be merged first.
fixed different active set size in block creation Anton Relatively local change, no conflicts expected.
New CI infrastructure to support private ELK per test Amit Changes CI infra, may reduce arbitrary errors in other merges, should be merged early.
Return 20-byte block ids in api Noam Local change that shouldn't cause conflicts.
Fix flaky blocks-add-node test Nikita Fixes one of the tests - should be merged first.
Local change that shouldn't cause conflicts.
Krishna/2225/remove timestamp from block header Noam Community contribution.
Local change that shouldn't cause conflicts.
Continuous Deployment for Releases Narayan Local change that shouldn't cause conflicts.
NTP Servers List Configurable via CLI Narayan Local change that shouldn't cause conflicts.
Profiler CLI Option Narayan Local change that shouldn't cause conflicts.
updated PR template Narayan Local change that shouldn't cause conflicts.
don't close listener when calling Close on an incoming udp session. Yosher Local change that shouldn't cause conflicts.
Implement Golden ATX Nikita Conflicts expected.
changed order of syntactic validation to not fail when fast validating Anton Local change that shouldn't cause conflicts.
Verifying tortoise Yosher Major change.
update MultiAccountsState to store root hash and not string Aviv Local change that shouldn't cause conflicts.
Remove CI status badge from README Lane Local change that shouldn't cause conflicts.
Output canonical address string (40 hex chars) instead of 7 in logs Aviv Local change that shouldn't cause conflicts.
Variable size PoST Noam Major change.
Sync integration Anton Major change.
Smesher API + GPU/Tree-free PoST integration Shababo Major change.

Suggested Merge Order

1st wave [Anton]

Merge into single branch and PR, then use bors merge.

  1. work parallel worker queue work - Anton
  2. Fix flaky blocks-add-node test - Nikita

2nd wave [Noam]

Run bors merge on each of these. Bors will try to combine them and if it fails do a binary search for the offender. I expect this to take several hours - we can let it run overnight or over a weekend, then fix conflicts and retry.

  1. fixed different active set size in block creation - Anton
  2. Return 20-byte block ids in api - Noam
  3. Krishna/2225/remove timestamp from block header - Noam
  4. Continuous Deployment for Releases - Narayan
  5. NTP Servers List Configurable via CLI - Narayan
  6. Profiler CLI Option - Narayan
  7. updated PR template - Narayan
  8. don’t close listener when calling Close on an incoming udp session. - Yosher
  9. changed order of syntactic validation to not fail when fast validating - Anton
  10. update MultiAccountsState to store root hash and not string - Aviv
  11. Remove CI status badge from README - Lane
  12. Output canonical address string (40 hex chars) instead of 7 in logs - Aviv

Finally: Implement Golden ATX - Nikita

3rd wave

Should be merged separately (in this order) fixing conflicts manually before trying to merge.

Each of these should have a long-running devnet running for a week or so, in addition to a combined devnet for all of them.

  1. Sync integration - Anton
  2. Verifying tortoise - Yosher
  3. Variable size PoST - Noam
  4. Smesher API + GPU/Tree-free PoST integration - Shababo
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment