deps(identity): update ed25519-dalek to 2.0 #4337

jxs · 2023-08-17T11:28:32Z

Description

Notes & open questions

ed25519-dalek has deprecated some try_into methods by putting the slice length in the input type, to maintain identity's type signatures and therefore avoid breaking changes I used [0..32].try_into().
If prefered I can follow ed25519-dalek and change the methods.

Change checklist

I have performed a self-review of my own code
I have made corresponding changes to the documentation
I have added tests that prove my fix is effective or that my feature works
A changelog entry has been made in the appropriate crates

altonen · 2023-08-17T12:11:25Z

Is it possible to get this backported to 0.51?

thomaseizinger

Looks great! Thanks for the PR.

identity/CHANGELOG.md

identity/src/ed25519.rs

libp2p/CHANGELOG.md

thomaseizinger · 2023-08-17T12:21:34Z

Is it possible to get this backported to 0.51?

We can try! Are you open to fix up potential problems that come up in the backport PR? Let's get this merged first and then we can see.

thomaseizinger · 2023-08-17T12:21:41Z

@Mergifyio backport v0.51

mergify · 2023-08-17T12:21:45Z

backport v0.51

✅ Backports have been created

#4343 deps(identity): update ed25519-dalek to 2.0 (backport #4337) has been created for branch v0.51 but encountered conflicts

altonen · 2023-08-17T12:27:19Z

Is it possible to get this backported to 0.51?

We can try! Are you open to fix up potential problems that come up in the backport PR? Let's get this merged first and then we can see.

ok cool and yes I am

mxinden

Minus the clippy warnings, this looks good to me. Thank you for the work @jxs!

identity/CHANGELOG.md

mxinden · 2023-08-17T15:17:01Z

identity/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-identity"
-version = "0.2.2"
+version = "0.2.3"


Needs a bump of libp2p-identity in the root Cargo.toml. See CI failure: https://github.com/libp2p/rust-libp2p/actions/runs/5891817364/job/15979771326?pr=4337

Yeah I tried it, but if I do it all other semver-check workflows fail, see here

Maybe cargo-semver-check does not adhere to the override?

rust-libp2p/Cargo.toml

Lines 111 to 118 in cbdbaa8

[patch.crates-io]

# Patch away `libp2p-idnentity` in our dependency tree with the workspace version.

# `libp2p-identity` is a leaf dependency and used within `rust-multiaddr` which is **not** part of the workspace.

# As a result, we cannot just reference the workspace version in our crates because the types would mismatch with what

# we import via `rust-multiaddr`.

# This is expected to stay here until we move `libp2p-identity` to a separate repository which makes the dependency relationship more obvious.

libp2p-identity = { path = "identity" }

I am surprised that this is showing up now, how did we ever bump this version? Maybe this failure happens now with the recent version change of cargo semver-checks?

The issue with libp2p-identity is that we need to patch it across the workspace and I'd assume that the temporary workspace created by cargo semver-checks does not support that. To properly fix this, we should move libp2p-identity out of the mono-repo. We should very rarely make breaking changes to it anyway because it sits at the very bottom of the dependency chain of the ecosystem.

The issue with libp2p-identity is that we need to patch it across the workspace and I'd assume that the temporary workspace created by cargo semver-checks does not support that.

Maybe @obi1kenobi you have seen this issue before, i.e. that cargo-semver-checks does not adhere to the workspace patches. Note that this is only a suspicion. Issue might as well be on the rust-libp2p end.

@thomaseizinger @jxs I am fine merging here as is, i.e. with the failing cargo-semver-checks check on the libp2p-identity run. Once libp2p-identity v0.2.3 is released we can update our root Cargo.toml. Objections?

Yeah I don't believe it copies patches. You can double-check and make sure by looking up the generated manifest inside target/semver-checks. But I'm pretty sure we never read patches from the source manifest so that's probably it.

If running cargo-semver-checks on an intermediate state that isn't right before a cargo publish, checking with patches included makes sense.

But is there risk that pre-publish checking while using patches might falsely say there are no semver issues, only for issues to come up after the crate gets published and used by users that don't have the patches locally?

updated main Cargo.toml to identity 0.2.3

jxs

Thanks Max, addressed the clippy lints

jxs · 2023-08-17T15:35:19Z

identity/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "libp2p-identity"
-version = "0.2.2"
+version = "0.2.3"


Yeah I tried it, but if I do it all other semver-check workflows fail, see here

identity/CHANGELOG.md

mxinden · 2023-08-17T20:08:24Z

I will merge and cut a release tomorrow morning.

Pull-Request: #4337. (cherry picked from commit fb61697) # Conflicts: # Cargo.lock # Cargo.toml # identity/CHANGELOG.md # identity/Cargo.toml

mxinden · 2023-08-18T08:05:25Z

Is it possible to get this backported to 0.51?

We can try! Are you open to fix up potential problems that come up in the backport PR? Let's get this merged first and then we can see.

ok cool and yes I am

@altonen you can build on top of #4343 or cherry-pick yourself. Let me know if you need any help.

mxinden · 2023-08-18T08:08:22Z

Tagged and published.

Thank you for the work @jxs.

Pull-Request: #4337.

jxs added 4 commits August 17, 2023 12:23

