From 3b81fc059818fe273bc2cf7aea575514d233ecd4 Mon Sep 17 00:00:00 2001 From: Luke Iannucci Date: Thu, 3 Oct 2024 11:36:26 -0400 Subject: [PATCH 1/3] bump hot shot version to 0.5.77 --- Cargo.lock | 34 +++++++++++++++++----------------- Cargo.toml | 6 +++--- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d5efc56..d7d67e0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2974,8 +2974,8 @@ dependencies = [ [[package]] name = "hotshot" -version = "0.5.76" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.76#b715bd4976daccfda8087a050cad152c3415f6ab" +version = "0.5.77" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.77#35a2a447b6593b6f2cd8bf4c53b36116d1c43c07" dependencies = [ "anyhow", "async-broadcast", @@ -3023,7 +3023,7 @@ dependencies = [ [[package]] name = "hotshot-builder-api" version = "0.1.7" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.76#b715bd4976daccfda8087a050cad152c3415f6ab" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.77#35a2a447b6593b6f2cd8bf4c53b36116d1c43c07" dependencies = [ "async-trait", "clap", @@ -3041,7 +3041,7 @@ dependencies = [ [[package]] name = "hotshot-events-service" -version = "0.1.48" +version = "0.1.49" dependencies = [ "async-broadcast", "async-compatibility-layer", @@ -3069,8 +3069,8 @@ dependencies = [ [[package]] name = "hotshot-example-types" -version = "0.5.76" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.76#b715bd4976daccfda8087a050cad152c3415f6ab" +version = "0.5.77" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.77#35a2a447b6593b6f2cd8bf4c53b36116d1c43c07" dependencies = [ "anyhow", "async-broadcast", @@ -3102,8 +3102,8 @@ dependencies = [ [[package]] name = "hotshot-orchestrator" -version = "0.5.76" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.76#b715bd4976daccfda8087a050cad152c3415f6ab" +version = "0.5.77" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.77#35a2a447b6593b6f2cd8bf4c53b36116d1c43c07" dependencies = [ "anyhow", "async-compatibility-layer", @@ -3132,8 +3132,8 @@ dependencies = [ [[package]] name = "hotshot-task" -version = "0.5.76" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.76#b715bd4976daccfda8087a050cad152c3415f6ab" +version = "0.5.77" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.77#35a2a447b6593b6f2cd8bf4c53b36116d1c43c07" dependencies = [ "anyhow", "async-broadcast", @@ -3147,8 +3147,8 @@ dependencies = [ [[package]] name = "hotshot-task-impls" -version = "0.5.76" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.76#b715bd4976daccfda8087a050cad152c3415f6ab" +version = "0.5.77" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.77#35a2a447b6593b6f2cd8bf4c53b36116d1c43c07" dependencies = [ "anyhow", "async-broadcast", @@ -3185,7 +3185,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.76#b715bd4976daccfda8087a050cad152c3415f6ab" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.77#35a2a447b6593b6f2cd8bf4c53b36116d1c43c07" dependencies = [ "anyhow", "ark-bn254", @@ -4236,8 +4236,8 @@ dependencies = [ [[package]] name = "libp2p-networking" -version = "0.5.76" -source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.76#b715bd4976daccfda8087a050cad152c3415f6ab" +version = "0.5.77" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.77#35a2a447b6593b6f2cd8bf4c53b36116d1c43c07" dependencies = [ "anyhow", "async-compatibility-layer", @@ -5850,9 +5850,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.12.7" +version = "0.12.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" +checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" dependencies = [ "base64 0.22.1", "bytes", diff --git a/Cargo.toml b/Cargo.toml index 1ee5d2d..2b1c4ba 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "hotshot-events-service" -version = "0.1.48" +version = "0.1.49" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -17,7 +17,7 @@ derivative = "2.2" derive_more = "0.99" either = { version = "1.12", features = ["serde"] } futures = "0.3" -hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.76" } +hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.77" } rand = "0.8.5" serde = { version = "1.0", features = ["derive"] } snafu = "0.8" @@ -28,6 +28,6 @@ tracing = "0.1" vbs = "0.1.4" [dev-dependencies] -hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.76" } +hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.77" } portpicker = "0.1.1" surf-disco = "0.9" From cd71e03c1766bd4035166d99e64e605f6d7c3902 Mon Sep 17 00:00:00 2001 From: Luke Iannucci Date: Thu, 3 Oct 2024 16:38:25 -0400 Subject: [PATCH 2/3] update hotshot commit --- Cargo.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d7d67e0..135b9ce 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2975,7 +2975,7 @@ dependencies = [ [[package]] name = "hotshot" version = "0.5.77" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.77#35a2a447b6593b6f2cd8bf4c53b36116d1c43c07" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.77#37608bbc478744c5ccfe913dfa5bd22ed469e86c" dependencies = [ "anyhow", "async-broadcast", @@ -3023,7 +3023,7 @@ dependencies = [ [[package]] name = "hotshot-builder-api" version = "0.1.7" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.77#35a2a447b6593b6f2cd8bf4c53b36116d1c43c07" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.77#37608bbc478744c5ccfe913dfa5bd22ed469e86c" dependencies = [ "async-trait", "clap", @@ -3070,7 +3070,7 @@ dependencies = [ [[package]] name = "hotshot-example-types" version = "0.5.77" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.77#35a2a447b6593b6f2cd8bf4c53b36116d1c43c07" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.77#37608bbc478744c5ccfe913dfa5bd22ed469e86c" dependencies = [ "anyhow", "async-broadcast", @@ -3103,7 +3103,7 @@ dependencies = [ [[package]] name = "hotshot-orchestrator" version = "0.5.77" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.77#35a2a447b6593b6f2cd8bf4c53b36116d1c43c07" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.77#37608bbc478744c5ccfe913dfa5bd22ed469e86c" dependencies = [ "anyhow", "async-compatibility-layer", @@ -3133,7 +3133,7 @@ dependencies = [ [[package]] name = "hotshot-task" version = "0.5.77" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.77#35a2a447b6593b6f2cd8bf4c53b36116d1c43c07" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.77#37608bbc478744c5ccfe913dfa5bd22ed469e86c" dependencies = [ "anyhow", "async-broadcast", @@ -3148,7 +3148,7 @@ dependencies = [ [[package]] name = "hotshot-task-impls" version = "0.5.77" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.77#35a2a447b6593b6f2cd8bf4c53b36116d1c43c07" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.77#37608bbc478744c5ccfe913dfa5bd22ed469e86c" dependencies = [ "anyhow", "async-broadcast", @@ -3185,7 +3185,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.77#35a2a447b6593b6f2cd8bf4c53b36116d1c43c07" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.77#37608bbc478744c5ccfe913dfa5bd22ed469e86c" dependencies = [ "anyhow", "ark-bn254", @@ -4237,7 +4237,7 @@ dependencies = [ [[package]] name = "libp2p-networking" version = "0.5.77" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.77#35a2a447b6593b6f2cd8bf4c53b36116d1c43c07" +source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.77#37608bbc478744c5ccfe913dfa5bd22ed469e86c" dependencies = [ "anyhow", "async-compatibility-layer", From 3f7e6ac512b0705aac4d569630a9ff4274f1c450 Mon Sep 17 00:00:00 2001 From: lukeiannucci Date: Mon, 7 Oct 2024 14:00:02 -0600 Subject: [PATCH 3/3] update HS --- Cargo.lock | 16 ++++++++-------- Cargo.toml | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 135b9ce..8e910c1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2975,7 +2975,7 @@ dependencies = [ [[package]] name = "hotshot" version = "0.5.77" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.77#37608bbc478744c5ccfe913dfa5bd22ed469e86c" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.77#e8c3e75775e2124f11a60ec4d6a6090d012dbb35" dependencies = [ "anyhow", "async-broadcast", @@ -3023,7 +3023,7 @@ dependencies = [ [[package]] name = "hotshot-builder-api" version = "0.1.7" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.77#37608bbc478744c5ccfe913dfa5bd22ed469e86c" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.77#e8c3e75775e2124f11a60ec4d6a6090d012dbb35" dependencies = [ "async-trait", "clap", @@ -3070,7 +3070,7 @@ dependencies = [ [[package]] name = "hotshot-example-types" version = "0.5.77" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.77#37608bbc478744c5ccfe913dfa5bd22ed469e86c" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.77#e8c3e75775e2124f11a60ec4d6a6090d012dbb35" dependencies = [ "anyhow", "async-broadcast", @@ -3103,7 +3103,7 @@ dependencies = [ [[package]] name = "hotshot-orchestrator" version = "0.5.77" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.77#37608bbc478744c5ccfe913dfa5bd22ed469e86c" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.77#e8c3e75775e2124f11a60ec4d6a6090d012dbb35" dependencies = [ "anyhow", "async-compatibility-layer", @@ -3133,7 +3133,7 @@ dependencies = [ [[package]] name = "hotshot-task" version = "0.5.77" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.77#37608bbc478744c5ccfe913dfa5bd22ed469e86c" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.77#e8c3e75775e2124f11a60ec4d6a6090d012dbb35" dependencies = [ "anyhow", "async-broadcast", @@ -3148,7 +3148,7 @@ dependencies = [ [[package]] name = "hotshot-task-impls" version = "0.5.77" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.77#37608bbc478744c5ccfe913dfa5bd22ed469e86c" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.77#e8c3e75775e2124f11a60ec4d6a6090d012dbb35" dependencies = [ "anyhow", "async-broadcast", @@ -3185,7 +3185,7 @@ dependencies = [ [[package]] name = "hotshot-types" version = "0.1.11" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.77#37608bbc478744c5ccfe913dfa5bd22ed469e86c" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.77#e8c3e75775e2124f11a60ec4d6a6090d012dbb35" dependencies = [ "anyhow", "ark-bn254", @@ -4237,7 +4237,7 @@ dependencies = [ [[package]] name = "libp2p-networking" version = "0.5.77" -source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.77#37608bbc478744c5ccfe913dfa5bd22ed469e86c" +source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.77#e8c3e75775e2124f11a60ec4d6a6090d012dbb35" dependencies = [ "anyhow", "async-compatibility-layer", diff --git a/Cargo.toml b/Cargo.toml index 2b1c4ba..3b1989a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ derivative = "2.2" derive_more = "0.99" either = { version = "1.12", features = ["serde"] } futures = "0.3" -hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.77" } +hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.77" } rand = "0.8.5" serde = { version = "1.0", features = ["derive"] } snafu = "0.8" @@ -28,6 +28,6 @@ tracing = "0.1" vbs = "0.1.4" [dev-dependencies] -hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.77" } +hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.77" } portpicker = "0.1.1" surf-disco = "0.9"