From 6eccb03f8da8a24b35c3be845952791e3ab59bf0 Mon Sep 17 00:00:00 2001 From: Sishan Long Date: Wed, 28 Aug 2024 23:27:13 -0700 Subject: [PATCH 1/6] bump hotshot --- Cargo.lock | 40 ++++++++++++++++++++-------------------- Cargo.toml | 10 +++++----- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 590d70ada..ee7edbc13 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3064,8 +3064,8 @@ dependencies = [ [[package]] name = "hotshot" -version = "0.5.72" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.72#165cbadba6e3ea4ac440625b0b6d0a7a01c2d97b" +version = "0.5.73" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#633978fe5c58d019dad4f079e65df6a8bd53832f" dependencies = [ "anyhow", "async-broadcast", @@ -3112,7 +3112,7 @@ dependencies = [ [[package]] name = "hotshot-builder-api" version = "0.1.7" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.72#165cbadba6e3ea4ac440625b0b6d0a7a01c2d97b" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#633978fe5c58d019dad4f079e65df6a8bd53832f" dependencies = [ "async-trait", "clap", @@ -3130,8 +3130,8 @@ dependencies = [ [[package]] name = "hotshot-example-types" -version = "0.5.72" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.72#165cbadba6e3ea4ac440625b0b6d0a7a01c2d97b" +version = "0.5.73" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#633978fe5c58d019dad4f079e65df6a8bd53832f" dependencies = [ "anyhow", "async-broadcast", @@ -3163,8 +3163,8 @@ dependencies = [ [[package]] name = "hotshot-fakeapi" -version = "0.5.72" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.72#165cbadba6e3ea4ac440625b0b6d0a7a01c2d97b" +version = "0.5.73" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#633978fe5c58d019dad4f079e65df6a8bd53832f" dependencies = [ "anyhow", "async-lock 2.8.0", @@ -3182,8 +3182,8 @@ dependencies = [ [[package]] name = "hotshot-macros" -version = "0.5.72" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.72#165cbadba6e3ea4ac440625b0b6d0a7a01c2d97b" +version = "0.5.73" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#633978fe5c58d019dad4f079e65df6a8bd53832f" dependencies = [ "derive_builder", "proc-macro2", @@ -3193,8 +3193,8 @@ dependencies = [ [[package]] name = "hotshot-orchestrator" -version = "0.5.72" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.72#165cbadba6e3ea4ac440625b0b6d0a7a01c2d97b" +version = "0.5.73" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#633978fe5c58d019dad4f079e65df6a8bd53832f" dependencies = [ "anyhow", "async-compatibility-layer", @@ -3282,8 +3282,8 @@ dependencies = [ [[package]] name = "hotshot-task" -version = "0.5.72" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.72#165cbadba6e3ea4ac440625b0b6d0a7a01c2d97b" +version = "0.5.73" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#633978fe5c58d019dad4f079e65df6a8bd53832f" dependencies = [ "anyhow", "async-broadcast", @@ -3297,8 +3297,8 @@ dependencies = [ [[package]] name = "hotshot-task-impls" -version = "0.5.72" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.72#165cbadba6e3ea4ac440625b0b6d0a7a01c2d97b" +version = "0.5.73" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#633978fe5c58d019dad4f079e65df6a8bd53832f" dependencies = [ "anyhow", "async-broadcast", @@ -3334,8 +3334,8 @@ dependencies = [ [[package]] name = "hotshot-testing" -version = "0.5.72" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.72#165cbadba6e3ea4ac440625b0b6d0a7a01c2d97b" +version = "0.5.73" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#633978fe5c58d019dad4f079e65df6a8bd53832f" dependencies = [ "anyhow", "async-broadcast", @@ -3381,7 +3381,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.72#165cbadba6e3ea4ac440625b0b6d0a7a01c2d97b" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#633978fe5c58d019dad4f079e65df6a8bd53832f" dependencies = [ "anyhow", "ark-bn254", @@ -4443,8 +4443,8 @@ dependencies = [ [[package]] name = "libp2p-networking" -version = "0.5.72" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.72#165cbadba6e3ea4ac440625b0b6d0a7a01c2d97b" +version = "0.5.73" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#633978fe5c58d019dad4f079e65df6a8bd53832f" dependencies = [ "anyhow", "async-compatibility-layer", diff --git a/Cargo.toml b/Cargo.toml index 267060afb..e1e0c576e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -75,9 +75,9 @@ derivative = "2.2" derive_more = "0.99" either = "1.12" futures = "0.3" -hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.72" } -hotshot-testing = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.72" } -hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.72" } +hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.73" } +hotshot-testing = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.73" } +hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.73" } itertools = "0.12.1" jf-merkle-tree = { version = "0.1.0", git = "https://github.com/EspressoSystems/jellyfish", tag = "0.4.5", features = [ "std", @@ -119,7 +119,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.72", optional = true } +hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.73", optional = true } portpicker = { version = "0.1", optional = true } rand = { version = "0.8", optional = true } spin_sleep = { version = "1.2", optional = true } @@ -140,7 +140,7 @@ backtrace-on-stack-overflow = { version = "0.3", optional = true } clap = { version = "4.5", features = ["derive", "env"] } 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.72" } +hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.73" } portpicker = "0.1" rand = "0.8" reqwest = "0.12.3" From 655b907a426558a6f039600a5fe48a5508f49cff Mon Sep 17 00:00:00 2001 From: Sishan Long Date: Fri, 30 Aug 2024 16:52:28 -0700 Subject: [PATCH 2/6] latest hotshot 0.5.73 --- Cargo.lock | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ee7edbc13..c0020ca55 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3065,7 +3065,7 @@ dependencies = [ [[package]] name = "hotshot" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#633978fe5c58d019dad4f079e65df6a8bd53832f" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#b031d90c543b1592e5a0e23673fe5342ccfc6710" dependencies = [ "anyhow", "async-broadcast", @@ -3112,7 +3112,7 @@ dependencies = [ [[package]] name = "hotshot-builder-api" version = "0.1.7" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#633978fe5c58d019dad4f079e65df6a8bd53832f" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#b031d90c543b1592e5a0e23673fe5342ccfc6710" dependencies = [ "async-trait", "clap", @@ -3131,7 +3131,7 @@ dependencies = [ [[package]] name = "hotshot-example-types" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#633978fe5c58d019dad4f079e65df6a8bd53832f" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#b031d90c543b1592e5a0e23673fe5342ccfc6710" dependencies = [ "anyhow", "async-broadcast", @@ -3164,7 +3164,7 @@ dependencies = [ [[package]] name = "hotshot-fakeapi" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#633978fe5c58d019dad4f079e65df6a8bd53832f" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#b031d90c543b1592e5a0e23673fe5342ccfc6710" dependencies = [ "anyhow", "async-lock 2.8.0", @@ -3183,7 +3183,7 @@ dependencies = [ [[package]] name = "hotshot-macros" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#633978fe5c58d019dad4f079e65df6a8bd53832f" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#b031d90c543b1592e5a0e23673fe5342ccfc6710" dependencies = [ "derive_builder", "proc-macro2", @@ -3194,7 +3194,7 @@ dependencies = [ [[package]] name = "hotshot-orchestrator" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#633978fe5c58d019dad4f079e65df6a8bd53832f" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#b031d90c543b1592e5a0e23673fe5342ccfc6710" dependencies = [ "anyhow", "async-compatibility-layer", @@ -3283,7 +3283,7 @@ dependencies = [ [[package]] name = "hotshot-task" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#633978fe5c58d019dad4f079e65df6a8bd53832f" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#b031d90c543b1592e5a0e23673fe5342ccfc6710" dependencies = [ "anyhow", "async-broadcast", @@ -3298,7 +3298,7 @@ dependencies = [ [[package]] name = "hotshot-task-impls" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#633978fe5c58d019dad4f079e65df6a8bd53832f" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#b031d90c543b1592e5a0e23673fe5342ccfc6710" dependencies = [ "anyhow", "async-broadcast", @@ -3335,7 +3335,7 @@ dependencies = [ [[package]] name = "hotshot-testing" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#633978fe5c58d019dad4f079e65df6a8bd53832f" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#b031d90c543b1592e5a0e23673fe5342ccfc6710" dependencies = [ "anyhow", "async-broadcast", @@ -3381,7 +3381,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#633978fe5c58d019dad4f079e65df6a8bd53832f" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#b031d90c543b1592e5a0e23673fe5342ccfc6710" dependencies = [ "anyhow", "ark-bn254", @@ -4444,7 +4444,7 @@ dependencies = [ [[package]] name = "libp2p-networking" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#633978fe5c58d019dad4f079e65df6a8bd53832f" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#b031d90c543b1592e5a0e23673fe5342ccfc6710" dependencies = [ "anyhow", "async-compatibility-layer", @@ -4464,6 +4464,7 @@ dependencies = [ "libp2p-identity", "libp2p-swarm-derive", "pin-project", + "portpicker", "rand 0.8.5", "serde", "serde_bytes", From a4993a7418b60336ac804694d8a3c8412b0f71b1 Mon Sep 17 00:00:00 2001 From: Sishan Long Date: Tue, 3 Sep 2024 08:36:23 -0700 Subject: [PATCH 3/6] latest hotshot --- Cargo.lock | 257 ++++++++++++++++++++++++----------------------------- 1 file changed, 114 insertions(+), 143 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c0020ca55..beedbdda7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -335,7 +335,7 @@ dependencies = [ "num-traits", "paste", "rayon", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "zeroize", ] @@ -510,7 +510,7 @@ checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", "synstructure 0.13.1", ] @@ -522,7 +522,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -697,7 +697,7 @@ dependencies = [ "futures-lite 2.3.0", "parking", "polling 3.7.3", - "rustix 0.38.34", + "rustix 0.38.35", "slab", "tracing", "windows-sys 0.59.0", @@ -759,7 +759,7 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.34", + "rustix 0.38.35", "windows-sys 0.48.0", ] @@ -775,7 +775,7 @@ dependencies = [ "cfg-if", "futures-core", "futures-io", - "rustix 0.38.34", + "rustix 0.38.35", "signal-hook-registry", "slab", "windows-sys 0.59.0", @@ -857,7 +857,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -881,13 +881,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -985,7 +985,7 @@ checksum = "edf3ee19dbc0a46d740f6f0926bde8c50f02bdbc7b536842da28f6ac56513a8b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -1442,7 +1442,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -1654,9 +1654,9 @@ checksum = "373e9fafaa20882876db20562275ff58d50e0caa2590077fe7ce7bef90211d0d" [[package]] name = "constant_time_eq" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "convert_case" @@ -1881,7 +1881,7 @@ dependencies = [ "curve25519-dalek-derive", "digest 0.10.7", "fiat-crypto", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "subtle", "zeroize", ] @@ -1894,7 +1894,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -1936,7 +1936,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", "synstructure 0.13.1", ] @@ -1961,7 +1961,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -1972,7 +1972,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -2017,13 +2017,13 @@ dependencies = [ [[package]] name = "delegate" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e018fccbeeb50ff26562ece792ed06659b9c2dae79ece77c4456bb10d9bf79b" +checksum = "5060bb0febb73fa907273f8a7ed17ab4bf831d585eac835b28ec24a1e2460956" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -2080,38 +2080,38 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] name = "derive_builder" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" +checksum = "cd33f37ee6a119146a1781d3356a7c26028f83d779b2e04ecd45fdc75c76877b" dependencies = [ "derive_builder_macro", ] [[package]] name = "derive_builder_core" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" +checksum = "7431fa049613920234f22c47fdc33e6cf3ee83067091ea4277a3f8c4587aae38" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] name = "derive_builder_macro" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" +checksum = "4abae7035bf79b9877b779505d8cf3749285b80c43941eda66604841889451dc" dependencies = [ "derive_builder_core", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -2123,8 +2123,8 @@ dependencies = [ "convert_case 0.4.0", "proc-macro2", "quote", - "rustc_version 0.4.0", - "syn 2.0.76", + "rustc_version 0.4.1", + "syn 2.0.77", ] [[package]] @@ -2144,7 +2144,7 @@ checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -2212,7 +2212,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -2323,7 +2323,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -2653,7 +2653,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -2795,7 +2795,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.4.0", + "indexmap 2.5.0", "slab", "tokio", "tokio-util", @@ -2814,7 +2814,7 @@ dependencies = [ "futures-core", "futures-sink", "http 1.1.0", - "indexmap 2.4.0", + "indexmap 2.5.0", "slab", "tokio", "tokio-util", @@ -3065,7 +3065,7 @@ dependencies = [ [[package]] name = "hotshot" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#b031d90c543b1592e5a0e23673fe5342ccfc6710" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#fb6d064d1386741db7a519b9f09c0b7769ee79c3" dependencies = [ "anyhow", "async-broadcast", @@ -3112,7 +3112,7 @@ dependencies = [ [[package]] name = "hotshot-builder-api" version = "0.1.7" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#b031d90c543b1592e5a0e23673fe5342ccfc6710" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#fb6d064d1386741db7a519b9f09c0b7769ee79c3" dependencies = [ "async-trait", "clap", @@ -3131,7 +3131,7 @@ dependencies = [ [[package]] name = "hotshot-example-types" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#b031d90c543b1592e5a0e23673fe5342ccfc6710" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#fb6d064d1386741db7a519b9f09c0b7769ee79c3" dependencies = [ "anyhow", "async-broadcast", @@ -3164,7 +3164,7 @@ dependencies = [ [[package]] name = "hotshot-fakeapi" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#b031d90c543b1592e5a0e23673fe5342ccfc6710" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#fb6d064d1386741db7a519b9f09c0b7769ee79c3" dependencies = [ "anyhow", "async-lock 2.8.0", @@ -3183,18 +3183,18 @@ dependencies = [ [[package]] name = "hotshot-macros" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#b031d90c543b1592e5a0e23673fe5342ccfc6710" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#fb6d064d1386741db7a519b9f09c0b7769ee79c3" dependencies = [ "derive_builder", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] name = "hotshot-orchestrator" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#b031d90c543b1592e5a0e23673fe5342ccfc6710" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#fb6d064d1386741db7a519b9f09c0b7769ee79c3" dependencies = [ "anyhow", "async-compatibility-layer", @@ -3283,7 +3283,7 @@ dependencies = [ [[package]] name = "hotshot-task" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#b031d90c543b1592e5a0e23673fe5342ccfc6710" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#fb6d064d1386741db7a519b9f09c0b7769ee79c3" dependencies = [ "anyhow", "async-broadcast", @@ -3298,7 +3298,7 @@ dependencies = [ [[package]] name = "hotshot-task-impls" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#b031d90c543b1592e5a0e23673fe5342ccfc6710" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#fb6d064d1386741db7a519b9f09c0b7769ee79c3" dependencies = [ "anyhow", "async-broadcast", @@ -3335,7 +3335,7 @@ dependencies = [ [[package]] name = "hotshot-testing" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#b031d90c543b1592e5a0e23673fe5342ccfc6710" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#fb6d064d1386741db7a519b9f09c0b7769ee79c3" dependencies = [ "anyhow", "async-broadcast", @@ -3381,7 +3381,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#b031d90c543b1592e5a0e23673fe5342ccfc6710" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#fb6d064d1386741db7a519b9f09c0b7769ee79c3" dependencies = [ "anyhow", "ark-bn254", @@ -3795,9 +3795,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -4444,7 +4444,7 @@ dependencies = [ [[package]] name = "libp2p-networking" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#b031d90c543b1592e5a0e23673fe5342ccfc6710" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#fb6d064d1386741db7a519b9f09c0b7769ee79c3" dependencies = [ "anyhow", "async-compatibility-layer", @@ -4557,7 +4557,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -4702,9 +4702,9 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "local-ip-address" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136ef34e18462b17bf39a7826f8f3bbc223341f8e83822beb8b77db9a3d49696" +checksum = "b435d7dd476416a905f9634dff8c330cee8d3168fdd1fbd472a17d1a75c00c3e" dependencies = [ "libc", "neli", @@ -4810,7 +4810,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -5239,7 +5239,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -5295,7 +5295,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -5368,7 +5368,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.3", + "redox_syscall", "smallvec", "windows-targets 0.52.6", ] @@ -5441,7 +5441,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -5490,7 +5490,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -5581,7 +5581,7 @@ dependencies = [ "concurrent-queue", "hermit-abi 0.4.0", "pin-project-lite 0.2.14", - "rustix 0.38.34", + "rustix 0.38.35", "tracing", "windows-sys 0.59.0", ] @@ -5680,11 +5680,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.21.1", + "toml_edit", ] [[package]] @@ -5760,7 +5760,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -5783,7 +5783,7 @@ dependencies = [ "itertools 0.12.1", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -5864,9 +5864,9 @@ dependencies = [ [[package]] name = "quinn" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156" +checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" dependencies = [ "async-io 2.3.4", "async-std", @@ -5885,9 +5885,9 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.6" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd" +checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" dependencies = [ "bytes", "rand 0.8.5", @@ -5902,15 +5902,15 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" +checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b" dependencies = [ "libc", "once_cell", "socket2 0.5.7", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -6067,15 +6067,6 @@ dependencies = [ "url", ] -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.5.3" @@ -6138,7 +6129,7 @@ dependencies = [ "quote", "refinery-core", "regex", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -6409,9 +6400,9 @@ dependencies = [ [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver 1.0.23", ] @@ -6441,9 +6432,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f" dependencies = [ "bitflags 2.6.0", "errno", @@ -6475,7 +6466,7 @@ dependencies = [ "once_cell", "ring 0.17.8", "rustls-pki-types", - "rustls-webpki 0.102.6", + "rustls-webpki 0.102.7", "subtle", "zeroize", ] @@ -6508,9 +6499,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.102.6" +version = "0.102.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56" dependencies = [ "ring 0.17.8", "rustls-pki-types", @@ -6667,7 +6658,7 @@ checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -6733,7 +6724,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.4.0", + "indexmap 2.5.0", "serde", "serde_derive", "serde_json", @@ -6750,7 +6741,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -7005,7 +6996,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -7106,7 +7097,7 @@ dependencies = [ "hashbrown 0.14.5", "hashlink", "hex", - "indexmap 2.4.0", + "indexmap 2.5.0", "log", "memchr", "once_cell", @@ -7135,7 +7126,7 @@ dependencies = [ "quote", "sqlx-core", "sqlx-macros-core", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -7158,7 +7149,7 @@ dependencies = [ "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite", - "syn 2.0.76", + "syn 2.0.77", "tempfile", "tokio", "url", @@ -7367,7 +7358,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -7486,9 +7477,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.76" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -7530,7 +7521,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -7616,7 +7607,7 @@ dependencies = [ "cfg-if", "fastrand 2.1.1", "once_cell", - "rustix 0.38.34", + "rustix 0.38.35", "windows-sys 0.59.0", ] @@ -7637,7 +7628,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -7847,9 +7838,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.39.3" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", @@ -7882,7 +7873,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -7976,7 +7967,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.20", + "toml_edit", ] [[package]] @@ -7988,28 +7979,17 @@ dependencies = [ "serde", ] -[[package]] -name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap 2.4.0", - "toml_datetime", - "winnow 0.5.40", -] - [[package]] name = "toml_edit" version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ - "indexmap 2.4.0", + "indexmap 2.5.0", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.18", + "winnow", ] [[package]] @@ -8118,7 +8098,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -8222,7 +8202,7 @@ checksum = "70977707304198400eb4835a78f6a9f928bf41bba420deb8fdb175cd965d77a7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -8387,7 +8367,7 @@ dependencies = [ "rustls 0.23.12", "rustls-pki-types", "url", - "webpki-roots 0.26.3", + "webpki-roots 0.26.5", ] [[package]] @@ -8596,7 +8576,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", "wasm-bindgen-shared", ] @@ -8630,7 +8610,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -8682,20 +8662,20 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.3" +version = "0.26.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" dependencies = [ "rustls-pki-types", ] [[package]] name = "whoami" -version = "1.5.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" +checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d" dependencies = [ - "redox_syscall 0.4.1", + "redox_syscall", "wasite", "web-sys", ] @@ -8943,15 +8923,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" -[[package]] -name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - [[package]] name = "winnow" version = "0.6.18" @@ -9049,7 +9020,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -9069,5 +9040,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] From 3098fc370815de5014ad31ed9ca05e930c40f83e Mon Sep 17 00:00:00 2001 From: Sishan Long Date: Tue, 3 Sep 2024 17:14:02 -0700 Subject: [PATCH 4/6] latest hotshot --- Cargo.lock | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index beedbdda7..dcbc58269 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3065,7 +3065,7 @@ dependencies = [ [[package]] name = "hotshot" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#fb6d064d1386741db7a519b9f09c0b7769ee79c3" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#1fdfb8dcb233af0712d1f00ca91078dd7bf3b3e0" dependencies = [ "anyhow", "async-broadcast", @@ -3112,7 +3112,7 @@ dependencies = [ [[package]] name = "hotshot-builder-api" version = "0.1.7" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#fb6d064d1386741db7a519b9f09c0b7769ee79c3" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#1fdfb8dcb233af0712d1f00ca91078dd7bf3b3e0" dependencies = [ "async-trait", "clap", @@ -3131,7 +3131,7 @@ dependencies = [ [[package]] name = "hotshot-example-types" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#fb6d064d1386741db7a519b9f09c0b7769ee79c3" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#1fdfb8dcb233af0712d1f00ca91078dd7bf3b3e0" dependencies = [ "anyhow", "async-broadcast", @@ -3164,7 +3164,7 @@ dependencies = [ [[package]] name = "hotshot-fakeapi" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#fb6d064d1386741db7a519b9f09c0b7769ee79c3" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#1fdfb8dcb233af0712d1f00ca91078dd7bf3b3e0" dependencies = [ "anyhow", "async-lock 2.8.0", @@ -3183,7 +3183,7 @@ dependencies = [ [[package]] name = "hotshot-macros" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#fb6d064d1386741db7a519b9f09c0b7769ee79c3" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#1fdfb8dcb233af0712d1f00ca91078dd7bf3b3e0" dependencies = [ "derive_builder", "proc-macro2", @@ -3194,7 +3194,7 @@ dependencies = [ [[package]] name = "hotshot-orchestrator" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#fb6d064d1386741db7a519b9f09c0b7769ee79c3" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#1fdfb8dcb233af0712d1f00ca91078dd7bf3b3e0" dependencies = [ "anyhow", "async-compatibility-layer", @@ -3283,7 +3283,7 @@ dependencies = [ [[package]] name = "hotshot-task" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#fb6d064d1386741db7a519b9f09c0b7769ee79c3" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#1fdfb8dcb233af0712d1f00ca91078dd7bf3b3e0" dependencies = [ "anyhow", "async-broadcast", @@ -3298,7 +3298,7 @@ dependencies = [ [[package]] name = "hotshot-task-impls" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#fb6d064d1386741db7a519b9f09c0b7769ee79c3" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#1fdfb8dcb233af0712d1f00ca91078dd7bf3b3e0" dependencies = [ "anyhow", "async-broadcast", @@ -3335,7 +3335,7 @@ dependencies = [ [[package]] name = "hotshot-testing" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#fb6d064d1386741db7a519b9f09c0b7769ee79c3" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#1fdfb8dcb233af0712d1f00ca91078dd7bf3b3e0" dependencies = [ "anyhow", "async-broadcast", @@ -3381,7 +3381,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#fb6d064d1386741db7a519b9f09c0b7769ee79c3" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#1fdfb8dcb233af0712d1f00ca91078dd7bf3b3e0" dependencies = [ "anyhow", "ark-bn254", @@ -4444,7 +4444,7 @@ dependencies = [ [[package]] name = "libp2p-networking" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#fb6d064d1386741db7a519b9f09c0b7769ee79c3" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#1fdfb8dcb233af0712d1f00ca91078dd7bf3b3e0" dependencies = [ "anyhow", "async-compatibility-layer", @@ -7065,9 +7065,9 @@ dependencies = [ [[package]] name = "sqlx" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcfa89bea9500db4a0d038513d7a060566bfc51d46d1c014847049a45cce85e8" +checksum = "93334716a037193fac19df402f8571269c84a00852f6a7066b5d2616dcd64d3e" dependencies = [ "sqlx-core", "sqlx-macros", @@ -7078,9 +7078,9 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d06e2f2bd861719b1f3f0c7dbe1d80c30bf59e76cf019f07d9014ed7eefb8e08" +checksum = "d4d8060b456358185f7d50c55d9b5066ad956956fddec42ee2e8567134a8936e" dependencies = [ "atoi", "byteorder", @@ -7118,9 +7118,9 @@ dependencies = [ [[package]] name = "sqlx-macros" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f998a9defdbd48ed005a89362bd40dd2117502f15294f61c8d47034107dbbdc" +checksum = "cac0692bcc9de3b073e8d747391827297e075c7710ff6276d9f7a1f3d58c6657" dependencies = [ "proc-macro2", "quote", @@ -7131,9 +7131,9 @@ dependencies = [ [[package]] name = "sqlx-macros-core" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d100558134176a2629d46cec0c8891ba0be8910f7896abfdb75ef4ab6f4e7ce" +checksum = "1804e8a7c7865599c9c79be146dc8a9fd8cc86935fa641d3ea58e5f0688abaa5" dependencies = [ "dotenvy", "either", @@ -7157,9 +7157,9 @@ dependencies = [ [[package]] name = "sqlx-mysql" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cac0ab331b14cb3921c62156d913e4c15b74fb6ec0f3146bd4ef6e4fb3c12" +checksum = "64bb4714269afa44aef2755150a0fc19d756fb580a67db8885608cf02f47d06a" dependencies = [ "atoi", "base64 0.22.1", @@ -7200,9 +7200,9 @@ dependencies = [ [[package]] name = "sqlx-postgres" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9734dbce698c67ecf67c442f768a5e90a49b2a4d61a9f1d59f73874bd4cf0710" +checksum = "6fa91a732d854c5d7726349bb4bb879bb9478993ceb764247660aee25f67c2f8" dependencies = [ "atoi", "base64 0.22.1", @@ -7239,9 +7239,9 @@ dependencies = [ [[package]] name = "sqlx-sqlite" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75b419c3c1b1697833dd927bdc4c6545a620bc1bbafabd44e1efbe9afcd337e" +checksum = "d5b2cf34a45953bfd3daaf3db0f7a7878ab9b7a6b91b422d24a7a9e4c857b680" dependencies = [ "atoi", "flume", From 5db2241d6ce38e74ce3925d3c7538ed08cab1e7a Mon Sep 17 00:00:00 2001 From: Sishan Long Date: Tue, 3 Sep 2024 22:44:48 -0700 Subject: [PATCH 5/6] clippy --- Cargo.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dcbc58269..252dfc82a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3065,7 +3065,7 @@ dependencies = [ [[package]] name = "hotshot" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#1fdfb8dcb233af0712d1f00ca91078dd7bf3b3e0" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#381088ca08ebb343a28ace30101d532f19d8e2b6" dependencies = [ "anyhow", "async-broadcast", @@ -3112,7 +3112,7 @@ dependencies = [ [[package]] name = "hotshot-builder-api" version = "0.1.7" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#1fdfb8dcb233af0712d1f00ca91078dd7bf3b3e0" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#381088ca08ebb343a28ace30101d532f19d8e2b6" dependencies = [ "async-trait", "clap", @@ -3131,7 +3131,7 @@ dependencies = [ [[package]] name = "hotshot-example-types" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#1fdfb8dcb233af0712d1f00ca91078dd7bf3b3e0" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#381088ca08ebb343a28ace30101d532f19d8e2b6" dependencies = [ "anyhow", "async-broadcast", @@ -3164,7 +3164,7 @@ dependencies = [ [[package]] name = "hotshot-fakeapi" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#1fdfb8dcb233af0712d1f00ca91078dd7bf3b3e0" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#381088ca08ebb343a28ace30101d532f19d8e2b6" dependencies = [ "anyhow", "async-lock 2.8.0", @@ -3183,7 +3183,7 @@ dependencies = [ [[package]] name = "hotshot-macros" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#1fdfb8dcb233af0712d1f00ca91078dd7bf3b3e0" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#381088ca08ebb343a28ace30101d532f19d8e2b6" dependencies = [ "derive_builder", "proc-macro2", @@ -3194,7 +3194,7 @@ dependencies = [ [[package]] name = "hotshot-orchestrator" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#1fdfb8dcb233af0712d1f00ca91078dd7bf3b3e0" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#381088ca08ebb343a28ace30101d532f19d8e2b6" dependencies = [ "anyhow", "async-compatibility-layer", @@ -3283,7 +3283,7 @@ dependencies = [ [[package]] name = "hotshot-task" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#1fdfb8dcb233af0712d1f00ca91078dd7bf3b3e0" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#381088ca08ebb343a28ace30101d532f19d8e2b6" dependencies = [ "anyhow", "async-broadcast", @@ -3298,7 +3298,7 @@ dependencies = [ [[package]] name = "hotshot-task-impls" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#1fdfb8dcb233af0712d1f00ca91078dd7bf3b3e0" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#381088ca08ebb343a28ace30101d532f19d8e2b6" dependencies = [ "anyhow", "async-broadcast", @@ -3335,7 +3335,7 @@ dependencies = [ [[package]] name = "hotshot-testing" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#1fdfb8dcb233af0712d1f00ca91078dd7bf3b3e0" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#381088ca08ebb343a28ace30101d532f19d8e2b6" dependencies = [ "anyhow", "async-broadcast", @@ -3381,7 +3381,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#1fdfb8dcb233af0712d1f00ca91078dd7bf3b3e0" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#381088ca08ebb343a28ace30101d532f19d8e2b6" dependencies = [ "anyhow", "ark-bn254", @@ -4444,7 +4444,7 @@ dependencies = [ [[package]] name = "libp2p-networking" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#1fdfb8dcb233af0712d1f00ca91078dd7bf3b3e0" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#381088ca08ebb343a28ace30101d532f19d8e2b6" dependencies = [ "anyhow", "async-compatibility-layer", From b0401ad03014483838bc40a4ebf76debd1c11c2a Mon Sep 17 00:00:00 2001 From: Sishan Long Date: Wed, 4 Sep 2024 08:38:13 -0700 Subject: [PATCH 6/6] tag hotshot --- Cargo.lock | 36 ++++++++++++++++++------------------ Cargo.toml | 12 ++++++------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 252dfc82a..340b06196 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1287,9 +1287,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.15" +version = "1.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" +checksum = "e9d013ecb737093c0e86b151a7b837993cf9ec6c502946cfb44bedc392421e0b" dependencies = [ "shlex", ] @@ -2286,9 +2286,9 @@ dependencies = [ [[package]] name = "edit-distance" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "853fc7035888bd1c9320f3a05bfe7f344f49b8766a4bb4209b1ac5f0503d9577" +checksum = "e3f497e87b038c09a155dfd169faa5ec940d0644635555ef6bd464ac20e97397" [[package]] name = "either" @@ -3065,7 +3065,7 @@ dependencies = [ [[package]] name = "hotshot" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#381088ca08ebb343a28ace30101d532f19d8e2b6" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.73#92dfe8406567bba5d1e553df95807f680790fce0" dependencies = [ "anyhow", "async-broadcast", @@ -3112,7 +3112,7 @@ dependencies = [ [[package]] name = "hotshot-builder-api" version = "0.1.7" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#381088ca08ebb343a28ace30101d532f19d8e2b6" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.73#92dfe8406567bba5d1e553df95807f680790fce0" dependencies = [ "async-trait", "clap", @@ -3131,7 +3131,7 @@ dependencies = [ [[package]] name = "hotshot-example-types" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#381088ca08ebb343a28ace30101d532f19d8e2b6" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.73#92dfe8406567bba5d1e553df95807f680790fce0" dependencies = [ "anyhow", "async-broadcast", @@ -3164,7 +3164,7 @@ dependencies = [ [[package]] name = "hotshot-fakeapi" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#381088ca08ebb343a28ace30101d532f19d8e2b6" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.73#92dfe8406567bba5d1e553df95807f680790fce0" dependencies = [ "anyhow", "async-lock 2.8.0", @@ -3183,7 +3183,7 @@ dependencies = [ [[package]] name = "hotshot-macros" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#381088ca08ebb343a28ace30101d532f19d8e2b6" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.73#92dfe8406567bba5d1e553df95807f680790fce0" dependencies = [ "derive_builder", "proc-macro2", @@ -3194,7 +3194,7 @@ dependencies = [ [[package]] name = "hotshot-orchestrator" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#381088ca08ebb343a28ace30101d532f19d8e2b6" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.73#92dfe8406567bba5d1e553df95807f680790fce0" dependencies = [ "anyhow", "async-compatibility-layer", @@ -3223,7 +3223,7 @@ dependencies = [ [[package]] name = "hotshot-query-service" -version = "0.1.52" +version = "0.1.53" dependencies = [ "anyhow", "ark-serialize", @@ -3283,7 +3283,7 @@ dependencies = [ [[package]] name = "hotshot-task" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#381088ca08ebb343a28ace30101d532f19d8e2b6" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.73#92dfe8406567bba5d1e553df95807f680790fce0" dependencies = [ "anyhow", "async-broadcast", @@ -3298,7 +3298,7 @@ dependencies = [ [[package]] name = "hotshot-task-impls" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#381088ca08ebb343a28ace30101d532f19d8e2b6" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.73#92dfe8406567bba5d1e553df95807f680790fce0" dependencies = [ "anyhow", "async-broadcast", @@ -3335,7 +3335,7 @@ dependencies = [ [[package]] name = "hotshot-testing" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#381088ca08ebb343a28ace30101d532f19d8e2b6" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.73#92dfe8406567bba5d1e553df95807f680790fce0" dependencies = [ "anyhow", "async-broadcast", @@ -3381,7 +3381,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#381088ca08ebb343a28ace30101d532f19d8e2b6" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.73#92dfe8406567bba5d1e553df95807f680790fce0" dependencies = [ "anyhow", "ark-bn254", @@ -3587,9 +3587,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.2" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", "http 1.1.0", @@ -4444,7 +4444,7 @@ dependencies = [ [[package]] name = "libp2p-networking" version = "0.5.73" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.73#381088ca08ebb343a28ace30101d532f19d8e2b6" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.73#92dfe8406567bba5d1e553df95807f680790fce0" dependencies = [ "anyhow", "async-compatibility-layer", diff --git a/Cargo.toml b/Cargo.toml index e1e0c576e..c535755fb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ [package] name = "hotshot-query-service" -version = "0.1.52" +version = "0.1.53" authors = ["Espresso Systems "] edition = "2021" license = "GPL-3.0-or-later" @@ -75,9 +75,9 @@ derivative = "2.2" derive_more = "0.99" either = "1.12" futures = "0.3" -hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.73" } -hotshot-testing = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.73" } -hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.73" } +hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.73" } +hotshot-testing = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.73" } +hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.73" } itertools = "0.12.1" jf-merkle-tree = { version = "0.1.0", git = "https://github.com/EspressoSystems/jellyfish", tag = "0.4.5", features = [ "std", @@ -119,7 +119,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", branch = "bump/rc-0.5.73", optional = true } +hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.73", optional = true } portpicker = { version = "0.1", optional = true } rand = { version = "0.8", optional = true } spin_sleep = { version = "1.2", optional = true } @@ -140,7 +140,7 @@ backtrace-on-stack-overflow = { version = "0.3", optional = true } clap = { version = "4.5", features = ["derive", "env"] } 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", branch = "bump/rc-0.5.73" } +hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.73" } portpicker = "0.1" rand = "0.8" reqwest = "0.12.3"