deps(identity): update ed25519-dalek to 2.0

015c28c

update PR number

cd37165

update main Cargo.toml

abbcea9

revert identity bump on Cargo.toml

0555126

thomaseizinger reviewed Aug 17, 2023

View reviewed changes

identity/CHANGELOG.md Show resolved Hide resolved

identity/CHANGELOG.md Outdated Show resolved Hide resolved

identity/src/ed25519.rs Outdated Show resolved Hide resolved

libp2p/CHANGELOG.md Outdated Show resolved Hide resolved

address review

3449fee

mxinden reviewed Aug 17, 2023

View reviewed changes

identity/CHANGELOG.md Outdated Show resolved Hide resolved

mxinden reviewed Aug 17, 2023

View reviewed changes

address Max review

de50a75

jxs commented Aug 17, 2023

View reviewed changes

update main Cargo.toml to identity 0.2.3

bfbeffe

mxinden reviewed Aug 17, 2023

View reviewed changes

identity/CHANGELOG.md Outdated Show resolved Hide resolved

Update identity/CHANGELOG.md

6c6d653

mxinden approved these changes Aug 18, 2023

View reviewed changes

mxinden merged commit fb61697 into libp2p:master Aug 18, 2023

mergify bot pushed a commit that referenced this pull request Aug 18, 2023

deps(identity): update ed25519-dalek to 2.0

7266eb7

Pull-Request: #4337. (cherry picked from commit fb61697) # Conflicts: # Cargo.lock # Cargo.toml # identity/CHANGELOG.md # identity/Cargo.toml

mergify bot mentioned this pull request Aug 18, 2023

deps(identity): update ed25519-dalek to 2.0 (backport #4337) #4343

Closed

thomaseizinger pushed a commit that referenced this pull request Aug 20, 2023

deps(identity): update ed25519-dalek to 2.0

353882a

Pull-Request: #4337.

altonen mentioned this pull request Aug 21, 2023

deps(identity): update ed25519-dalek to 2.0 #4365

Merged

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

deps(identity): update ed25519-dalek to 2.0 #4337

deps(identity): update ed25519-dalek to 2.0 #4337

jxs commented Aug 17, 2023 •

edited by thomaseizinger

Loading

altonen commented Aug 17, 2023

thomaseizinger left a comment

thomaseizinger commented Aug 17, 2023

thomaseizinger commented Aug 17, 2023

mergify bot commented Aug 17, 2023 •

edited

Loading

altonen commented Aug 17, 2023

mxinden left a comment

mxinden Aug 17, 2023 •

edited by thomaseizinger

Loading

jxs Aug 17, 2023

mxinden Aug 17, 2023

thomaseizinger Aug 17, 2023 •

edited

Loading

mxinden Aug 17, 2023

obi1kenobi Aug 17, 2023

jxs Aug 17, 2023

jxs left a comment

jxs Aug 17, 2023

mxinden commented Aug 17, 2023

mxinden commented Aug 18, 2023

mxinden commented Aug 18, 2023

	[patch.crates-io]

	# Patch away `libp2p-idnentity` in our dependency tree with the workspace version.
	# `libp2p-identity` is a leaf dependency and used within `rust-multiaddr` which is not part of the workspace.
	# As a result, we cannot just reference the workspace version in our crates because the types would mismatch with what
	# we import via `rust-multiaddr`.
	# This is expected to stay here until we move `libp2p-identity` to a separate repository which makes the dependency relationship more obvious.
	libp2p-identity = { path = "identity" }

deps(identity): update ed25519-dalek to 2.0 #4337

deps(identity): update ed25519-dalek to 2.0 #4337

Conversation

jxs commented Aug 17, 2023 • edited by thomaseizinger Loading

Description

Notes & open questions

Change checklist

altonen commented Aug 17, 2023

thomaseizinger left a comment

Choose a reason for hiding this comment

thomaseizinger commented Aug 17, 2023

thomaseizinger commented Aug 17, 2023

mergify bot commented Aug 17, 2023 • edited Loading

✅ Backports have been created

altonen commented Aug 17, 2023

mxinden left a comment

Choose a reason for hiding this comment

mxinden Aug 17, 2023 • edited by thomaseizinger Loading

Choose a reason for hiding this comment

jxs Aug 17, 2023

Choose a reason for hiding this comment

mxinden Aug 17, 2023

Choose a reason for hiding this comment

thomaseizinger Aug 17, 2023 • edited Loading

Choose a reason for hiding this comment

mxinden Aug 17, 2023

Choose a reason for hiding this comment

obi1kenobi Aug 17, 2023

Choose a reason for hiding this comment

jxs Aug 17, 2023

Choose a reason for hiding this comment

jxs left a comment

Choose a reason for hiding this comment

jxs Aug 17, 2023

Choose a reason for hiding this comment

mxinden commented Aug 17, 2023

mxinden commented Aug 18, 2023

mxinden commented Aug 18, 2023

jxs commented Aug 17, 2023 •

edited by thomaseizinger

Loading

mergify bot commented Aug 17, 2023 •

edited

Loading

mxinden Aug 17, 2023 •

edited by thomaseizinger

Loading

thomaseizinger Aug 17, 2023 •

edited

Loading