Merge branch 'fix/mempool-query' into fix/mempool-query-errors

Author: obycode

stacks-common/src/util/lru_cache.rs

@@ -5031,7 +5031,7 @@ fn paramaterized_mempool_walk_test(
 #[test]
 /// Test that the mempool walk query ignores old nonces and prefers next possible nonces before higher global fees.
 fn mempool_walk_test_next_nonce_with_highest_fee_rate_strategy() {
-    let key_address_pairs: Vec<(Secp256k1PrivateKey, StacksAddress)> = (0..7)
+    let key_address_pairs: Vec<_> = (0..7)
         .map(|_user_index| {
             let privk = StacksPrivateKey::random();
             let addr = StacksAddress::from_public_keys(

stackslib/src/chainstate/stacks/tests/block_construction.rs

@@ -1616,6 +1616,15 @@ impl MemPoolDB {
             .query(NO_PARAMS)
             .map_err(Error::SqliteError)?;
 
+        // Here we have a nested loop to walk the mempool.
+        //
+        // The `GlobalFeeRate` strategy includes all transactions, so we just
+        // query once and walk the full mempool in the inner loop.
+        //
+        // The `NextNonceWithHighestFeeRate` strategy only selects transactions
+        // that have the next expected nonce, so we need to re-query the
+        // mempool after one batch has been processed and the nonce table has
+        // been updated. This is handled in the outer loop.
         let stop_reason = loop {
             let mut state_changed = false;
 
@@ -1902,7 +1911,11 @@ impl MemPoolDB {
             };
 
             // If we've reached the end of the mempool, or if we've stopped
-            // iterating for some other reason, break out of the loop
+            // iterating for some other reason, break out of the loop. In the
+            // case of `NextNonceWithHighestFeeRate` we know we've reached the
+            // end of the mempool if the state has not changed. In the case of
+            // `GlobalFeeRate` we know we've reached the end of the mempool if
+            // the stop reason is `NoMoreCandidates`.
             if settings.strategy != MemPoolWalkStrategy::NextNonceWithHighestFeeRate
                 || stop_reason != MempoolIterationStopReason::NoMoreCandidates
                 || !state_changed

stackslib/src/core/mempool.rs

@@ -32,10 +32,10 @@ use crate::chainstate::burn::ConsensusHash;
 pub mod mempool;
 pub mod nonce_cache;
 
+#[cfg(any(test, feature = "testing"))]
+pub mod test_util;
 #[cfg(test)]
 pub mod tests;
-#[cfg(any(test, feature = "testing"))]
-pub mod util;
 
 use std::cmp::Ordering;
 pub type StacksEpoch = GenericStacksEpoch<ExecutionCost>;

stackslib/src/core/mod.rs

@@ -266,13 +266,7 @@ pub fn make_contract_publish_microblock_only(
 }
 
 pub fn to_addr(sk: &StacksPrivateKey) -> StacksAddress {
-    StacksAddress::from_public_keys(
-        C32_ADDRESS_VERSION_TESTNET_SINGLESIG,
-        &AddressHashMode::SerializeP2PKH,
-        1,
-        &vec![StacksPublicKey::from_private(sk)],
-    )
-    .unwrap()
+    StacksAddress::p2pkh(false, &StacksPublicKey::from_private(sk))
 }
 
 pub fn make_stacks_transfer(

stackslib/src/core/util.rs renamed to stackslib/src/core/test_util.rs

@@ -65,7 +65,7 @@ use crate::core::mempool::{
     db_get_all_nonces, MemPoolSyncData, MemPoolWalkSettings, MemPoolWalkTxTypes, TxTag,
     BLOOM_COUNTER_DEPTH, BLOOM_COUNTER_ERROR_RATE, MAX_BLOOM_COUNTER_TXS,
 };
-use crate::core::util::{insert_tx_in_mempool, make_stacks_transfer, to_addr};
+use crate::core::test_util::{insert_tx_in_mempool, make_stacks_transfer, to_addr};
 use crate::core::{FIRST_BURNCHAIN_CONSENSUS_HASH, FIRST_STACKS_BLOCK_HASH};
 use crate::net::Error as NetError;
 use crate::util_lib::bloom::test::setup_bloom_counter;

stackslib/src/core/tests/mod.rs

@@ -43,7 +43,7 @@ use crate::chainstate::stacks::{
     TransactionPayload, TransactionVersion,
 };
 use crate::clarity::vm::types::StacksAddressExtensions;
-use crate::core::util::to_addr;
+use crate::core::test_util::to_addr;
 use crate::net::api::gettenureinfo::RPCGetTenureInfo;
 use crate::net::download::nakamoto::{TenureStartEnd, WantedTenure, *};
 use crate::net::inv::nakamoto::NakamotoTenureInv;

stackslib/src/net/tests/download/nakamoto.rs

@@ -43,7 +43,7 @@ use crate::chainstate::stacks::{
     TransactionAuth, TransactionPayload, TransactionVersion,
 };
 use crate::clarity::vm::types::StacksAddressExtensions;
-use crate::core::util::to_addr;
+use crate::core::test_util::to_addr;
 use crate::core::StacksEpochExtension;
 use crate::net::inv::nakamoto::{InvGenerator, NakamotoInvStateMachine, NakamotoTenureInv};
 use crate::net::neighbors::comms::NeighborComms;

stackslib/src/net/tests/inv/nakamoto.rs

@@ -32,7 +32,7 @@ use crate::burnchains::*;
 use crate::chainstate::nakamoto::coordinator::tests::make_token_transfer;
 use crate::chainstate::stacks::test::*;
 use crate::chainstate::stacks::*;
-use crate::core::util::to_addr;
+use crate::core::test_util::to_addr;
 use crate::core::StacksEpochExtension;
 use crate::net::atlas::*;
 use crate::net::codec::*;

stackslib/src/net/tests/mempool/mod.rs

@@ -14,7 +14,7 @@ use stacks::chainstate::stacks::{
     StacksBlockHeader, StacksPrivateKey, StacksTransaction, TransactionPayload,
 };
 use stacks::config::{EventKeyType, InitialBalance};
-use stacks::core::util::{
+use stacks::core::test_util::{
     make_contract_call, make_contract_call_mblock_only, make_contract_publish,
     make_contract_publish_microblock_only, to_addr,
 };