Feat/ibc app ics20 add timestamp ( develop )

migrations/20230926042146_ibc_ics20_add_timestamp.ts

@@ -0,0 +1,53 @@
+import { Knex } from 'knex';
+import { IbcIcs20, IbcMessage } from '../src/models';
+
+export async function up(knex: Knex): Promise<void> {
+  await knex.schema.alterTable('ibc_ics20', (table) => {
+    table.timestamp('start_time');
+    table.timestamp('finish_time');
+  });
+  await knex.transaction(async (trx) => {
+    const ibcIcs20s = await IbcIcs20.query().transacting(trx);
+    const ibcMsgs = await IbcMessage.query()
+      .transacting(trx)
+      .joinRelated('message.transaction')
+      .whereIn(
+        'sequence_key',
+        ibcIcs20s.map((ibcIcs20) => ibcIcs20.sequence_key)
+      )
+      .select(
+        'message:transaction.timestamp',
+        'ibc_message.sequence_key',
+        'ibc_message.type'
+      );
+    if (ibcIcs20s.length > 0) {
+      ibcIcs20s.forEach((ibcIcs20) => {
+        ibcIcs20.start_time = ibcMsgs.find(
+          (e) =>
+            e.sequence_key === ibcIcs20.sequence_key &&
+            e.type === IbcMessage.EVENT_TYPE.SEND_PACKET
+        )?.timestamp;
+        ibcIcs20.finish_time = ibcMsgs.find(
+          (e) =>
+            e.sequence_key === ibcIcs20.sequence_key &&
+            [
+              IbcMessage.EVENT_TYPE.RECV_PACKET,
+              IbcMessage.EVENT_TYPE.TIMEOUT_PACKET,
+              IbcMessage.EVENT_TYPE.ACKNOWLEDGE_PACKET,
+            ].includes(e.type)
+        )?.timestamp;
+      });
+      await IbcIcs20.query()
+        .transacting(trx)
+        .insert(ibcIcs20s)
+        .onConflict('id')
+        .merge();
+    }
+  });
+}
+
+export async function down(knex: Knex): Promise<void> {
+  await knex.schema.alterTable('ibc_ics20', (table) => {
+    table.dropColumns('start_time', 'finish_time');
+  });
+}

src/models/ibc_ics20.ts

