add better claim block header logging

EspressoSystems · Feb 13, 2025 · dd41df1 · dd41df1
1 parent 822dfe2
commit dd41df1
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/hotshot-builder-core-refactored/src/testing/mod.rs b/hotshot-builder-core-refactored/src/testing/mod.rs
@@ -131,7 +131,7 @@ impl TestServiceWrapper {
     ) -> Vec<TestTransaction> {
         let mut available_states = self
             .client
-            .available_blocks::<TestVersions>(
+            .available_blocks(
                 state_id.parent_commitment,
                 *state_id.parent_view,
                 MOCK_LEADER_KEYS.0,

diff --git a/hotshot-task-impls/Cargo.toml b/hotshot-task-impls/Cargo.toml
@@ -22,6 +22,7 @@ either = { workspace = true }
 futures = { workspace = true }
 hotshot-builder-api = { workspace = true }
 hotshot-task = { workspace = true }
+reqwest = "0.12"
 hotshot-types = { workspace = true }
 hotshot-utils = { workspace = true }
 jf-vid = { workspace = true }

diff --git a/hotshot-task-impls/src/builder.rs b/hotshot-task-impls/src/builder.rs
@@ -12,10 +12,7 @@ use hotshot_builder_api::v0_1::{
 };
 use hotshot_types::{
     constants::LEGACY_BUILDER_MODULE,
-    traits::{
-        node_implementation::{NodeType, Versions},
-        signature_key::SignatureKey,
-    },
+    traits::{node_implementation::NodeType, signature_key::SignatureKey},
     vid::VidCommitment,
 };
 use serde::{Deserialize, Serialize};
@@ -111,7 +108,7 @@ impl<TYPES: NodeType, Ver: StaticVersionType> BuilderClient<TYPES, Ver> {
     /// # Errors
     /// - [`BuilderClientError::BlockNotFound`] if blocks aren't available for this parent
     /// - [`BuilderClientError::Api`] if API isn't responding or responds incorrectly
-    pub async fn available_blocks<V: Versions>(
+    pub async fn available_blocks(
         &self,
         parent: VidCommitment,
         view_number: u64,
@@ -159,13 +156,18 @@ pub mod v0_1 {
             signature: &<<TYPES as NodeType>::SignatureKey as SignatureKey>::PureAssembledSignatureType,
         ) -> Result<AvailableBlockHeaderInput<TYPES>, BuilderClientError> {
             let encoded_signature: TaggedBase64 = signature.clone().into();
-            self.client
-                .get(&format!(
-                    "{LEGACY_BUILDER_MODULE}/claimheaderinput/{block_hash}/{view_number}/{sender}/{encoded_signature}"
-                ))
-                .send()
-                .await
-                .map_err(Into::into)
+            let endpoint = &format!(
+                "{LEGACY_BUILDER_MODULE}/claimheaderinput/{block_hash}/{view_number}/{sender}/{encoded_signature}"
+            );
+
+            let response = reqwest::get(endpoint).await;
+            println!("reqwest response: {:?}", response);
+
+            println!("querying {}", endpoint);
+            self.client.get(endpoint).send().await.map_err(|err| {
+                println!("error: {:#}", err);
+                err.into()
+            })
         }
 
         /// Claim block

diff --git a/hotshot-task-impls/src/transactions.rs b/hotshot-task-impls/src/transactions.rs
@@ -634,7 +634,7 @@ impl<TYPES: NodeType, I: NodeImplementation<TYPES>, V: Versions> TransactionTask
             .enumerate()
             .map(|(builder_idx, client)| async move {
                 client
-                    .available_blocks::<V>(
+                    .available_blocks(
                         parent_comm,
                         view_number.u64(),
                         self.public_key.clone(),

diff --git a/hotshot-testing/tests/tests_1/block_builder.rs b/hotshot-testing/tests/tests_1/block_builder.rs
@@ -66,7 +66,7 @@ async fn test_random_block_builder() {
     let mut blocks = loop {
         // Test getting blocks
         let blocks = client
-            .available_blocks::<TestVersions>(
+            .available_blocks(
                 vid_commitment::<TestVersions>(&[], 1, version),
                 dummy_view_number,
                 pub_key,