From 572e115cc41a74c770652d817aab7b6a9ea21d85 Mon Sep 17 00:00:00 2001
From: Sishan Long <dlsubjam@gmail.com>
Date: Thu, 24 Oct 2024 12:56:20 -0700
Subject: [PATCH 01/15] update hotshot dep

---
 Cargo.lock | 42 +++++++++++++++++++++++++++---------------
 Cargo.toml | 16 ++++++++--------
 2 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6e665d94..b2a288a2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -972,7 +972,7 @@ checksum = "edf3ee19dbc0a46d740f6f0926bde8c50f02bdbc7b536842da28f6ac56513a8b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.82",
 ]
 
 [[package]]
@@ -3005,7 +3005,7 @@ dependencies = [
 [[package]]
 name = "hotshot"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.78#be7d9be60abbf8f293b7e95940ff77eff2e0739e"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#d5ba8512fe52b871fa7ad4a45a9d699ab6caba30"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3046,13 +3046,14 @@ dependencies = [
  "tokio",
  "tracing",
  "url",
+ "utils",
  "vbs",
 ]
 
 [[package]]
 name = "hotshot-builder-api"
 version = "0.1.7"
-source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.78#be7d9be60abbf8f293b7e95940ff77eff2e0739e"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#d5ba8512fe52b871fa7ad4a45a9d699ab6caba30"
 dependencies = [
  "async-trait",
  "clap",
@@ -3105,7 +3106,7 @@ dependencies = [
 [[package]]
 name = "hotshot-events-service"
 version = "0.1.49"
-source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?tag=0.1.50#8cbc0e0787ebcfef750c0b4f2f9f7f16d8ea21a8"
+source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?branch=sishan/trait_builder_transaction#cb283e53bca1a0c26aea255f6158ed2fba503fa2"
 dependencies = [
  "async-broadcast",
  "async-compatibility-layer",
@@ -3131,7 +3132,7 @@ dependencies = [
 [[package]]
 name = "hotshot-example-types"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.78#be7d9be60abbf8f293b7e95940ff77eff2e0739e"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#d5ba8512fe52b871fa7ad4a45a9d699ab6caba30"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3164,7 +3165,7 @@ dependencies = [
 [[package]]
 name = "hotshot-fakeapi"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.78#be7d9be60abbf8f293b7e95940ff77eff2e0739e"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#d5ba8512fe52b871fa7ad4a45a9d699ab6caba30"
 dependencies = [
  "anyhow",
  "async-compatibility-layer",
@@ -3184,18 +3185,18 @@ dependencies = [
 [[package]]
 name = "hotshot-macros"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.78#be7d9be60abbf8f293b7e95940ff77eff2e0739e"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#d5ba8512fe52b871fa7ad4a45a9d699ab6caba30"
 dependencies = [
  "derive_builder",
  "proc-macro2",
  "quote",
- "syn 2.0.77",
+ "syn 2.0.82",
 ]
 
 [[package]]
 name = "hotshot-orchestrator"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.78#be7d9be60abbf8f293b7e95940ff77eff2e0739e"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#d5ba8512fe52b871fa7ad4a45a9d699ab6caba30"
 dependencies = [
  "anyhow",
  "async-compatibility-layer",
@@ -3224,7 +3225,7 @@ dependencies = [
 [[package]]
 name = "hotshot-task"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.78#be7d9be60abbf8f293b7e95940ff77eff2e0739e"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#d5ba8512fe52b871fa7ad4a45a9d699ab6caba30"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3234,12 +3235,13 @@ dependencies = [
  "futures",
  "tokio",
  "tracing",
+ "utils",
 ]
 
 [[package]]
 name = "hotshot-task-impls"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.78#be7d9be60abbf8f293b7e95940ff77eff2e0739e"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#d5ba8512fe52b871fa7ad4a45a9d699ab6caba30"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3269,6 +3271,7 @@ dependencies = [
  "tokio",
  "tracing",
  "url",
+ "utils",
  "vbs",
  "vec1",
 ]
@@ -3276,7 +3279,7 @@ dependencies = [
 [[package]]
 name = "hotshot-testing"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.78#be7d9be60abbf8f293b7e95940ff77eff2e0739e"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#d5ba8512fe52b871fa7ad4a45a9d699ab6caba30"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3322,7 +3325,7 @@ dependencies = [
 [[package]]
 name = "hotshot-types"
 version = "0.1.11"
-source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.78#be7d9be60abbf8f293b7e95940ff77eff2e0739e"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#d5ba8512fe52b871fa7ad4a45a9d699ab6caba30"
 dependencies = [
  "anyhow",
  "ark-bn254",
@@ -3374,6 +3377,7 @@ dependencies = [
  "tracing",
  "typenum",
  "url",
+ "utils",
  "vbs",
  "vec1",
 ]
@@ -3503,7 +3507,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite 0.2.14",
- "socket2 0.4.10",
+ "socket2 0.5.7",
  "tokio",
  "tower-service",
  "tracing",
@@ -4388,7 +4392,7 @@ dependencies = [
 [[package]]
 name = "libp2p-networking"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.78#be7d9be60abbf8f293b7e95940ff77eff2e0739e"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#d5ba8512fe52b871fa7ad4a45a9d699ab6caba30"
 dependencies = [
  "anyhow",
  "async-compatibility-layer",
@@ -8202,6 +8206,14 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
+[[package]]
+name = "utils"
+version = "0.5.78"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#d5ba8512fe52b871fa7ad4a45a9d699ab6caba30"
+dependencies = [
+ "tracing",
+]
+
 [[package]]
 name = "uuid"
 version = "1.10.0"
diff --git a/Cargo.toml b/Cargo.toml
index 3dabc77a..ea609203 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,14 +3,14 @@ resolver = "2"
 members = ["crates/*"]
 
 [workspace.dependencies]
-hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.78" }
-hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.78" }
-hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", tag = "0.1.50" }
-hotshot-macros = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.78" }
-hotshot-task-impls = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.78" }
-hotshot-testing = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.78" }
-hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.78" }
-hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.78" }
+hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "sishan/trait_builder_transaction" }
+hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "sishan/trait_builder_transaction" }
+hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", branch = "sishan/trait_builder_transaction" }
+hotshot-macros = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "sishan/trait_builder_transaction" }
+hotshot-task-impls = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "sishan/trait_builder_transaction" }
+hotshot-testing = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "sishan/trait_builder_transaction" }
+hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "sishan/trait_builder_transaction" }
+hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "sishan/trait_builder_transaction" }
 
 anyhow = "1"
 async-broadcast = "0.7"

From 685615f2ecc302cdfc71a0689f9ae0d380ba5cb9 Mon Sep 17 00:00:00 2001
From: Sishan Long <dlsubjam@gmail.com>
Date: Thu, 24 Oct 2024 14:23:05 -0700
Subject: [PATCH 02/15] version that will fail the test

---
 Cargo.lock                   | 26 +++++++++++++-------------
 crates/legacy/src/service.rs |  6 ++++--
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b2a288a2..5f019c6b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3005,7 +3005,7 @@ dependencies = [
 [[package]]
 name = "hotshot"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#d5ba8512fe52b871fa7ad4a45a9d699ab6caba30"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#b5749fbb63f25e9ddff87277552fc88ca6ff7976"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3053,7 +3053,7 @@ dependencies = [
 [[package]]
 name = "hotshot-builder-api"
 version = "0.1.7"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#d5ba8512fe52b871fa7ad4a45a9d699ab6caba30"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#b5749fbb63f25e9ddff87277552fc88ca6ff7976"
 dependencies = [
  "async-trait",
  "clap",
@@ -3106,7 +3106,7 @@ dependencies = [
 [[package]]
 name = "hotshot-events-service"
 version = "0.1.49"
-source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?branch=sishan/trait_builder_transaction#cb283e53bca1a0c26aea255f6158ed2fba503fa2"
+source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?branch=sishan/trait_builder_transaction#883960d9cc1e779af2cc792096f7c25e51403308"
 dependencies = [
  "async-broadcast",
  "async-compatibility-layer",
@@ -3132,7 +3132,7 @@ dependencies = [
 [[package]]
 name = "hotshot-example-types"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#d5ba8512fe52b871fa7ad4a45a9d699ab6caba30"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#b5749fbb63f25e9ddff87277552fc88ca6ff7976"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3165,7 +3165,7 @@ dependencies = [
 [[package]]
 name = "hotshot-fakeapi"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#d5ba8512fe52b871fa7ad4a45a9d699ab6caba30"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#b5749fbb63f25e9ddff87277552fc88ca6ff7976"
 dependencies = [
  "anyhow",
  "async-compatibility-layer",
@@ -3185,7 +3185,7 @@ dependencies = [
 [[package]]
 name = "hotshot-macros"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#d5ba8512fe52b871fa7ad4a45a9d699ab6caba30"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#b5749fbb63f25e9ddff87277552fc88ca6ff7976"
 dependencies = [
  "derive_builder",
  "proc-macro2",
@@ -3196,7 +3196,7 @@ dependencies = [
 [[package]]
 name = "hotshot-orchestrator"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#d5ba8512fe52b871fa7ad4a45a9d699ab6caba30"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#b5749fbb63f25e9ddff87277552fc88ca6ff7976"
 dependencies = [
  "anyhow",
  "async-compatibility-layer",
@@ -3225,7 +3225,7 @@ dependencies = [
 [[package]]
 name = "hotshot-task"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#d5ba8512fe52b871fa7ad4a45a9d699ab6caba30"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#b5749fbb63f25e9ddff87277552fc88ca6ff7976"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3241,7 +3241,7 @@ dependencies = [
 [[package]]
 name = "hotshot-task-impls"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#d5ba8512fe52b871fa7ad4a45a9d699ab6caba30"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#b5749fbb63f25e9ddff87277552fc88ca6ff7976"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3279,7 +3279,7 @@ dependencies = [
 [[package]]
 name = "hotshot-testing"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#d5ba8512fe52b871fa7ad4a45a9d699ab6caba30"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#b5749fbb63f25e9ddff87277552fc88ca6ff7976"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3325,7 +3325,7 @@ dependencies = [
 [[package]]
 name = "hotshot-types"
 version = "0.1.11"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#d5ba8512fe52b871fa7ad4a45a9d699ab6caba30"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#b5749fbb63f25e9ddff87277552fc88ca6ff7976"
 dependencies = [
  "anyhow",
  "ark-bn254",
@@ -4392,7 +4392,7 @@ dependencies = [
 [[package]]
 name = "libp2p-networking"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#d5ba8512fe52b871fa7ad4a45a9d699ab6caba30"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#b5749fbb63f25e9ddff87277552fc88ca6ff7976"
 dependencies = [
  "anyhow",
  "async-compatibility-layer",
@@ -8209,7 +8209,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 [[package]]
 name = "utils"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#d5ba8512fe52b871fa7ad4a45a9d699ab6caba30"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#b5749fbb63f25e9ddff87277552fc88ca6ff7976"
 dependencies = [
  "tracing",
 ]
diff --git a/crates/legacy/src/service.rs b/crates/legacy/src/service.rs
index 8a42e2fa..b8ce74d4 100644
--- a/crates/legacy/src/service.rs
+++ b/crates/legacy/src/service.rs
@@ -9,7 +9,7 @@ use hotshot_types::{
     event::EventType,
     message::Proposal,
     traits::{
-        block_contents::BlockPayload,
+        block_contents::{BlockPayload, BuilderTransaction},
         node_implementation::{ConsensusTime, NodeType},
         signature_key::{BuilderSignatureKey, SignatureKey},
     },
@@ -1446,7 +1446,9 @@ impl<Types: NodeType> Iterator for HandleReceivedTxns<Types> {
         // encoded transaction length. Luckily, this being roughly proportional
         // to encoded length is enough, because we only use this value to estimate
         // our limitations on computing the VID in time.
-        let len = bincode::serialized_size(&tx).unwrap_or_default();
+        // let len = bincode::serialized_size(&tx).unwrap_or_default();
+        let len = tx.minimum_block_size();
+        tracing::error!("Transaction size: {:?}, old transaction size = {:?}", len, bincode::serialized_size(&tx).unwrap_or_default());
         let max_txn_len = self.max_txn_len;
         if len > max_txn_len {
             tracing::warn!(%commit, %len, %max_txn_len, "Transaction too big");

From e3363e48c913b5acdf0ef0c487c3dbcf8f379c0e Mon Sep 17 00:00:00 2001
From: Sishan Long <dlsubjam@gmail.com>
Date: Thu, 24 Oct 2024 16:02:44 -0700
Subject: [PATCH 03/15] const test_max_tx_len

---
 crates/legacy/src/service.rs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/crates/legacy/src/service.rs b/crates/legacy/src/service.rs
index b8ce74d4..6a7a8a4d 100644
--- a/crates/legacy/src/service.rs
+++ b/crates/legacy/src/service.rs
@@ -1446,9 +1446,7 @@ impl<Types: NodeType> Iterator for HandleReceivedTxns<Types> {
         // encoded transaction length. Luckily, this being roughly proportional
         // to encoded length is enough, because we only use this value to estimate
         // our limitations on computing the VID in time.
-        // let len = bincode::serialized_size(&tx).unwrap_or_default();
         let len = tx.minimum_block_size();
-        tracing::error!("Transaction size: {:?}, old transaction size = {:?}", len, bincode::serialized_size(&tx).unwrap_or_default());
         let max_txn_len = self.max_txn_len;
         if len > max_txn_len {
             tracing::warn!(%commit, %len, %max_txn_len, "Transaction too big");
@@ -1542,6 +1540,9 @@ mod test {
         HandleQuorumEventError, HandleReceivedTxns, ProxyGlobalState,
     };
 
+    /// A const number on max_tx_len to be used consistently spanning all the tests
+    const TEST_MAX_TX_LEN: u64 = 20;
+
     // GlobalState Tests
 
     // GlobalState::new Tests
@@ -4292,7 +4293,7 @@ mod test {
                 tx_sender,
                 txns.clone(),
                 TransactionSource::HotShot,
-                10,
+                TEST_MAX_TX_LEN,
             );
 
             assert!(handle_received_txns_iter.next().is_some());
@@ -4340,7 +4341,7 @@ mod test {
                 tx_sender,
                 txns.clone(),
                 TransactionSource::HotShot,
-                10,
+                TEST_MAX_TX_LEN,
             );
 
             assert!(handle_received_txns_iter.next().is_some());
@@ -4352,7 +4353,7 @@ mod test {
                 })) => {
                     // This is expected,
                     assert!(estimated_length >= 256);
-                    assert_eq!(max_txn_len, 10);
+                    assert_eq!(max_txn_len, TEST_MAX_TX_LEN);
                 }
                 Some(Err(err)) => {
                     panic!("Unexpected error: {:?}", err);
@@ -4398,7 +4399,7 @@ mod test {
                 tx_sender,
                 txns.clone(),
                 TransactionSource::HotShot,
-                10,
+                TEST_MAX_TX_LEN,
             );
 
             match handle_received_txns_iter.next() {
@@ -4443,7 +4444,7 @@ mod test {
             tx_sender,
             txns.clone(),
             TransactionSource::HotShot,
-            10,
+            TEST_MAX_TX_LEN,
         );
 
         for iteration in handle_received_txns_iter {

From ce583407bc4b470155f74b42ea3218aa0d8d3039 Mon Sep 17 00:00:00 2001
From: Sishan Long <dlsubjam@gmail.com>
Date: Thu, 24 Oct 2024 16:34:54 -0700
Subject: [PATCH 04/15] update calc of tx len

---
 Cargo.lock                   | 26 +++++++++++++-------------
 crates/legacy/src/service.rs | 14 +++++++++++++-
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5f019c6b..a0c21eae 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3005,7 +3005,7 @@ dependencies = [
 [[package]]
 name = "hotshot"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#b5749fbb63f25e9ddff87277552fc88ca6ff7976"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#5b025d1e573efab0e5310945cc7b30ba3cbf22db"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3053,7 +3053,7 @@ dependencies = [
 [[package]]
 name = "hotshot-builder-api"
 version = "0.1.7"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#b5749fbb63f25e9ddff87277552fc88ca6ff7976"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#5b025d1e573efab0e5310945cc7b30ba3cbf22db"
 dependencies = [
  "async-trait",
  "clap",
@@ -3106,7 +3106,7 @@ dependencies = [
 [[package]]
 name = "hotshot-events-service"
 version = "0.1.49"
-source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?branch=sishan/trait_builder_transaction#883960d9cc1e779af2cc792096f7c25e51403308"
+source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?branch=sishan/trait_builder_transaction#dde5998e1978f42db4ff9592f9ba39e35da662b0"
 dependencies = [
  "async-broadcast",
  "async-compatibility-layer",
@@ -3132,7 +3132,7 @@ dependencies = [
 [[package]]
 name = "hotshot-example-types"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#b5749fbb63f25e9ddff87277552fc88ca6ff7976"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#5b025d1e573efab0e5310945cc7b30ba3cbf22db"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3165,7 +3165,7 @@ dependencies = [
 [[package]]
 name = "hotshot-fakeapi"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#b5749fbb63f25e9ddff87277552fc88ca6ff7976"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#5b025d1e573efab0e5310945cc7b30ba3cbf22db"
 dependencies = [
  "anyhow",
  "async-compatibility-layer",
@@ -3185,7 +3185,7 @@ dependencies = [
 [[package]]
 name = "hotshot-macros"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#b5749fbb63f25e9ddff87277552fc88ca6ff7976"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#5b025d1e573efab0e5310945cc7b30ba3cbf22db"
 dependencies = [
  "derive_builder",
  "proc-macro2",
@@ -3196,7 +3196,7 @@ dependencies = [
 [[package]]
 name = "hotshot-orchestrator"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#b5749fbb63f25e9ddff87277552fc88ca6ff7976"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#5b025d1e573efab0e5310945cc7b30ba3cbf22db"
 dependencies = [
  "anyhow",
  "async-compatibility-layer",
@@ -3225,7 +3225,7 @@ dependencies = [
 [[package]]
 name = "hotshot-task"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#b5749fbb63f25e9ddff87277552fc88ca6ff7976"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#5b025d1e573efab0e5310945cc7b30ba3cbf22db"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3241,7 +3241,7 @@ dependencies = [
 [[package]]
 name = "hotshot-task-impls"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#b5749fbb63f25e9ddff87277552fc88ca6ff7976"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#5b025d1e573efab0e5310945cc7b30ba3cbf22db"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3279,7 +3279,7 @@ dependencies = [
 [[package]]
 name = "hotshot-testing"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#b5749fbb63f25e9ddff87277552fc88ca6ff7976"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#5b025d1e573efab0e5310945cc7b30ba3cbf22db"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3325,7 +3325,7 @@ dependencies = [
 [[package]]
 name = "hotshot-types"
 version = "0.1.11"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#b5749fbb63f25e9ddff87277552fc88ca6ff7976"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#5b025d1e573efab0e5310945cc7b30ba3cbf22db"
 dependencies = [
  "anyhow",
  "ark-bn254",
@@ -4392,7 +4392,7 @@ dependencies = [
 [[package]]
 name = "libp2p-networking"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#b5749fbb63f25e9ddff87277552fc88ca6ff7976"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#5b025d1e573efab0e5310945cc7b30ba3cbf22db"
 dependencies = [
  "anyhow",
  "async-compatibility-layer",
@@ -8209,7 +8209,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 [[package]]
 name = "utils"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#b5749fbb63f25e9ddff87277552fc88ca6ff7976"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#5b025d1e573efab0e5310945cc7b30ba3cbf22db"
 dependencies = [
  "tracing",
 ]
diff --git a/crates/legacy/src/service.rs b/crates/legacy/src/service.rs
index 6a7a8a4d..3c70688a 100644
--- a/crates/legacy/src/service.rs
+++ b/crates/legacy/src/service.rs
@@ -1446,7 +1446,19 @@ impl<Types: NodeType> Iterator for HandleReceivedTxns<Types> {
         // encoded transaction length. Luckily, this being roughly proportional
         // to encoded length is enough, because we only use this value to estimate
         // our limitations on computing the VID in time.
-        let len = tx.minimum_block_size();
+        // In sequencer we account for block byte length limit with:
+        // let len = tx.payload().len() + NsTableBuilder::entry_byte_len() + NsPayloadBuilder::tx_table_header_byte_len() + NsPayloadBuilder::tx_table_entry_byte_len();
+        // where
+        // pub const fn entry_byte_len() -> usize {NS_ID_BYTE_LEN (4) + NS_OFFSET_BYTE_LEN (4)}
+        // pub const fn tx_table_header_byte_len() -> usize {NUM_TXS_BYTE_LEN (4)}
+        // pub const fn tx_table_entry_byte_len() -> usize {TX_OFFSET_BYTE_LEN (4)}
+        const NS_ID_BYTE_LEN: usize = 4;
+        const NS_OFFSET_BYTE_LEN: usize = 4;
+        const NUM_TXS_BYTE_LEN: usize = 4;
+        const TX_OFFSET_BYTE_LEN: usize = 4;
+        let len = tx.minimum_block_size(
+            ((NS_ID_BYTE_LEN + NS_OFFSET_BYTE_LEN) + NUM_TXS_BYTE_LEN + TX_OFFSET_BYTE_LEN) as u64,
+        );
         let max_txn_len = self.max_txn_len;
         if len > max_txn_len {
             tracing::warn!(%commit, %len, %max_txn_len, "Transaction too big");

From 4197e4f81823e6d0cb4adc4984240af435530227 Mon Sep 17 00:00:00 2001
From: Sishan Long <dlsubjam@gmail.com>
Date: Thu, 24 Oct 2024 16:42:18 -0700
Subject: [PATCH 05/15] clippy

---
 crates/legacy/src/service.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/legacy/src/service.rs b/crates/legacy/src/service.rs
index 3c70688a..34427572 100644
--- a/crates/legacy/src/service.rs
+++ b/crates/legacy/src/service.rs
@@ -1552,7 +1552,7 @@ mod test {
         HandleQuorumEventError, HandleReceivedTxns, ProxyGlobalState,
     };
 
-    /// A const number on max_tx_len to be used consistently spanning all the tests
+    /// A const number on `max_tx_len` to be used consistently spanning all the tests
     const TEST_MAX_TX_LEN: u64 = 20;
 
     // GlobalState Tests

From ca748e199c404d619349b63069f118993112d03f Mon Sep 17 00:00:00 2001
From: Sishan Long <dlsubjam@gmail.com>
Date: Fri, 25 Oct 2024 13:27:22 -0700
Subject: [PATCH 06/15] upd

---
 Cargo.lock                   | 27 ++++++++++++++-------------
 crates/legacy/src/service.rs | 21 +++++----------------
 2 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a0c21eae..8813503e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3005,7 +3005,7 @@ dependencies = [
 [[package]]
 name = "hotshot"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#5b025d1e573efab0e5310945cc7b30ba3cbf22db"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#846d7506d25a0e6d439d21caf4816798bff8ea94"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3053,7 +3053,7 @@ dependencies = [
 [[package]]
 name = "hotshot-builder-api"
 version = "0.1.7"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#5b025d1e573efab0e5310945cc7b30ba3cbf22db"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#846d7506d25a0e6d439d21caf4816798bff8ea94"
 dependencies = [
  "async-trait",
  "clap",
@@ -3106,7 +3106,7 @@ dependencies = [
 [[package]]
 name = "hotshot-events-service"
 version = "0.1.49"
-source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?branch=sishan/trait_builder_transaction#dde5998e1978f42db4ff9592f9ba39e35da662b0"
+source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?branch=sishan/trait_builder_transaction#3c8e106b36b3d0f62260cd8858f63d7211df835a"
 dependencies = [
  "async-broadcast",
  "async-compatibility-layer",
@@ -3132,7 +3132,7 @@ dependencies = [
 [[package]]
 name = "hotshot-example-types"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#5b025d1e573efab0e5310945cc7b30ba3cbf22db"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#846d7506d25a0e6d439d21caf4816798bff8ea94"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3146,6 +3146,7 @@ dependencies = [
  "ethereum-types",
  "futures",
  "hotshot",
+ "hotshot-builder-api",
  "hotshot-task",
  "hotshot-task-impls",
  "hotshot-types",
@@ -3165,7 +3166,7 @@ dependencies = [
 [[package]]
 name = "hotshot-fakeapi"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#5b025d1e573efab0e5310945cc7b30ba3cbf22db"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#846d7506d25a0e6d439d21caf4816798bff8ea94"
 dependencies = [
  "anyhow",
  "async-compatibility-layer",
@@ -3185,7 +3186,7 @@ dependencies = [
 [[package]]
 name = "hotshot-macros"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#5b025d1e573efab0e5310945cc7b30ba3cbf22db"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#846d7506d25a0e6d439d21caf4816798bff8ea94"
 dependencies = [
  "derive_builder",
  "proc-macro2",
@@ -3196,7 +3197,7 @@ dependencies = [
 [[package]]
 name = "hotshot-orchestrator"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#5b025d1e573efab0e5310945cc7b30ba3cbf22db"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#846d7506d25a0e6d439d21caf4816798bff8ea94"
 dependencies = [
  "anyhow",
  "async-compatibility-layer",
@@ -3225,7 +3226,7 @@ dependencies = [
 [[package]]
 name = "hotshot-task"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#5b025d1e573efab0e5310945cc7b30ba3cbf22db"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#846d7506d25a0e6d439d21caf4816798bff8ea94"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3241,7 +3242,7 @@ dependencies = [
 [[package]]
 name = "hotshot-task-impls"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#5b025d1e573efab0e5310945cc7b30ba3cbf22db"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#846d7506d25a0e6d439d21caf4816798bff8ea94"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3279,7 +3280,7 @@ dependencies = [
 [[package]]
 name = "hotshot-testing"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#5b025d1e573efab0e5310945cc7b30ba3cbf22db"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#846d7506d25a0e6d439d21caf4816798bff8ea94"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3325,7 +3326,7 @@ dependencies = [
 [[package]]
 name = "hotshot-types"
 version = "0.1.11"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#5b025d1e573efab0e5310945cc7b30ba3cbf22db"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#846d7506d25a0e6d439d21caf4816798bff8ea94"
 dependencies = [
  "anyhow",
  "ark-bn254",
@@ -4392,7 +4393,7 @@ dependencies = [
 [[package]]
 name = "libp2p-networking"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#5b025d1e573efab0e5310945cc7b30ba3cbf22db"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#846d7506d25a0e6d439d21caf4816798bff8ea94"
 dependencies = [
  "anyhow",
  "async-compatibility-layer",
@@ -8209,7 +8210,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 [[package]]
 name = "utils"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#5b025d1e573efab0e5310945cc7b30ba3cbf22db"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#846d7506d25a0e6d439d21caf4816798bff8ea94"
 dependencies = [
  "tracing",
 ]
diff --git a/crates/legacy/src/service.rs b/crates/legacy/src/service.rs
index 34427572..6db24863 100644
--- a/crates/legacy/src/service.rs
+++ b/crates/legacy/src/service.rs
@@ -9,7 +9,7 @@ use hotshot_types::{
     event::EventType,
     message::Proposal,
     traits::{
-        block_contents::{BlockPayload, BuilderTransaction},
+        block_contents::{BlockPayload, Transaction},
         node_implementation::{ConsensusTime, NodeType},
         signature_key::{BuilderSignatureKey, SignatureKey},
     },
@@ -1423,7 +1423,7 @@ impl<Types: NodeType> HandleReceivedTxns<Types> {
     }
 }
 
-impl<Types: NodeType> Iterator for HandleReceivedTxns<Types> {
+impl<Types: NodeType> Iterator for HandleReceivedTxns<Types> where Types::Transaction: Transaction {
     type Item =
         Result<Commitment<<Types as NodeType>::Transaction>, HandleReceivedTxnsError<Types>>;
 
@@ -1446,19 +1446,7 @@ impl<Types: NodeType> Iterator for HandleReceivedTxns<Types> {
         // encoded transaction length. Luckily, this being roughly proportional
         // to encoded length is enough, because we only use this value to estimate
         // our limitations on computing the VID in time.
-        // In sequencer we account for block byte length limit with:
-        // let len = tx.payload().len() + NsTableBuilder::entry_byte_len() + NsPayloadBuilder::tx_table_header_byte_len() + NsPayloadBuilder::tx_table_entry_byte_len();
-        // where
-        // pub const fn entry_byte_len() -> usize {NS_ID_BYTE_LEN (4) + NS_OFFSET_BYTE_LEN (4)}
-        // pub const fn tx_table_header_byte_len() -> usize {NUM_TXS_BYTE_LEN (4)}
-        // pub const fn tx_table_entry_byte_len() -> usize {TX_OFFSET_BYTE_LEN (4)}
-        const NS_ID_BYTE_LEN: usize = 4;
-        const NS_OFFSET_BYTE_LEN: usize = 4;
-        const NUM_TXS_BYTE_LEN: usize = 4;
-        const TX_OFFSET_BYTE_LEN: usize = 4;
-        let len = tx.minimum_block_size(
-            ((NS_ID_BYTE_LEN + NS_OFFSET_BYTE_LEN) + NUM_TXS_BYTE_LEN + TX_OFFSET_BYTE_LEN) as u64,
-        );
+        let len = tx.minimum_block_size();
         let max_txn_len = self.max_txn_len;
         if len > max_txn_len {
             tracing::warn!(%commit, %len, %max_txn_len, "Transaction too big");
@@ -1553,7 +1541,8 @@ mod test {
     };
 
     /// A const number on `max_tx_len` to be used consistently spanning all the tests
-    const TEST_MAX_TX_LEN: u64 = 20;
+    /// It is set to 1 as current estimation on TestTransaction is 1
+    const TEST_MAX_TX_LEN: u64 = 1;
 
     // GlobalState Tests
 

From 3e0757243026c3580a97292ba9d3aff8331df187 Mon Sep 17 00:00:00 2001
From: Sishan Long <dlsubjam@gmail.com>
Date: Fri, 25 Oct 2024 13:32:56 -0700
Subject: [PATCH 07/15] fmt

---
 crates/legacy/src/service.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/crates/legacy/src/service.rs b/crates/legacy/src/service.rs
index 6db24863..2fa74254 100644
--- a/crates/legacy/src/service.rs
+++ b/crates/legacy/src/service.rs
@@ -1423,7 +1423,10 @@ impl<Types: NodeType> HandleReceivedTxns<Types> {
     }
 }
 
-impl<Types: NodeType> Iterator for HandleReceivedTxns<Types> where Types::Transaction: Transaction {
+impl<Types: NodeType> Iterator for HandleReceivedTxns<Types>
+where
+    Types::Transaction: Transaction,
+{
     type Item =
         Result<Commitment<<Types as NodeType>::Transaction>, HandleReceivedTxnsError<Types>>;
 

From 9003349f3a5a95372d279bcc72fbcca14b5f94c1 Mon Sep 17 00:00:00 2001
From: Sishan Long <dlsubjam@gmail.com>
Date: Fri, 25 Oct 2024 13:38:25 -0700
Subject: [PATCH 08/15] fmt

---
 crates/legacy/src/service.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/legacy/src/service.rs b/crates/legacy/src/service.rs
index 2fa74254..9c7ad22a 100644
--- a/crates/legacy/src/service.rs
+++ b/crates/legacy/src/service.rs
@@ -1544,7 +1544,7 @@ mod test {
     };
 
     /// A const number on `max_tx_len` to be used consistently spanning all the tests
-    /// It is set to 1 as current estimation on TestTransaction is 1
+    /// It is set to 1 as current estimation on `TestTransaction` is 1
     const TEST_MAX_TX_LEN: u64 = 1;
 
     // GlobalState Tests

From 84f882b2d05ae49e0762640e5f2e80f65e0d9733 Mon Sep 17 00:00:00 2001
From: Sishan Long <dlsubjam@gmail.com>
Date: Fri, 25 Oct 2024 15:15:54 -0700
Subject: [PATCH 09/15] add one more param

---
 Cargo.lock                   | 26 +++++++++++++-------------
 crates/legacy/src/service.rs |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8813503e..0c10941f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3005,7 +3005,7 @@ dependencies = [
 [[package]]
 name = "hotshot"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#846d7506d25a0e6d439d21caf4816798bff8ea94"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#f242f097b86547213d6301fb7251dbfe2188741e"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3053,7 +3053,7 @@ dependencies = [
 [[package]]
 name = "hotshot-builder-api"
 version = "0.1.7"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#846d7506d25a0e6d439d21caf4816798bff8ea94"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#f242f097b86547213d6301fb7251dbfe2188741e"
 dependencies = [
  "async-trait",
  "clap",
@@ -3106,7 +3106,7 @@ dependencies = [
 [[package]]
 name = "hotshot-events-service"
 version = "0.1.49"
-source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?branch=sishan/trait_builder_transaction#3c8e106b36b3d0f62260cd8858f63d7211df835a"
+source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?branch=sishan/trait_builder_transaction#7d2a201f54effcc249b5ff3290cb9fa3e2df8fed"
 dependencies = [
  "async-broadcast",
  "async-compatibility-layer",
@@ -3132,7 +3132,7 @@ dependencies = [
 [[package]]
 name = "hotshot-example-types"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#846d7506d25a0e6d439d21caf4816798bff8ea94"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#f242f097b86547213d6301fb7251dbfe2188741e"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3166,7 +3166,7 @@ dependencies = [
 [[package]]
 name = "hotshot-fakeapi"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#846d7506d25a0e6d439d21caf4816798bff8ea94"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#f242f097b86547213d6301fb7251dbfe2188741e"
 dependencies = [
  "anyhow",
  "async-compatibility-layer",
@@ -3186,7 +3186,7 @@ dependencies = [
 [[package]]
 name = "hotshot-macros"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#846d7506d25a0e6d439d21caf4816798bff8ea94"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#f242f097b86547213d6301fb7251dbfe2188741e"
 dependencies = [
  "derive_builder",
  "proc-macro2",
@@ -3197,7 +3197,7 @@ dependencies = [
 [[package]]
 name = "hotshot-orchestrator"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#846d7506d25a0e6d439d21caf4816798bff8ea94"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#f242f097b86547213d6301fb7251dbfe2188741e"
 dependencies = [
  "anyhow",
  "async-compatibility-layer",
@@ -3226,7 +3226,7 @@ dependencies = [
 [[package]]
 name = "hotshot-task"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#846d7506d25a0e6d439d21caf4816798bff8ea94"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#f242f097b86547213d6301fb7251dbfe2188741e"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3242,7 +3242,7 @@ dependencies = [
 [[package]]
 name = "hotshot-task-impls"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#846d7506d25a0e6d439d21caf4816798bff8ea94"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#f242f097b86547213d6301fb7251dbfe2188741e"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3280,7 +3280,7 @@ dependencies = [
 [[package]]
 name = "hotshot-testing"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#846d7506d25a0e6d439d21caf4816798bff8ea94"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#f242f097b86547213d6301fb7251dbfe2188741e"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3326,7 +3326,7 @@ dependencies = [
 [[package]]
 name = "hotshot-types"
 version = "0.1.11"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#846d7506d25a0e6d439d21caf4816798bff8ea94"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#f242f097b86547213d6301fb7251dbfe2188741e"
 dependencies = [
  "anyhow",
  "ark-bn254",
@@ -4393,7 +4393,7 @@ dependencies = [
 [[package]]
 name = "libp2p-networking"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#846d7506d25a0e6d439d21caf4816798bff8ea94"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#f242f097b86547213d6301fb7251dbfe2188741e"
 dependencies = [
  "anyhow",
  "async-compatibility-layer",
@@ -8210,7 +8210,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 [[package]]
 name = "utils"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#846d7506d25a0e6d439d21caf4816798bff8ea94"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#f242f097b86547213d6301fb7251dbfe2188741e"
 dependencies = [
  "tracing",
 ]
diff --git a/crates/legacy/src/service.rs b/crates/legacy/src/service.rs
index 9c7ad22a..32f2b6da 100644
--- a/crates/legacy/src/service.rs
+++ b/crates/legacy/src/service.rs
@@ -1449,7 +1449,7 @@ where
         // encoded transaction length. Luckily, this being roughly proportional
         // to encoded length is enough, because we only use this value to estimate
         // our limitations on computing the VID in time.
-        let len = tx.minimum_block_size();
+        let len = tx.minimum_block_size(true);
         let max_txn_len = self.max_txn_len;
         if len > max_txn_len {
             tracing::warn!(%commit, %len, %max_txn_len, "Transaction too big");

From 784fe95fa235ee8404fd10c1359b7cde0ef5a0ba Mon Sep 17 00:00:00 2001
From: Sishan Long <dlsubjam@gmail.com>
Date: Mon, 28 Oct 2024 13:02:00 -0700
Subject: [PATCH 10/15] remove param

---
 Cargo.lock                   | 26 +++++++++++++-------------
 crates/legacy/src/service.rs |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0c10941f..e6320828 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3005,7 +3005,7 @@ dependencies = [
 [[package]]
 name = "hotshot"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#f242f097b86547213d6301fb7251dbfe2188741e"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#10983f5596f2c6149d31d748f103134539329024"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3053,7 +3053,7 @@ dependencies = [
 [[package]]
 name = "hotshot-builder-api"
 version = "0.1.7"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#f242f097b86547213d6301fb7251dbfe2188741e"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#10983f5596f2c6149d31d748f103134539329024"
 dependencies = [
  "async-trait",
  "clap",
@@ -3106,7 +3106,7 @@ dependencies = [
 [[package]]
 name = "hotshot-events-service"
 version = "0.1.49"
-source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?branch=sishan/trait_builder_transaction#7d2a201f54effcc249b5ff3290cb9fa3e2df8fed"
+source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?branch=sishan/trait_builder_transaction#085b911bd7611021c44f0a314ce6b636b0547439"
 dependencies = [
  "async-broadcast",
  "async-compatibility-layer",
@@ -3132,7 +3132,7 @@ dependencies = [
 [[package]]
 name = "hotshot-example-types"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#f242f097b86547213d6301fb7251dbfe2188741e"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#10983f5596f2c6149d31d748f103134539329024"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3166,7 +3166,7 @@ dependencies = [
 [[package]]
 name = "hotshot-fakeapi"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#f242f097b86547213d6301fb7251dbfe2188741e"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#10983f5596f2c6149d31d748f103134539329024"
 dependencies = [
  "anyhow",
  "async-compatibility-layer",
@@ -3186,7 +3186,7 @@ dependencies = [
 [[package]]
 name = "hotshot-macros"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#f242f097b86547213d6301fb7251dbfe2188741e"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#10983f5596f2c6149d31d748f103134539329024"
 dependencies = [
  "derive_builder",
  "proc-macro2",
@@ -3197,7 +3197,7 @@ dependencies = [
 [[package]]
 name = "hotshot-orchestrator"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#f242f097b86547213d6301fb7251dbfe2188741e"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#10983f5596f2c6149d31d748f103134539329024"
 dependencies = [
  "anyhow",
  "async-compatibility-layer",
@@ -3226,7 +3226,7 @@ dependencies = [
 [[package]]
 name = "hotshot-task"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#f242f097b86547213d6301fb7251dbfe2188741e"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#10983f5596f2c6149d31d748f103134539329024"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3242,7 +3242,7 @@ dependencies = [
 [[package]]
 name = "hotshot-task-impls"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#f242f097b86547213d6301fb7251dbfe2188741e"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#10983f5596f2c6149d31d748f103134539329024"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3280,7 +3280,7 @@ dependencies = [
 [[package]]
 name = "hotshot-testing"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#f242f097b86547213d6301fb7251dbfe2188741e"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#10983f5596f2c6149d31d748f103134539329024"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3326,7 +3326,7 @@ dependencies = [
 [[package]]
 name = "hotshot-types"
 version = "0.1.11"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#f242f097b86547213d6301fb7251dbfe2188741e"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#10983f5596f2c6149d31d748f103134539329024"
 dependencies = [
  "anyhow",
  "ark-bn254",
@@ -4393,7 +4393,7 @@ dependencies = [
 [[package]]
 name = "libp2p-networking"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#f242f097b86547213d6301fb7251dbfe2188741e"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#10983f5596f2c6149d31d748f103134539329024"
 dependencies = [
  "anyhow",
  "async-compatibility-layer",
@@ -8210,7 +8210,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 [[package]]
 name = "utils"
 version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#f242f097b86547213d6301fb7251dbfe2188741e"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#10983f5596f2c6149d31d748f103134539329024"
 dependencies = [
  "tracing",
 ]
diff --git a/crates/legacy/src/service.rs b/crates/legacy/src/service.rs
index 32f2b6da..9c7ad22a 100644
--- a/crates/legacy/src/service.rs
+++ b/crates/legacy/src/service.rs
@@ -1449,7 +1449,7 @@ where
         // encoded transaction length. Luckily, this being roughly proportional
         // to encoded length is enough, because we only use this value to estimate
         // our limitations on computing the VID in time.
-        let len = tx.minimum_block_size(true);
+        let len = tx.minimum_block_size();
         let max_txn_len = self.max_txn_len;
         if len > max_txn_len {
             tracing::warn!(%commit, %len, %max_txn_len, "Transaction too big");

From 6ce127d969d8290b65f49138db7d8dbd6eaf6fd4 Mon Sep 17 00:00:00 2001
From: Sishan Long <dlsubjam@gmail.com>
Date: Mon, 28 Oct 2024 17:02:56 -0700
Subject: [PATCH 11/15] hotshot bump

---
 Cargo.lock | 57 +++++++++++++++++++++++++++++++++---------------------
 Cargo.toml | 16 +++++++--------
 2 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8a7a3288..ea54da68 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3004,8 +3004,8 @@ dependencies = [
 
 [[package]]
 name = "hotshot"
-version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch4#e8abb17d990560d6c92489522d218b99d2089db3"
+version = "0.5.79"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#b704eb86fffd00e29361906d2315a001e2275af9"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3046,13 +3046,14 @@ dependencies = [
  "tokio",
  "tracing",
  "url",
+ "utils",
  "vbs",
 ]
 
 [[package]]
 name = "hotshot-builder-api"
 version = "0.1.7"
-source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch4#e8abb17d990560d6c92489522d218b99d2089db3"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#b704eb86fffd00e29361906d2315a001e2275af9"
 dependencies = [
  "async-trait",
  "clap",
@@ -3105,7 +3106,7 @@ dependencies = [
 [[package]]
 name = "hotshot-events-service"
 version = "0.1.49"
-source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?tag=0.1.51#8d4092ef01a5a6c9151df4a29fa3218726f91016"
+source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?branch=hotshot/rc-0.5.79#2cdc6bf36bccecd5574ee193f3408705f051ef45"
 dependencies = [
  "async-broadcast",
  "async-compatibility-layer",
@@ -3130,8 +3131,8 @@ dependencies = [
 
 [[package]]
 name = "hotshot-example-types"
-version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch4#e8abb17d990560d6c92489522d218b99d2089db3"
+version = "0.5.79"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#b704eb86fffd00e29361906d2315a001e2275af9"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3145,6 +3146,7 @@ dependencies = [
  "ethereum-types",
  "futures",
  "hotshot",
+ "hotshot-builder-api",
  "hotshot-task",
  "hotshot-task-impls",
  "hotshot-types",
@@ -3163,8 +3165,8 @@ dependencies = [
 
 [[package]]
 name = "hotshot-fakeapi"
-version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch4#e8abb17d990560d6c92489522d218b99d2089db3"
+version = "0.5.79"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#b704eb86fffd00e29361906d2315a001e2275af9"
 dependencies = [
  "anyhow",
  "async-compatibility-layer",
@@ -3183,8 +3185,8 @@ dependencies = [
 
 [[package]]
 name = "hotshot-macros"
-version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch4#e8abb17d990560d6c92489522d218b99d2089db3"
+version = "0.5.79"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#b704eb86fffd00e29361906d2315a001e2275af9"
 dependencies = [
  "derive_builder",
  "proc-macro2",
@@ -3194,8 +3196,8 @@ dependencies = [
 
 [[package]]
 name = "hotshot-orchestrator"
-version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch4#e8abb17d990560d6c92489522d218b99d2089db3"
+version = "0.5.79"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#b704eb86fffd00e29361906d2315a001e2275af9"
 dependencies = [
  "anyhow",
  "async-compatibility-layer",
@@ -3223,8 +3225,8 @@ dependencies = [
 
 [[package]]
 name = "hotshot-task"
-version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch4#e8abb17d990560d6c92489522d218b99d2089db3"
+version = "0.5.79"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#b704eb86fffd00e29361906d2315a001e2275af9"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3234,12 +3236,13 @@ dependencies = [
  "futures",
  "tokio",
  "tracing",
+ "utils",
 ]
 
 [[package]]
 name = "hotshot-task-impls"
-version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch4#e8abb17d990560d6c92489522d218b99d2089db3"
+version = "0.5.79"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#b704eb86fffd00e29361906d2315a001e2275af9"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3269,14 +3272,15 @@ dependencies = [
  "tokio",
  "tracing",
  "url",
+ "utils",
  "vbs",
  "vec1",
 ]
 
 [[package]]
 name = "hotshot-testing"
-version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch4#e8abb17d990560d6c92489522d218b99d2089db3"
+version = "0.5.79"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#b704eb86fffd00e29361906d2315a001e2275af9"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3322,7 +3326,7 @@ dependencies = [
 [[package]]
 name = "hotshot-types"
 version = "0.1.11"
-source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch4#e8abb17d990560d6c92489522d218b99d2089db3"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#b704eb86fffd00e29361906d2315a001e2275af9"
 dependencies = [
  "anyhow",
  "ark-bn254",
@@ -3374,6 +3378,7 @@ dependencies = [
  "tracing",
  "typenum",
  "url",
+ "utils",
  "vbs",
  "vec1",
 ]
@@ -3503,7 +3508,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite 0.2.14",
- "socket2 0.4.10",
+ "socket2 0.5.7",
  "tokio",
  "tower-service",
  "tracing",
@@ -4387,8 +4392,8 @@ dependencies = [
 
 [[package]]
 name = "libp2p-networking"
-version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.78-patch4#e8abb17d990560d6c92489522d218b99d2089db3"
+version = "0.5.79"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#b704eb86fffd00e29361906d2315a001e2275af9"
 dependencies = [
  "anyhow",
  "async-compatibility-layer",
@@ -8202,6 +8207,14 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
+[[package]]
+name = "utils"
+version = "0.5.79"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#b704eb86fffd00e29361906d2315a001e2275af9"
+dependencies = [
+ "tracing",
+]
+
 [[package]]
 name = "uuid"
 version = "1.10.0"
diff --git a/Cargo.toml b/Cargo.toml
index e2850c96..a3e0825c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,14 +3,14 @@ resolver = "2"
 members = ["crates/*"]
 
 [workspace.dependencies]
-hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch4" }
-hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch4" }
-hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", tag = "0.1.51" }
-hotshot-macros = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch4" }
-hotshot-task-impls = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch4" }
-hotshot-testing = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch4" }
-hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch4" }
-hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.78-patch4" }
+hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.79" }
+hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.79" }
+hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", branch = "hotshot/rc-0.5.79" }
+hotshot-macros = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.79" }
+hotshot-task-impls = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.79" }
+hotshot-testing = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.79" }
+hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.79" }
+hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.79" }
 
 anyhow = "1"
 async-broadcast = "0.7"

From da844ef4ad17b8d0b39b94de504a94e132ae1dfb Mon Sep 17 00:00:00 2001
From: Sishan Long <dlsubjam@gmail.com>
Date: Mon, 28 Oct 2024 17:30:15 -0700
Subject: [PATCH 12/15] bump hotshot

---
 Cargo.lock | 46 +++++++++++++++++++++++-----------------------
 Cargo.toml | 16 ++++++++--------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e6320828..ea54da68 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3004,8 +3004,8 @@ dependencies = [
 
 [[package]]
 name = "hotshot"
-version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#10983f5596f2c6149d31d748f103134539329024"
+version = "0.5.79"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#b704eb86fffd00e29361906d2315a001e2275af9"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3053,7 +3053,7 @@ dependencies = [
 [[package]]
 name = "hotshot-builder-api"
 version = "0.1.7"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#10983f5596f2c6149d31d748f103134539329024"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#b704eb86fffd00e29361906d2315a001e2275af9"
 dependencies = [
  "async-trait",
  "clap",
@@ -3106,7 +3106,7 @@ dependencies = [
 [[package]]
 name = "hotshot-events-service"
 version = "0.1.49"
-source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?branch=sishan/trait_builder_transaction#085b911bd7611021c44f0a314ce6b636b0547439"
+source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?branch=hotshot/rc-0.5.79#2cdc6bf36bccecd5574ee193f3408705f051ef45"
 dependencies = [
  "async-broadcast",
  "async-compatibility-layer",
@@ -3131,8 +3131,8 @@ dependencies = [
 
 [[package]]
 name = "hotshot-example-types"
-version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#10983f5596f2c6149d31d748f103134539329024"
+version = "0.5.79"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#b704eb86fffd00e29361906d2315a001e2275af9"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3165,8 +3165,8 @@ dependencies = [
 
 [[package]]
 name = "hotshot-fakeapi"
-version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#10983f5596f2c6149d31d748f103134539329024"
+version = "0.5.79"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#b704eb86fffd00e29361906d2315a001e2275af9"
 dependencies = [
  "anyhow",
  "async-compatibility-layer",
@@ -3185,8 +3185,8 @@ dependencies = [
 
 [[package]]
 name = "hotshot-macros"
-version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#10983f5596f2c6149d31d748f103134539329024"
+version = "0.5.79"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#b704eb86fffd00e29361906d2315a001e2275af9"
 dependencies = [
  "derive_builder",
  "proc-macro2",
@@ -3196,8 +3196,8 @@ dependencies = [
 
 [[package]]
 name = "hotshot-orchestrator"
-version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#10983f5596f2c6149d31d748f103134539329024"
+version = "0.5.79"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#b704eb86fffd00e29361906d2315a001e2275af9"
 dependencies = [
  "anyhow",
  "async-compatibility-layer",
@@ -3225,8 +3225,8 @@ dependencies = [
 
 [[package]]
 name = "hotshot-task"
-version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#10983f5596f2c6149d31d748f103134539329024"
+version = "0.5.79"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#b704eb86fffd00e29361906d2315a001e2275af9"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3241,8 +3241,8 @@ dependencies = [
 
 [[package]]
 name = "hotshot-task-impls"
-version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#10983f5596f2c6149d31d748f103134539329024"
+version = "0.5.79"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#b704eb86fffd00e29361906d2315a001e2275af9"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3279,8 +3279,8 @@ dependencies = [
 
 [[package]]
 name = "hotshot-testing"
-version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#10983f5596f2c6149d31d748f103134539329024"
+version = "0.5.79"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#b704eb86fffd00e29361906d2315a001e2275af9"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3326,7 +3326,7 @@ dependencies = [
 [[package]]
 name = "hotshot-types"
 version = "0.1.11"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#10983f5596f2c6149d31d748f103134539329024"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#b704eb86fffd00e29361906d2315a001e2275af9"
 dependencies = [
  "anyhow",
  "ark-bn254",
@@ -4392,8 +4392,8 @@ dependencies = [
 
 [[package]]
 name = "libp2p-networking"
-version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#10983f5596f2c6149d31d748f103134539329024"
+version = "0.5.79"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#b704eb86fffd00e29361906d2315a001e2275af9"
 dependencies = [
  "anyhow",
  "async-compatibility-layer",
@@ -8209,8 +8209,8 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "utils"
-version = "0.5.78"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=sishan/trait_builder_transaction#10983f5596f2c6149d31d748f103134539329024"
+version = "0.5.79"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#b704eb86fffd00e29361906d2315a001e2275af9"
 dependencies = [
  "tracing",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index ea609203..a3e0825c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,14 +3,14 @@ resolver = "2"
 members = ["crates/*"]
 
 [workspace.dependencies]
-hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "sishan/trait_builder_transaction" }
-hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "sishan/trait_builder_transaction" }
-hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", branch = "sishan/trait_builder_transaction" }
-hotshot-macros = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "sishan/trait_builder_transaction" }
-hotshot-task-impls = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "sishan/trait_builder_transaction" }
-hotshot-testing = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "sishan/trait_builder_transaction" }
-hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "sishan/trait_builder_transaction" }
-hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "sishan/trait_builder_transaction" }
+hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.79" }
+hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.79" }
+hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", branch = "hotshot/rc-0.5.79" }
+hotshot-macros = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.79" }
+hotshot-task-impls = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.79" }
+hotshot-testing = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.79" }
+hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.79" }
+hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.79" }
 
 anyhow = "1"
 async-broadcast = "0.7"

From a5314256d64406c6d0c1ef7b0d4313106d078c3b Mon Sep 17 00:00:00 2001
From: Sishan Long <dlsubjam@gmail.com>
Date: Tue, 29 Oct 2024 15:12:54 -0700
Subject: [PATCH 13/15] latest v

---
 Cargo.lock | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ea54da68..9f87784b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3005,7 +3005,7 @@ dependencies = [
 [[package]]
 name = "hotshot"
 version = "0.5.79"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#b704eb86fffd00e29361906d2315a001e2275af9"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#25d33773bb95c059b227980fa9657d4a263362d4"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3053,7 +3053,7 @@ dependencies = [
 [[package]]
 name = "hotshot-builder-api"
 version = "0.1.7"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#b704eb86fffd00e29361906d2315a001e2275af9"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#25d33773bb95c059b227980fa9657d4a263362d4"
 dependencies = [
  "async-trait",
  "clap",
@@ -3106,7 +3106,7 @@ dependencies = [
 [[package]]
 name = "hotshot-events-service"
 version = "0.1.49"
-source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?branch=hotshot/rc-0.5.79#2cdc6bf36bccecd5574ee193f3408705f051ef45"
+source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?branch=hotshot/rc-0.5.79#9d4182a683816da921934819f42feb0f49fef364"
 dependencies = [
  "async-broadcast",
  "async-compatibility-layer",
@@ -3132,7 +3132,7 @@ dependencies = [
 [[package]]
 name = "hotshot-example-types"
 version = "0.5.79"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#b704eb86fffd00e29361906d2315a001e2275af9"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#25d33773bb95c059b227980fa9657d4a263362d4"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3166,7 +3166,7 @@ dependencies = [
 [[package]]
 name = "hotshot-fakeapi"
 version = "0.5.79"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#b704eb86fffd00e29361906d2315a001e2275af9"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#25d33773bb95c059b227980fa9657d4a263362d4"
 dependencies = [
  "anyhow",
  "async-compatibility-layer",
@@ -3186,7 +3186,7 @@ dependencies = [
 [[package]]
 name = "hotshot-macros"
 version = "0.5.79"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#b704eb86fffd00e29361906d2315a001e2275af9"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#25d33773bb95c059b227980fa9657d4a263362d4"
 dependencies = [
  "derive_builder",
  "proc-macro2",
@@ -3197,7 +3197,7 @@ dependencies = [
 [[package]]
 name = "hotshot-orchestrator"
 version = "0.5.79"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#b704eb86fffd00e29361906d2315a001e2275af9"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#25d33773bb95c059b227980fa9657d4a263362d4"
 dependencies = [
  "anyhow",
  "async-compatibility-layer",
@@ -3226,7 +3226,7 @@ dependencies = [
 [[package]]
 name = "hotshot-task"
 version = "0.5.79"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#b704eb86fffd00e29361906d2315a001e2275af9"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#25d33773bb95c059b227980fa9657d4a263362d4"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3242,7 +3242,7 @@ dependencies = [
 [[package]]
 name = "hotshot-task-impls"
 version = "0.5.79"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#b704eb86fffd00e29361906d2315a001e2275af9"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#25d33773bb95c059b227980fa9657d4a263362d4"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3280,7 +3280,7 @@ dependencies = [
 [[package]]
 name = "hotshot-testing"
 version = "0.5.79"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#b704eb86fffd00e29361906d2315a001e2275af9"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#25d33773bb95c059b227980fa9657d4a263362d4"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3326,7 +3326,7 @@ dependencies = [
 [[package]]
 name = "hotshot-types"
 version = "0.1.11"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#b704eb86fffd00e29361906d2315a001e2275af9"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#25d33773bb95c059b227980fa9657d4a263362d4"
 dependencies = [
  "anyhow",
  "ark-bn254",
@@ -4393,7 +4393,7 @@ dependencies = [
 [[package]]
 name = "libp2p-networking"
 version = "0.5.79"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#b704eb86fffd00e29361906d2315a001e2275af9"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#25d33773bb95c059b227980fa9657d4a263362d4"
 dependencies = [
  "anyhow",
  "async-compatibility-layer",
@@ -8210,7 +8210,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 [[package]]
 name = "utils"
 version = "0.5.79"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#b704eb86fffd00e29361906d2315a001e2275af9"
+source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#25d33773bb95c059b227980fa9657d4a263362d4"
 dependencies = [
  "tracing",
 ]

From 488fcf608897b5aaff21b6cdd53a53592fc5cb35 Mon Sep 17 00:00:00 2001
From: Sishan Long <dlsubjam@gmail.com>
Date: Wed, 30 Oct 2024 08:33:03 -0700
Subject: [PATCH 14/15] upd

---
 Cargo.lock | 26 +++++++++++++-------------
 Cargo.toml | 16 ++++++++--------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9f87784b..e79c3dc2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3005,7 +3005,7 @@ dependencies = [
 [[package]]
 name = "hotshot"
 version = "0.5.79"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#25d33773bb95c059b227980fa9657d4a263362d4"
+source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.79#f942200b8ae31038d55cc1a45d2f780bc13de458"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3053,7 +3053,7 @@ dependencies = [
 [[package]]
 name = "hotshot-builder-api"
 version = "0.1.7"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#25d33773bb95c059b227980fa9657d4a263362d4"
+source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.79#f942200b8ae31038d55cc1a45d2f780bc13de458"
 dependencies = [
  "async-trait",
  "clap",
@@ -3106,7 +3106,7 @@ dependencies = [
 [[package]]
 name = "hotshot-events-service"
 version = "0.1.49"
-source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?branch=hotshot/rc-0.5.79#9d4182a683816da921934819f42feb0f49fef364"
+source = "git+https://github.com/EspressoSystems/hotshot-events-service.git?tag=0.1.52#95ef82a7f5ffeab18df34a697bef35f2319971d0"
 dependencies = [
  "async-broadcast",
  "async-compatibility-layer",
@@ -3132,7 +3132,7 @@ dependencies = [
 [[package]]
 name = "hotshot-example-types"
 version = "0.5.79"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#25d33773bb95c059b227980fa9657d4a263362d4"
+source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.79#f942200b8ae31038d55cc1a45d2f780bc13de458"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3166,7 +3166,7 @@ dependencies = [
 [[package]]
 name = "hotshot-fakeapi"
 version = "0.5.79"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#25d33773bb95c059b227980fa9657d4a263362d4"
+source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.79#f942200b8ae31038d55cc1a45d2f780bc13de458"
 dependencies = [
  "anyhow",
  "async-compatibility-layer",
@@ -3186,7 +3186,7 @@ dependencies = [
 [[package]]
 name = "hotshot-macros"
 version = "0.5.79"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#25d33773bb95c059b227980fa9657d4a263362d4"
+source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.79#f942200b8ae31038d55cc1a45d2f780bc13de458"
 dependencies = [
  "derive_builder",
  "proc-macro2",
@@ -3197,7 +3197,7 @@ dependencies = [
 [[package]]
 name = "hotshot-orchestrator"
 version = "0.5.79"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#25d33773bb95c059b227980fa9657d4a263362d4"
+source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.79#f942200b8ae31038d55cc1a45d2f780bc13de458"
 dependencies = [
  "anyhow",
  "async-compatibility-layer",
@@ -3226,7 +3226,7 @@ dependencies = [
 [[package]]
 name = "hotshot-task"
 version = "0.5.79"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#25d33773bb95c059b227980fa9657d4a263362d4"
+source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.79#f942200b8ae31038d55cc1a45d2f780bc13de458"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3242,7 +3242,7 @@ dependencies = [
 [[package]]
 name = "hotshot-task-impls"
 version = "0.5.79"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#25d33773bb95c059b227980fa9657d4a263362d4"
+source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.79#f942200b8ae31038d55cc1a45d2f780bc13de458"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3280,7 +3280,7 @@ dependencies = [
 [[package]]
 name = "hotshot-testing"
 version = "0.5.79"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#25d33773bb95c059b227980fa9657d4a263362d4"
+source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.79#f942200b8ae31038d55cc1a45d2f780bc13de458"
 dependencies = [
  "anyhow",
  "async-broadcast",
@@ -3326,7 +3326,7 @@ dependencies = [
 [[package]]
 name = "hotshot-types"
 version = "0.1.11"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#25d33773bb95c059b227980fa9657d4a263362d4"
+source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.79#f942200b8ae31038d55cc1a45d2f780bc13de458"
 dependencies = [
  "anyhow",
  "ark-bn254",
@@ -4393,7 +4393,7 @@ dependencies = [
 [[package]]
 name = "libp2p-networking"
 version = "0.5.79"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#25d33773bb95c059b227980fa9657d4a263362d4"
+source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.79#f942200b8ae31038d55cc1a45d2f780bc13de458"
 dependencies = [
  "anyhow",
  "async-compatibility-layer",
@@ -8210,7 +8210,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 [[package]]
 name = "utils"
 version = "0.5.79"
-source = "git+https://github.com/EspressoSystems/HotShot.git?branch=bump/rc-0.5.79#25d33773bb95c059b227980fa9657d4a263362d4"
+source = "git+https://github.com/EspressoSystems/HotShot.git?tag=0.5.79#f942200b8ae31038d55cc1a45d2f780bc13de458"
 dependencies = [
  "tracing",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index a3e0825c..4aa5c12d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,14 +3,14 @@ resolver = "2"
 members = ["crates/*"]
 
 [workspace.dependencies]
-hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.79" }
-hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.79" }
-hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", branch = "hotshot/rc-0.5.79" }
-hotshot-macros = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.79" }
-hotshot-task-impls = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.79" }
-hotshot-testing = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.79" }
-hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.79" }
-hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", branch = "bump/rc-0.5.79" }
+hotshot = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.79" }
+hotshot-builder-api = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.79" }
+hotshot-events-service = { git = "https://github.com/EspressoSystems/hotshot-events-service.git", tag = "0.1.52" }
+hotshot-macros = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.79" }
+hotshot-task-impls = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.79" }
+hotshot-testing = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.79" }
+hotshot-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.79" }
+hotshot-example-types = { git = "https://github.com/EspressoSystems/HotShot.git", tag = "0.5.79" }
 
 anyhow = "1"
 async-broadcast = "0.7"

From 85e108d76ec3dfdfee4280a5b43c026d6f28ed51 Mon Sep 17 00:00:00 2001
From: Sishan Long <dlsubjam@gmail.com>
Date: Wed, 30 Oct 2024 08:59:15 -0700
Subject: [PATCH 15/15] ignore test-ignored in CI

---
 .github/workflows/test.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d99b1534..e1577cfc 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -43,6 +43,7 @@ jobs:
         timeout-minutes: 60
 
   test-ignored:
+    if: false
     runs-on: ubuntu-latest
     env:
       RUSTFLAGS: '--cfg async_executor_impl="async-std" --cfg async_channel_impl="async-std"'