From 81d4852198623712cbca475e11205c30eab54120 Mon Sep 17 00:00:00 2001 From: Brendon Fish Date: Mon, 28 Oct 2024 14:45:53 -0400 Subject: [PATCH] update HotShot --- Cargo.lock | 181 ++++++++++++++++++++++++++++++++++++++++++----------- Cargo.toml | 12 ++++ 2 files changed, 155 insertions(+), 38 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3f720e0b25..f076976109 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1315,10 +1315,10 @@ dependencies = [ "hotshot-orchestrator", "hotshot-stake-table", "hotshot-state-prover", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch5)", "jf-signature", "libp2p", - "libp2p-networking", + "libp2p-networking 0.5.78 (git+https://github.com/EspressoSystems//HotShot.git?tag=0.5.78-patch5)", "marketplace-builder-shared", "portpicker", "rand 0.8.5", @@ -2975,7 +2975,7 @@ dependencies = [ "hotshot-orchestrator", "hotshot-query-service", "hotshot-testing", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch5)", "itertools 0.12.1", "jf-merkle-tree", "jf-utils", @@ -4113,7 +4113,7 @@ dependencies = [ [[package]] name = "hotshot" version = "0.5.78" -source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.78-patch4#e8abb17d990560d6c92489522d218b99d2089db3" +source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch5#a9453cea6019b27e50ccf27bebc28bcb8f6d8268" dependencies = [ "anyhow", "async-broadcast", @@ -4137,10 +4137,10 @@ dependencies = [ "futures", "hotshot-task", "hotshot-task-impls", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch5)", "jf-signature", "libp2p-identity", - "libp2p-networking", + "libp2p-networking 0.5.78 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch5)", "lru 0.12.5", "num_enum", "parking_lot", @@ -4160,14 +4160,14 @@ dependencies = [ [[package]] name = "hotshot-builder-api" version = "0.1.7" -source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.78-patch4#e8abb17d990560d6c92489522d218b99d2089db3" +source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch5#a9453cea6019b27e50ccf27bebc28bcb8f6d8268" dependencies = [ "async-trait", "clap", "committable", "derive_more 1.0.0", "futures", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch5)", "serde", "tagged-base64", "thiserror", @@ -4196,7 +4196,7 @@ dependencies = [ "hotshot", "hotshot-builder-api", "hotshot-events-service", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch5)", "lru 0.12.5", "marketplace-builder-shared", "serde", @@ -4225,7 +4225,7 @@ dependencies = [ "contract-bindings", "diff-test-bn254", "ethers", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch5)", "jf-pcs", "jf-plonk", "jf-utils", @@ -4248,7 +4248,7 @@ dependencies = [ "derive_more 0.99.18", "either", "futures", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch5)", "rand 0.8.5", "serde", "snafu 0.8.4", @@ -4262,7 +4262,7 @@ dependencies = [ [[package]] name = "hotshot-example-types" version = "0.5.78" -source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.78-patch4#e8abb17d990560d6c92489522d218b99d2089db3" +source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch5#a9453cea6019b27e50ccf27bebc28bcb8f6d8268" dependencies = [ "anyhow", "async-broadcast", @@ -4278,7 +4278,7 @@ dependencies = [ "hotshot", "hotshot-task", "hotshot-task-impls", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch5)", "rand 0.8.5", "reqwest 0.12.8", "serde", @@ -4295,7 +4295,7 @@ dependencies = [ [[package]] name = "hotshot-fakeapi" version = "0.5.78" -source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.78-patch4#e8abb17d990560d6c92489522d218b99d2089db3" +source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch5#a9453cea6019b27e50ccf27bebc28bcb8f6d8268" dependencies = [ "anyhow", "async-compatibility-layer", @@ -4303,7 +4303,7 @@ dependencies = [ "async-trait", "futures", "hotshot-example-types", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch5)", "rand 0.8.5", "serde", "tide-disco", @@ -4323,10 +4323,21 @@ dependencies = [ "syn 2.0.77", ] +[[package]] +name = "hotshot-macros" +version = "0.5.78" +source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch5#a9453cea6019b27e50ccf27bebc28bcb8f6d8268" +dependencies = [ + "derive_builder", + "proc-macro2", + "quote", + "syn 2.0.77", +] + [[package]] name = "hotshot-orchestrator" version = "0.5.78" -source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.78-patch4#e8abb17d990560d6c92489522d218b99d2089db3" +source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch5#a9453cea6019b27e50ccf27bebc28bcb8f6d8268" dependencies = [ "anyhow", "async-compatibility-layer", @@ -4337,7 +4348,7 @@ dependencies = [ "clap", "csv", "futures", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch5)", "libp2p", "multiaddr", "serde", @@ -4376,7 +4387,7 @@ dependencies = [ "hotshot", "hotshot-example-types", "hotshot-testing", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch5)", "include_dir", "itertools 0.12.1", "jf-merkle-tree", @@ -4408,7 +4419,7 @@ dependencies = [ [[package]] name = "hotshot-stake-table" version = "0.5.78" -source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.78-patch4#e8abb17d990560d6c92489522d218b99d2089db3" +source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch5#a9453cea6019b27e50ccf27bebc28bcb8f6d8268" dependencies = [ "ark-bn254", "ark-ed-on-bn254", @@ -4417,7 +4428,7 @@ dependencies = [ "ark-std", "digest 0.10.7", "ethereum-types", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch5)", "jf-crhf", "jf-rescue", "jf-signature", @@ -4446,7 +4457,7 @@ dependencies = [ "futures", "hotshot-contract-adapter", "hotshot-stake-table", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch5)", "itertools 0.12.1", "jf-crhf", "jf-pcs", @@ -4470,7 +4481,7 @@ dependencies = [ [[package]] name = "hotshot-task" version = "0.5.78" -source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.78-patch4#e8abb17d990560d6c92489522d218b99d2089db3" +source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch5#a9453cea6019b27e50ccf27bebc28bcb8f6d8268" dependencies = [ "anyhow", "async-broadcast", @@ -4485,7 +4496,7 @@ dependencies = [ [[package]] name = "hotshot-task-impls" version = "0.5.78" -source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.78-patch4#e8abb17d990560d6c92489522d218b99d2089db3" +source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch5#a9453cea6019b27e50ccf27bebc28bcb8f6d8268" dependencies = [ "anyhow", "async-broadcast", @@ -4502,7 +4513,7 @@ dependencies = [ "futures", "hotshot-builder-api", "hotshot-task", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch5)", "jf-signature", "jf-vid", "rand 0.8.5", @@ -4522,7 +4533,7 @@ dependencies = [ [[package]] name = "hotshot-testing" version = "0.5.78" -source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.78-patch4#e8abb17d990560d6c92489522d218b99d2089db3" +source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch5#a9453cea6019b27e50ccf27bebc28bcb8f6d8268" dependencies = [ "anyhow", "async-broadcast", @@ -4540,11 +4551,11 @@ dependencies = [ "hotshot-builder-api", "hotshot-example-types", "hotshot-fakeapi", - "hotshot-macros", + "hotshot-macros 0.5.78 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch5)", "hotshot-orchestrator", "hotshot-task", "hotshot-task-impls", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch5)", "itertools 0.13.0", "jf-signature", "jf-vid", @@ -4568,7 +4579,66 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.78-patch4#e8abb17d990560d6c92489522d218b99d2089db3" +source = "git+https://github.com/EspressoSystems//HotShot.git?tag=0.5.78-patch5#a9453cea6019b27e50ccf27bebc28bcb8f6d8268" +dependencies = [ + "anyhow", + "ark-bn254", + "ark-ed-on-bn254", + "ark-ff", + "ark-serialize", + "ark-srs", + "ark-std", + "async-compatibility-layer", + "async-lock 2.8.0", + "async-std", + "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 1.0.17 (git+https://github.com/dtolnay/dyn-clone?tag=1.0.17)", + "either", + "espresso-systems-common 0.4.1", + "ethereum-types", + "futures", + "jf-pcs", + "jf-signature", + "jf-utils", + "jf-vid", + "lazy_static", + "libp2p", + "memoize", + "rand 0.8.5", + "rand_chacha 0.3.1", + "reqwest 0.12.8", + "serde", + "serde-inline-default", + "serde_bytes", + "serde_json", + "sha2 0.10.8", + "surf-disco", + "tagged-base64", + "thiserror", + "time 0.3.36", + "tokio", + "toml", + "tracing", + "typenum", + "url", + "vbs", + "vec1", +] + +[[package]] +name = "hotshot-types" +version = "0.1.11" +source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch5#a9453cea6019b27e50ccf27bebc28bcb8f6d8268" dependencies = [ "anyhow", "ark-bn254", @@ -5829,7 +5899,42 @@ dependencies = [ [[package]] name = "libp2p-networking" version = "0.5.78" -source = "git+https://github.com/EspressoSystems/hotshot?tag=0.5.78-patch4#e8abb17d990560d6c92489522d218b99d2089db3" +source = "git+https://github.com/EspressoSystems//HotShot.git?tag=0.5.78-patch5#a9453cea6019b27e50ccf27bebc28bcb8f6d8268" +dependencies = [ + "anyhow", + "async-compatibility-layer", + "async-lock 2.8.0", + "async-std", + "async-trait", + "bincode", + "blake3", + "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.78-patch5)", + "lazy_static", + "libp2p", + "libp2p-identity", + "libp2p-swarm-derive", + "pin-project", + "portpicker", + "rand 0.8.5", + "serde", + "serde_bytes", + "serde_json", + "thiserror", + "tokio", + "tokio-stream", + "tracing", + "void", +] + +[[package]] +name = "libp2p-networking" +version = "0.5.78" +source = "git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch5#a9453cea6019b27e50ccf27bebc28bcb8f6d8268" dependencies = [ "anyhow", "async-compatibility-layer", @@ -5843,7 +5948,7 @@ dependencies = [ "derive_builder", "either", "futures", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch5)", "lazy_static", "libp2p", "libp2p-identity", @@ -6197,7 +6302,7 @@ dependencies = [ "hotshot-orchestrator", "hotshot-query-service", "hotshot-stake-table", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch5)", "jf-merkle-tree", "jf-signature", "marketplace-builder-core", @@ -6235,10 +6340,10 @@ dependencies = [ "hotshot", "hotshot-builder-api", "hotshot-events-service", - "hotshot-macros", + "hotshot-macros 0.5.78 (git+https://github.com/EspressoSystems/hotshot?tag=0.5.78-patch4)", "hotshot-task-impls", "hotshot-testing", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch5)", "lru 0.12.5", "marketplace-builder-shared", "multimap", @@ -6279,7 +6384,7 @@ dependencies = [ "hotshot-example-types", "hotshot-task-impls", "hotshot-testing", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch5)", "rand 0.8.5", "serde", "surf-disco", @@ -6307,7 +6412,7 @@ dependencies = [ "hotshot", "hotshot-events-service", "hotshot-query-service", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch5)", "jf-signature", "portpicker", "rand 0.8.5", @@ -6690,7 +6795,7 @@ dependencies = [ "hotshot", "hotshot-query-service", "hotshot-stake-table", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch5)", "prometheus-parse", "reqwest 0.12.8", "serde", @@ -8701,7 +8806,7 @@ dependencies = [ "hotshot-stake-table", "hotshot-state-prover", "hotshot-testing", - "hotshot-types", + "hotshot-types 0.1.11 (git+https://www.github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch5)", "include_dir", "itertools 0.12.1", "jf-crhf", @@ -8710,7 +8815,7 @@ dependencies = [ "jf-signature", "jf-vid", "libp2p", - "libp2p-networking", + "libp2p-networking 0.5.78 (git+https://github.com/EspressoSystems//HotShot.git?tag=0.5.78-patch5)", "marketplace-builder-core", "marketplace-builder-shared", "marketplace-solver", diff --git a/Cargo.toml b/Cargo.toml index 12048e445c..fa5ed74e1e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -155,3 +155,15 @@ debug = false strip = "debuginfo" [profile.dev.package."*"] opt-level = 3 + +[patch."https://github.com/EspressoSystems/HotShot.git"] +hotshot = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch5" } +hotshot-builder-api = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch5" } +hotshot-orchestrator = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch5" } +hotshot-stake-table = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch5" } +hotshot-task ={ git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch5" } +hotshot-task-impls ={ git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch5" } +hotshot-testing ={ git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch5" } +hotshot-types = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch5" } +libp2p-networking = { git = "https://github.com/EspressoSystems//HotShot.git", tag = "0.5.78-patch5" } +hotshot-example-types = { git = "https://www.github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch5" }