Merge pull request #2346 from hirosystems/develop

release to master

Author: rafaelcr

src/api/controllers/db-controller.ts

@@ -168,7 +168,7 @@ export function getTxTypeId(typeString: Transaction['tx_type']): DbTxTypeId[] {
     case 'poison_microblock':
       return [DbTxTypeId.PoisonMicroblock];
     case 'coinbase':
-      return [DbTxTypeId.Coinbase, DbTxTypeId.CoinbaseToAltRecipient];
+      return [DbTxTypeId.Coinbase, DbTxTypeId.CoinbaseToAltRecipient, DbTxTypeId.NakamotoCoinbase];
     case 'tenure_change':
       return [DbTxTypeId.TenureChange];
     default:

src/datastore/pg-store-v2.ts

@@ -966,7 +966,7 @@ export class PgStoreV2 extends BasePgStoreModule {
         WHERE ps.canonical = TRUE 
           AND ps.cycle_number = ${cycleNumber} 
           AND ps.signing_key = ${signerKey}
-        ORDER BY locked DESC
+        ORDER BY locked DESC, stacker ASC
         LIMIT ${limit}
         OFFSET ${offset}
       `;

tests/api/tx.test.ts

@@ -2698,6 +2698,24 @@ describe('tx tests', () => {
       .build();
     await db.update(block3);
 
+    const block4 = new TestBlockBuilder({
+      block_height: 4,
+      index_block_hash: '0x04',
+      parent_block_hash: block3.block.block_hash,
+      parent_index_block_hash: block3.block.index_block_hash,
+      burn_block_time: 1740000000,
+    })
+      .addTx({
+        tx_id: '0x4234',
+        fee_rate: 4n,
+        sender_address: testSendertAddr,
+        nonce: 4,
+        type_id: DbTxTypeId.NakamotoCoinbase,
+        coinbase_vrf_proof: '0x01',
+      })
+      .build();
+    await db.update(block4);
+
     const filterTypes: TransactionType[] = ['coinbase', 'poison_microblock', 'token_transfer'];
     const txsReq1 = await supertest(api.server).get(
       `/extended/v1/tx?type=${filterTypes.join(',')}`
@@ -2706,6 +2724,9 @@ describe('tx tests', () => {
     expect(txsReq1.body).toEqual(
       expect.objectContaining({
         results: [
+          expect.objectContaining({
+            tx_id: block4.txs[0].tx.tx_id,
+          }),
           expect.objectContaining({
             tx_id: block3.txs[0].tx.tx_id,
           }),