From d202d5a3f31bb901723ad82ffcc5763104472b47 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Dec 2024 03:41:10 +0000 Subject: [PATCH] Bump the hotshot group with 6 updates Bumps the hotshot group with 6 updates: | Package | From | To | | --- | --- | --- | | [hotshot-builder-core](https://github.com/EspressoSystems/marketplace-builder-core) | `0.1.57` | `0.1.58` | | [hotshot-query-service](https://github.com/EspressoSystems/hotshot-query-service) | `v0.1.75` | `0.1.75` | | [hotshot-task](https://github.com/EspressoSystems/hotshot) | ``ecfd22a`` | ``4ed1df2`` | | [hotshot-testing](https://github.com/EspressoSystems/hotshot) | ``ecfd22a`` | ``4ed1df2`` | | [hotshot-types](https://github.com/EspressoSystems/hotshot) | ``ecfd22a`` | ``4ed1df2`` | | [hotshot-example-types](https://github.com/EspressoSystems/hotshot) | ``ecfd22a`` | ``4ed1df2`` | Updates `hotshot-builder-core` from 0.1.57 to 0.1.58 - [Release notes](https://github.com/EspressoSystems/marketplace-builder-core/releases) - [Commits](https://github.com/EspressoSystems/marketplace-builder-core/compare/cf9d2cbf154809a31bcf2dccc1218ee9c6875f1e...7df48a9099241c92f4946dd13a9f86d90fb23768) Updates `hotshot-query-service` from v0.1.75 to 0.1.75 - [Release notes](https://github.com/EspressoSystems/hotshot-query-service/releases) - [Commits](https://github.com/EspressoSystems/hotshot-query-service/compare/dffefa160f441a663723a67bc54efedb11a88b02...fec63771185ca66f618d983aad6f84683f1bc8e1) Updates `hotshot-task` from `ecfd22a` to `4ed1df2` - [Release notes](https://github.com/EspressoSystems/hotshot/releases) - [Commits](https://github.com/EspressoSystems/hotshot/compare/ecfd22a4b3d20b7cf89282b172f178ab2ebf81a4...4ed1df20f793b947d5c9f90a1cb10e4177f8521d) Updates `hotshot-testing` from `ecfd22a` to `4ed1df2` - [Release notes](https://github.com/EspressoSystems/hotshot/releases) - [Commits](https://github.com/EspressoSystems/hotshot/compare/ecfd22a4b3d20b7cf89282b172f178ab2ebf81a4...4ed1df20f793b947d5c9f90a1cb10e4177f8521d) Updates `hotshot-types` from `ecfd22a` to `4ed1df2` - [Release notes](https://github.com/EspressoSystems/hotshot/releases) - [Commits](https://github.com/EspressoSystems/hotshot/compare/ecfd22a4b3d20b7cf89282b172f178ab2ebf81a4...4ed1df20f793b947d5c9f90a1cb10e4177f8521d) Updates `hotshot-example-types` from `ecfd22a` to `4ed1df2` - [Release notes](https://github.com/EspressoSystems/hotshot/releases) - [Commits](https://github.com/EspressoSystems/hotshot/compare/ecfd22a4b3d20b7cf89282b172f178ab2ebf81a4...4ed1df20f793b947d5c9f90a1cb10e4177f8521d) --- updated-dependencies: - dependency-name: hotshot-builder-core dependency-type: direct:production dependency-group: hotshot - dependency-name: hotshot-query-service dependency-type: direct:production dependency-group: hotshot - dependency-name: hotshot-task dependency-type: direct:production dependency-group: hotshot - dependency-name: hotshot-testing dependency-type: direct:production dependency-group: hotshot - dependency-name: hotshot-types dependency-type: direct:production dependency-group: hotshot - dependency-name: hotshot-example-types dependency-type: direct:production dependency-group: hotshot ... Signed-off-by: dependabot[bot] --- Cargo.lock | 821 +++++++++++++++++++++++++++++++++++++++++++++++------ Cargo.toml | 4 +- 2 files changed, 729 insertions(+), 96 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0844e2b46..aae6270c9 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" @@ -116,6 +116,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", + "getrandom 0.2.15", "once_cell", "version_check", "zerocopy", @@ -547,7 +548,7 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.87", - "synstructure", + "synstructure 0.13.1", ] [[package]] @@ -938,6 +939,15 @@ dependencies = [ "num-traits", ] +[[package]] +name = "atomic" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d818003e740b63afc82337e3160717f4f63078720a810b7b903e70a5d1d2994" +dependencies = [ + "bytemuck", +] + [[package]] name = "atomic-waker" version = "1.1.2" @@ -1264,14 +1274,14 @@ dependencies = [ "espresso-types", "ethers", "futures", - "hotshot", - "hotshot-builder-api", + "hotshot 0.5.79", + "hotshot-builder-api 0.1.7 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.82)", "hotshot-builder-core", "hotshot-events-service", "hotshot-state-prover", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.82)", "jf-signature 0.2.0", - "marketplace-builder-shared", + "marketplace-builder-shared 0.1.57", "portpicker", "rand 0.8.5", "sequencer", @@ -1320,6 +1330,26 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "bytemuck" +version = "1.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b37c88a63ffd85d15b406896cc343916d7cf57838a847b3a6f2ca5d39a5695a" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "byteorder" version = "1.5.0" @@ -1377,6 +1407,15 @@ dependencies = [ "serde", ] +[[package]] +name = "capnp" +version = "0.19.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e985a566bdaae9a428a957d12b10c318d41b2afddb54cfbb764878059df636e" +dependencies = [ + "embedded-io", +] + [[package]] name = "capnp" version = "0.20.3" @@ -1386,13 +1425,22 @@ dependencies = [ "embedded-io", ] +[[package]] +name = "capnpc" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ba30e0f08582d53c2f3710cf4bb65ff562614b1ba86906d7391adffe189ec" +dependencies = [ + "capnp 0.19.8", +] + [[package]] name = "capnpc" version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1aa3d5f01e69ed11656d2c7c47bf34327ea9bfb5c85c7de787fcd7b6c5e45b61" dependencies = [ - "capnp", + "capnp 0.20.3", ] [[package]] @@ -1448,6 +1496,29 @@ dependencies = [ "shlex", ] +[[package]] +name = "cdn-broker" +version = "0.4.0" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.7#5406fde54e61058428a7b55e1a98b699f0f606f1" +dependencies = [ + "cdn-proto 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.7)", + "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" @@ -1494,6 +1565,21 @@ dependencies = [ "tracing-subscriber 0.3.18", ] +[[package]] +name = "cdn-client" +version = "0.4.0" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.7#5406fde54e61058428a7b55e1a98b699f0f606f1" +dependencies = [ + "cdn-proto 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.7)", + "clap", + "jf-signature 0.1.0", + "parking_lot", + "rand 0.8.5", + "tokio", + "tracing", + "tracing-subscriber 0.3.18", +] + [[package]] name = "cdn-client" version = "0.4.0" @@ -1510,6 +1596,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.4.7#5406fde54e61058428a7b55e1a98b699f0f606f1" +dependencies = [ + "cdn-proto 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.7)", + "clap", + "jf-signature 0.1.0", + "tokio", + "tracing", + "tracing-subscriber 0.3.18", +] + [[package]] name = "cdn-marshal" version = "0.4.0" @@ -1536,6 +1635,40 @@ dependencies = [ "tracing-subscriber 0.3.18", ] +[[package]] +name = "cdn-proto" +version = "0.4.0" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.7#5406fde54e61058428a7b55e1a98b699f0f606f1" +dependencies = [ + "anyhow", + "ark-serialize", + "async-trait", + "capnp 0.19.8", + "capnpc 0.19.0", + "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 0.26.1", + "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" @@ -1544,8 +1677,8 @@ dependencies = [ "anyhow", "ark-serialize", "async-trait", - "capnp", - "capnpc", + "capnp 0.20.3", + "capnpc 0.20.1", "derivative", "jf-signature 0.1.0", "kanal", @@ -1557,7 +1690,7 @@ dependencies = [ "quinn", "rand 0.8.5", "rcgen 0.13.1", - "redis", + "redis 0.27.5", "rkyv", "rustls 0.23.18", "rustls-pki-types", @@ -1578,8 +1711,8 @@ dependencies = [ "anyhow", "ark-serialize", "async-trait", - "capnp", - "capnpc", + "capnp 0.20.3", + "capnpc 0.20.1", "derivative", "derive_more 1.0.0", "jf-signature 0.2.0", @@ -1592,7 +1725,7 @@ dependencies = [ "quinn", "rand 0.8.5", "rcgen 0.13.1", - "redis", + "redis 0.27.5", "rkyv", "rustls 0.23.18", "rustls-pki-types", @@ -1718,6 +1851,17 @@ dependencies = [ "vbs", ] +[[package]] +name = "coarsetime" +version = "0.1.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4252bf230cb600c19826a575b31c8c9c84c6f11acfab6dfcad2e941b10b6f8e2" +dependencies = [ + "libc", + "wasix", + "wasm-bindgen", +] + [[package]] name = "coins-bip32" version = "0.8.7" @@ -2230,13 +2374,33 @@ dependencies = [ "syn 2.0.87", ] +[[package]] +name = "custom_debug" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89e0ae2c2a42be29595d05c50e3ce6096c0698a97e021c3289790f0750cc8e2" +dependencies = [ + "custom_debug_derive 0.5.1", +] + [[package]] name = "custom_debug" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14e715bf0e503e909c7076c052e39dd215202e8edeb32f1c194fd630c314d256" dependencies = [ - "custom_debug_derive", + "custom_debug_derive 0.6.1", +] + +[[package]] +name = "custom_debug_derive" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08a9f3941234c9f62ceaa2782974827749de9b0a8a6487275a278da068e1baf7" +dependencies = [ + "proc-macro2", + "syn 1.0.109", + "synstructure 0.12.6", ] [[package]] @@ -2250,7 +2414,7 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.87", - "synstructure", + "synstructure 0.13.1", ] [[package]] @@ -2817,6 +2981,11 @@ name = "espresso-systems-common" version = "0.4.0" source = "git+https://github.com/espressosystems/espresso-systems-common?tag=0.4.0#5abd890f79014a86db31286e1f3a529f161e69de" +[[package]] +name = "espresso-systems-common" +version = "0.4.1" +source = "git+https://github.com/espressosystems/espresso-systems-common?tag=0.4.1#2e889e878866c2a5cce1daaab947f7c93d5811ae" + [[package]] name = "espresso-types" version = "0.1.0" @@ -2838,10 +3007,10 @@ dependencies = [ "ethers", "fluent-asserter", "futures", - "hotshot", + "hotshot 0.5.79", "hotshot-contract-adapter", "hotshot-query-service", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.82)", "itertools 0.12.1", "jf-merkle-tree", "jf-signature 0.2.0", @@ -4001,7 +4170,7 @@ dependencies = [ "bincode", "blake3", "cdn-broker 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.5.6)", - "cdn-client", + "cdn-client 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.5.6)", "cdn-marshal 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.5.6)", "chrono", "committable", @@ -4009,11 +4178,11 @@ dependencies = [ "derive_more 1.0.0", "either", "futures", - "hotshot-task", - "hotshot-task-impls", - "hotshot-types", + "hotshot-task 0.5.79", + "hotshot-task-impls 0.5.79", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.82)", "libp2p-identity", - "libp2p-networking", + "libp2p-networking 0.5.79", "lru 0.12.5", "num_enum", "parking_lot", @@ -4027,7 +4196,73 @@ dependencies = [ "tracing", "tracing-subscriber 0.3.18", "url", - "utils", + "utils 0.5.79", + "vbs", +] + +[[package]] +name = "hotshot" +version = "0.5.81" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.81#4ed1df20f793b947d5c9f90a1cb10e4177f8521d" +dependencies = [ + "anyhow", + "async-broadcast", + "async-lock 3.4.0", + "async-trait", + "bimap", + "bincode", + "blake3", + "cdn-broker 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.7)", + "cdn-client 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.7)", + "cdn-marshal 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.7)", + "chrono", + "committable", + "custom_debug 0.5.1", + "dashmap", + "derive_more 1.0.0", + "either", + "ethereum-types", + "futures", + "hotshot-task 0.5.81", + "hotshot-task-impls 0.5.81", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.81)", + "jf-signature 0.2.0", + "libp2p-identity", + "libp2p-networking 0.5.81", + "lru 0.12.5", + "num_enum", + "parking_lot", + "portpicker", + "rand 0.8.5", + "serde", + "sha2 0.10.8", + "surf-disco", + "thiserror 1.0.69", + "time 0.3.36", + "tokio", + "tracing", + "tracing-subscriber 0.3.18", + "url", + "utils 0.5.81", + "vbs", +] + +[[package]] +name = "hotshot-builder-api" +version = "0.1.7" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.81#4ed1df20f793b947d5c9f90a1cb10e4177f8521d" +dependencies = [ + "async-trait", + "clap", + "committable", + "derive_more 1.0.0", + "futures", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.81)", + "serde", + "tagged-base64", + "thiserror 1.0.69", + "tide-disco", + "toml 0.8.19", "vbs", ] @@ -4041,7 +4276,7 @@ dependencies = [ "committable", "derive_more 1.0.0", "futures", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.82)", "serde", "tagged-base64", "thiserror 2.0.3", @@ -4052,22 +4287,26 @@ dependencies = [ [[package]] name = "hotshot-builder-core" -version = "0.1.57" -source = "git+https://github.com/EspressoSystems/marketplace-builder-core?tag=0.1.57#cf9d2cbf154809a31bcf2dccc1218ee9c6875f1e" +version = "0.1.58" +source = "git+https://github.com/EspressoSystems/marketplace-builder-core?tag=0.1.58#7df48a9099241c92f4946dd13a9f86d90fb23768" dependencies = [ "anyhow", "async-broadcast", "async-lock 3.4.0", "async-trait", + "atomic", "bincode", + "bytemuck", + "coarsetime", "committable", "derive_more 1.0.0", "futures", - "hotshot", - "hotshot-builder-api", - "hotshot-types", + "hotshot 0.5.79", + "hotshot-builder-api 0.1.7 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.82)", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.82)", "lru 0.12.5", - "marketplace-builder-shared", + "marketplace-builder-shared 0.1.58", + "once_cell", "serde", "sha2 0.10.8", "tagged-base64", @@ -4094,7 +4333,7 @@ dependencies = [ "derive_more 1.0.0", "diff-test-bn254", "ethers", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.82)", "jf-pcs", "jf-plonk", "jf-utils", @@ -4117,7 +4356,7 @@ dependencies = [ "derive_more 0.99.18", "either", "futures", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.82)", "libp2p-identity", "rand 0.8.5", "serde", @@ -4140,9 +4379,9 @@ dependencies = [ "async-lock 3.4.0", "async-trait", "committable", - "hotshot", - "hotshot-task-impls", - "hotshot-types", + "hotshot 0.5.79", + "hotshot-task-impls 0.5.79", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.82)", "jf-vid", "rand 0.8.5", "reqwest 0.12.9", @@ -4156,6 +4395,39 @@ dependencies = [ "vbs", ] +[[package]] +name = "hotshot-example-types" +version = "0.5.81" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.81#4ed1df20f793b947d5c9f90a1cb10e4177f8521d" +dependencies = [ + "anyhow", + "async-broadcast", + "async-lock 3.4.0", + "async-trait", + "bitvec", + "committable", + "either", + "ethereum-types", + "futures", + "hotshot 0.5.81", + "hotshot-builder-api 0.1.7 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.81)", + "hotshot-task 0.5.81", + "hotshot-task-impls 0.5.81", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.81)", + "jf-vid", + "rand 0.8.5", + "reqwest 0.12.9", + "serde", + "sha2 0.10.8", + "sha3", + "thiserror 1.0.69", + "time 0.3.36", + "tokio", + "tracing", + "url", + "vbs", +] + [[package]] name = "hotshot-fakeapi" version = "0.5.79" @@ -4165,8 +4437,8 @@ dependencies = [ "async-lock 3.4.0", "async-trait", "futures", - "hotshot-example-types", - "hotshot-types", + "hotshot-example-types 0.5.79", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.82)", "rand 0.8.5", "tide-disco", "tokio", @@ -4174,6 +4446,26 @@ dependencies = [ "vbs", ] +[[package]] +name = "hotshot-fakeapi" +version = "0.5.81" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.81#4ed1df20f793b947d5c9f90a1cb10e4177f8521d" +dependencies = [ + "anyhow", + "async-lock 3.4.0", + "async-trait", + "futures", + "hotshot-example-types 0.5.81", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.81)", + "rand 0.8.5", + "serde", + "tide-disco", + "tokio", + "toml 0.8.19", + "tracing", + "vbs", +] + [[package]] name = "hotshot-macros" version = "0.5.79" @@ -4185,6 +4477,17 @@ dependencies = [ "syn 2.0.87", ] +[[package]] +name = "hotshot-macros" +version = "0.5.81" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.81#4ed1df20f793b947d5c9f90a1cb10e4177f8521d" +dependencies = [ + "derive_builder", + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "hotshot-orchestrator" version = "0.5.79" @@ -4196,22 +4499,49 @@ dependencies = [ "clap", "csv", "futures", - "hotshot-types", - "libp2p-identity", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.82)", + "libp2p-identity", + "multiaddr", + "serde", + "surf-disco", + "tide-disco", + "tokio", + "toml 0.8.19", + "tracing", + "vbs", +] + +[[package]] +name = "hotshot-orchestrator" +version = "0.5.81" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.81#4ed1df20f793b947d5c9f90a1cb10e4177f8521d" +dependencies = [ + "anyhow", + "async-lock 3.4.0", + "bincode", + "blake3", + "clap", + "csv", + "futures", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.81)", + "libp2p", "multiaddr", "serde", + "serde_json", "surf-disco", + "thiserror 1.0.69", "tide-disco", "tokio", "toml 0.8.19", "tracing", "vbs", + "vec1", ] [[package]] name = "hotshot-query-service" -version = "0.1.75" -source = "git+https://github.com/EspressoSystems/hotshot-query-service?tag=v0.1.75#dffefa160f441a663723a67bc54efedb11a88b02" +version = "0.1.62" +source = "git+https://github.com/EspressoSystems/hotshot-query-service?tag=0.1.75#fec63771185ca66f618d983aad6f84683f1bc8e1" dependencies = [ "anyhow", "ark-serialize", @@ -4222,16 +4552,16 @@ dependencies = [ "bincode", "chrono", "committable", - "custom_debug", + "custom_debug 0.6.1", "derivative", "derive_more 0.99.18", "either", "espresso-macros", "futures", - "hotshot", - "hotshot-example-types", - "hotshot-testing", - "hotshot-types", + "hotshot 0.5.81", + "hotshot-example-types 0.5.81", + "hotshot-testing 0.5.81", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.81)", "include_dir", "itertools 0.12.1", "jf-merkle-tree", @@ -4274,7 +4604,7 @@ dependencies = [ "ark-serialize", "ark-std", "digest 0.10.7", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.82)", "jf-crhf", "jf-rescue", "jf-signature 0.2.0", @@ -4303,7 +4633,7 @@ dependencies = [ "futures", "hotshot-contract-adapter", "hotshot-stake-table", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.82)", "itertools 0.12.1", "jf-crhf", "jf-pcs", @@ -4335,7 +4665,21 @@ dependencies = [ "futures", "tokio", "tracing", - "utils", + "utils 0.5.79", +] + +[[package]] +name = "hotshot-task" +version = "0.5.81" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.81#4ed1df20f793b947d5c9f90a1cb10e4177f8521d" +dependencies = [ + "anyhow", + "async-broadcast", + "async-trait", + "futures", + "tokio", + "tracing", + "utils 0.5.81", ] [[package]] @@ -4352,9 +4696,9 @@ dependencies = [ "committable", "either", "futures", - "hotshot-builder-api", - "hotshot-task", - "hotshot-types", + "hotshot-builder-api 0.1.7 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.82)", + "hotshot-task 0.5.79", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.82)", "jf-vid", "lru 0.12.5", "rand 0.8.5", @@ -4367,7 +4711,44 @@ dependencies = [ "tokio", "tracing", "url", - "utils", + "utils 0.5.79", + "vbs", + "vec1", +] + +[[package]] +name = "hotshot-task-impls" +version = "0.5.81" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.81#4ed1df20f793b947d5c9f90a1cb10e4177f8521d" +dependencies = [ + "anyhow", + "async-broadcast", + "async-lock 3.4.0", + "async-trait", + "bincode", + "bitvec", + "cdn-proto 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.7)", + "chrono", + "committable", + "either", + "futures", + "hotshot-builder-api 0.1.7 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.81)", + "hotshot-task 0.5.81", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.81)", + "jf-signature 0.2.0", + "jf-vid", + "lru 0.12.5", + "rand 0.8.5", + "serde", + "sha2 0.10.8", + "surf-disco", + "tagged-base64", + "thiserror 1.0.69", + "time 0.3.36", + "tokio", + "tracing", + "url", + "utils 0.5.81", "vbs", "vec1", ] @@ -4386,14 +4767,14 @@ dependencies = [ "committable", "either", "futures", - "hotshot", - "hotshot-builder-api", - "hotshot-example-types", - "hotshot-fakeapi", - "hotshot-macros", - "hotshot-task", - "hotshot-task-impls", - "hotshot-types", + "hotshot 0.5.79", + "hotshot-builder-api 0.1.7 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.82)", + "hotshot-example-types 0.5.79", + "hotshot-fakeapi 0.5.79", + "hotshot-macros 0.5.79", + "hotshot-task 0.5.79", + "hotshot-task-impls 0.5.79", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.82)", "itertools 0.13.0", "jf-vid", "lru 0.12.5", @@ -4413,6 +4794,108 @@ dependencies = [ "vec1", ] +[[package]] +name = "hotshot-testing" +version = "0.5.81" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.81#4ed1df20f793b947d5c9f90a1cb10e4177f8521d" +dependencies = [ + "anyhow", + "async-broadcast", + "async-lock 3.4.0", + "async-trait", + "automod", + "bitvec", + "committable", + "either", + "ethereum-types", + "futures", + "hotshot 0.5.81", + "hotshot-builder-api 0.1.7 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.81)", + "hotshot-example-types 0.5.81", + "hotshot-fakeapi 0.5.81", + "hotshot-macros 0.5.81", + "hotshot-orchestrator 0.5.81", + "hotshot-task 0.5.81", + "hotshot-task-impls 0.5.81", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.81)", + "itertools 0.13.0", + "jf-signature 0.2.0", + "jf-vid", + "lru 0.12.5", + "portpicker", + "rand 0.8.5", + "reqwest 0.12.9", + "serde", + "sha2 0.10.8", + "sha3", + "tagged-base64", + "thiserror 1.0.69", + "tide-disco", + "tokio", + "tracing", + "url", + "vbs", + "vec1", +] + +[[package]] +name = "hotshot-types" +version = "0.1.11" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.81#4ed1df20f793b947d5c9f90a1cb10e4177f8521d" +dependencies = [ + "anyhow", + "ark-bn254", + "ark-ed-on-bn254", + "ark-ff", + "ark-serialize", + "ark-srs", + "ark-std", + "async-lock 3.4.0", + "async-trait", + "bincode", + "bitvec", + "blake3", + "cdn-proto 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.7)", + "clap", + "committable", + "custom_debug 0.5.1", + "derivative", + "digest 0.10.7", + "displaydoc", + "dyn-clone", + "either", + "espresso-systems-common 0.4.1", + "ethereum-types", + "futures", + "jf-pcs", + "jf-signature 0.2.0", + "jf-utils", + "jf-vid", + "lazy_static", + "libp2p", + "memoize", + "rand 0.8.5", + "rand_chacha 0.3.1", + "reqwest 0.12.9", + "serde", + "serde-inline-default", + "serde_bytes", + "serde_json", + "sha2 0.10.8", + "surf-disco", + "tagged-base64", + "thiserror 1.0.69", + "time 0.3.36", + "tokio", + "toml 0.8.19", + "tracing", + "typenum", + "url", + "utils 0.5.81", + "vbs", + "vec1", +] + [[package]] name = "hotshot-types" version = "0.1.11" @@ -4463,7 +4946,7 @@ dependencies = [ "tracing", "typenum", "url", - "utils", + "utils 0.5.79", "vbs", "vec1", ] @@ -5229,7 +5712,7 @@ dependencies = [ "displaydoc", "downcast-rs", "dyn-clone", - "espresso-systems-common", + "espresso-systems-common 0.4.0", "hashbrown 0.14.5", "itertools 0.12.1", "jf-crhf", @@ -5837,17 +6320,52 @@ dependencies = [ "derive_builder", "derive_more 1.0.0", "futures", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.82)", + "lazy_static", + "libp2p", + "libp2p-identity", + "libp2p-swarm-derive", + "pin-project", + "rand 0.8.5", + "serde", + "tokio", + "tracing", + "tracing-subscriber 0.3.18", +] + +[[package]] +name = "libp2p-networking" +version = "0.5.81" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.81#4ed1df20f793b947d5c9f90a1cb10e4177f8521d" +dependencies = [ + "anyhow", + "async-lock 3.4.0", + "async-trait", + "bincode", + "blake3", + "cbor4ii", + "custom_debug 0.5.1", + "delegate", + "derive_builder", + "either", + "futures", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.81)", "lazy_static", "libp2p", "libp2p-identity", "libp2p-swarm-derive", "pin-project", + "portpicker", "rand 0.8.5", "serde", + "serde_bytes", + "serde_json", + "thiserror 1.0.69", "tokio", + "tokio-stream", "tracing", "tracing-subscriber 0.3.18", + "void", ] [[package]] @@ -6181,17 +6699,17 @@ dependencies = [ "espresso-types", "ethers", "futures", - "hotshot", - "hotshot-builder-api", + "hotshot 0.5.79", + "hotshot-builder-api 0.1.7 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.82)", "hotshot-events-service", - "hotshot-orchestrator", + "hotshot-orchestrator 0.5.79", "hotshot-query-service", "hotshot-stake-table", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.82)", "jf-merkle-tree", "jf-signature 0.2.0", "marketplace-builder-core", - "marketplace-builder-shared", + "marketplace-builder-shared 0.1.57", "marketplace-solver", "portpicker", "sequencer", @@ -6218,11 +6736,11 @@ dependencies = [ "committable", "derive_more 1.0.0", "futures", - "hotshot", - "hotshot-builder-api", - "hotshot-types", + "hotshot 0.5.79", + "hotshot-builder-api 0.1.7 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.82)", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.82)", "lru 0.12.5", - "marketplace-builder-shared", + "marketplace-builder-shared 0.1.57", "sha2 0.10.8", "tagged-base64", "tide-disco", @@ -6248,18 +6766,58 @@ dependencies = [ "either", "futures", "hex", - "hotshot", - "hotshot-builder-api", + "hotshot 0.5.79", + "hotshot-builder-api 0.1.7 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.82)", + "hotshot-events-service", + "hotshot-example-types 0.5.79", + "hotshot-task-impls 0.5.79", + "hotshot-testing 0.5.79", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.82)", + "jf-vid", + "nonempty-collections", + "rand 0.8.5", + "serde", + "surf-disco", + "tokio", + "tracing", + "tracing-subscriber 0.3.18", + "url", + "vbs", + "vec1", +] + +[[package]] +name = "marketplace-builder-shared" +version = "0.1.58" +source = "git+https://github.com/EspressoSystems/marketplace-builder-core?tag=0.1.58#7df48a9099241c92f4946dd13a9f86d90fb23768" +dependencies = [ + "anyhow", + "async-broadcast", + "async-lock 3.4.0", + "async-trait", + "bincode", + "chrono", + "committable", + "derive_more 1.0.0", + "either", + "futures", + "hex", + "hotshot 0.5.79", + "hotshot-builder-api 0.1.7 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.82)", "hotshot-events-service", - "hotshot-example-types", - "hotshot-task-impls", - "hotshot-testing", - "hotshot-types", + "hotshot-example-types 0.5.79", + "hotshot-task-impls 0.5.79", + "hotshot-testing 0.5.79", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.82)", "jf-vid", "nonempty-collections", + "once_cell", + "quick_cache", "rand 0.8.5", "serde", + "sha2 0.10.8", "surf-disco", + "thiserror 2.0.3", "tokio", "tracing", "tracing-subscriber 0.3.18", @@ -6280,10 +6838,10 @@ dependencies = [ "committable", "espresso-types", "futures", - "hotshot", + "hotshot 0.5.79", "hotshot-events-service", "hotshot-query-service", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.82)", "marketplace-solver", "portpicker", "rand 0.8.5", @@ -6643,10 +7201,10 @@ dependencies = [ "clap", "espresso-types", "futures", - "hotshot", + "hotshot 0.5.79", "hotshot-query-service", "hotshot-stake-table", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.82)", "node-metrics", "prometheus-parse", "reqwest 0.12.9", @@ -7642,6 +8200,18 @@ dependencies = [ "unsigned-varint 0.8.0", ] +[[package]] +name = "quick_cache" +version = "0.6.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d7c94f8935a9df96bb6380e8592c70edf497a643f94bd23b2f76b399385dbf4" +dependencies = [ + "ahash 0.8.11", + "equivalent", + "hashbrown 0.14.5", + "parking_lot", +] + [[package]] name = "quinn" version = "0.11.5" @@ -7843,6 +8413,29 @@ dependencies = [ "yasna", ] +[[package]] +name = "redis" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e902a69d09078829137b4a5d9d082e0490393537badd7c91a3d69d14639e115f" +dependencies = [ + "arc-swap", + "async-trait", + "bytes 1.8.0", + "combine", + "futures", + "futures-util", + "itoa", + "num-bigint", + "percent-encoding", + "pin-project-lite 0.2.15", + "ryu", + "tokio", + "tokio-retry", + "tokio-util", + "url", +] + [[package]] name = "redis" version = "0.27.5" @@ -8632,16 +9225,16 @@ dependencies = [ "espresso-types", "ethers", "futures", - "hotshot", + "hotshot 0.5.79", "hotshot-contract-adapter", "hotshot-events-service", - "hotshot-example-types", - "hotshot-orchestrator", + "hotshot-example-types 0.5.79", + "hotshot-orchestrator 0.5.79", "hotshot-query-service", "hotshot-stake-table", "hotshot-state-prover", - "hotshot-testing", - "hotshot-types", + "hotshot-testing 0.5.79", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.82)", "include_dir", "itertools 0.12.1", "jf-crhf", @@ -8650,9 +9243,9 @@ dependencies = [ "jf-signature 0.2.0", "jf-vid", "libp2p", - "libp2p-networking", + "libp2p-networking 0.5.79", "marketplace-builder-core", - "marketplace-builder-shared", + "marketplace-builder-shared 0.1.57", "marketplace-solver", "num_enum", "parking_lot", @@ -8701,9 +9294,9 @@ dependencies = [ "derive_more 1.0.0", "ethers", "futures", - "hotshot", + "hotshot 0.5.79", "hotshot-contract-adapter", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.82)", "log-panics", "portpicker", "reqwest 0.11.27", @@ -9694,6 +10287,18 @@ dependencies = [ "futures-core", ] +[[package]] +name = "synstructure" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "unicode-xid", +] + [[package]] name = "synstructure" version = "0.13.1" @@ -10166,6 +10771,17 @@ dependencies = [ "whoami", ] +[[package]] +name = "tokio-retry" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f" +dependencies = [ + "pin-project", + "rand 0.8.5", + "tokio", +] + [[package]] name = "tokio-retry2" version = "0.5.6" @@ -10725,6 +11341,14 @@ dependencies = [ "tracing", ] +[[package]] +name = "utils" +version = "0.5.81" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.81#4ed1df20f793b947d5c9f90a1cb10e4177f8521d" +dependencies = [ + "tracing", +] + [[package]] name = "uuid" version = "0.8.2" @@ -10904,6 +11528,15 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" +[[package]] +name = "wasix" +version = "0.12.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1fbb4ef9bbca0c1170e0b00dd28abc9e3b68669821600cad1caaed606583c6d" +dependencies = [ + "wasi 0.11.0+wasi-snapshot-preview1", +] + [[package]] name = "wasm-bindgen" version = "0.2.95" @@ -11426,7 +12059,7 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.87", - "synstructure", + "synstructure 0.13.1", ] [[package]] @@ -11468,7 +12101,7 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.87", - "synstructure", + "synstructure 0.13.1", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 630d32d08..15b54744a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -67,12 +67,12 @@ tokio = { version = "1", default-features = false, features = [ hotshot = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.82" } # Hotshot imports hotshot-builder-api = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.82" } -hotshot-builder-core = { git = "https://github.com/EspressoSystems/marketplace-builder-core", tag = "0.1.57" } +hotshot-builder-core = { git = "https://github.com/EspressoSystems/marketplace-builder-core", tag = "0.1.58" } marketplace-builder-core = { git = "https://github.com/EspressoSystems/marketplace-builder-core", tag = "0.1.57" } marketplace-builder-shared = { git = "https://github.com/EspressoSystems/marketplace-builder-core", tag = "0.1.57" } hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", tag = "0.1.56" } hotshot-orchestrator = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.82" } -hotshot-query-service = { git = "https://github.com/EspressoSystems/hotshot-query-service", tag = "v0.1.75" } +hotshot-query-service = { git = "https://github.com/EspressoSystems/hotshot-query-service", tag = "0.1.75" } hotshot-stake-table = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.82" } hotshot-state-prover = { version = "0.1.0", path = "hotshot-state-prover" } hotshot-task = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.82" }