fix: issue with block_time receipt not being written to db (#1961)

* fix: issue with block_time receipt not being written to db

* chore: fix tests

Author: zone117x

src/datastore/common.ts

@@ -1257,6 +1257,7 @@ export interface BlockInsertValues {
   parent_microblock_hash: PgBytea;
   parent_microblock_sequence: number;
   block_height: number;
+  block_time: number;
   burn_block_time: number;
   burn_block_hash: PgBytea;
   burn_block_height: number;

src/datastore/pg-write-store.ts

@@ -465,6 +465,7 @@ export class PgWriteStore extends PgStore {
       parent_microblock_hash: block.parent_microblock_hash,
       parent_microblock_sequence: block.parent_microblock_sequence,
       block_height: block.block_height,
+      block_time: block.block_time,
       burn_block_time: block.burn_block_time,
       burn_block_hash: block.burn_block_hash,
       burn_block_height: block.burn_block_height,
@@ -3056,6 +3057,7 @@ export class PgWriteStore extends PgStore {
   async insertBlockBatch(sql: PgSqlClient, blocks: DbBlock[]) {
     const values: BlockInsertValues[] = blocks.map(block => ({
       block_hash: block.block_hash,
+      block_time: block.block_time,
       index_block_hash: block.index_block_hash,
       parent_index_block_hash: block.parent_index_block_hash,
       parent_block_hash: block.parent_block_hash,

src/event-stream/event-server.ts

@@ -252,7 +252,7 @@ async function handleBlockMessage(
     // TODO: if the core node can give use the stacks-block count/index for the current tenure/burn_block then we should
     // increment this by that value so that timestampts increase monotonically.
     const stacksBlockReceiptDate = db.isEventReplay
-      ? msg.parent_burn_block_timestamp
+      ? msg.burn_block_time
       : Math.round(Date.now() / 1000);
     blockData.block_time = stacksBlockReceiptDate;
   }
@@ -320,7 +320,7 @@ async function handleBlockMessage(
     execution_cost_write_count: 0,
     execution_cost_write_length: 0,
     tx_count: msg.transactions.length,
-    block_time: msg.block_time,
+    block_time: blockData.block_time,
     signer_bitvec: signerBitvec,
   };
 

src/tests/block-tests.ts

@@ -257,8 +257,8 @@ describe('block tests', () => {
           canonical: true,
           height: 1,
           hash: block_hash,
-          block_time: 94869286,
-          block_time_iso: '1973-01-03T00:34:46.000Z',
+          block_time: 94869287,
+          block_time_iso: '1973-01-03T00:34:47.000Z',
           parent_block_hash: '0x',
           burn_block_time: 94869286,
           burn_block_time_iso: '1973-01-03T00:34:46.000Z',
@@ -440,8 +440,8 @@ describe('block tests', () => {
       index_block_hash: '0x0001',
       hash: '0x0001',
       height: 1,
-      block_time: 94869286,
-      block_time_iso: '1973-01-03T00:34:46.000Z',
+      block_time: 94869287,
+      block_time_iso: '1973-01-03T00:34:47.000Z',
       microblocks_accepted: [],
       microblocks_streamed: [
         microblock1.microblocks[0].microblock_hash,
@@ -492,8 +492,8 @@ describe('block tests', () => {
       index_block_hash: '0x0002',
       hash: '0x0002',
       height: 2,
-      block_time: 94869286,
-      block_time_iso: '1973-01-03T00:34:46.000Z',
+      block_time: 94869287,
+      block_time_iso: '1973-01-03T00:34:47.000Z',
       microblocks_accepted: [microblock1.microblocks[0].microblock_hash],
       microblocks_streamed: [],
       miner_txid: '0x4321',
@@ -672,8 +672,8 @@ describe('block tests', () => {
 
     // Filter by burn hash
     const block5 = {
-      block_time: 94869286,
-      block_time_iso: '1973-01-03T00:34:46.000Z',
+      block_time: 94869287,
+      block_time_iso: '1973-01-03T00:34:47.000Z',
       burn_block_hash: '0x00000000000000000001e2ee7f0c6bd5361b5e7afd76156ca7d6f524ee5ca3d8',
       burn_block_height: 700000,
       burn_block_time: 94869286,
@@ -709,8 +709,8 @@ describe('block tests', () => {
 
     // Get latest block
     const block8 = {
-      block_time: 94869286,
-      block_time_iso: '1973-01-03T00:34:46.000Z',
+      block_time: 94869287,
+      block_time_iso: '1973-01-03T00:34:47.000Z',
       burn_block_hash: '0x000000000000000000028eacd4e6e58405d5a37d06b5d7b93776f1eab68d2494',
       burn_block_height: 700001,
       burn_block_time: 94869286,
@@ -762,8 +762,8 @@ describe('block tests', () => {
 
     // Get latest
     const block5 = {
-      block_time: 94869286,
-      block_time_iso: '1973-01-03T00:34:46.000Z',
+      block_time: 94869287,
+      block_time_iso: '1973-01-03T00:34:47.000Z',
       burn_block_hash: '0x00000000000000000001e2ee7f0c6bd5361b5e7afd76156ca7d6f524ee5ca3d8',
       burn_block_height: 700000,
       burn_block_time: 94869286,

src/tests/datastore-tests.ts

@@ -605,7 +605,7 @@ describe('postgres datastore', () => {
       parent_block_hash: '0xff0011',
       parent_microblock_hash: '0x00',
       block_height: 1235,
-      block_time: 94869286,
+      block_time: 94869287,
       burn_block_time: 94869286,
       burn_block_hash: '0x1234',
       burn_block_height: 123,
@@ -634,7 +634,7 @@ describe('postgres datastore', () => {
       index_block_hash: block.index_block_hash,
       block_hash: block.block_hash,
       block_height: 68456,
-      block_time: 2837565,
+      block_time: 2837566,
       burn_block_time: 2837565,
       parent_burn_block_time: 1626122935,
       type_id: DbTxTypeId.Coinbase,