refactor and address all warnings

Author: disassembler

src/api.rs

@@ -1,125 +1,25 @@
-// shadowharvester/src/api.rs
+// src/api.rs
 
-use serde::{Deserialize, Serialize};
-use reqwest;
 use reqwest::blocking;
-use serde_json;
 
-// FIX: Import MOCK constants from the new module
-use crate::constants::USER_AGENT;
+// FIX: Import structs from the new module location
+use crate::data_types::{
+    TandCResponse, RegistrationReceipt, ChallengeData, ChallengeResponse,
+    SolutionReceipt, DonateResponse, Statistics, StatisticsApiResponse, CliChallengeData, ApiErrorResponse
+};
 
-// --- RESPONSE STRUCTS ---
-
-#[derive(Debug, Deserialize)]
-pub struct TandCResponse {
-    pub version: String,
-    pub content: String,
-    pub message: String,
-}
-
-#[derive(Debug, Deserialize)]
-pub struct RegistrationReceipt {
-    #[serde(rename = "registrationReceipt")]
-    pub registration_receipt: serde_json::Value,
-}
-
-#[derive(Debug, Deserialize, Serialize, Clone)]
-pub struct ChallengeData {
-    pub challenge_id: String,
-    pub difficulty: String,
-    #[serde(rename = "no_pre_mine")]
-    pub no_pre_mine_key: String,
-    #[serde(rename = "no_pre_mine_hour")]
-    pub no_pre_mine_hour_str: String,
-    pub latest_submission: String,
-    // NEW: Fields for listing command
-    pub challenge_number: u16,
-    pub day: u8,
-    pub issued_at: String,
-}
-
-#[derive(Debug, Deserialize)]
-pub struct ChallengeResponse { // Made struct public for use in main.rs
-    pub code: String,
-    pub challenge: Option<ChallengeData>,
-    pub starts_at: Option<String>,
-    // NEW: Fields for listing command (overall status)
-    pub mining_period_ends: Option<String>,
-    pub max_day: Option<u8>,
-    pub total_challenges: Option<u16>,
-    pub current_day: Option<u8>,
-    pub next_challenge_starts_at: Option<String>,
-}
-
-#[derive(Debug, Deserialize, PartialEq)]
-pub struct SolutionReceipt {
-    #[serde(rename = "crypto_receipt")]
-    pub crypto_receipt: serde_json::Value,
-}
-
-#[derive(Debug, Deserialize, PartialEq)]
-pub struct DonateResponse {
-    pub status: String,
-    #[serde(rename = "donation_id")]
-    pub donation_id: String,
-}
-
-
-#[derive(Debug, Deserialize)]
-struct ApiErrorResponse {
-    pub message: String,
-    pub error: Option<String>,
-    pub statusCode: Option<u16>,
-}
+// --- API FUNCTIONS ---
 
-#[derive(Debug, Deserialize)]
-pub struct GlobalStatistics {
-    pub wallets: u32,
-    pub challenges: u16,
-    #[serde(rename = "total_challenges")]
-    pub total_challenges: u16,
-    #[serde(rename = "total_crypto_receipts")]
-    pub total_crypto_receipts: u32,
-    #[serde(rename = "recent_crypto_receipts")]
-    pub recent_crypto_receipts: u32,
-}
+/// Fetches the T&C from the API, returning the full response object.
+pub fn fetch_tandc(client: &blocking::Client, api_url: &str) -> Result<TandCResponse, reqwest::Error> {
+    let url = format!("{}/TandC/1-0", api_url);
+    println!("-> Fetching Terms and Conditions from: {}", url);
 
-// NEW: Struct for the statistics under the "local" key
-#[derive(Debug, Deserialize)]
-pub struct LocalStatistics {
-    pub crypto_receipts: u32,
-    pub night_allocation: u32,
-}
+    let response = client.get(url).send()?;
 
-// NEW: Struct representing the entire JSON response from the /statistics/:address endpoint
-#[derive(Debug, Deserialize)]
-pub struct StatisticsApiResponse {
-    pub global: GlobalStatistics,
-    pub local: LocalStatistics,
-}
+    let response = response.error_for_status()?;
 
-#[derive(Debug)]
-pub struct Statistics {
-    // Local Address (Added by the client)
-    pub local_address: String,
-    // Global fields
-    pub wallets: u32,
-    pub challenges: u16,
-    pub total_challenges: u16,
-    pub total_crypto_receipts: u32,
-    pub recent_crypto_receipts: u32,
-    // Local fields
-    pub crypto_receipts: u32,
-    pub night_allocation: u32,
-}
-// NEW: Struct for the challenge parameters provided via CLI
-#[derive(Debug, Clone)]
-pub struct CliChallengeData {
-    pub challenge_id: String,
-    pub no_pre_mine_key: String,
-    pub difficulty: String,
-    pub no_pre_mine_hour_str: String,
-    pub latest_submission: String,
+    response.json()
 }
 
 // NEW FUNCTION: Parses the comma-separated CLI challenge string
@@ -143,20 +43,6 @@ pub fn parse_cli_challenge_string(challenge_str: &str) -> Result<CliChallengeDat
 }
 
 
