[Merged by Bors] - Extend proposal builder to allow the use of a fallback active set. #5378

fasmat · 2023-12-19T13:26:16Z

Motivation

related to #5366

Allow to set a fallback active set to be used by the proposal builder via the same mechanism as we use for the fallback beacon.

Changes

some minor fixes in bootstrap cmd code
extend ProposalBuilder to be able to set a specific active set for an epoch
extend node routine listening for updates to fallback beacon / activeset to propagate a fallback to the ProposalBuilder

Test Plan

added test case to ProposalBuilder to verify use of fallback active set if available
manual testing on testnet-10

TODO

Explain motivation or link existing issue(s)
Test changes and document test plan
Update documentation as needed
Update changelog as needed

codecov · 2023-12-19T13:34:28Z

Codecov Report

Attention: 21 lines in your changes are missing coverage. Please review.

Comparison is base (c580fba) 77.3% compared to head (44d50ce) 77.3%.

Files	Patch %	Lines
node/node.go	26.3%	14 Missing ⚠️
miner/proposal_builder.go	89.8%	5 Missing and 2 partials ⚠️

Additional details and impacted files

@@            Coverage Diff            @@
##           develop   #5378     +/-   ##
=========================================
- Coverage     77.3%   77.3%   -0.1%     
=========================================
  Files          258     258             
  Lines        30526   30590     +64     
=========================================
+ Hits         23599   23648     +49     
- Misses        5429    5444     +15     
  Partials      1498    1498

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

node/node.go

miner/proposal_builder.go

dshulyak · 2023-12-19T17:54:27Z

miner/proposal_builder.go

@@ -368,6 +373,20 @@ func (pb *ProposalBuilder) decideMeshHash(ctx context.Context, current types.Lay
 	return mesh
 }

+func (pb *ProposalBuilder) UpdateActiveSet(epoch types.EpochID, activeSet []types.ATXID) {


what about also providing weight as a part of fallback data?

We could, I wanted to avoid that because for this we have to change the schema of the json thats inside the bootstrap file; to change it in a backwards compatible way the weight would then be optional.

dshulyak · 2023-12-19T17:56:55Z

Should the activeset be persisted in the activeset table when received via update?

yes we should persist it on every node, otherwise non-smeshing nodes will ask it over the p2p network

Is it correct to fetch all missing ATXs from the fallback active set immediatly?

it is better to drop it from this pr, it is covered in my change.

what about sharing weight as well? it would make this hack more robust

fasmat · 2023-12-19T18:11:19Z

yes we should persist it on every node, otherwise non-smeshing nodes will ask it over the p2p network

Will add that.

it is better to drop it from this pr, it is covered in my change.

I saw 🙂 for the test build I removed my code and used the code from your PR.

what about sharing weight as well? it would make this hack more robust

we could; I wasn't sure about it because it will force all nodes to update then (even for beacon).

dshulyak · 2023-12-19T18:14:48Z

we could; I wasn't sure about it because it will force all nodes to update then (even for beacon).

do you mean that if we will add one new field, old versions will reject data with that field?

fasmat · 2023-12-19T18:25:50Z

do you mean that if we will add one new field, old versions will reject data with that field?

I didn't try, just adding the field probably works. We can also add it to the schema if we don't make it a required field (to not break backwards compatibility). At the moment the only required fields are version and epoch, all other fields are optional.

fasmat · 2023-12-21T12:21:33Z

bors merge

…5378) ## Motivation related to #5366 Allow to set a fallback active set to be used by the proposal builder via the same mechanism as we use for the fallback beacon. ## Changes - some minor fixes in `bootstrap` cmd code - extend `ProposalBuilder` to be able to set a specific active set for an epoch - extend node routine listening for updates to fallback beacon / activeset to propagate a fallback to the `ProposalBuilder` ## Test Plan - added test case to `ProposalBuilder` to verify use of fallback active set if available - manual testing on `testnet-10` ## TODO  - [x] Explain motivation or link existing issue(s) - [x] Test changes and document test plan - [x] Update documentation as needed - [x] Update [changelog](../CHANGELOG.md) as needed

spacemesh-bors · 2023-12-21T13:15:26Z

Build failed:

systest-status

fasmat · 2023-12-21T13:16:05Z

bors merge

…5378) ## Motivation related to #5366 Allow to set a fallback active set to be used by the proposal builder via the same mechanism as we use for the fallback beacon. ## Changes - some minor fixes in `bootstrap` cmd code - extend `ProposalBuilder` to be able to set a specific active set for an epoch - extend node routine listening for updates to fallback beacon / activeset to propagate a fallback to the `ProposalBuilder` ## Test Plan - added test case to `ProposalBuilder` to verify use of fallback active set if available - manual testing on `testnet-10` ## TODO  - [x] Explain motivation or link existing issue(s) - [x] Test changes and document test plan - [x] Update documentation as needed - [x] Update [changelog](../CHANGELOG.md) as needed

