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.

Sign up for GitHub

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

Jump to bottom

chore(deps): bump enr, discv5, secp256k1 #7000

Merged
merged 2 commits into from
Apr 25, 2024
Merged

chore(deps): bump enr, discv5, secp256k1 #7000

merged 2 commits into from
Apr 25, 2024

Conversation

DaniPopes
Copy link
Member

@DaniPopes DaniPopes commented Mar 6, 2024 •
edited
Loading

  • KeyPair -> Keypair
  • Message::from_slice(&[u8])? -> Message::from_digest([u8; 32])

Blocked on enr updating their secp256k1 sigp/enr#61.

Blocked on a discv5 release: sigp/discv5#244

@DaniPopes DaniPopes added S-blocked This cannot more forward until something else changes A-dependencies Pull requests or issues that are about dependencies M-prevent-stale Prevents old inactive issues/PRs from being closed due to inactivity labels Mar 6, 2024
@DaniPopes DaniPopes changed the title chore(deps): bump secp256k1 to 0.10 chore(deps): bump secp256k1 to 0.28 Mar 6, 2024
mattsse
mattsse approved these changes Mar 6, 2024
View reviewed changes
Copy link
Collaborator

@mattsse mattsse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

more breaking changes 👍

lgtm, when it compiles

crates/interfaces/src/test_utils/generators.rs Show resolved Hide resolved
@DaniPopes DaniPopes marked this pull request as draft March 6, 2024 18:55
@DaniPopes
Copy link
Member Author

Blocked on @mattsse PR 😄 sigp/enr#61

@Rjected
Copy link
Member

Rjected commented Mar 11, 2024

Blocked on @mattsse PR 😄 sigp/enr#61

cc @mattsse this is merged!

@DaniPopes
Copy link
Member Author

Looks like enr 0.10.1 was released with breaking changes, and discv5 will also need to be updated.

@citizen-stig
Copy link
Contributor

Looking forward for this PR to be merged.

I am probably missing something, but discv5 in Cargo.toml is 0.4 and in Cargo.lock is 0.4.1 , which is latest in crates.io as for today.

Also, I want to point out, that currently there are 2 version of secp256k1 in dependency tree: revm-primitives brings 0.28.2 already. So merging this could slightly improve compilation time.

@DaniPopes
Copy link
Member Author

DaniPopes commented Mar 19, 2024 •
edited
Loading

Yes, that's correct, however discv5 has not yet updated to using alloy-rlp or to the latest secp256k1, so until these are done in discv5 this PR cannot be merged.

@citizen-stig
Copy link
Contributor

@DaniPopes thank you for clarification!

@DaniPopes DaniPopes mentioned this pull request Mar 27, 2024
Closed
@DaniPopes DaniPopes changed the title chore(deps): bump secp256k1 to 0.28 chore(deps): bump secp256k1 to 0.28, remove ethers from dev-dependencies Mar 27, 2024
@DaniPopes
Copy link
Member Author

DaniPopes commented Mar 27, 2024 •
edited
Loading

One of the failures: sigp/enr#69

@DaniPopes DaniPopes mentioned this pull request Apr 4, 2024
Merged
@DaniPopes DaniPopes changed the title chore(deps): bump secp256k1 to 0.28, remove ethers from dev-dependencies chore(deps): bump enr, discv5, secp256k1; remove ethers from dev-dependencies Apr 4, 2024
@DaniPopes DaniPopes force-pushed the dani/bump-secp256k1-0.28 branch 3 times, most recently from e28b4a3 to 9860a22 Compare April 4, 2024 10:36
@emhane
Copy link
Member

emhane commented Apr 4, 2024

discv5 is configured to a git commit, and should remain so. for reth_discv5 to work we need at least commit 3c0d3d7 on https://github.com/sigp/discv5/commits/master/, but ideally we want commit 15b1725 to be able to update the local enr with fork id after starting the node which isn't possible otherwise without some hacks.

emhane
emhane requested changes Apr 4, 2024
View reviewed changes
Cargo.toml Outdated Show resolved Hide resolved
Cargo.toml Outdated Show resolved Hide resolved
crates/net/dns/src/lib.rs Outdated Show resolved Hide resolved
crates/net/discv5/Cargo.toml Outdated Show resolved Hide resolved
@DaniPopes DaniPopes force-pushed the dani/bump-secp256k1-0.28 branch 2 times, most recently from 10815b8 to 7fb84b3 Compare April 9, 2024 14:21
@DaniPopes DaniPopes changed the title chore(deps): bump enr, discv5, secp256k1; remove ethers from dev-dependencies chore(deps): bump enr, discv5, secp256k1 Apr 9, 2024
@DaniPopes DaniPopes force-pushed the dani/bump-secp256k1-0.28 branch 3 times, most recently from e9bbbb6 to b01ed49 Compare April 9, 2024 14:59
@mattsse
Copy link
Collaborator

mattsse commented Apr 11, 2024

I still think enr decoding is currently broken, resulting in lots of invalid signature errors on decoding

@emhane
Copy link
Member

emhane commented Apr 15, 2024

I still think enr decoding is currently broken, resulting in lots of invalid signature errors on decoding

yes, blocked by sigp/enr#75

@emhane emhane removed the S-blocked This cannot more forward until something else changes label Apr 21, 2024
@emhane
Copy link
Member

emhane commented Apr 21, 2024

discv5 bumped sigp/discv5@e9e0d4f
enr bumped https://github.com/sigp/enr/releases/tag/v0.12.0

@DaniPopes
Copy link
Member Author

discv5 is still on enr 0.11

@emhane
Copy link
Member

emhane commented Apr 25, 2024

discv5 is still on enr 0.11

enr bumped in discv5 https://github.com/sigp/discv5/releases/tag/v0.6.0

@DaniPopes DaniPopes marked this pull request as ready for review April 25, 2024 19:40
@DaniPopes DaniPopes added this pull request to the merge queue Apr 25, 2024
Merged via the queue into main with commit e2e5201 Apr 25, 2024
29 checks passed
@DaniPopes DaniPopes deleted the dani/bump-secp256k1-0.28 branch April 25, 2024 20:04
mw2000 pushed a commit to mw2000/reth that referenced this pull request Jun 5, 2024
@DaniPopes @emhane @mw2000
chore(deps): bump enr, discv5, secp256k1 (paradigmxyz#7000)
464e260 
Co-authored-by: Emilia Hane <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mattsse mattsse mattsse approved these changes

@emhane emhane emhane approved these changes

@Rjected Rjected Awaiting requested review from Rjected Rjected is a code owner

@gakonst gakonst Awaiting requested review from gakonst gakonst is a code owner

Assignees
No one assigned
Labels
A-dependencies Pull requests or issues that are about dependencies M-prevent-stale Prevents old inactive issues/PRs from being closed due to inactivity
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@DaniPopes @Rjected @citizen-stig @emhane @mattsse