Expose additional builder booster related flags in the vc #5086

eserilev · 2024-01-19T02:36:39Z

Issue Addressed

#5039

Proposed Changes

Add two new flags to the VC

prefer_builder_proposals
builder_boost_factor

Use these new flags plus the existing builder_proposals flag to 'calculate' the correct boost factor.

Enable these flags to be set via cli and relevant validator management api endpoints

…ints, update tests

…pose-builder-booster-flags-vc

book/src/help_vc.md

paulhauner

Looking great! I just a have a few minor suggestions. There are also some docs over in the Lighthouse book that might be nice to update, eg https://github.com/sigp/lighthouse/blob/stable/book/src/api-vc-endpoints.md#patch-lighthousevalidatorsvoting_pubkey

validator_client/src/validator_store.rs

validator_client/src/config.rs

validator_client/src/block_service.rs

…d some additional documentation

eserilev · 2024-01-22T17:45:54Z

thanks for the review Paul. I've made changes based on your feedback and added some additional documentation to the Lighthouse book.

validator_client/src/block_service.rs

… present

paulhauner

Nice! Once we have approval from @realbigsean as well we can merge!

realbigsean

Awesome!

validator_client/src/block_service.rs

validator_client/src/validator_store.rs

…/lighthouse into fork/eserilev/expose-builder-booster-flags-vc

jimmygchen · 2024-01-24T05:53:56Z

I've added a new test (locally) that covers the scenario where process defaults is present, and checking that the per-validator value overrides them - the test is failing though, I'm investigating now.

Squashed commit of the following: commit 4df4663 Author: Paul Hauner <paul@paulhauner.com> Date: Wed Jan 24 18:23:20 2024 +1100 Fix issue with PATCH request commit 45d7ea5 Author: Jimmy Chen <jchen.tc@gmail.com> Date: Wed Jan 24 17:26:25 2024 +1100 Add http test for builder boost factor with process defaults. commit 800e29c Merge: b225328 2401fd7 Author: Jimmy Chen <jchen.tc@gmail.com> Date: Wed Jan 24 12:29:28 2024 +1100 Merge branch 'expose-builder-booster-flags-vc' of github.com:eserilev/lighthouse into fork/eserilev/expose-builder-booster-flags-vc commit b225328 Author: Jimmy Chen <jchen.tc@gmail.com> Date: Wed Jan 24 11:37:14 2024 +1100 Prioritise per validator builder boost configurations over CLI flags. commit 2401fd7 Author: Mac L <mjladson@pm.me> Date: Wed Jan 24 11:03:31 2024 +1100 Fix CLI help text commit c852a51 Author: Eitan Seri-Levi <eserilev@ucsc.edu> Date: Tue Jan 23 03:34:39 2024 +0200 typo commit 59af312 Author: Eitan Seri-Levi <eserilev@ucsc.edu> Date: Tue Jan 23 03:32:56 2024 +0200 typo commit 24a522b Author: Eitan Seri-Levi <eserilev@ucsc.edu> Date: Tue Jan 23 02:55:33 2024 +0200 fmt commit f3a1b30 Author: Eitan Seri-Levi <eserilev@ucsc.edu> Date: Tue Jan 23 02:02:45 2024 +0200 assume builder-proosals flag if one of other two vc builder flags are present commit 2b2c9af Author: Eitan Seri-Levi <eserilev@ucsc.edu> Date: Mon Jan 22 19:43:27 2024 +0200 fix typos commit d1591fe Author: Eitan Seri-Levi <eserilev@ucsc.edu> Date: Mon Jan 22 19:43:20 2024 +0200 fix typos commit dc7a870 Author: Eitan Seri-Levi <eserilev@ucsc.edu> Date: Mon Jan 22 19:25:51 2024 +0200 remove unneeded val, change how boost factor flag logic in the vc, add some additional documentation commit 7a214f7 Author: Eitan Seri-Levi <eserilev@ucsc.edu> Date: Sat Jan 20 21:57:36 2024 +0200 fix issues related to CreateConfig and MoveConfig commit 89ade68 Author: Eitan Seri-Levi <eserilev@ucsc.edu> Date: Sat Jan 20 01:52:42 2024 +0200 resolve failing test commit 5641d24 Merge: 03d68f5 185646a Author: Eitan Seri-Levi <eserilev@ucsc.edu> Date: Fri Jan 19 04:30:54 2024 +0200 Merge branch 'unstable' of https://github.com/sigp/lighthouse into expose-builder-booster-flags-vc commit 03d68f5 Author: Eitan Seri-Levi <eserilev@ucsc.edu> Date: Fri Jan 19 04:30:39 2024 +0200 expose builder booster flags in vc, enable options in validator endpoints, update tests

