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

Update Cargo.lock #5670

Merged
merged 5 commits into from
May 2, 2024
Merged

Update Cargo.lock #5670

merged 5 commits into from
May 2, 2024

Conversation

jxs
Copy link
Member

@jxs jxs commented Apr 30, 2024

And remove no longer required patch'ed rust-yamux

@jxs jxs changed the base branch from stable to unstable April 30, 2024 18:52
@michaelsproul michaelsproul added v5.2.0 Q2 2024 ready-for-review The code is ready for review labels May 2, 2024
@michaelsproul
Copy link
Member

I think we probably can include this in v5.2.0 now, now that we're a bit delayed anyway.

@michaelsproul michaelsproul added ready-for-merge This PR is ready to merge. and removed ready-for-review The code is ready for review labels May 2, 2024
@michaelsproul
Copy link
Member

@Mergifyio queue

Copy link

mergify bot commented May 2, 2024

queue

✅ The pull request has been merged automatically

The pull request has been merged automatically at 6725837

mergify bot added a commit that referenced this pull request May 2, 2024
@michaelsproul michaelsproul mentioned this pull request May 2, 2024
michaelsproul added a commit that referenced this pull request May 2, 2024
Squashed commit of the following:

commit 27c0cce
Author: João Oliveira <[email protected]>
Date:   Wed May 1 21:15:22 2024 +0100

    update to new libp2p versions

commit b112551
Merge: 0b5b760 beaa586
Author: João Oliveira <[email protected]>
Date:   Wed May 1 00:01:26 2024 +0100

    Merge branch 'unstable' of github.com:sigp/lighthouse into update-cargo

commit 0b5b760
Merge: 17d4169 be6df4a
Author: João Oliveira <[email protected]>
Date:   Wed May 1 00:00:18 2024 +0100

    Merge branch 'unstable' of github.com:jxs/lighthouse into update-cargo

commit 17d4169
Author: João Oliveira <[email protected]>
Date:   Tue Apr 30 19:51:02 2024 +0100

    update Cargo.lock

commit be6df4a
Author: João Oliveira <[email protected]>
Date:   Tue Apr 2 21:56:34 2024 +0100

    update rust-yamux
@mergify mergify bot merged commit 6725837 into sigp:unstable May 2, 2024
27 checks passed
ethDreamer added a commit that referenced this pull request May 2, 2024
* 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 <[email protected]>
Co-authored-by: Mac L <[email protected]>
Co-authored-by: Lion - dapplion <[email protected]>
Co-authored-by: Pawan Dhananjay <[email protected]>
Co-authored-by: Roman Krasiuk <[email protected]>
Co-authored-by: Eitan Seri-Levi <[email protected]>
Co-authored-by: antondlr <[email protected]>
Co-authored-by: Jimmy Chen <[email protected]>
Co-authored-by: Ærvin <[email protected]>
Co-authored-by: Age Manning <[email protected]>
Co-authored-by: João Oliveira <[email protected]>
Co-authored-by: Michael Sproul <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-for-merge This PR is ready to merge. v5.2.0 Q2 2024
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants