fix: prefer a higher principal_tx count bug

Author: zone117x

src/datastore/postgres-store.ts

@@ -5542,14 +5542,14 @@ export class PgDataStore
         // join against `txs` to get the full transaction objects only for that page.
         `
         WITH stx_txs AS (
-          SELECT tx_id
+          SELECT tx_id, ${countOverColumn()}
           FROM principal_stx_txs
           WHERE principal = $1 AND ${blockCond}
           ORDER BY block_height DESC, microblock_sequence DESC, tx_index DESC
           LIMIT $2
           OFFSET $3
         )
-        SELECT ${txColumns()}, ${abiColumn()}, ${countOverColumn()}
+        SELECT ${txColumns()}, ${abiColumn()}, count
         FROM stx_txs
         INNER JOIN txs
           ON (stx_txs.tx_id = txs.tx_id

src/tests/api-tests.ts

@@ -4933,7 +4933,7 @@ describe('api tests', () => {
     const expectedResp4 = {
       limit: 20,
       offset: 0,
-      total: 5,
+      total: 6,
       results: [
         {
           tx_id: '0x12340005',
@@ -5592,7 +5592,7 @@ describe('api tests', () => {
     );
     expect(unanchoredResult.status).toBe(200);
     expect(unanchoredResult.type).toBe('application/json');
-    expect(JSON.parse(unanchoredResult.text).total).toEqual(50); // 60 txs up to unanchored block_height=3
+    expect(JSON.parse(unanchoredResult.text).total).toEqual(60); // 60 txs up to unanchored block_height=3
     expect(JSON.parse(unanchoredResult.text).results.length).toEqual(50);
   });
 

src/tests/datastore-tests.ts

@@ -975,7 +975,7 @@ describe('postgres datastore', () => {
       atSingleBlock: false,
     });
 
-    expect(addrEResult.total).toBe(3);
+    expect(addrEResult.total).toBe(5);
 
     const mapAddrTxResults = (txs: DbTx[]) => {
       return txs.map(tx => ({
@@ -1129,8 +1129,8 @@ describe('postgres datastore', () => {
       atSingleBlock: false,
     });
 
-    expect(addrAAtBlockResult.total).toBe(3);
-    expect(addrAAllBlockResult.total).toBe(7);
+    expect(addrAAtBlockResult.total).toBe(4);
+    expect(addrAAllBlockResult.total).toBe(9);
   });
 
   test('pg get address asset events', async () => {