diff --git a/Cargo.lock b/Cargo.lock index 4a1f39a24..da9cabb36 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1273,12 +1273,12 @@ 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-events-service 0.1.49 (git+https://github.com/EspressoSystems/hotshot-events-service.git?tag=0.1.55)", "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", "portpicker", @@ -1501,14 +1501,14 @@ dependencies = [ [[package]] name = "cdn-broker" version = "0.4.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.5.1-upgrade#849e7edb32788e42738541ba4d5c64d3e061d86d" +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.1-upgrade)", + "cdn-proto 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.5.6)", "clap", "console-subscriber", "dashmap", "derivative", - "jf-signature 0.1.0", + "jf-signature 0.2.0", "lazy_static", "local-ip-address", "parking_lot", @@ -1536,6 +1536,22 @@ dependencies = [ "tracing-subscriber 0.3.19", ] +[[package]] +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)", + "clap", + "derive_more 1.0.0", + "jf-signature 0.2.0", + "parking_lot", + "rand 0.8.5", + "tokio", + "tracing", + "tracing-subscriber 0.3.19", +] + [[package]] name = "cdn-marshal" version = "0.4.0" @@ -1552,11 +1568,11 @@ dependencies = [ [[package]] name = "cdn-marshal" version = "0.4.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.5.1-upgrade#849e7edb32788e42738541ba4d5c64d3e061d86d" +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.1-upgrade)", + "cdn-proto 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.5.6)", "clap", - "jf-signature 0.1.0", + "jf-signature 0.2.0", "tokio", "tracing", "tracing-subscriber 0.3.19", @@ -1599,7 +1615,7 @@ dependencies = [ [[package]] name = "cdn-proto" version = "0.4.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.5.1-upgrade#849e7edb32788e42738541ba4d5c64d3e061d86d" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.5.6#9409763dbcb726e43218c3c4cfde91c7d5de6a52" dependencies = [ "anyhow", "ark-serialize", @@ -1607,7 +1623,8 @@ dependencies = [ "capnp 0.20.3", "capnpc 0.20.1", "derivative", - "jf-signature 0.1.0", + "derive_more 1.0.0", + "jf-signature 0.2.0", "kanal", "lazy_static", "mnemonic", @@ -2887,10 +2904,10 @@ dependencies = [ "ethers", "fluent-asserter", "futures", - "hotshot", + "hotshot 0.5.79", "hotshot-query-service", - "hotshot-types", - "itertools 0.12.1", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.82)", + "itertools 0.13.0", "jf-merkle-tree", "jf-utils", "jf-vid", @@ -2907,7 +2924,7 @@ dependencies = [ "static_assertions", "surf-disco", "tagged-base64", - "thiserror 1.0.69", + "thiserror 2.0.4", "tide-disco", "time 0.3.37", "tokio", @@ -4037,6 +4054,49 @@ dependencies = [ "winapi", ] +[[package]] +name = "hotshot" +version = "0.5.79" +source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.82#ecfd22a4b3d20b7cf89282b172f178ab2ebf81a4" +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.5.6)", + "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", + "dashmap", + "derive_more 1.0.0", + "either", + "futures", + "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 0.5.79", + "lru 0.12.5", + "num_enum", + "parking_lot", + "portpicker", + "primitive-types", + "rand 0.8.5", + "serde", + "sha2 0.10.8", + "time 0.3.37", + "tokio", + "tracing", + "tracing-subscriber 0.3.19", + "url", + "utils 0.5.79", + "vbs", +] + [[package]] name = "hotshot" version = "0.5.81" @@ -4050,7 +4110,7 @@ dependencies = [ "bincode", "blake3", "cdn-broker 0.4.0 (git+https://github.com/EspressoSystems/Push-CDN?tag=0.4.7)", - "cdn-client", + "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", @@ -4060,12 +4120,12 @@ dependencies = [ "either", "ethereum-types", "futures", - "hotshot-task", - "hotshot-task-impls", - "hotshot-types", + "hotshot-task 0.5.81", + "hotshot-task-impls 0.5.81", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.81)", "jf-signature 0.2.0", "libp2p-identity", - "libp2p-networking", + "libp2p-networking 0.5.81", "lru 0.12.5", "num_enum", "parking_lot", @@ -4080,7 +4140,7 @@ dependencies = [ "tracing", "tracing-subscriber 0.3.19", "url", - "utils", + "utils 0.5.81", "vbs", ] @@ -4094,7 +4154,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.81)", "serde", "tagged-base64", "thiserror 1.0.69", @@ -4103,6 +4163,25 @@ dependencies = [ "vbs", ] +[[package]] +name = "hotshot-builder-api" +version = "0.1.7" +source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.82#ecfd22a4b3d20b7cf89282b172f178ab2ebf81a4" +dependencies = [ + "async-trait", + "clap", + "committable", + "derive_more 1.0.0", + "futures", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.82)", + "serde", + "tagged-base64", + "thiserror 2.0.4", + "tide-disco", + "toml 0.8.19", + "vbs", +] + [[package]] name = "hotshot-builder-core" version = "0.1.55" @@ -4115,9 +4194,9 @@ dependencies = [ "bincode", "committable", "futures", - "hotshot", - "hotshot-builder-api", - "hotshot-types", + "hotshot 0.5.81", + "hotshot-builder-api 0.1.7 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.81)", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.81)", "lru 0.12.5", "marketplace-builder-shared", "serde", @@ -4143,7 +4222,7 @@ dependencies = [ "contract-bindings", "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", @@ -4164,7 +4243,33 @@ dependencies = [ "derive_more 0.99.18", "either", "futures", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.81)", + "rand 0.8.5", + "serde", + "snafu 0.8.5", + "tagged-base64", + "tide-disco", + "tokio", + "toml 0.8.19", + "tracing", + "tracing-subscriber 0.3.19", + "vbs", +] + +[[package]] +name = "hotshot-events-service" +version = "0.1.49" +source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?tag=0.1.55#799ce77ec830d15b96d60c83e48f93ad521b4895" +dependencies = [ + "async-broadcast", + "async-lock 3.4.0", + "async-trait", + "clap", + "derivative", + "derive_more 0.99.18", + "either", + "futures", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.81)", "rand 0.8.5", "serde", "snafu 0.8.5", @@ -4177,6 +4282,31 @@ dependencies = [ "vbs", ] +[[package]] +name = "hotshot-example-types" +version = "0.5.79" +source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.82#ecfd22a4b3d20b7cf89282b172f178ab2ebf81a4" +dependencies = [ + "anyhow", + "async-lock 3.4.0", + "async-trait", + "committable", + "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", + "serde", + "sha2 0.10.8", + "sha3", + "thiserror 2.0.4", + "time 0.3.37", + "tokio", + "url", + "vbs", +] + [[package]] name = "hotshot-example-types" version = "0.5.81" @@ -4191,11 +4321,11 @@ dependencies = [ "either", "ethereum-types", "futures", - "hotshot", - "hotshot-builder-api", - "hotshot-task", - "hotshot-task-impls", - "hotshot-types", + "hotshot 0.5.81", + "hotshot-builder-api 0.1.7 (git+https://github.com/EspressoSystems/hotshot?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?tag=0.5.81)", "jf-vid", "rand 0.8.5", "reqwest 0.12.9", @@ -4210,6 +4340,24 @@ dependencies = [ "vbs", ] +[[package]] +name = "hotshot-fakeapi" +version = "0.5.79" +source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.82#ecfd22a4b3d20b7cf89282b172f178ab2ebf81a4" +dependencies = [ + "anyhow", + "async-lock 3.4.0", + "async-trait", + "futures", + "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", + "toml 0.8.19", + "vbs", +] + [[package]] name = "hotshot-fakeapi" version = "0.5.81" @@ -4219,8 +4367,8 @@ dependencies = [ "async-lock 3.4.0", "async-trait", "futures", - "hotshot-example-types", - "hotshot-types", + "hotshot-example-types 0.5.81", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.81)", "rand 0.8.5", "serde", "tide-disco", @@ -4230,6 +4378,17 @@ dependencies = [ "vbs", ] +[[package]] +name = "hotshot-macros" +version = "0.5.79" +source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.82#ecfd22a4b3d20b7cf89282b172f178ab2ebf81a4" +dependencies = [ + "derive_builder", + "proc-macro2", + "quote", + "syn 2.0.90", +] + [[package]] name = "hotshot-macros" version = "0.5.81" @@ -4241,6 +4400,29 @@ dependencies = [ "syn 2.0.90", ] +[[package]] +name = "hotshot-orchestrator" +version = "0.5.79" +source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.82#ecfd22a4b3d20b7cf89282b172f178ab2ebf81a4" +dependencies = [ + "anyhow", + "async-lock 3.4.0", + "blake3", + "clap", + "csv", + "futures", + "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" @@ -4253,7 +4435,7 @@ dependencies = [ "clap", "csv", "futures", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.81)", "libp2p", "multiaddr", "serde", @@ -4288,10 +4470,10 @@ dependencies = [ "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?tag=0.5.81)", "include_dir", "itertools 0.12.1", "jf-merkle-tree", @@ -4325,8 +4507,8 @@ dependencies = [ [[package]] name = "hotshot-stake-table" -version = "0.5.81" -source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.81#4ed1df20f793b947d5c9f90a1cb10e4177f8521d" +version = "0.5.79" +source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.82#ecfd22a4b3d20b7cf89282b172f178ab2ebf81a4" dependencies = [ "ark-bn254", "ark-ed-on-bn254", @@ -4334,12 +4516,12 @@ dependencies = [ "ark-serialize", "ark-std", "digest 0.10.7", - "ethereum-types", - "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", "jf-utils", + "primitive-types", "serde", "tagged-base64", ] @@ -4363,8 +4545,8 @@ dependencies = [ "futures", "hotshot-contract-adapter", "hotshot-stake-table", - "hotshot-types", - "itertools 0.12.1", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.82)", + "itertools 0.13.0", "jf-crhf", "jf-pcs", "jf-plonk", @@ -4385,6 +4567,19 @@ dependencies = [ "vbs", ] +[[package]] +name = "hotshot-task" +version = "0.5.79" +source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.82#ecfd22a4b3d20b7cf89282b172f178ab2ebf81a4" +dependencies = [ + "async-broadcast", + "async-trait", + "futures", + "tokio", + "tracing", + "utils 0.5.79", +] + [[package]] name = "hotshot-task" version = "0.5.81" @@ -4396,7 +4591,41 @@ dependencies = [ "futures", "tokio", "tracing", - "utils", + "utils 0.5.81", +] + +[[package]] +name = "hotshot-task-impls" +version = "0.5.79" +source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.82#ecfd22a4b3d20b7cf89282b172f178ab2ebf81a4" +dependencies = [ + "anyhow", + "async-broadcast", + "async-lock 3.4.0", + "async-trait", + "bincode", + "chrono", + "committable", + "either", + "futures", + "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", + "serde", + "sha2 0.10.8", + "surf-disco", + "tagged-base64", + "thiserror 2.0.4", + "time 0.3.37", + "tokio", + "tracing", + "url", + "utils 0.5.79", + "vbs", + "vec1", ] [[package]] @@ -4415,9 +4644,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.81)", + "hotshot-task 0.5.81", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.81)", "jf-signature 0.2.0", "jf-vid", "lru 0.12.5", @@ -4431,7 +4660,48 @@ dependencies = [ "tokio", "tracing", "url", - "utils", + "utils 0.5.81", + "vbs", + "vec1", +] + +[[package]] +name = "hotshot-testing" +version = "0.5.79" +source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.82#ecfd22a4b3d20b7cf89282b172f178ab2ebf81a4" +dependencies = [ + "anyhow", + "async-broadcast", + "async-lock 3.4.0", + "async-trait", + "automod", + "bitvec", + "committable", + "either", + "futures", + "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", + "portpicker", + "primitive-types", + "rand 0.8.5", + "reqwest 0.12.9", + "serde", + "sha2 0.10.8", + "tagged-base64", + "thiserror 2.0.4", + "tide-disco", + "tokio", + "tracing", + "url", "vbs", "vec1", ] @@ -4451,15 +4721,15 @@ dependencies = [ "either", "ethereum-types", "futures", - "hotshot", - "hotshot-builder-api", - "hotshot-example-types", - "hotshot-fakeapi", - "hotshot-macros", - "hotshot-orchestrator", - "hotshot-task", - "hotshot-task-impls", - "hotshot-types", + "hotshot 0.5.81", + "hotshot-builder-api 0.1.7 (git+https://github.com/EspressoSystems/hotshot?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?tag=0.5.81)", "itertools 0.13.0", "jf-signature 0.2.0", "jf-vid", @@ -4533,7 +4803,62 @@ dependencies = [ "tracing", "typenum", "url", - "utils", + "utils 0.5.81", + "vbs", + "vec1", +] + +[[package]] +name = "hotshot-types" +version = "0.1.11" +source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.82#ecfd22a4b3d20b7cf89282b172f178ab2ebf81a4" +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", + "clap", + "committable", + "derive_more 1.0.0", + "digest 0.10.7", + "displaydoc", + "dyn-clone", + "either", + "futures", + "jf-pcs", + "jf-signature 0.2.0", + "jf-utils", + "jf-vid", + "lazy_static", + "libp2p-identity", + "memoize", + "mnemonic", + "multiaddr", + "primitive-types", + "rand 0.8.5", + "rand_chacha 0.3.1", + "serde", + "serde-inline-default", + "serde_bytes", + "serde_json", + "sha2 0.10.8", + "tagged-base64", + "thiserror 2.0.4", + "time 0.3.37", + "tokio", + "toml 0.8.19", + "tracing", + "typenum", + "url", + "utils 0.5.79", "vbs", "vec1", ] @@ -4665,7 +4990,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite 0.2.15", - "socket2 0.5.8", + "socket2 0.4.10", "tokio", "tower-service", "tracing", @@ -4721,6 +5046,7 @@ dependencies = [ "tokio", "tokio-rustls 0.26.0", "tower-service", + "webpki-roots 0.26.7", ] [[package]] @@ -5898,6 +6224,33 @@ dependencies = [ "prometheus-client", ] +[[package]] +name = "libp2p-networking" +version = "0.5.79" +source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.82#ecfd22a4b3d20b7cf89282b172f178ab2ebf81a4" +dependencies = [ + "anyhow", + "async-trait", + "bincode", + "blake3", + "cbor4ii", + "delegate", + "derive_builder", + "derive_more 1.0.0", + "futures", + "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.19", +] + [[package]] name = "libp2p-networking" version = "0.5.81" @@ -5914,7 +6267,7 @@ dependencies = [ "derive_builder", "either", "futures", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.81)", "lazy_static", "libp2p", "libp2p-identity", @@ -6264,13 +6617,13 @@ dependencies = [ "espresso-types", "ethers", "futures", - "hotshot", - "hotshot-builder-api", - "hotshot-events-service", - "hotshot-orchestrator", + "hotshot 0.5.79", + "hotshot-builder-api 0.1.7 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.82)", + "hotshot-events-service 0.1.49 (git+https://github.com/EspressoSystems/hotshot-events-service.git?tag=0.1.55)", + "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", @@ -6301,9 +6654,9 @@ dependencies = [ "committable", "derivative", "futures", - "hotshot", - "hotshot-builder-api", - "hotshot-types", + "hotshot 0.5.81", + "hotshot-builder-api 0.1.7 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.81)", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.81)", "lru 0.12.5", "marketplace-builder-shared", "sha2 0.10.8", @@ -6329,12 +6682,12 @@ dependencies = [ "either", "futures", "hex", - "hotshot", - "hotshot-builder-api", - "hotshot-events-service", - "hotshot-example-types", - "hotshot-testing", - "hotshot-types", + "hotshot 0.5.81", + "hotshot-builder-api 0.1.7 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.81)", + "hotshot-events-service 0.1.49 (git+https://github.com/EspressoSystems/hotshot-events-service.git?tag=0.1.54)", + "hotshot-example-types 0.5.81", + "hotshot-testing 0.5.81", + "hotshot-types 0.1.11 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.81)", "rand 0.8.5", "serde", "surf-disco", @@ -6358,17 +6711,17 @@ dependencies = [ "committable", "espresso-types", "futures", - "hotshot", - "hotshot-events-service", + "hotshot 0.5.79", + "hotshot-events-service 0.1.49 (git+https://github.com/EspressoSystems/hotshot-events-service.git?tag=0.1.55)", "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", "serde", "sqlx", "surf-disco", - "thiserror 1.0.69", + "thiserror 2.0.4", "tide-disco", "tokio", "toml 0.8.19", @@ -6719,10 +7072,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", @@ -7619,7 +7972,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", - "itertools 0.12.1", + "itertools 0.10.5", "proc-macro2", "quote", "syn 2.0.90", @@ -8138,7 +8491,10 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite 0.2.15", + "quinn", + "rustls 0.23.19", "rustls-pemfile 2.2.0", + "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", @@ -8146,11 +8502,13 @@ dependencies = [ "system-configuration 0.6.1", "tokio", "tokio-native-tls", + "tokio-rustls 0.26.0", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", + "webpki-roots 0.26.7", "windows-registry", ] @@ -8709,8 +9067,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 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)", "clap", "client", "committable", @@ -8725,25 +9083,25 @@ dependencies = [ "espresso-types", "ethers", "futures", - "hotshot", + "hotshot 0.5.79", "hotshot-contract-adapter", - "hotshot-events-service", - "hotshot-example-types", - "hotshot-orchestrator", + "hotshot-events-service 0.1.49 (git+https://github.com/EspressoSystems/hotshot-events-service.git?tag=0.1.55)", + "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", + "itertools 0.13.0", "jf-crhf", "jf-merkle-tree", "jf-rescue", "jf-signature 0.2.0", "jf-vid", "libp2p", - "libp2p-networking", + "libp2p-networking 0.5.79", "marketplace-builder-core", "marketplace-builder-shared", "marketplace-solver", @@ -8793,11 +9151,11 @@ dependencies = [ "derive_more 1.0.0", "ethers", "futures", - "hotshot", + "hotshot 0.5.79", "hotshot-contract-adapter", "log-panics", "portpicker", - "reqwest 0.11.27", + "reqwest 0.12.9", "serde", "serde_json", "surf", @@ -10798,6 +11156,14 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" +[[package]] +name = "utils" +version = "0.5.79" +source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.82#ecfd22a4b3d20b7cf89282b172f178ab2ebf81a4" +dependencies = [ + "tracing", +] + [[package]] name = "utils" version = "0.5.81" diff --git a/Cargo.toml b/Cargo.toml index d15148305..e74013c32 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -64,28 +64,28 @@ tokio = { version = "1", default-features = false, features = [ "sync", ] } -hotshot = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.81" } +hotshot = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.82" } # Hotshot imports -hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.81" } +hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.82" } hotshot-builder-core = { git = "https://github.com/EspressoSystems/marketplace-builder-core", tag = "0.1.56" } marketplace-builder-core = { git = "https://github.com/EspressoSystems/marketplace-builder-core", tag = "0.1.56" } marketplace-builder-shared = { git = "https://github.com/EspressoSystems/marketplace-builder-core", tag = "0.1.56" } -hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", tag = "0.1.54" } -hotshot-orchestrator = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.81" } +hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", tag = "0.1.55" } +hotshot-orchestrator = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.82" } hotshot-query-service = { git = "https://github.com/EspressoSystems/hotshot-query-service", tag = "0.1.74" } -hotshot-stake-table = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.81" } +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.81" } -hotshot-testing = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.81" } -hotshot-types = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.81" } -libp2p-networking = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.81" } +hotshot-task = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.82" } +hotshot-testing = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.82" } +hotshot-types = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.82" } +libp2p-networking = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.82" } hotshot-contract-adapter = { version = "0.1.0", path = "contracts/rust/adapter" } # Temporary, used to pull in the mock auction results provider -hotshot-example-types = { git = "https://github.com/EspressoSystems/hotshot", tag = "0.5.81" } +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", @@ -119,10 +119,10 @@ surf-disco = "0.9" sqlx = "0.8" tagged-base64 = "0.4" tide-disco = "0.9.3" -thiserror = "1.0.69" +thiserror = "2.0.4" tracing = "0.1" bytesize = "1.3" -itertools = "0.12" +itertools = "0.13" rand_chacha = "0.3" rand_distr = "0.4" reqwest = "0.12" diff --git a/utils/Cargo.toml b/utils/Cargo.toml index 5328ae0d7..f31ae9754 100644 --- a/utils/Cargo.toml +++ b/utils/Cargo.toml @@ -23,7 +23,7 @@ hotshot-contract-adapter = { workspace = true } log-panics = { workspace = true } portpicker = { workspace = true } # for price oracle and align with ethers-rs dep -reqwest = { version = "0.11.14", default-features = false, features = ["json", "rustls-tls"] } +reqwest = { version = "0.12.9", default-features = false, features = ["json", "rustls-tls"] } serde = { workspace = true } serde_json = "^1.0.113" surf = "2.3.2"