@@ -29,6 +29,10 @@ export class IbcIcs20 extends BaseModel {
 
   memo!: string;
 
+  start_time!: Date;
+
+  finish_time!: Date;
+
   static get tableName() {
     return 'ibc_ics20';
   }

src/models/ibc_message.ts

@@ -6,6 +6,8 @@ import { TransactionMessage } from './transaction_message';
 import config from '../../config.json' assert { type: 'json' };
 
 export class IbcMessage extends BaseModel {
+  [relation: string]: any;
+
   id!: number;
 
   transaction_message_id!: number;

src/models/transaction.ts

@@ -29,7 +29,7 @@ export class Transaction extends BaseModel {
 
   index!: number;
 
-  timstamp!: Date;
+  timestamp!: Date;
 
   data!: any;
 

src/services/ibc/crawl_ibc_ics20.service.ts

@@ -62,6 +62,14 @@ export default class CrawlIBCIcs20Service extends BullableService {
       .andWhere('ibc_message.type', IbcMessage.EVENT_TYPE.SEND_PACKET)
       .andWhere('message:transaction.height', '>', startHeight)
       .andWhere('message:transaction.height', '<=', endHeight)
+      .select(
+        'message:transaction.timestamp',
+        'ibc_message.sequence_key',
+        'ibc_message.id',
+        'ibc_message.src_channel_id',
+        'ibc_message.type',
+        'ibc_message.data'
+      )
       .orderBy('message.id')
       .transacting(trx);
     if (ics20Sends.length > 0) {
@@ -79,6 +87,7 @@ export default class CrawlIBCIcs20Service extends BullableService {
           status: IbcIcs20.STATUS_TYPE.ONGOING,
           sequence_key: msg.sequence_key,
           type: msg.type,
+          start_time: msg.timestamp,
         })
       );
       await IbcIcs20.query().insert(ibcIcs20s).transacting(trx);
@@ -104,6 +113,14 @@ export default class CrawlIBCIcs20Service extends BullableService {
       .andWhere('ibc_message.type', IbcMessage.EVENT_TYPE.RECV_PACKET)
       .andWhere('message:transaction.height', '>', startHeight)
       .andWhere('message:transaction.height', '<=', endHeight)
+      .select(
+        'message:transaction.timestamp',
+        'ibc_message.sequence_key',
+        'ibc_message.id',
+        'ibc_message.dst_port_id',
+        'ibc_message.dst_channel_id',
+        'ibc_message.type'
+      )
       .orderBy('message.id')
       .transacting(trx);
     if (ics20Recvs.length > 0) {
@@ -150,6 +167,7 @@ export default class CrawlIBCIcs20Service extends BullableService {
           sequence_key: msg.sequence_key,
           type: msg.type,
           memo,
+          finish_time: msg.timestamp,
         });
       });
       await IbcIcs20.query().insert(ibcIcs20s).transacting(trx);
@@ -174,6 +192,11 @@ export default class CrawlIBCIcs20Service extends BullableService {
       .andWhere('message:transaction.height', '>', startHeight)
       .andWhere('message:transaction.height', '<=', endHeight)
       .orderBy('message.id')
+      .select(
+        'message:transaction.timestamp',
+        'ibc_message.sequence_key',
+        'ibc_message.id'
+      )
       .transacting(trx);
     if (ics20Acks.length > 0) {
       // update success ack status for origin send ics20
@@ -229,6 +252,7 @@ export default class CrawlIBCIcs20Service extends BullableService {
       .andWhere('message:transaction.height', '>', startHeight)
       .andWhere('message:transaction.height', '<=', endHeight)
       .orderBy('message.id')
+      .select('message:transaction.timestamp', 'ibc_message.sequence_key')
       .transacting(trx);
     if (ics20Timeouts.length > 0) {
       await this.updateOriginSendStatus(
@@ -257,16 +281,26 @@ export default class CrawlIBCIcs20Service extends BullableService {
     type: string,
     trx: Knex.Transaction
   ) {
-    await IbcIcs20.query()
-      .transacting(trx)
-      .patch({
-        status: type,
-      })
-      .whereIn(
-        'sequence_key',
-        msgs.map((msg) => msg.sequence_key)
-      )
-      .andWhere('type', IbcMessage.EVENT_TYPE.SEND_PACKET);
+    if (msgs.length > 0) {
+      const ibcIcs20sKeyBy = _.keyBy(
+        await IbcIcs20.query()
+          .transacting(trx)
+          .whereIn(
+            'sequence_key',
+            msgs.map((msg) => msg.sequence_key)
+          )
+          .andWhere('type', IbcMessage.EVENT_TYPE.SEND_PACKET),
+        'sequence_key'
+      );
+      msgs.forEach((msg) => {
+        ibcIcs20sKeyBy[msg.sequence_key].finish_time = msg.timestamp;
+        ibcIcs20sKeyBy[msg.sequence_key].status = type;
+      });
+      await IbcIcs20.query()
+        .insert(Object.values(ibcIcs20sKeyBy))
+        .onConflict('id')
+        .merge();
+    }
   }
 
   async _start(): Promise<void> {

test/unit/services/ibc/crawl_ibc_ics20.spec.ts

@@ -116,6 +116,8 @@ export default class CrawlIbcIcs20Test {
       expect(result?.sequence_key).toEqual(ibcMessage.sequence_key);
       expect(result?.type).toEqual(ibcMessage.type);
       expect(result?.channel_id).toEqual(ibcMessage.src_channel_id);
+      expect(result?.finish_time).toBeNull();
+      expect(result?.start_time).toEqual(new Date(this.transaction.timestamp));
     });
   }
 
@@ -245,6 +247,8 @@ export default class CrawlIbcIcs20Test {
       expect(result?.sequence_key).toEqual(ibcMessage.sequence_key);
       expect(result?.type).toEqual(ibcMessage.type);
       expect(result?.channel_id).toEqual(ibcMessage.dst_channel_id);
+      expect(result?.start_time).toBeNull();
+      expect(result?.finish_time).toEqual(new Date(this.transaction.timestamp));
       await trx.rollback();
     });
   }
@@ -344,6 +348,8 @@ export default class CrawlIbcIcs20Test {
       expect(result?.sequence_key).toEqual(ibcMessage.sequence_key);
       expect(result?.type).toEqual(ibcMessage.type);
       expect(result?.channel_id).toEqual(ibcMessage.dst_channel_id);
+      expect(result?.start_time).toBeNull();
+      expect(result?.finish_time).toEqual(new Date(this.transaction.timestamp));
       await trx.rollback();
     });
   }
@@ -449,6 +455,9 @@ export default class CrawlIbcIcs20Test {
         .first()
         .transacting(trx);
       expect(originSend?.status).toEqual(IbcIcs20.STATUS_TYPE.ACK_ERROR);
+      expect(originSend?.finish_time).toEqual(
+        new Date(this.transaction.timestamp)
+      );
       await trx.rollback();
     });
   }
@@ -554,6 +563,9 @@ export default class CrawlIbcIcs20Test {
         .first()
         .transacting(trx);
       expect(originSend?.status).toEqual(IbcIcs20.STATUS_TYPE.ACK_SUCCESS);
+      expect(originSend?.finish_time).toEqual(
+        new Date(this.transaction.timestamp)
+      );
       await trx.rollback();
     });
   }
@@ -632,6 +644,9 @@ export default class CrawlIbcIcs20Test {
         .first()
         .transacting(trx);
       expect(originSend?.status).toEqual(IbcIcs20.STATUS_TYPE.TIMEOUT);
+      expect(originSend?.finish_time).toEqual(
+        new Date(this.transaction.timestamp)
+      );
       await trx.rollback();
     });
   }