diff --git a/Cargo.lock b/Cargo.lock index 3d2f48e99..7e283acb0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1322,20 +1322,18 @@ dependencies = [ [[package]] name = "cdn-broker" version = "0.1.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.1.9#8f9cc2d56e725a6cc29a792c6ed67e2e9efee756" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.1.11#c854b7c106f72f21c94a1235e8222f76f78e47e6" dependencies = [ "async-std", "cdn-proto", "clap", "dashmap", - "delegate", "derivative", "derive_builder 0.13.1", "jf-primitives", "lazy_static", "local-ip-address", "parking_lot", - "paste", "prometheus", "rkyv", "tokio", @@ -1346,7 +1344,7 @@ dependencies = [ [[package]] name = "cdn-client" version = "0.1.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.1.9#8f9cc2d56e725a6cc29a792c6ed67e2e9efee756" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.1.11#c854b7c106f72f21c94a1235e8222f76f78e47e6" dependencies = [ "async-std", "cdn-proto", @@ -1362,7 +1360,7 @@ dependencies = [ [[package]] name = "cdn-marshal" version = "0.1.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.1.9#8f9cc2d56e725a6cc29a792c6ed67e2e9efee756" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.1.11#c854b7c106f72f21c94a1235e8222f76f78e47e6" dependencies = [ "async-std", "cdn-proto", @@ -1377,7 +1375,7 @@ dependencies = [ [[package]] name = "cdn-proto" version = "0.1.0" -source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.1.9#8f9cc2d56e725a6cc29a792c6ed67e2e9efee756" +source = "git+https://github.com/EspressoSystems/Push-CDN?tag=0.1.11#c854b7c106f72f21c94a1235e8222f76f78e47e6" dependencies = [ "anyhow", "ark-serialize", @@ -1917,27 +1915,6 @@ dependencies = [ "serdect", ] -[[package]] -name = "csv" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" -dependencies = [ - "csv-core", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "csv-core" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" -dependencies = [ - "memchr", -] - [[package]] name = "ctr" version = "0.6.0" @@ -2178,17 +2155,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "delegate" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e018fccbeeb50ff26562ece792ed06659b9c2dae79ece77c4456bb10d9bf79b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - [[package]] name = "der" version = "0.7.8" @@ -2470,18 +2436,6 @@ dependencies = [ "serde", ] -[[package]] -name = "embed-doc-image" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af36f591236d9d822425cb6896595658fa558fcebf5ee8accac1d4b92c47166e" -dependencies = [ - "base64 0.13.1", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "embedded-io" version = "0.6.1" @@ -3280,7 +3234,7 @@ dependencies = [ [[package]] name = "hotshot" version = "0.5.26" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.27#8bf55cfb3a1d096c0330ba62d03ed1e5f7298cf8" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.28#db3fcfafccdc909845de47e2dd241662c3849b77" dependencies = [ "anyhow", "async-broadcast", @@ -3298,14 +3252,13 @@ dependencies = [ "dashmap", "derive_more", "either", - "embed-doc-image", "ethereum-types", "futures", - "hotshot-orchestrator", "hotshot-task", "hotshot-task-impls", "hotshot-types", "hotshot-web-server", + "jf-primitives", "libp2p-identity", "libp2p-networking", "lru", @@ -3323,7 +3276,7 @@ dependencies = [ [[package]] name = "hotshot-builder-api" version = "0.1.6" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.27#8bf55cfb3a1d096c0330ba62d03ed1e5f7298cf8" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.28#db3fcfafccdc909845de47e2dd241662c3849b77" dependencies = [ "async-trait", "clap", @@ -3341,7 +3294,7 @@ dependencies = [ [[package]] name = "hotshot-example-types" version = "0.5.26" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.27#8bf55cfb3a1d096c0330ba62d03ed1e5f7298cf8" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.28#db3fcfafccdc909845de47e2dd241662c3849b77" dependencies = [ "anyhow", "async-broadcast", @@ -3355,7 +3308,6 @@ dependencies = [ "ethereum-types", "futures", "hotshot", - "hotshot-orchestrator", "hotshot-task", "hotshot-task-impls", "hotshot-types", @@ -3369,32 +3321,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "hotshot-orchestrator" -version = "0.5.26" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.27#8bf55cfb3a1d096c0330ba62d03ed1e5f7298cf8" -dependencies = [ - "async-compatibility-layer 1.0.0 (git+https://github.com/EspressoSystems/async-compatibility-layer.git?tag=1.4.2)", - "async-lock 2.8.0", - "async-std", - "blake3", - "clap", - "csv", - "futures", - "hotshot-types", - "libp2p", - "serde", - "serde-inline-default", - "serde_json", - "surf-disco", - "thiserror", - "tide-disco", - "tokio", - "toml", - "tracing", - "versioned-binary-serialization", -] - [[package]] name = "hotshot-query-service" version = "0.1.0" @@ -3453,7 +3379,7 @@ dependencies = [ [[package]] name = "hotshot-task" version = "0.5.26" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.27#8bf55cfb3a1d096c0330ba62d03ed1e5f7298cf8" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.28#db3fcfafccdc909845de47e2dd241662c3849b77" dependencies = [ "async-broadcast", "async-compatibility-layer 1.0.0 (git+https://github.com/EspressoSystems/async-compatibility-layer.git?tag=1.4.2)", @@ -3466,7 +3392,7 @@ dependencies = [ [[package]] name = "hotshot-task-impls" version = "0.5.26" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.27#8bf55cfb3a1d096c0330ba62d03ed1e5f7298cf8" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.28#db3fcfafccdc909845de47e2dd241662c3849b77" dependencies = [ "async-broadcast", "async-compatibility-layer 1.0.0 (git+https://github.com/EspressoSystems/async-compatibility-layer.git?tag=1.4.2)", @@ -3498,7 +3424,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.27#8bf55cfb3a1d096c0330ba62d03ed1e5f7298cf8" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.28#db3fcfafccdc909845de47e2dd241662c3849b77" dependencies = [ "anyhow", "ark-bls12-381", @@ -3546,7 +3472,7 @@ dependencies = [ [[package]] name = "hotshot-web-server" version = "0.5.26" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.27#8bf55cfb3a1d096c0330ba62d03ed1e5f7298cf8" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.28#db3fcfafccdc909845de47e2dd241662c3849b77" dependencies = [ "async-compatibility-layer 1.0.0 (git+https://github.com/EspressoSystems/async-compatibility-layer.git?tag=1.4.2)", "async-lock 2.8.0", @@ -4490,7 +4416,7 @@ dependencies = [ [[package]] name = "libp2p-networking" version = "0.5.26" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.27#8bf55cfb3a1d096c0330ba62d03ed1e5f7298cf8" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.28#db3fcfafccdc909845de47e2dd241662c3849b77" dependencies = [ "anyhow", "async-compatibility-layer 1.0.0 (git+https://github.com/EspressoSystems/async-compatibility-layer.git?tag=1.4.2)", @@ -4499,7 +4425,6 @@ dependencies = [ "async-trait", "blake3", "custom_debug 0.5.1", - "dashmap", "derive_builder 0.20.0", "either", "futures", @@ -6943,17 +6868,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "serde-inline-default" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa824cde50b5f01ff28a955114d8152a07cd62d81f53459dad0f2610136be844" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "serde_bytes" version = "0.11.14" diff --git a/Cargo.toml b/Cargo.toml index 8c366e836..672c39e83 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -76,8 +76,8 @@ derivative = "2.2" derive_more = "0.99" either = "1.10" futures = "0.3" -hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.27" } -hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.27" } +hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.28" } +hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.28" } itertools = "0.12.1" jf-primitives = { git = "https://github.com/EspressoSystems/jellyfish", tag = "0.4.2" } prometheus = "0.13" @@ -111,7 +111,7 @@ tokio-postgres = { version = "0.7", optional = true, default-features = false, f # Dependencies enabled by feature "testing". espresso-macros = { git = "https://github.com/EspressoSystems/espresso-macros.git", tag = "0.1.0", optional = true } -hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.27", optional = true } +hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.28", optional = true } portpicker = { version = "0.1", optional = true } rand = { version = "0.8", optional = true } spin_sleep = { version = "1.2", optional = true } @@ -131,7 +131,7 @@ backtrace-on-stack-overflow = { version = "0.3", optional = true } [dev-dependencies] espresso-macros = { git = "https://github.com/EspressoSystems/espresso-macros.git", tag = "0.1.0" } generic-array = "0.14" -hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.27" } +hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.28" } portpicker = "0.1" rand = "0.8" spin_sleep = "1.2"