Squashed commit of the following: commit 6c6f6b7 Author: Paul Hauner <paul@paulhauner.com> Date: Wed Jan 24 19:06:33 2024 +1100 Add prefer builder proposals commit 4df4663 Author: Paul Hauner <paul@paulhauner.com> Date: Wed Jan 24 18:23:20 2024 +1100 Fix issue with PATCH request commit 45d7ea5 Author: Jimmy Chen <jchen.tc@gmail.com> Date: Wed Jan 24 17:26:25 2024 +1100 Add http test for builder boost factor with process defaults. commit 800e29c Merge: b225328 2401fd7 Author: Jimmy Chen <jchen.tc@gmail.com> Date: Wed Jan 24 12:29:28 2024 +1100 Merge branch 'expose-builder-booster-flags-vc' of github.com:eserilev/lighthouse into fork/eserilev/expose-builder-booster-flags-vc commit b225328 Author: Jimmy Chen <jchen.tc@gmail.com> Date: Wed Jan 24 11:37:14 2024 +1100 Prioritise per validator builder boost configurations over CLI flags. commit 2401fd7 Author: Mac L <mjladson@pm.me> Date: Wed Jan 24 11:03:31 2024 +1100 Fix CLI help text commit c852a51 Author: Eitan Seri-Levi <eserilev@ucsc.edu> Date: Tue Jan 23 03:34:39 2024 +0200 typo commit 59af312 Author: Eitan Seri-Levi <eserilev@ucsc.edu> Date: Tue Jan 23 03:32:56 2024 +0200 typo commit 24a522b Author: Eitan Seri-Levi <eserilev@ucsc.edu> Date: Tue Jan 23 02:55:33 2024 +0200 fmt commit f3a1b30 Author: Eitan Seri-Levi <eserilev@ucsc.edu> Date: Tue Jan 23 02:02:45 2024 +0200 assume builder-proosals flag if one of other two vc builder flags are present commit 2b2c9af Author: Eitan Seri-Levi <eserilev@ucsc.edu> Date: Mon Jan 22 19:43:27 2024 +0200 fix typos commit d1591fe Author: Eitan Seri-Levi <eserilev@ucsc.edu> Date: Mon Jan 22 19:43:20 2024 +0200 fix typos commit dc7a870 Author: Eitan Seri-Levi <eserilev@ucsc.edu> Date: Mon Jan 22 19:25:51 2024 +0200 remove unneeded val, change how boost factor flag logic in the vc, add some additional documentation commit 7a214f7 Author: Eitan Seri-Levi <eserilev@ucsc.edu> Date: Sat Jan 20 21:57:36 2024 +0200 fix issues related to CreateConfig and MoveConfig commit 89ade68 Author: Eitan Seri-Levi <eserilev@ucsc.edu> Date: Sat Jan 20 01:52:42 2024 +0200 resolve failing test commit 5641d24 Merge: 03d68f5 185646a Author: Eitan Seri-Levi <eserilev@ucsc.edu> Date: Fri Jan 19 04:30:54 2024 +0200 Merge branch 'unstable' of https://github.com/sigp/lighthouse into expose-builder-booster-flags-vc commit 03d68f5 Author: Eitan Seri-Levi <eserilev@ucsc.edu> Date: Fri Jan 19 04:30:39 2024 +0200 expose builder booster flags in vc, enable options in validator endpoints, update tests

eserilev · 2024-01-24T09:29:08Z

thanks for helping get this across the finish line everyone!

jimmygchen · 2024-01-24T12:51:06Z

I've added some more tests and it's looking good now after Paul's fixes!
Perhaps another approval from @realbigsean again and we can merge?

realbigsean

new changes look good!

michaelsproul

LGTM, let's ship 🚀

* expose builder booster flags in vc, enable options in validator endpoints, update tests * resolve failing test * fix issues related to CreateConfig and MoveConfig * remove unneeded val, change how boost factor flag logic in the vc, add some additional documentation * fix typos * fix typos * assume builder-proosals flag if one of other two vc builder flags are present * fmt * typo * typo * Fix CLI help text * Prioritise per validator builder boost configurations over CLI flags. * Add http test for builder boost factor with process defaults. * Fix issue with PATCH request * Add prefer builder proposals * Add more builder boost factor tests. --------- Co-authored-by: Mac L <mjladson@pm.me> Co-authored-by: Jimmy Chen <jchen.tc@gmail.com> Co-authored-by: Paul Hauner <paul@paulhauner.com>

eserilev added 2 commits January 19, 2024 04:30

expose builder booster flags in vc, enable options in validator endpo…

03d68f5

…ints, update tests

Merge branch 'unstable' of https://github.com/sigp/lighthouse into ex…

5641d24

…pose-builder-booster-flags-vc