-// --- API FUNCTIONS ---
-
-/// Fetches the T&C from the API, returning the full response object.
-pub fn fetch_tandc(client: &blocking::Client, api_url: &str) -> Result<TandCResponse, reqwest::Error> {
-    let url = format!("{}/TandC/1-0", api_url);
-    println!("-> Fetching Terms and Conditions from: {}", url);
-
-    let response = client.get(url).send()?;
-
-    let response = response.error_for_status()?;
-
-    response.json()
-}
-
 /// Performs the POST /register call using key/signature arguments.
 // RENAMED from register_address_mock
 pub fn register_address(
@@ -191,34 +77,17 @@ pub fn register_address(
     Ok(())
 }
 
-/// Fetches the current challenge parameters from the API.
-pub fn fetch_challenge(client: &blocking::Client, api_url: &str) -> Result<ChallengeData, String> {
-    let url = format!("{}/challenge", api_url);
-    println!("-> Fetching current challenge from: {}", url);
-
-    let response = client.get(url).send().map_err(|e| format!("API request failed: {}", e))?;
+/// Helper to format a detailed error message from the API response body.
+fn format_detailed_api_error(err: ApiErrorResponse, status: reqwest::StatusCode) -> String {
+    let mut msg = format!("(Status {}) {}", status.as_u16(), err.message);
 
-    if !response.status().is_success() {
-        return Err(format!("Challenge API returned non-success status: {}", response.status()));
+    if let Some(e) = err.error {
+        msg.push_str(&format!(" [Type: {}]", e));
     }
-
-    let challenge_response: ChallengeResponse = response.json().map_err(|e| format!("JSON parsing failed: {}", e))?;
-
-    match challenge_response.code.as_str() {
-        "active" => {
-            Ok(challenge_response.challenge.unwrap())
-        }
-        "before" => {
-            let start_time = challenge_response.starts_at.unwrap_or_default();
-            Err(format!("MINING IS NOT YET ACTIVE. Starts at: {}", start_time))
-        }
-        "after" => {
-            Err("MINING PERIOD HAS ENDED.".to_string())
-        }
-        _ => {
-            Err(format!("Received unexpected challenge code: {}", challenge_response.code))
-        }
+    if let Some(code) = err.status_code {
+        msg.push_str(&format!(" [API Code: {}]", code));
     }
+    msg
 }
 
 /// Performs the POST /solution call.
@@ -258,8 +127,8 @@ pub fn submit_solution(
 
         match api_error {
             Ok(err) => {
-                // API returned a structured error message (e.g., Not registered, Invalid difficulty)
-                Err(format!("API Validation Failed (Status {}): {}", status.as_u16(), err.message))
+                // FIX: Use all error fields for detailed reporting
+                Err(format!("API Validation Failed: {}", format_detailed_api_error(err, status)))
             }
             Err(_) => {
                 // API returned a non-structured error (e.g., plain text or unreadable JSON)
@@ -288,7 +157,6 @@ pub fn donate_to(
     );
 
     println!("-> Donating funds from {} to {}", original_address, destination_address);
-    println!("url: {}", &url);
 
     let response = client
         .post(&url)
@@ -308,7 +176,8 @@ pub fn donate_to(
 
         match api_error {
             Ok(err) => {
-                Err(format!("Donation Failed (Status {}): {}", status.as_u16(), err.message))
+                // FIX: Use all error fields for detailed reporting
+                Err(format!("Donation Failed: {}", format_detailed_api_error(err, status)))
             }
             Err(_) => {
                 Err(format!("HTTP Error {} with unparseable body: {}", status.as_u16(), body_text))
@@ -335,7 +204,7 @@ pub fn fetch_challenge_status(client: &blocking::Client, api_url: &str) -> Resul
 /// Fetches and validates the active challenge parameters, returning data only if active.
 // RENAMED from fetch_challenge
 pub fn get_active_challenge_data(client: &blocking::Client, api_url: &str) -> Result<ChallengeData, String> {
-    let challenge_response = fetch_challenge_status(&client, api_url)?;
+    let challenge_response = fetch_challenge_status(client, api_url)?;
 
     match challenge_response.code.as_str() {
         "active" => {
@@ -378,19 +247,19 @@ pub fn fetch_statistics(client: &blocking::Client, api_url: &str, address: &str)
             wallets: api_data.global.wallets,
             challenges: api_data.global.challenges,
             total_challenges: api_data.global.total_challenges,
-            total_crypto_receipts: api_data.global.total_crypto_receipts,
             recent_crypto_receipts: api_data.global.recent_crypto_receipts,
+            total_crypto_receipts: api_data.global.total_crypto_receipts,
             crypto_receipts: api_data.local.crypto_receipts,
             night_allocation: api_data.local.night_allocation,
         })
     } else {
         let body_text = response.text().unwrap_or_else(|_| format!("(Could not read response body for status {})", status));
-        // ... (error handling omitted)
         let api_error: Result<ApiErrorResponse, _> = serde_json::from_str(&body_text);
 
         match api_error {
             Ok(err) => {
-                Err(format!("API Error (Status {}): {}", status.as_u16(), err.message))
+                // FIX: Use all error fields for detailed reporting
+                Err(format!("API Error: {}", format_detailed_api_error(err, status)))
             }
             Err(_) => {
                 Err(format!("HTTP Error {} with unparseable body: {}", status.as_u16(), body_text))

src/cardano.rs

@@ -11,8 +11,8 @@ use cryptoxide::{hmac::Hmac, pbkdf2::pbkdf2, sha2::Sha512};
 use minicbor::*;
 
 use rand_core::{OsRng};
-use bip39::{Language, Mnemonic};
-use ed25519_bip32::{self, XPrv, XPub, XPRV_SIZE};
+use bip39::Mnemonic;
+use ed25519_bip32::{self, XPrv, XPRV_SIZE};
 
 pub enum FlexibleSecretKey {
     Standard(SecretKey),
@@ -128,7 +128,7 @@ pub struct CoseSignData<'a> {
     pub payload: &'a [u8],
 }
 
-impl<'a, C> Encode<C> for CoseSignData<'a>
+impl<C> Encode<C> for CoseSignData<'_>
 where
     C: Default,
 {
@@ -150,11 +150,11 @@ pub struct CoseSign1<'a> {
     pub signature: &'a [u8],
 }
 
-impl<'a, C> Encode<C> for CoseSign1<'a>
+impl<C> Encode<C> for CoseSign1<'_>
 where
     C: Default,
 {
-    fn encode<W: encode::Write>(&self, e: &mut Encoder<W>, ctx: &mut C) -> Result<(), encode::Error<W::Error>> {
+    fn encode<W: encode::Write>(&self, e: &mut Encoder<W>, _ctx: &mut C) -> Result<(), encode::Error<W::Error>> {
         e.array(4)?;
         e.bytes(self.protected_header)?;
         e.map(1)?;
@@ -176,7 +176,7 @@ where
 /// but the signature and public key components are guaranteed to be unique.
 pub fn cip8_sign(kp: &KeyPairAndAddress, message: &str) -> (String, String) {
 
-    let pubkey = hex::encode(&kp.1.as_ref());
+    let pubkey = hex::encode(kp.1.as_ref());
     let prot_header = CoseProtHeader {
         address: kp.2.to_vec(),
     };
@@ -185,7 +185,7 @@ pub fn cip8_sign(kp: &KeyPairAndAddress, message: &str) -> (String, String) {
         label: "Signature1",
         protected_header: &cose_prot_cbor,
         external_aad: b"" ,
-        payload: &message.as_bytes(),
+        payload: message.as_bytes(),
     };
     let to_sign_cbor = pallas::codec::minicbor::to_vec(&to_sign).unwrap();
     // The specific error type the compiler couldn't figure out. Let's use &'static str
@@ -207,8 +207,8 @@ pub fn cip8_sign(kp: &KeyPairAndAddress, message: &str) -> (String, String) {
 
     let cose_struct = CoseSign1 {
         protected_header: &cose_prot_cbor,
-        payload: &message.as_bytes(),
-        signature: &sig.as_ref(),
+        payload: message.as_bytes(),
+        signature: sig.as_ref(),
     };
     let cose_sign1_cbor = pallas::codec::minicbor::to_vec(&cose_struct).unwrap();
 

src/cli.rs

@@ -1,4 +1,4 @@
-// shadowharvester/src/cli.rs
+// src/cli.rs
 
 use clap::{Parser, Subcommand};
 
@@ -24,15 +24,19 @@ pub struct Cli {
     #[arg(long, default_value_t = 24)]
     pub threads: u32,
 
-    /// NEW: Optional secret key (hex-encoded) to mine with. If passed, only solves once.
+    /// Optional secret key (hex-encoded) to mine with.
     #[arg(long)]
     pub payment_key: Option<String>,
 
-    /// NEW: Cardano address (bech32) to donate all accumulated rewards to.
+    /// NEW: Automatically generate a new ephemeral key pair for every mining cycle.
+    #[arg(long)]
+    pub ephemeral_key: bool,
+
+    /// Cardano address (bech32) to donate all accumulated rewards to.
     #[arg(long)]
     pub donate_to: Option<String>,
 
-    /// NEW: 24-word BIP39 mnemonic phrase for sequential address generation.
+    /// 24-word BIP39 mnemonic phrase for sequential address generation.
     #[arg(long)]
     pub mnemonic: Option<String>,
 
@@ -56,7 +60,7 @@ pub struct Cli {
 
 #[derive(Subcommand, Debug, Clone)]
 pub enum Commands {
-    /// NEW: Lists the current status and details of the mining challenge.
+    /// Lists the current status and details of the mining challenge.
     #[command(author, about = "List current challenge status")]
     Challenges,
 }

src/constants.rs

@@ -1,14 +1,4 @@
 // shadowharvester/src/constants.rs
 
-/// Placeholder Ed25519 Public Key (64-character hex string) for mock registration.
-pub const MOCK_PUBKEY: &str = "009236f53f5fbb1056defb64d623f7508bc1b61822016d43faf62070f1489ff5";
-
-/// Placeholder CIP-30 Signature (long CBOR hex string) for mock registration.
-/// This signature must be generated over the official T&C message.
-pub const MOCK_SIGNATURE: &str = "845882a30127045839001c2e057143337716055394074256b79df7fc36051802ccefc1b2d3bf2a77372b1cff16a2cfe1e9a634bfaae3c74e8c8188e6043f572295f067616464726573735839001c2e057143337716055394074256b79df7fc36051802ccefc1b2d3bf2a77372b1cff16a2cfe1e9a634bfaae3c74e8c8188e6043f572295f0a166686173686564f458b34920616772656520746f20616269646520627920746865207465726d7320616e6420636f6e646974696f6e732061732064657363726962656420696e2076657273696f6e20312d30206f6620746865204d69646e696768742073636176656e676572206d96e69676874";
-
-/// Placeholder CIP-30 Signature for the donation message.
-pub const DONATE_MESSAGE_SIG: &str = "845882a3012704583900d91c05fb2f3c47e7fbb3c657775d9d189daaa468683ff7852c8ce674cc91d284f1635432c18613b194bd1900db1bf11e4bb9fb40dc0a70da6761646472657373583900d91c05fb2f3c47e7fbb3c657775d9d189daaa468683ff7852c8ce674cc91d284f1635432c18613b194bd1900db1bf11e4bb9fb40dc0a70daa166686173686564f4589441737369676e20616363756d756c617465642053636176656e6765722072696768747320746f3a20616464725f7465737431717134646c336e6872306178757267637270756e39787970303470643272326477753578376565616d3938707376366468786c6465387563636c7632703436686d303737647334767a656c66353536356667336b79373934756872713575703068655840514b869f06b1d86b61781291bef81753b118cf9f11a13ee4824ff151cda4529c1580ab465c1aae5153bc18d94de71978221e6d714dd2329634e5733946c39103";
-
 // UserAgent String
 pub const USER_AGENT: &str = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.0.0 Safari/537.36";