Improve ENR updates #5483

AgeManning · 2024-03-26T05:09:53Z

Issue Addressed

I've noticed that on boot, we are aggressively updating the ENR. This increases our sequence number and makes for more ENRs to propagate though the DHT.

After looking into it, it seems we are updating the ENR unnecessarily and also could be updating the wrong fields. When we listen to an ipv6 address we would update the ipv4 tcp port on the ENR.

Proposed Changes

This PR adjusts some logic so that we only update the ENR if there is a change, and also we update the ip4/ip6 fields respectively.

beacon_node/lighthouse_network/src/discovery/mod.rs

dapplion

LGTM 🤝 fmt 🤝 clippy

AgeManning · 2024-04-02T23:01:08Z

@Mergifyio queue

mergify · 2024-04-02T23:01:25Z

queue

🛑 The pull request has been removed from the queue `default`

The queue conditions cannot be satisfied due to failing checks.

You can take a look at Queue: Embarked in merge queue check runs for more details.

In case of a failure due to a flaky test, you should first retrigger the CI.
Then, re-embark the pull request into the merge queue by posting the comment
@mergifyio refresh on the pull request.

jxs

LGTM, thanks for this age!

jxs · 2024-04-08T11:36:50Z

@Mergifyio refresh

mergify · 2024-04-08T11:36:57Z

refresh

✅ Pull request refreshed

jxs · 2024-04-08T12:39:02Z

@Mergifyio queue

mergify · 2024-04-08T12:39:12Z

queue

🛑 The pull request has been removed from the queue `default`

The queue conditions cannot be satisfied due to failing checks.

You can take a look at Queue: Embarked in merge queue check runs for more details.

In case of a failure due to a flaky test, you should first retrigger the CI.
Then, re-embark the pull request into the merge queue by posting the comment
@mergifyio refresh on the pull request.

AgeManning · 2024-04-15T01:08:16Z

@Mergifyio queue

mergify · 2024-04-15T01:08:24Z

queue

🛑 The pull request has been removed from the queue `default`

The queue conditions cannot be satisfied due to failing checks.

You can take a look at Queue: Embarked in merge queue check runs for more details.

In case of a failure due to a flaky test, you should first retrigger the CI.
Then, re-embark the pull request into the merge queue by posting the comment
@mergifyio refresh on the pull request.

AgeManning · 2024-04-17T01:02:16Z

@Mergifyio queue

mergify · 2024-04-17T01:02:19Z

queue

🛑 The pull request has been removed from the queue `default`

The queue conditions cannot be satisfied due to failing checks.

You can take a look at Queue: Embarked in merge queue check runs for more details.

In case of a failure due to a flaky test, you should first retrigger the CI.
Then, re-embark the pull request into the merge queue by posting the comment
@mergifyio refresh on the pull request.

AgeManning · 2024-04-17T01:04:58Z

@Mergifyio refresh

mergify · 2024-04-17T01:05:06Z

refresh

✅ Pull request refreshed

AgeManning · 2024-04-17T23:46:30Z

@Mergifyio refresh

mergify · 2024-04-17T23:46:54Z

refresh

✅ Pull request refreshed

AgeManning · 2024-05-01T04:24:46Z

@Mergifyio queue

mergify · 2024-05-01T04:24:53Z

queue

🛑 The pull request has been removed from the queue `default`

The queue conditions cannot be satisfied due to failing checks.

You can take a look at Queue: Embarked in merge queue check runs for more details.

In case of a failure due to a flaky test, you should first retrigger the CI.
Then, re-embark the pull request into the merge queue by posting the comment
@mergifyio refresh on the pull request.

AgeManning · 2024-05-01T08:12:40Z

@Mergifyio queue

mergify · 2024-05-01T08:12:48Z

queue

✅ The pull request has been merged automatically

The pull request has been merged automatically at 59753f5

