From ab0caa77fbe13261aa95a4f629c70224bba14088 Mon Sep 17 00:00:00 2001
From: Jeb Bearer <jeb@espressosys.com>
Date: Fri, 10 May 2024 14:36:53 -0400
Subject: [PATCH 1/2] Update to HotShot 0.5.53

---
 Cargo.lock | 18 +++++++++---------
 Cargo.toml |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 25c7fc2..66c35a0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3032,7 +3032,7 @@ dependencies = [
 [[package]]
 name = "hotshot"
 version = "0.5.43"
-source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.51#0b6aa78b9e81d5f8875ebd9f1bb6a6a531297891"
+source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.53#9fbb21fe45ee1dbf63c136e850cda7a520d24a39"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3077,7 +3077,7 @@ dependencies = [
 [[package]]
 name = "hotshot-builder-api"
 version = "0.1.7"
-source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.51#0b6aa78b9e81d5f8875ebd9f1bb6a6a531297891"
+source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.53#9fbb21fe45ee1dbf63c136e850cda7a520d24a39"
 dependencies = [
  "async-trait",
  "clap",
@@ -3095,7 +3095,7 @@ dependencies = [
 
 [[package]]
 name = "hotshot-events-service"
-version = "0.1.19"
+version = "0.1.21"
 dependencies = [
  "async-broadcast",
  "async-compatibility-layer",
@@ -3123,7 +3123,7 @@ dependencies = [
 [[package]]
 name = "hotshot-example-types"
 version = "0.5.43"
-source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.51#0b6aa78b9e81d5f8875ebd9f1bb6a6a531297891"
+source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.53#9fbb21fe45ee1dbf63c136e850cda7a520d24a39"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3153,7 +3153,7 @@ dependencies = [
 [[package]]
 name = "hotshot-orchestrator"
 version = "0.5.43"
-source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.51#0b6aa78b9e81d5f8875ebd9f1bb6a6a531297891"
+source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.53#9fbb21fe45ee1dbf63c136e850cda7a520d24a39"
 dependencies = [
  "anyhow",
  "async-compatibility-layer",
@@ -3182,7 +3182,7 @@ dependencies = [
 [[package]]
 name = "hotshot-task"
 version = "0.5.43"
-source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.51#0b6aa78b9e81d5f8875ebd9f1bb6a6a531297891"
+source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.53#9fbb21fe45ee1dbf63c136e850cda7a520d24a39"
 dependencies = [
  "async-broadcast",
  "async-compatibility-layer",
@@ -3195,7 +3195,7 @@ dependencies = [
 [[package]]
 name = "hotshot-task-impls"
 version = "0.5.43"
-source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.51#0b6aa78b9e81d5f8875ebd9f1bb6a6a531297891"
+source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.53#9fbb21fe45ee1dbf63c136e850cda7a520d24a39"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3230,7 +3230,7 @@ dependencies = [
 [[package]]
 name = "hotshot-types"
 version = "0.1.11"
-source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.51#0b6aa78b9e81d5f8875ebd9f1bb6a6a531297891"
+source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.53#9fbb21fe45ee1dbf63c136e850cda7a520d24a39"
 dependencies = [
  "anyhow",
  "ark-bls12-381",
@@ -4330,7 +4330,7 @@ dependencies = [
 [[package]]
 name = "libp2p-networking"
 version = "0.5.43"
-source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.51#0b6aa78b9e81d5f8875ebd9f1bb6a6a531297891"
+source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.53#9fbb21fe45ee1dbf63c136e850cda7a520d24a39"
 dependencies = [
  "anyhow",
  "async-compatibility-layer",
diff --git a/Cargo.toml b/Cargo.toml
index 17bde1e..7782f59 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hotshot-events-service"
-version = "0.1.19"
+version = "0.1.21"
 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", features = ["serde"] }
 futures = "0.3"
-hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.51" }
+hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.53" }
 serde = { version = "1.0", features = ["derive"] }
 snafu = "0.8"
 tagged-base64 = "0.4"
@@ -27,6 +27,6 @@ tracing = "0.1"
 vbs = "0.1.4"
 
 [dev-dependencies]
-hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.51" }
+hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.53" }
 portpicker = "0.1.1"
 surf-disco = "0.6"

From 8412ca61bc02026aa7c6fe1d24ad2582de1def0e Mon Sep 17 00:00:00 2001
From: Jeb Bearer <jeb@espressosys.com>
Date: Fri, 10 May 2024 15:23:16 -0400
Subject: [PATCH 2/2] Output logs from tests in CI

---
 .github/workflows/build_windows.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
index acd52bc..6a616db 100644
--- a/.github/workflows/build_windows.yml
+++ b/.github/workflows/build_windows.yml
@@ -53,5 +53,5 @@ jobs:
       - name: Test
         run: |
           cargo test --workspace --release --all-features --no-run
-          cargo test --workspace --release --all-features --verbose -- --test-threads 2
+          cargo test --workspace --release --all-features --verbose -- --nocapture --test-threads 2
         timeout-minutes: 60