From d84efe86574ce11cfa34e85be7e04c3f60fefa6b Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Thu, 23 May 2024 22:54:04 +0200 Subject: [PATCH 1/3] Use litep2p from crates-io Signed-off-by: Oliver Tale-Yazdi --- Cargo.lock | 5 +++-- substrate/client/network/Cargo.toml | 2 +- substrate/client/network/types/Cargo.toml | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e3a72ca23d883..b6e5d5050097e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8074,8 +8074,9 @@ dependencies = [ [[package]] name = "litep2p" -version = "0.3.0" -source = "git+https://github.com/paritytech/litep2p?rev=e03a6023882db111beeb24d8c0ceaac0721d3f0f#e03a6023882db111beeb24d8c0ceaac0721d3f0f" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adf107268459b653df189050c9ae2301253b9c62ceafa993dc69dad29870155c" dependencies = [ "async-trait", "bs58 0.4.0", diff --git a/substrate/client/network/Cargo.toml b/substrate/client/network/Cargo.toml index 5a469469539b2..b06d9c73540cf 100644 --- a/substrate/client/network/Cargo.toml +++ b/substrate/client/network/Cargo.toml @@ -59,7 +59,7 @@ sp-blockchain = { path = "../../primitives/blockchain" } sp-core = { path = "../../primitives/core" } sp-runtime = { path = "../../primitives/runtime" } wasm-timer = "0.2" -litep2p = { git = "https://github.com/paritytech/litep2p", rev = "e03a6023882db111beeb24d8c0ceaac0721d3f0f" } +litep2p = "0.4.0" once_cell = "1.18.0" void = "1.0.2" schnellru = "0.2.1" diff --git a/substrate/client/network/types/Cargo.toml b/substrate/client/network/types/Cargo.toml index f9d9330a43951..ed89eca2dd1f0 100644 --- a/substrate/client/network/types/Cargo.toml +++ b/substrate/client/network/types/Cargo.toml @@ -13,7 +13,7 @@ documentation = "https://docs.rs/sc-network-types" bs58 = "0.5.0" ed25519-dalek = "2.1" libp2p-identity = { version = "0.1.3", features = ["ed25519", "peerid"] } -litep2p = { git = "https://github.com/paritytech/litep2p", rev = "e03a6023882db111beeb24d8c0ceaac0721d3f0f" } +litep2p = "0.4.0" multiaddr = "0.17.0" multihash = { version = "0.17.0", default-features = false, features = ["identity", "multihash-impl", "sha2", "std"] } rand = "0.8.5" From 843b5c3edb3bc3256b0c04d131f1f941bca3089a Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Thu, 23 May 2024 23:03:19 +0200 Subject: [PATCH 2/3] Add prdoc Signed-off-by: Oliver Tale-Yazdi --- prdoc/pr_4560.prdoc | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 prdoc/pr_4560.prdoc diff --git a/prdoc/pr_4560.prdoc b/prdoc/pr_4560.prdoc new file mode 100644 index 0000000000000..01771c0ebdb7a --- /dev/null +++ b/prdoc/pr_4560.prdoc @@ -0,0 +1,13 @@ +title: Use litep2p from crates-io instead of git. + +doc: + - audience: Runtime Dev + description: | + Use crates.io dependencies instead of `git =` for litep2p. Otherwise it is not possible to + publish the crate. + +crates: + - name: sc-network + bump: patch + - name: sc-network-types + bump: patch From a062bddadfbf67d9f66f4a445cb5fa915cb30176 Mon Sep 17 00:00:00 2001 From: Oliver Tale-Yazdi Date: Fri, 24 May 2024 13:13:49 +0200 Subject: [PATCH 3/3] Remove prdoc Signed-off-by: Oliver Tale-Yazdi --- prdoc/pr_4560.prdoc | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 prdoc/pr_4560.prdoc diff --git a/prdoc/pr_4560.prdoc b/prdoc/pr_4560.prdoc deleted file mode 100644 index 01771c0ebdb7a..0000000000000 --- a/prdoc/pr_4560.prdoc +++ /dev/null @@ -1,13 +0,0 @@ -title: Use litep2p from crates-io instead of git. - -doc: - - audience: Runtime Dev - description: | - Use crates.io dependencies instead of `git =` for litep2p. Otherwise it is not possible to - publish the crate. - -crates: - - name: sc-network - bump: patch - - name: sc-network-types - bump: patch