chore: merge

Author: rafaelcr

stackslib/src/core/mempool.rs

@@ -1559,28 +1559,13 @@ impl MemPoolDB {
                         ELSE fee_rate
                     END AS sort_fee_rate
                 FROM mempool AS m
-                LEFT JOIN nonces AS no ON m.origin_address = no.address
-                LEFT JOIN nonces AS ns ON m.sponsor_address = ns.address
-                WHERE (no.address IS NULL OR m.origin_nonce = no.nonce)
-                    AND (ns.address IS NULL OR m.sponsor_nonce = ns.nonce)
-                ORDER BY fee_rate DESC
-                LIMIT 1024
-            ),
-            address_nonce_ranked AS (
-                SELECT *,
-                    ROW_NUMBER() OVER (
-                        PARTITION BY origin_address
-                        ORDER BY origin_nonce ASC, sort_fee_rate DESC
-                    ) AS origin_rank,
-                    ROW_NUMBER() OVER (
-                        PARTITION BY sponsor_address
-                        ORDER BY sponsor_nonce ASC, sort_fee_rate DESC
-                    ) AS sponsor_rank
-                FROM nonce_filtered
+                LEFT JOIN nonces AS no ON m.origin_address = no.address AND m.origin_nonce = no.nonce
+                LEFT JOIN nonces AS ns ON m.sponsor_address = ns.address AND m.sponsor_nonce = ns.nonce
+                ORDER BY accept_time ASC
+                LIMIT 300
             )
             SELECT txid, origin_nonce, origin_address, sponsor_nonce, sponsor_address, fee_rate
-            FROM address_nonce_ranked
-            ORDER BY origin_rank ASC, sponsor_rank ASC, sort_fee_rate DESC
+            FROM nonce_filtered ORDER BY sort_fee_rate DESC
             ";
             let mut query_stmt_nonce_rank = self.db.prepare(&sql).map_err(Error::SqliteError)?;
             let mut nonce_rank_iterator = query_stmt_nonce_rank