feat: using contract address as confirmations identifier

rsksmart · Jun 19, 2020 · 8d7bb55 · 8d7bb55
1 parent c3d3ad2
commit 8d7bb55
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 11 deletions.
diff --git a/src/blockchain/event.model.ts b/src/blockchain/event.model.ts
@@ -24,6 +24,9 @@ export default class Event extends Model {
   @Column(DataType.INTEGER)
   targetConfirmation!: number
 
+  @Column(DataType.STRING(66))
+  contractAddress!: string
+
   @Column(DataType.TEXT)
   event!: string
 
@@ -39,5 +42,5 @@ export default class Event extends Model {
 }
 
 export type EventInterface =
-  Pick<Event, 'blockNumber' | 'transactionHash' | 'logIndex' | 'event' | 'targetConfirmation' | 'content'>
+  Pick<Event, 'blockNumber' | 'transactionHash' | 'logIndex' | 'contractAddress' | 'event' | 'targetConfirmation' | 'content'>
   & { emitted?: boolean }
diff --git a/src/blockchain/events.ts b/src/blockchain/events.ts
@@ -321,7 +321,7 @@ export abstract class BaseEventsEmitter extends AutoStartStopEventEmitter {
       const dbEvents = await Event.findAll({
         where: {
           blockNumber: { [Op.lte]: currentBlock.number - this.confirmations },
-          event: this.events,
+          contractAddress: this.contract.options.address,
           emitted: false
         }
       })
@@ -354,6 +354,7 @@ export abstract class BaseEventsEmitter extends AutoStartStopEventEmitter {
       blockNumber: data.blockNumber,
       transactionHash: data.transactionHash,
       logIndex: data.logIndex,
+      contractAddress: this.contract.options.address,
       event: data.event,
       targetConfirmation: this.confirmations,
       content: JSON.stringify(data)
@@ -499,7 +500,7 @@ export class PollingEventsEmitter extends BaseEventsEmitter {
 
   async poll (currentBlock: BlockHeader): Promise<void> {
     await this.semaphore.acquire()
-    this.logger.verbose(`Received new block number ${currentBlock}`)
+    this.logger.verbose(`Received new block number ${currentBlock.number}`)
     try {
       const [lastFetchedBlockNumber, lastFetchedBlockHash] = this.blockTracker.getLastFetchedBlock()
 

diff --git a/src/blockchain/utils.ts b/src/blockchain/utils.ts
@@ -19,7 +19,7 @@ export async function getBlockDate (eth: Eth, blockNumber: number): Promise<Date
 
 export function isServiceInitialized (serviceName: string): boolean {
   const blockTracker = getBlockTracker(`${serviceName}.`)
-  return blockTracker.getLastFetchedBlock() !== undefined
+  return blockTracker.getLastFetchedBlock()[0] !== undefined
 }
 
 export function getEventsEmitterForService (serviceName: string, eth: Eth, contractAbi: AbiItem[]): EventEmitter {

diff --git a/src/services/rns/index.ts b/src/services/rns/index.ts
@@ -151,9 +151,12 @@ const rns: CachedService = {
     logger.info(`Removed ${offersCount} offers entries, ${soldCount} sold domains, ${transferCount} transfers and ${domainsCount} domains`)
 
     const store = getObject()
-    delete store['rns.placement.lastFetchedBlock']
-    delete store['rns.reverse.lastFetchedBlock']
-    delete store['rns.owner.lastFetchedBlock']
+    delete store['rns.placement.lastFetchedBlockNumber']
+    delete store['rns.placement.lastFetchedBlockHash']
+    delete store['rns.reverse.lastFetchedBlockNumber']
+    delete store['rns.reverse.lastFetchedBlockHash']
+    delete store['rns.owner.lastFetchedBlockNumber']
+    delete store['rns.owner.lastFetchedBlockHash']
   }
 
 }

diff --git a/src/services/storage/index.ts b/src/services/storage/index.ts
@@ -91,6 +91,7 @@ const storage: CachedService = {
 
     const store = getObject()
     delete store['storage.lastFetchedBlockNumber']
+    delete store['storage.lastFetchedBlockHash']
   },
 
   precache

diff --git a/src/store.ts b/src/store.ts
@@ -4,11 +4,23 @@ import type { Sequelize } from 'sequelize'
 
 export function initStore (sequelize: Sequelize): Promise<void> {
   return init(sequelize, {
-    'storage.lastFetchedBlock': 'json',
+    'storage.lastFetchedBlockNumber': 'int',
+    'storage.lastFetchedBlockHash': 'string',
+    'storage.lastProcessedBlockNumber': 'int',
+    'storage.lastProcessedBlockHash': 'string',
     'rates.lastUpdate': 'int',
-    'rns.owner.lastFetchedBlock': 'json',
-    'rns.reverse.lastFetchedBlock': 'json',
-    'rns.placement.lastFetchedBlock': 'json'
+    'rns.owner.lastFetchedBlockNumber': 'int',
+    'rns.owner.lastFetchedBlockHash': 'string',
+    'rns.reverse.lastFetchedBlockNumber': 'int',
+    'rns.reverse.lastFetchedBlockHash': 'string',
+    'rns.placement.lastFetchedBlockNumber': 'int',
+    'rns.placement.lastFetchedBlockHash': 'string',
+    'rns.owner.lastProcessedBlockNumber': 'int',
+    'rns.owner.lastProcessedBlockHash': 'string',
+    'rns.reverse.lastProcessedBlockNumber': 'int',
+    'rns.reverse.lastProcessedBlockHash': 'string',
+    'rns.placement.lastProcessedBlockNumber': 'int',
+    'rns.placement.lastProcessedBlockHash': 'string'
   })
 }