spacemesh-bors · 2023-12-21T14:10:12Z

Pull request successfully merged into develop.

Build succeeded:

ci-status
systest-status

…5378) ## Motivation related to #5366 Allow to set a fallback active set to be used by the proposal builder via the same mechanism as we use for the fallback beacon. ## Changes - some minor fixes in `bootstrap` cmd code - extend `ProposalBuilder` to be able to set a specific active set for an epoch - extend node routine listening for updates to fallback beacon / activeset to propagate a fallback to the `ProposalBuilder` ## Test Plan - added test case to `ProposalBuilder` to verify use of fallback active set if available - manual testing on `testnet-10` ## TODO  - [x] Explain motivation or link existing issue(s) - [x] Test changes and document test plan - [x] Update documentation as needed - [x] Update [changelog](../CHANGELOG.md) as needed

fasmat self-assigned this Dec 19, 2023

fasmat requested review from dshulyak and poszu as code owners December 19, 2023 13:26

fasmat force-pushed the fetch-active-set branch from 9294372 to 049d58f Compare December 19, 2023 13:26

fasmat mentioned this pull request Dec 19, 2023

[Merged by Bors] - spawn a process to download atxs hinted by a server #5377

Closed

dshulyak reviewed Dec 19, 2023

View reviewed changes

fasmat added 4 commits December 20, 2023 19:11

Extend proposal builder to allow the use of a fallback active set.

817297c

Review feedback for proposal builder

c700eb7

Review feedback

a617b44

Fix incorrect annotation

4201550

fasmat force-pushed the fetch-active-set branch from 616c2b7 to 4201550 Compare December 20, 2023 19:11

fasmat added a commit that referenced this pull request Dec 20, 2023

Backport of #5378 for v1.2.x

6603fe9

fasmat mentioned this pull request Dec 20, 2023

Extend proposal builder to allow the use of a fallback active set for v1.2.x #5384

Merged

4 tasks

fasmat added a commit that referenced this pull request Dec 20, 2023

Backport of #5378 for v1.2.x

b8c4a5c

Add changelog and fix typos

f8001e3

dshulyak approved these changes Dec 21, 2023

View reviewed changes

Merge remote-tracking branch 'origin/develop' into fetch-active-set

44d50ce

fasmat force-pushed the fetch-active-set branch from a286765 to 44d50ce Compare December 21, 2023 12:20

fasmat added a commit that referenced this pull request Dec 21, 2023

Backport of #5378 for v1.2.x

a9d026c

spacemesh-bors bot changed the title ~~Extend proposal builder to allow the use of a fallback active set.~~ [Merged by Bors] - Extend proposal builder to allow the use of a fallback active set. Dec 21, 2023

spacemesh-bors bot closed this Dec 21, 2023

spacemesh-bors bot deleted the fetch-active-set branch December 21, 2023 14:10

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Merged by Bors] - Extend proposal builder to allow the use of a fallback active set. #5378

[Merged by Bors] - Extend proposal builder to allow the use of a fallback active set. #5378

fasmat commented Dec 19, 2023 •

edited

Loading

codecov bot commented Dec 19, 2023 •

edited

Loading

dshulyak Dec 19, 2023

fasmat Dec 19, 2023 •

edited

Loading

dshulyak commented Dec 19, 2023

fasmat commented Dec 19, 2023 •

edited

Loading

dshulyak commented Dec 19, 2023

fasmat commented Dec 19, 2023

fasmat commented Dec 21, 2023

spacemesh-bors bot commented Dec 21, 2023

fasmat commented Dec 21, 2023

spacemesh-bors bot commented Dec 21, 2023

[Merged by Bors] - Extend proposal builder to allow the use of a fallback active set. #5378

[Merged by Bors] - Extend proposal builder to allow the use of a fallback active set. #5378

Conversation

fasmat commented Dec 19, 2023 • edited Loading

Motivation

Changes

Test Plan

TODO

codecov bot commented Dec 19, 2023 • edited Loading

Codecov Report

dshulyak Dec 19, 2023

Choose a reason for hiding this comment

fasmat Dec 19, 2023 • edited Loading

Choose a reason for hiding this comment

dshulyak commented Dec 19, 2023

fasmat commented Dec 19, 2023 • edited Loading

dshulyak commented Dec 19, 2023

fasmat commented Dec 19, 2023

fasmat commented Dec 21, 2023

spacemesh-bors bot commented Dec 21, 2023

fasmat commented Dec 21, 2023

spacemesh-bors bot commented Dec 21, 2023

fasmat commented Dec 19, 2023 •

edited

Loading

codecov bot commented Dec 19, 2023 •

edited

Loading

fasmat Dec 19, 2023 •

edited

Loading

fasmat commented Dec 19, 2023 •

edited

Loading