fix: Varoius fixes so that /v3/signer/ endpoint works now

Author: jbencin

stackslib/src/chainstate/nakamoto/mod.rs

@@ -3305,16 +3305,7 @@ impl NakamotoChainState {
             "SELECT blocks_signed FROM signer_stats WHERE public_key = ?1 AND reward_cycle = ?2";
         let params = params![serde_json::to_string(&signer_pubkey).unwrap(), reward_cycle];
         chainstate_db
-            .query_row(sql, params, |row| {
-                let value: String = row.get(2)?;
-                value.parse::<u64>().map_err(|e| {
-                    rusqlite::Error::FromSqlConversionFailure(
-                        size_of::<u64>(),
-                        rusqlite::types::Type::Integer,
-                        e.into(),
-                    )
-                })
-            })
+            .query_row(sql, params, |row| row.get("blocks_signed"))
             .optional()
             .map(Option::unwrap_or_default) // It's fine to map `NONE` to `0`, because it's impossible to have `Some(0)`
             .map_err(ChainstateError::from)

stackslib/src/chainstate/stacks/db/mod.rs

@@ -298,14 +298,14 @@ impl DBConfig {
         });
         match epoch_id {
             StacksEpochId::Epoch10 => true,
-            StacksEpochId::Epoch20 => version_u32 >= 1 && version_u32 <= 6,
-            StacksEpochId::Epoch2_05 => version_u32 >= 2 && version_u32 <= 6,
-            StacksEpochId::Epoch21 => version_u32 >= 3 && version_u32 <= 6,
-            StacksEpochId::Epoch22 => version_u32 >= 3 && version_u32 <= 6,
-            StacksEpochId::Epoch23 => version_u32 >= 3 && version_u32 <= 6,
-            StacksEpochId::Epoch24 => version_u32 >= 3 && version_u32 <= 6,
-            StacksEpochId::Epoch25 => version_u32 >= 3 && version_u32 <= 6,
-            StacksEpochId::Epoch30 => version_u32 >= 3 && version_u32 <= 6,
+            StacksEpochId::Epoch20 => version_u32 >= 1 && version_u32 <= 7,
+            StacksEpochId::Epoch2_05 => version_u32 >= 2 && version_u32 <= 7,
+            StacksEpochId::Epoch21 => version_u32 >= 3 && version_u32 <= 7,
+            StacksEpochId::Epoch22 => version_u32 >= 3 && version_u32 <= 7,
+            StacksEpochId::Epoch23 => version_u32 >= 3 && version_u32 <= 7,
+            StacksEpochId::Epoch24 => version_u32 >= 3 && version_u32 <= 7,
+            StacksEpochId::Epoch25 => version_u32 >= 3 && version_u32 <= 7,
+            StacksEpochId::Epoch30 => version_u32 >= 3 && version_u32 <= 7,
         }
     }
 }

stackslib/src/net/api/getsigner.rs

@@ -61,10 +61,8 @@ impl HttpRequest for GetSignerRequestHandler {
     }
 
     fn path_regex(&self) -> Regex {
-        Regex::new(
-            r#"^/v3/stacker_set/(?P<signer_pubkey>[0-9a-f]{66})/(?P<cycle_num>[0-9]{1,10})$"#,
-        )
-        .unwrap()
+        Regex::new(r#"^/v3/signer/(?P<signer_pubkey>[0-9a-f]{66})/(?P<cycle_num>[0-9]{1,10})$"#)
+            .unwrap()
     }
 
     fn metrics_identifier(&self) -> &str {

stackslib/src/net/api/mod.rs

@@ -125,6 +125,7 @@ impl StacksHttp {
         self.register_rpc_endpoint(
             gettransaction_unconfirmed::RPCGetTransactionUnconfirmedRequestHandler::new(),
         );
+        self.register_rpc_endpoint(getsigner::GetSignerRequestHandler::default());
         self.register_rpc_endpoint(
             liststackerdbreplicas::RPCListStackerDBReplicasRequestHandler::new(),
         );

testnet/stacks-node/src/tests/nakamoto_integrations.rs

@@ -7983,14 +7983,15 @@ fn v3_signer_api_endpoint() {
     let http_origin = format!("http://{}", &conf.node.rpc_bind);
 
     let get_v3_signer = |pubkey: &Secp256k1PublicKey, reward_cycle: u64| {
-        let url = format!(
+        let url = &format!(
             "{http_origin}/v3/signer/{pk}/{reward_cycle}",
             pk = pubkey.to_hex()
         );
-        info!("Sending GET {url}");
+        info!("Send request: GET {url}");
         reqwest::blocking::get(url)
             .unwrap_or_else(|e| panic!("GET request failed: {e}"))
             .text()
+            .inspect(|response| info!("Recieved response: GET {url} -> {response}"))
             .expect("Empty response")
             .parse::<u64>()
             .unwrap_or_else(|e| panic!("Failed to parse response as `u64`: {e}"))