feat: leverage type-safe /p2p in multiaddr
#4037
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…-libp2p into libp2p-identity-no-multiaddr
This comment was marked as resolved.
This comment was marked as resolved.
thomaseizinger
commented
Jun 6, 2023
Comment on lines
+106
to
+113
| [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" } |
There was a problem hiding this comment.
@mxinden I did not expect that we need this but it actually makes sense. We can't just depend on libp2p-idenity via path in here because it will mismatch with what is coming from multiaddr.
There was a problem hiding this comment.
This makes sense. I think cargo publish will ignore all patch sections, thus this does not affect our published crates.
4 tasks
This comment was marked as resolved.
This comment was marked as resolved.
thomaseizinger
commented
Jun 6, 2023
thomaseizinger
commented
Jun 6, 2023
Comment on lines
-3404
to
-3416
| [[package]] | ||
| name = "multihash-derive" | ||
| version = "0.8.1" | ||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| checksum = "1d6d4752e6230d8ef7adf7bd5d8c4b1f6561c1014c5ba9a37445ccefe18aa1db" | ||
| dependencies = [ | ||
| "proc-macro-crate", | ||
| "proc-macro-error", | ||
| "proc-macro2", | ||
| "quote", | ||
| "syn 1.0.109", | ||
| "synstructure", | ||
| ] |
thomaseizinger
commented
Jun 6, 2023
Comment on lines
-3917
to
-3949
| [[package]] | ||
| name = "proc-macro-crate" | ||
| version = "1.1.3" | ||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a" | ||
| dependencies = [ | ||
| "thiserror", | ||
| "toml", | ||
| ] | ||
|
|
||
| [[package]] | ||
| name = "proc-macro-error" | ||
| version = "1.0.4" | ||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" | ||
| dependencies = [ | ||
| "proc-macro-error-attr", | ||
| "proc-macro2", | ||
| "quote", | ||
| "syn 1.0.109", | ||
| "version_check", | ||
| ] | ||
|
|
||
| [[package]] | ||
| name = "proc-macro-error-attr" | ||
| version = "1.0.4" | ||
| source = "registry+https://github.com/rust-lang/crates.io-index" | ||
| checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" | ||
| dependencies = [ | ||
| "proc-macro2", | ||
| "quote", | ||
| "version_check", | ||
| ] |
thomaseizinger
commented
Jun 6, 2023
| @@ -11,4 +11,4 @@ async-trait = "0.1" | |||
| env_logger = "0.10" | |||
| futures = "0.3.28" | |||
| libp2p = { path = "../../libp2p", features = ["async-std", "dns", "kad", "mdns", "noise", "macros", "tcp", "websocket", "yamux"] } | |||
| multiaddr = { version = "0.17.1" } | |||
| multiaddr = { workspace = true } | |||
There was a problem hiding this comment.
Oh, this one we should probably remove in favor of accessing it from libp2p.
thomaseizinger
commented
Jun 6, 2023
examples/file-sharing/Cargo.toml
Outdated
| @@ -13,5 +13,5 @@ either = "1.8" | |||
| env_logger = "0.10" | |||
| futures = "0.3.28" | |||
| libp2p = { path = "../../libp2p", features = ["async-std", "dns", "kad", "noise", "macros", "request-response", "tcp", "websocket", "yamux"] } | |||
| multiaddr = { version = "0.17.1" } | |||
| multiaddr = { workspace = true } | |||
There was a problem hiding this comment.
And here too!
thomaseizinger
commented
Jun 6, 2023
examples/ipfs-private/Cargo.toml
Outdated
| multiaddr = { workspace = true } |
thomaseizinger
commented
Jun 6, 2023
examples/ping-example/Cargo.toml
Outdated
| multiaddr = { workspace = true } |
thomaseizinger
commented
Jun 6, 2023
Comment on lines
-1522
to
-1523
| /// The provided peer identity is invalid. | ||
| InvalidPeerId(Multihash), |
There was a problem hiding this comment.
This is probably worth a changelog entry.
This comment was marked as resolved.
This comment was marked as resolved.
mxinden
approved these changes
Jun 8, 2023
Comment on lines
+106
to
+113
| [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" } |
There was a problem hiding this comment.
This makes sense. I think cargo publish will ignore all patch sections, thus this does not affect our published crates.
Comment on lines
-1522
to
-1523
| /// The provided peer identity is invalid. | ||
| InvalidPeerId(Multihash), |
umgefahren
pushed a commit
to umgefahren/rust-libp2p
that referenced
this pull request
Mar 8, 2024
This updates `multiaddr` to version `0.19`. Depends-On: libp2p#3656. Depends-On: multiformats/rust-multiaddr#83. Resolves: libp2p#4039. Pull-Request: libp2p#4037.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This updates
multiaddrto version0.19.Depends-On: #3656.
Depends-On: multiformats/rust-multiaddr#83.
Resolves: #4039.
Notes & open questions
This currently does not compile becausePeerIdexported frommultiaddris not the same as the one we use across the workspace here. But, the resolution of all other errors shows that this will work.Change checklist