@@ -288,16 +288,18 @@ export class PgStoreV2 extends BasePgStoreModule {
288
288
b.block_hash,
289
289
b.block_time,
290
290
b.block_height,
291
+ b.tx_count,
291
292
LAG(b.block_time) OVER (PARTITION BY b.burn_block_height ORDER BY b.block_height) AS previous_block_time
292
293
FROM blocks b
293
294
WHERE
294
295
canonical = true AND
295
296
b.burn_block_height IN (SELECT burn_block_height FROM RelevantBlocks)
296
297
),
297
- AverageTimes AS (
298
+ BlockStatistics AS (
298
299
SELECT
299
300
burn_block_height,
300
- AVG(block_time - previous_block_time) FILTER (WHERE previous_block_time IS NOT NULL) AS avg_block_time
301
+ AVG(block_time - previous_block_time) FILTER (WHERE previous_block_time IS NOT NULL) AS avg_block_time,
302
+ SUM(tx_count) AS total_tx_count
301
303
FROM BlocksWithPrevTime
302
304
GROUP BY burn_block_height
303
305
)
@@ -311,10 +313,11 @@ export class PgStoreV2 extends BasePgStoreModule {
311
313
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
312
314
) AS stacks_blocks,
313
315
(SELECT block_count FROM chain_tip)::int AS total,
314
- a.avg_block_time
316
+ a.avg_block_time,
317
+ a.total_tx_count
315
318
FROM RelevantBlocks r
316
319
JOIN BlocksWithPrevTime b ON b.burn_block_height = r.burn_block_height
317
- JOIN AverageTimes a ON a.burn_block_height = r.burn_block_height
320
+ JOIN BlockStatistics a ON a.burn_block_height = r.burn_block_height
318
321
ORDER BY r.burn_block_height DESC, b.block_height DESC;
319
322
` ;
320
323
return {
@@ -343,14 +346,16 @@ export class PgStoreV2 extends BasePgStoreModule {
343
346
block_hash,
344
347
block_time,
345
348
block_height,
349
+ tx_count,
346
350
LAG(block_time) OVER (PARTITION BY burn_block_height ORDER BY block_height) AS previous_block_time
347
351
FROM blocks
348
352
WHERE canonical = true AND ${ filter }
349
353
),
350
- AverageTimes AS (
354
+ BlockStatistics AS (
351
355
SELECT
352
356
burn_block_height,
353
- AVG(block_time - previous_block_time) FILTER (WHERE previous_block_time IS NOT NULL) AS avg_block_time
357
+ AVG(block_time - previous_block_time) FILTER (WHERE previous_block_time IS NOT NULL) AS avg_block_time,
358
+ SUM(tx_count) AS total_tx_count
354
359
FROM BlocksWithPrevTime
355
360
GROUP BY burn_block_height
356
361
)
@@ -363,9 +368,10 @@ export class PgStoreV2 extends BasePgStoreModule {
363
368
ORDER BY b.block_height DESC
364
369
ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
365
370
) AS stacks_blocks,
366
- a.avg_block_time
371
+ a.avg_block_time,
372
+ a.total_tx_count
367
373
FROM BlocksWithPrevTime b
368
- JOIN AverageTimes a ON a.burn_block_height = b.burn_block_height
374
+ JOIN BlockStatistics a ON a.burn_block_height = b.burn_block_height
369
375
LIMIT 1
370
376
` ;
371
377
if ( blockQuery . count > 0 ) return blockQuery [ 0 ] ;
0 commit comments