From 8db40f0d620e59d404b8f8c41c20bb1197ff2ca5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Dec 2024 03:19:03 +0000 Subject: [PATCH] Bump the cdn group with 2 updates Bumps the cdn group with 2 updates: [cdn-broker](https://github.com/EspressoSystems/Push-CDN) and [cdn-marshal](https://github.com/EspressoSystems/Push-CDN). Updates `cdn-broker` from 0.5.1-upgrade to 0.5.6 - [Release notes](https://github.com/EspressoSystems/Push-CDN/releases) - [Commits](https://github.com/EspressoSystems/Push-CDN/compare/849e7edb32788e42738541ba4d5c64d3e061d86d...9409763dbcb726e43218c3c4cfde91c7d5de6a52) Updates `cdn-marshal` from 0.5.1-upgrade to 0.5.6 - [Release notes](https://github.com/EspressoSystems/Push-CDN/releases) - [Commits](https://github.com/EspressoSystems/Push-CDN/compare/849e7edb32788e42738541ba4d5c64d3e061d86d...9409763dbcb726e43218c3c4cfde91c7d5de6a52) --- updated-dependencies: - dependency-name: cdn-broker dependency-type: direct:production dependency-group: cdn - dependency-name: cdn-marshal dependency-type: direct:production dependency-group: cdn ... Signed-off-by: dependabot[bot] --- Cargo.lock | 141 ++++++++--------------------------------------------- Cargo.toml | 4 +- 2 files changed, 23 insertions(+), 122 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0844e2b46..315a2d332 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "Inflector" @@ -1270,7 +1270,7 @@ dependencies = [ "hotshot-events-service", "hotshot-state-prover", "hotshot-types", - "jf-signature 0.2.0", + "jf-signature", "marketplace-builder-shared", "portpicker", "rand 0.8.5", @@ -1448,40 +1448,17 @@ dependencies = [ "shlex", ] -[[package]] -name = "cdn-broker" -version = "0.4.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.5.1-upgrade#849e7edb32788e42738541ba4d5c64d3e061d86d" -dependencies = [ - "cdn-proto 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.5.1-upgrade)", - "clap", - "console-subscriber", - "dashmap", - "derivative", - "jf-signature 0.1.0", - "lazy_static", - "local-ip-address", - "parking_lot", - "portpicker", - "prometheus", - "rand 0.8.5", - "rkyv", - "tokio", - "tracing", - "tracing-subscriber 0.3.18", -] - [[package]] name = "cdn-broker" version = "0.4.0" source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.5.6#9409763dbcb726e43218c3c4cfde91c7d5de6a52" dependencies = [ - "cdn-proto 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.5.6)", + "cdn-proto", "clap", "console-subscriber", "dashmap", "derivative", - "jf-signature 0.2.0", + "jf-signature", "lazy_static", "local-ip-address", "parking_lot", @@ -1499,10 +1476,10 @@ name = "cdn-client" version = "0.4.0" source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.5.6#9409763dbcb726e43218c3c4cfde91c7d5de6a52" dependencies = [ - "cdn-proto 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.5.6)", + "cdn-proto", "clap", "derive_more 1.0.0", - "jf-signature 0.2.0", + "jf-signature", "parking_lot", "rand 0.8.5", "tokio", @@ -1510,66 +1487,19 @@ dependencies = [ "tracing-subscriber 0.3.18", ] -[[package]] -name = "cdn-marshal" -version = "0.4.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.5.1-upgrade#849e7edb32788e42738541ba4d5c64d3e061d86d" -dependencies = [ - "cdn-proto 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.5.1-upgrade)", - "clap", - "jf-signature 0.1.0", - "tokio", - "tracing", - "tracing-subscriber 0.3.18", -] - [[package]] name = "cdn-marshal" version = "0.4.0" source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.5.6#9409763dbcb726e43218c3c4cfde91c7d5de6a52" dependencies = [ - "cdn-proto 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.5.6)", + "cdn-proto", "clap", - "jf-signature 0.2.0", + "jf-signature", "tokio", "tracing", "tracing-subscriber 0.3.18", ] -[[package]] -name = "cdn-proto" -version = "0.4.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.5.1-upgrade#849e7edb32788e42738541ba4d5c64d3e061d86d" -dependencies = [ - "anyhow", - "ark-serialize", - "async-trait", - "capnp", - "capnpc", - "derivative", - "jf-signature 0.1.0", - "kanal", - "lazy_static", - "mnemonic", - "num_enum", - "pem 3.0.4", - "prometheus", - "quinn", - "rand 0.8.5", - "rcgen 0.13.1", - "redis", - "rkyv", - "rustls 0.23.18", - "rustls-pki-types", - "sqlx", - "thiserror 1.0.69", - "tokio", - "tokio-rustls 0.26.0", - "tracing", - "url", - "warp", -] - [[package]] name = "cdn-proto" version = "0.4.0" @@ -1582,7 +1512,7 @@ dependencies = [ "capnpc", "derivative", "derive_more 1.0.0", - "jf-signature 0.2.0", + "jf-signature", "kanal", "lazy_static", "mnemonic", @@ -2498,7 +2428,7 @@ dependencies = [ "hotshot-state-prover", "jf-pcs", "jf-plonk", - "jf-signature 0.2.0", + "jf-signature", "jf-utils", "sha3", ] @@ -2844,7 +2774,7 @@ dependencies = [ "hotshot-types", "itertools 0.12.1", "jf-merkle-tree", - "jf-signature 0.2.0", + "jf-signature", "jf-utils", "jf-vid", "lru 0.12.5", @@ -4000,9 +3930,9 @@ dependencies = [ "bimap", "bincode", "blake3", - "cdn-broker 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.5.6)", + "cdn-broker", "cdn-client", - "cdn-marshal 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.5.6)", + "cdn-marshal", "chrono", "committable", "dashmap", @@ -4277,7 +4207,7 @@ dependencies = [ "hotshot-types", "jf-crhf", "jf-rescue", - "jf-signature 0.2.0", + "jf-signature", "jf-utils", "primitive-types", "serde", @@ -4310,7 +4240,7 @@ dependencies = [ "jf-plonk", "jf-relation", "jf-rescue", - "jf-signature 0.2.0", + "jf-signature", "jf-utils", "reqwest 0.12.9", "sequencer-utils", @@ -4439,7 +4369,7 @@ dependencies = [ "either", "futures", "jf-pcs", - "jf-signature 0.2.0", + "jf-signature", "jf-utils", "jf-vid", "lazy_static", @@ -5305,35 +5235,6 @@ dependencies = [ "jf-utils", ] -[[package]] -name = "jf-signature" -version = "0.1.0" -source = "git+https://github.com/EspressoSystems/jellyfish?tag=0.4.5#7d71dbeff14f1a501b0b0dc391f1dffa1b8374fb" -dependencies = [ - "ark-bls12-381", - "ark-bn254", - "ark-ec", - "ark-ff", - "ark-serialize", - "ark-std", - "blst", - "derivative", - "digest 0.10.7", - "displaydoc", - "hashbrown 0.14.5", - "itertools 0.12.1", - "jf-crhf", - "jf-relation", - "jf-rescue", - "jf-utils", - "num-bigint", - "num-traits", - "serde", - "sha3", - "tagged-base64", - "zeroize", -] - [[package]] name = "jf-signature" version = "0.2.0" @@ -6189,7 +6090,7 @@ dependencies = [ "hotshot-stake-table", "hotshot-types", "jf-merkle-tree", - "jf-signature 0.2.0", + "jf-signature", "marketplace-builder-core", "marketplace-builder-shared", "marketplace-solver", @@ -7560,7 +7461,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", - "itertools 0.12.1", + "itertools 0.11.0", "proc-macro2", "quote", "syn 2.0.87", @@ -8617,8 +8518,8 @@ dependencies = [ "async-once-cell", "async-trait", "bincode", - "cdn-broker 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.5.1-upgrade)", - "cdn-marshal 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.5.1-upgrade)", + "cdn-broker", + "cdn-marshal", "clap", "client", "committable", @@ -8647,7 +8548,7 @@ dependencies = [ "jf-crhf", "jf-merkle-tree", "jf-rescue", - "jf-signature 0.2.0", + "jf-signature", "jf-vid", "libp2p", "libp2p-networking", diff --git a/Cargo.toml b/Cargo.toml index 630d32d08..2e47943d9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -84,8 +84,8 @@ hotshot-contract-adapter = { version = "0.1.0", path = "contracts/rust/adapter" hotshot-example-types = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.82" } # Push CDN imports -cdn-broker = { git = "https://github.com/EspressoSystems/Push-CDN", tag = "0.5.1-upgrade", package = "cdn-broker" } -cdn-marshal = { git = "https://github.com/EspressoSystems/Push-CDN", tag = "0.5.1-upgrade", package = "cdn-marshal" } +cdn-broker = { git = "https://github.com/EspressoSystems/Push-CDN", tag = "0.5.6", package = "cdn-broker" } +cdn-marshal = { git = "https://github.com/EspressoSystems/Push-CDN", tag = "0.5.6", package = "cdn-marshal" } jf-plonk = { git = "https://github.com/EspressoSystems/jellyfish", tag = "jf-plonk-v0.5.1", features = [ "test-apis",