eserilev changed the title ~~Expose builder booster flags vc~~ Expose additional builder booster flags in the vc Jan 19, 2024

eserilev changed the title ~~Expose additional builder booster flags in the vc~~ Expose additional builder booster related flags in the vc Jan 19, 2024

michaelsproul added the v4.6.0 ETA Q1 2024 label Jan 19, 2024

paulhauner reviewed Jan 19, 2024

View reviewed changes

book/src/help_vc.md Outdated Show resolved Hide resolved

eserilev added 2 commits January 20, 2024 01:52

resolve failing test

89ade68

fix issues related to CreateConfig and MoveConfig

7a214f7

dapplion added the ready-for-review The code is ready for review label Jan 21, 2024

paulhauner self-assigned this Jan 22, 2024

paulhauner reviewed Jan 22, 2024

View reviewed changes

validator_client/src/validator_store.rs Outdated Show resolved Hide resolved

validator_client/src/config.rs Outdated Show resolved Hide resolved

validator_client/src/block_service.rs Outdated Show resolved Hide resolved

eserilev added 3 commits January 22, 2024 19:25

remove unneeded val, change how boost factor flag logic in the vc, ad…

dc7a870

…d some additional documentation

fix typos

d1591fe

fix typos

2b2c9af

realbigsean reviewed Jan 22, 2024

View reviewed changes

validator_client/src/block_service.rs Outdated Show resolved Hide resolved

assume builder-proosals flag if one of other two vc builder flags are…

f3a1b30

… present

paulhauner approved these changes Jan 23, 2024

View reviewed changes

eserilev added 3 commits January 23, 2024 02:55

fmt

24a522b

typo

59af312

typo

c852a51

realbigsean approved these changes Jan 23, 2024

View reviewed changes

michaelsproul added ready-for-merge This PR is ready to merge. and removed ready-for-review The code is ready for review labels Jan 23, 2024

michaelsproul requested changes Jan 23, 2024

View reviewed changes

validator_client/src/block_service.rs Outdated Show resolved Hide resolved

validator_client/src/validator_store.rs Outdated Show resolved Hide resolved

michaelsproul added under-review A reviewer has only partially completed a review. and removed ready-for-merge This PR is ready to merge. labels Jan 23, 2024

macladson and others added 3 commits January 24, 2024 11:03

Fix CLI help text

2401fd7

Prioritise per validator builder boost configurations over CLI flags.

b225328

Merge branch 'expose-builder-booster-flags-vc' of github.com:eserilev…

800e29c

…/lighthouse into fork/eserilev/expose-builder-booster-flags-vc

jimmygchen and others added 2 commits January 24, 2024 18:25

Add http test for builder boost factor with process defaults.

45d7ea5

Fix issue with PATCH request

4df4663

paulhauner mentioned this pull request Jan 24, 2024

v4.6.0 #5091

Closed

2 tasks

Add prefer builder proposals

6c6f6b7

Add more builder boost factor tests.

ba34b3f

jimmygchen added ready-for-review The code is ready for review and removed under-review A reviewer has only partially completed a review. labels Jan 24, 2024

jimmygchen requested a review from realbigsean January 24, 2024 12:51

realbigsean approved these changes Jan 24, 2024

View reviewed changes

michaelsproul approved these changes Jan 24, 2024

View reviewed changes

paulhauner merged commit f9e36c9 into sigp:unstable Jan 24, 2024
29 checks passed

jimmygchen mentioned this pull request Jan 24, 2024

Expose more builder_boost_factor settings in VC #5039

Closed

chenrui333 mentioned this pull request Jan 28, 2024

lighthouse 4.6.0 Homebrew/homebrew-core#161115

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Expose additional builder booster related flags in the vc #5086

Expose additional builder booster related flags in the vc #5086

eserilev commented Jan 19, 2024

paulhauner left a comment

eserilev commented Jan 22, 2024

paulhauner left a comment

realbigsean left a comment

jimmygchen commented Jan 24, 2024

eserilev commented Jan 24, 2024

jimmygchen commented Jan 24, 2024

realbigsean left a comment

michaelsproul left a comment

Expose additional builder booster related flags in the vc #5086

Expose additional builder booster related flags in the vc #5086

Conversation

eserilev commented Jan 19, 2024

Issue Addressed

Proposed Changes

paulhauner left a comment

Choose a reason for hiding this comment

eserilev commented Jan 22, 2024

paulhauner left a comment

Choose a reason for hiding this comment

realbigsean left a comment

Choose a reason for hiding this comment

jimmygchen commented Jan 24, 2024

eserilev commented Jan 24, 2024

jimmygchen commented Jan 24, 2024

realbigsean left a comment

Choose a reason for hiding this comment

michaelsproul left a comment

Choose a reason for hiding this comment