Merge branch 'fix/burn-view' of https://github.com/stacks-network/stacks-core into fix/burn-view

Author: jcnelson

.github/workflows/bitcoin-tests.yml

@@ -142,6 +142,7 @@ jobs:
           - tests::signer::v0::incoming_signers_ignore_block_proposals
           - tests::signer::v0::outgoing_signers_ignore_block_proposals
           - tests::signer::v0::injected_signatures_are_ignored_across_boundaries
+          - tests::signer::v0::fast_sortition
           - tests::nakamoto_integrations::burn_ops_integration_test
           - tests::nakamoto_integrations::check_block_heights
           - tests::nakamoto_integrations::clarity_burn_state

stackslib/src/burnchains/bitcoin/indexer.rs

@@ -1100,8 +1100,10 @@ impl BurnchainIndexer for BitcoinIndexer {
         start_height: u64,
         end_height: Option<u64>,
     ) -> Result<u64, burnchain_error> {
-        if end_height.is_some() && end_height <= Some(start_height) {
-            return Ok(end_height.unwrap());
+        if let Some(end_height) = end_height {
+            if end_height <= start_height {
+                return Ok(end_height);
+            }
         }
 
         let new_height = self

stackslib/src/burnchains/tests/db.rs

@@ -59,7 +59,7 @@ impl BurnchainDB {
         let sql = "SELECT op FROM burnchain_db_block_ops WHERE block_hash = ?1";
         let args = params![block_hash];
         let mut ops: Vec<BlockstackOperationType> = query_rows(&self.conn, sql, args)?;
-        ops.sort_by(|a, b| a.vtxindex().cmp(&b.vtxindex()));
+        ops.sort_by_key(|op| op.vtxindex());
         Ok(ops)
     }
 

stackslib/src/chainstate/nakamoto/tests/mod.rs

@@ -3049,7 +3049,7 @@ fn filter_one_transaction_per_signer_duplicate_nonces() {
         txs.clone(),
     );
     let filtered_txs: Vec<_> = filtered_transactions.into_values().collect();
-    txs.sort_by(|a, b| a.txid().cmp(&b.txid()));
+    txs.sort_by_key(|tx| tx.txid());
     assert_eq!(filtered_txs.len(), 1);
     assert!(filtered_txs.contains(&txs.first().expect("failed to get first tx")));
 }

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

@@ -454,7 +454,9 @@ pub fn get_latest_block_proposal(
         info!("Consider block"; "signer_sighash" => %b.header.signer_signature_hash(), "is_latest_sortition" => is_latest, "chain_height" => b.header.chain_length);
     }
 
-    let (proposed_block, miner_addr, _) = proposed_blocks.pop().unwrap();
+    let Some((proposed_block, miner_addr, _)) = proposed_blocks.pop() else {
+        return Err("No block proposals found".into());
+    };
 
     let pubkey = StacksPublicKey::recover_to_pubkey(
         proposed_block.header.miner_signature_hash().as_bytes(),

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

@@ -53,6 +53,7 @@ use stacks::net::api::getaccount::AccountEntryResponse;
 use stacks::net::api::getcontractsrc::ContractSrcResponse;
 use stacks::net::api::getinfo::RPCPeerInfoData;
 use stacks::net::api::getpoxinfo::RPCPoxInfoData;
+use stacks::net::api::getsortition::SortitionInfo;
 use stacks::net::api::gettransaction_unconfirmed::UnconfirmedTransactionResponse;
 use stacks::net::api::postblock::StacksBlockAcceptedData;
 use stacks::net::api::postfeerate::RPCFeeEstimateResponse;
@@ -1351,7 +1352,7 @@ pub fn get_account_result<F: std::fmt::Display>(
     let client = reqwest::blocking::Client::new();
     let path = format!("{http_origin}/v2/accounts/{account}?proof=0");
     let res = client.get(&path).send()?.json::<AccountEntryResponse>()?;
-    info!("Account response: {res:#?}");
+    debug!("Account response: {res:#?}");
     Ok(Account {
         balance: u128::from_str_radix(&res.balance[2..], 16).unwrap(),
         locked: u128::from_str_radix(&res.locked[2..], 16).unwrap(),
@@ -1363,6 +1364,22 @@ pub fn get_account<F: std::fmt::Display>(http_origin: &str, account: &F) -> Acco
     get_account_result(http_origin, account).unwrap()
 }
 
+pub fn get_sortition_info(conf: &Config) -> SortitionInfo {
+    let client = reqwest::blocking::Client::new();
+    let http_origin = format!("http://{}", &conf.node.rpc_bind);
+    let path = format!("{http_origin}/v3/sortitions");
+    let mut resp: Vec<_> = client.get(&path).send().unwrap().json().unwrap();
+    resp.pop().unwrap()
+}
+
+pub fn get_sortition_info_ch(conf: &Config, ch: &ConsensusHash) -> SortitionInfo {
+    let client = reqwest::blocking::Client::new();
+    let http_origin = format!("http://{}", &conf.node.rpc_bind);
+    let path = format!("{http_origin}/v3/sortitions/consensus/{ch}");
+    let mut resp: Vec<_> = client.get(&path).send().unwrap().json().unwrap();
+    resp.pop().unwrap()
+}
+
 pub fn get_neighbors(conf: &Config) -> Option<serde_json::Value> {
     let client = reqwest::blocking::Client::new();
     let http_origin = format!("http://{}", &conf.node.rpc_bind);