From 32e8d8143e7e3c5e0d8ea520ccd6eb5963ced9fd Mon Sep 17 00:00:00 2001 From: Darius Clark Date: Mon, 8 Jul 2024 14:41:26 -0400 Subject: [PATCH] chore: Promote `multiaddr` and `cid` to workspace dependency and update cid. --- Cargo.lock | 99 ++++++--------------------------- Cargo.toml | 5 +- packages/rust-ipns/CHANGELOG.md | 3 + packages/rust-ipns/Cargo.toml | 6 +- 4 files changed, 26 insertions(+), 87 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7e90876bf..071e6324a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -869,19 +869,6 @@ dependencies = [ "half", ] -[[package]] -name = "cid" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd94671561e36e4e7de75f753f577edafb0e7c05d6e4547229fdf7938fbcd2c3" -dependencies = [ - "core2", - "multibase", - "multihash 0.18.1", - "serde", - "unsigned-varint 0.7.2", -] - [[package]] name = "cid" version = "0.11.1" @@ -890,7 +877,7 @@ checksum = "3147d8272e8fa0ccd29ce51194dd98f79ddfb8191ba9e3409884e751798acf3a" dependencies = [ "core2", "multibase", - "multihash 0.19.1", + "multihash", "serde", "serde_bytes", "unsigned-varint 0.8.0", @@ -2258,7 +2245,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4ede82a79e134f179f4b29b5fdb1eb92bd1b38c4dfea394c539051150a21b9b" dependencies = [ - "cid 0.11.1", + "cid", "serde", "serde_bytes", ] @@ -2458,7 +2445,7 @@ dependencies = [ "futures-timer", "libp2p-identity", "multiaddr", - "multihash 0.19.1", + "multihash", "multistream-select", "once_cell", "parking_lot 0.12.3", @@ -2603,7 +2590,7 @@ dependencies = [ "ed25519-dalek", "hkdf", "libsecp256k1", - "multihash 0.19.1", + "multihash", "p256", "quick-protobuf", "rand 0.8.5", @@ -2719,7 +2706,7 @@ dependencies = [ "libp2p-core", "libp2p-identity", "multiaddr", - "multihash 0.19.1", + "multihash", "once_cell", "quick-protobuf", "rand 0.8.5", @@ -3048,7 +3035,7 @@ dependencies = [ "libp2p-identity", "libp2p-noise", "libp2p-webrtc-utils", - "multihash 0.19.1", + "multihash", "rand 0.8.5", "rcgen 0.11.3", "serde", @@ -3156,7 +3143,7 @@ dependencies = [ "libp2p-identity", "libp2p-noise", "multiaddr", - "multihash 0.19.1", + "multihash", "send_wrapper 0.6.0", "thiserror", "tracing", @@ -3380,7 +3367,7 @@ dependencies = [ "data-encoding", "libp2p-identity", "multibase", - "multihash 0.19.1", + "multihash", "percent-encoding", "serde", "static_assertions", @@ -3399,23 +3386,6 @@ dependencies = [ "data-encoding-macro", ] -[[package]] -name = "multihash" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfd8a792c1694c6da4f68db0a9d707c72bd260994da179e6030a5dcee00bb815" -dependencies = [ - "blake2b_simd", - "blake2s_simd", - "blake3", - "core2", - "digest 0.10.7", - "multihash-derive 0.8.1", - "sha2 0.10.8", - "sha3", - "unsigned-varint 0.7.2", -] - [[package]] name = "multihash" version = "0.19.1" @@ -3438,7 +3408,7 @@ dependencies = [ "blake3", "core2", "digest 0.10.7", - "multihash-derive 0.9.0", + "multihash-derive", "ripemd", "sha1", "sha2 0.10.8", @@ -3446,20 +3416,6 @@ dependencies = [ "strobe-rs", ] -[[package]] -name = "multihash-derive" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6d4752e6230d8ef7adf7bd5d8c4b1f6561c1014c5ba9a37445ccefe18aa1db" -dependencies = [ - "proc-macro-crate 1.1.3", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", - "synstructure 0.12.6", -] - [[package]] name = "multihash-derive" version = "0.9.0" @@ -3467,7 +3423,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "890e72cb7396cb99ed98c1246a97b243cc16394470d94e0bc8b0c2c11d84290e" dependencies = [ "core2", - "multihash 0.19.1", + "multihash", "multihash-derive-impl", ] @@ -3477,7 +3433,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3958713ce794e12f7c6326fac9aa274c68d74c4881dd37b3e2662b8a2046bb19" dependencies = [ - "proc-macro-crate 2.0.2", + "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", @@ -3957,16 +3913,6 @@ dependencies = [ "elliptic-curve", ] -[[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-crate" version = "2.0.2" @@ -4487,9 +4433,9 @@ dependencies = [ "libp2p-webrtc", "libp2p-webrtc-websys", "multibase", - "multihash 0.19.1", + "multihash", "multihash-codetable", - "multihash-derive 0.9.0", + "multihash-derive", "p256", "parking_lot 0.12.3", "pem", @@ -4530,16 +4476,16 @@ dependencies = [ [[package]] name = "rust-ipns" -version = "0.5.2" +version = "0.6.0" dependencies = [ "cbor4ii 0.3.2", "chrono", - "cid 0.10.1", + "cid", "clap", "derive_more", "getrandom 0.2.14", "libp2p-identity", - "multihash 0.18.1", + "multihash", "quick-protobuf", "serde", "sha2 0.10.8", @@ -4557,9 +4503,9 @@ dependencies = [ "ipld-dagpb", "libc", "multibase", - "multihash 0.19.1", + "multihash", "multihash-codetable", - "multihash-derive 0.9.0", + "multihash-derive", "quick-protobuf", "sha2 0.10.8", "tar", @@ -5440,15 +5386,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - [[package]] name = "toml_datetime" version = "0.6.3" diff --git a/Cargo.toml b/Cargo.toml index 56b662da4..3a4c39cab 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,6 +29,7 @@ asynchronous-codec = "0.7.0" base64 = { default-features = false, features = ["alloc"], version = "0.22" } byteorder = { version = "1" } bytes = "1" +cid = "0.11.1" chrono = { version = "0.4.35" } clap = { version = "4.5", features = ["derive"] } either = { version = "1" } @@ -43,7 +44,6 @@ idb = "0.6" indexmap = "2.2.0" ipld-core = { version = "0.4.1", features = ["serde"] } ipld-dagpb = "0.2.1" -#libipld = { version = "0.16", features = ["serde-codec"] } libp2p = { version = "0.53" } libp2p-allow-block-list = "0.3" libp2p-connection-limits = "0.3" @@ -65,7 +65,7 @@ rand_chacha = "0.3.1" rcgen = { version = "0.13.1", features = ["pem", "x509-parser"] } redb = { version = "1.3" } rlimit = "0.10" -rust-ipns = { version = "0.5.1", path = "packages/rust-ipns" } +rust-ipns = { version = "0.6.0", path = "packages/rust-ipns" } rust-unixfs = { version = "0.5.0", path = "unixfs" } sec1 = { version = "0.7.3", features = ["pem", "pkcs8"] } send_wrapper = "0.6" @@ -111,7 +111,6 @@ hkdf.workspace = true indexmap.workspace = true ipld-core.workspace = true ipld-dagpb.workspace = true -#libipld.workspace = true libp2p-allow-block-list.workspace = true libp2p-connection-limits.workspace = true libp2p-relay-manager = { workspace = true } diff --git a/packages/rust-ipns/CHANGELOG.md b/packages/rust-ipns/CHANGELOG.md index 8ed18fe89..bd762cefd 100644 --- a/packages/rust-ipns/CHANGELOG.md +++ b/packages/rust-ipns/CHANGELOG.md @@ -1,3 +1,6 @@ +# 0.6.0 +- chore: Promote `multiaddr` and `cid` to workspace dependency. + # 0.5.2 # 0.5.1 diff --git a/packages/rust-ipns/Cargo.toml b/packages/rust-ipns/Cargo.toml index 461428ef5..1b9727046 100644 --- a/packages/rust-ipns/Cargo.toml +++ b/packages/rust-ipns/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT OR Apache-2.0" readme = "README.md" repository = "https://github.com/dariusc93/rust-ipfs" description = "Rust implementation of IPNS" -version = "0.5.2" +version = "0.6.0" authors = ["Darius Clark"] keywords = ["libp2p", "ipfs"] @@ -15,9 +15,9 @@ keywords = ["libp2p", "ipfs"] [dependencies] cbor4ii = { version = "0.3", features = ["serde1"] } quick-protobuf = "0.8" -cid = "0.10" +cid.workspace = true serde = { version = "1", features = ["derive"] } -multihash = { version = "0.18" } +multihash.workspace = true sha2 = { version = "0.10" } chrono = { version = "0.4.35" }