* Fix execution integration tests (#5647) * update waiting status * revert to old nethermind version * Add electra presets to beacon API (#5630) * add presets to API * add extra fields to config spec in beacon API * remove unused * add mainnet presets for gnosis and fix minimal preset default values * Rename `Merge` to `Bellatrix` (#5601) * Rename Merge to Bellatrix * Remove tree-hash-cache which got readded from the rebase * Deterministic block generation for tests (#5654) * Deterministic block generation for tests * Electra other containers (#5652) * add new fields to execution payload and header * beacon state changes * partial beacon state * safe arith in upgrade to electra * initialize balances cache in interop genesis state * Revert "initialize balances cache in interop genesis state" This reverts commit c60b522. * always initialize balances cache if necessary in electra upgrade * build cache earlier * fix block test * per fork NUM_FIELDS_POW2 * Merge branch 'unstable' of https://github.com/sigp/lighthouse into electra-other-containers * fix lints * get fields based on post state, as is spec'd * fix type and move cache build * Add more electra helpers (#5653) * Add new helpers * Fix some stuff * Fix compilation errors * lint * Address review * Ignore gossip blob already imported (#5656) * Ignore gossip blob already imported * Beta compiler fix (#5659) * fix beta compiler compilation * remove unused import * Revert "remove unused import" This reverts commit 0bef36b. * Revert "fix beta compiler compilation" This reverts commit 23152cf. * rename ununsed fields * allow dead code on some error variants * remove unused blob download queue * add back debug to backfill error * more allow dead code on errors * fix(validator_client): raise soft fd limit (#4796) * fix(validator_client): raise soft fd limit * Merge branch 'unstable' of https://github.com/sigp/lighthouse into rkrasiuk/raise-vc-fdlimit * cargo lock * Merge branch 'unstable' of https://github.com/sigp/lighthouse into rkrasiuk/raise-vc-fdlimit * Proposer and attester slashing sse events (#5327) * default vc to block v3 endpoint and deprecate block-v3 flag * Merge branch 'unstable' of https://github.com/sigp/lighthouse into unstable * add proposer and attester event variants * add TOOOs * add tests, event triggers * Merge branch 'unstable' of https://github.com/sigp/lighthouse into proposer-and-attester-slashing-sse-events * revert * revert * remove double event tracking * Merge branch 'unstable' into proposer-and-attester-slashing-sse-events * remove todo, fix test * resolve merge conflicts * Merge branch 'proposer-and-attester-slashing-sse-events' of https://github.com/eserilev/lighthouse into proposer-and-attester-slashing-sse-events * leftover debugging * Merge branch 'unstable' of https://github.com/sigp/lighthouse into proposer-and-attester-slashing-sse-events * Merge branch 'unstable' of https://github.com/sigp/lighthouse into proposer-and-attester-slashing-sse-events * pin macos release runner to `macos-13` (#5665) * pin macos release runner to `macos-13` * Update .github/workflows/release.yml * Remove snapshot cache related code (#5661) * Remove snapshot cache and other references. * Fix default state cache size in docs * Remove cache miss comment entirely * Add state cache CLI tests * Uncomment self_hosted_runner after PR Merge #5137 (#5291) * Uncomment self_hosted_runner after PR Merge #5137 * Merge branch 'unstable' into fix_todo * Merge branch 'unstable' of https://github.com/sigp/lighthouse into fix_todo * Only `portable` builds (binaries) (#5615) * release workflow: portable builds by default * Delete outdated comment * Merge branch 'unstable' into portable-builds-binaries # Conflicts: # .github/workflows/release.yml * Merge parent and current sync lookups (#5655) * Drop lookup type trait for a simple arg * Drop reconstructed for processing * Send parent blocks one by one * Merge current and parent lookups * Merge current and parent lookups clean up todos * Merge current and parent lookups tests * Merge remote-tracking branch 'origin/unstable' into sync-merged-lookup * Merge branch 'unstable' of https://github.com/sigp/lighthouse into sync-merged-lookup * fix compile after merge * #5655 pr review (#26) * fix compile after merge * remove todos, fix typos etc * fix compile * stable rng * delete TODO and unfilled out test * make download result a struct * enums instead of bools as params * fix comment * Various fixes * Track ignored child components * Track dropped lookup reason as metric * fix test * add comment describing behavior of avail check error * update ordering * delete spammy log (#5672) * delete spammy log * Ensure block only range requests don't fail on download (#5675) * ensure pruned blobs don't fail on download * Typo * Improve ENR updates (#5483) * Improve ENR updates * forever fmt * Appease my old friend clippy * Merge network unstable * Check da_checker before doing a block lookup request (#5681) * Check da_checker before doing a block lookup request * Ensure consistent handling of lookup result * use req resp pre import cache rather than da checker * Update Cargo.lock (#5670) * update rust-yamux * update Cargo.lock * Merge branch 'unstable' of github.com:jxs/lighthouse into update-cargo * Merge branch 'unstable' of github.com:sigp/lighthouse into update-cargo * update to new libp2p versions * Add metric for current epoch total balance (#5688) * Add metric for current epoch total balance --------- Co-authored-by: realbigsean <sean@sigmaprime.io> Co-authored-by: Mac L <mjladson@pm.me> Co-authored-by: Lion - dapplion <35266934+dapplion@users.noreply.github.com> Co-authored-by: Pawan Dhananjay <pawandhananjay@gmail.com> Co-authored-by: Roman Krasiuk <rokrassyuk@gmail.com> Co-authored-by: Eitan Seri-Levi <eserilev@ucsc.edu> Co-authored-by: antondlr <anton@delaruelle.net> Co-authored-by: Jimmy Chen <jchen.tc@gmail.com> Co-authored-by: Ærvin <arvin.morawej@gmail.com> Co-authored-by: Age Manning <Age@AgeManning.com> Co-authored-by: João Oliveira <hello@jxs.pt> Co-authored-by: Michael Sproul <michael@sigmaprime.io>

Improve ENR updates

1b770a3

AgeManning added the Networking label Mar 26, 2024

AgeManning requested a review from jxs March 26, 2024 05:09

dapplion reviewed Mar 26, 2024

View reviewed changes

beacon_node/lighthouse_network/src/discovery/mod.rs Show resolved Hide resolved

AgeManning added 2 commits March 28, 2024 12:19

forever fmt

364bb6e

Appease my old friend clippy

2dee89d

dapplion approved these changes Mar 29, 2024

View reviewed changes

mergify bot added a commit that referenced this pull request Apr 2, 2024

Merge of #5483

53d2e9f

mergify bot mentioned this pull request Apr 2, 2024

merge queue: embarking unstable (969d12d) and #5483 together #5513

Closed

5 tasks

jxs approved these changes Apr 8, 2024

View reviewed changes

Merge network unstable

68af60d

mergify bot added a commit that referenced this pull request May 1, 2024

Merge of #5483

00fe2b4

mergify bot mentioned this pull request May 1, 2024

merge queue: embarking unstable (b9655b6) and #5483 together #5679

Closed

5 tasks

mergify bot merged commit 59753f5 into sigp:unstable May 1, 2024
27 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Improve ENR updates #5483

Improve ENR updates #5483

AgeManning commented Mar 26, 2024

dapplion left a comment •

edited

Loading

AgeManning commented Apr 2, 2024

mergify bot commented Apr 2, 2024 •

edited

Loading

jxs left a comment

jxs commented Apr 8, 2024

mergify bot commented Apr 8, 2024

jxs commented Apr 8, 2024

mergify bot commented Apr 8, 2024

AgeManning commented Apr 15, 2024

mergify bot commented Apr 15, 2024

AgeManning commented Apr 17, 2024

mergify bot commented Apr 17, 2024

AgeManning commented Apr 17, 2024

mergify bot commented Apr 17, 2024

AgeManning commented Apr 17, 2024 •

edited

Loading

mergify bot commented Apr 17, 2024

AgeManning commented May 1, 2024

mergify bot commented May 1, 2024

AgeManning commented May 1, 2024

mergify bot commented May 1, 2024 •

edited

Loading

Improve ENR updates #5483

Improve ENR updates #5483

Conversation

AgeManning commented Mar 26, 2024

Issue Addressed

Proposed Changes

dapplion left a comment • edited Loading

Choose a reason for hiding this comment

AgeManning commented Apr 2, 2024

mergify bot commented Apr 2, 2024 • edited Loading

🛑 The pull request has been removed from the queue default

jxs left a comment

Choose a reason for hiding this comment

jxs commented Apr 8, 2024

mergify bot commented Apr 8, 2024

✅ Pull request refreshed

jxs commented Apr 8, 2024

mergify bot commented Apr 8, 2024

🛑 The pull request has been removed from the queue default

AgeManning commented Apr 15, 2024

mergify bot commented Apr 15, 2024

🛑 The pull request has been removed from the queue default

AgeManning commented Apr 17, 2024

mergify bot commented Apr 17, 2024

🛑 The pull request has been removed from the queue default

AgeManning commented Apr 17, 2024

mergify bot commented Apr 17, 2024

✅ Pull request refreshed

AgeManning commented Apr 17, 2024 • edited Loading

mergify bot commented Apr 17, 2024

✅ Pull request refreshed

AgeManning commented May 1, 2024

mergify bot commented May 1, 2024

🛑 The pull request has been removed from the queue default

AgeManning commented May 1, 2024

mergify bot commented May 1, 2024 • edited Loading

✅ The pull request has been merged automatically

dapplion left a comment •

edited

Loading

mergify bot commented Apr 2, 2024 •

edited

Loading

🛑 The pull request has been removed from the queue `default`

🛑 The pull request has been removed from the queue `default`

🛑 The pull request has been removed from the queue `default`

🛑 The pull request has been removed from the queue `default`

AgeManning commented Apr 17, 2024 •

edited

Loading

🛑 The pull request has been removed from the queue `default`

mergify bot commented May 1, 2024 •

edited

Loading