Handle getStorage calls for old blocks (#145)

* Handle getStorage calls for old blocks * Refactor getStorage code in mobymask watcher * Fix returning proof as null
cerc-io · Jul 20, 2022 · 58bbf4d · 58bbf4d
1 parent e266869
commit 58bbf4d
Show file tree

Hide file tree

Showing 15 changed files with 269 additions and 175 deletions.
diff --git a/packages/codegen/src/data/entities/SyncStatus.yaml b/packages/codegen/src/data/entities/SyncStatus.yaml
@@ -38,6 +38,17 @@ columns:
     pgType: integer
     tsType: number
     columnType: Column
+  - name: initialIndexedBlockHash
+    pgType: varchar
+    tsType: string
+    columnType: Column
+    columnOptions:
+      - option: length
+        value: 66
+  - name: initialIndexedBlockNumber
+    pgType: integer
+    tsType: number
+    columnType: Column
 imports:
   - toImport:
       - Entity

diff --git a/packages/eden-watcher/src/entity/SyncStatus.ts b/packages/eden-watcher/src/entity/SyncStatus.ts
@@ -27,4 +27,10 @@ export class SyncStatus implements SyncStatusInterface {
 
   @Column('integer')
   latestCanonicalBlockNumber!: number;
+
+  @Column('varchar', { length: 66 })
+  initialIndexedBlockHash!: string;
+
+  @Column('integer')
+  initialIndexedBlockNumber!: number;
 }
diff --git a/packages/erc20-watcher/src/entity/SyncStatus.ts b/packages/erc20-watcher/src/entity/SyncStatus.ts
@@ -34,4 +34,10 @@ export class SyncStatus implements SyncStatusInterface {
 
   @Column('integer')
   latestCanonicalBlockNumber!: number;
+
+  @Column('varchar', { length: 66 })
+  initialIndexedBlockHash!: string;
+
+  @Column('integer')
+  initialIndexedBlockNumber!: number;
 }
diff --git a/packages/erc721-watcher/src/entity/SyncStatus.ts b/packages/erc721-watcher/src/entity/SyncStatus.ts
@@ -27,4 +27,10 @@ export class SyncStatus implements SyncStatusInterface {
 
   @Column('integer')
   latestCanonicalBlockNumber!: number;
+
+  @Column('varchar', { length: 66 })
+  initialIndexedBlockHash!: string;
+
+  @Column('integer')
+  initialIndexedBlockNumber!: number;
 }
diff --git a/packages/graph-node/test/utils/indexer.ts b/packages/graph-node/test/utils/indexer.ts
@@ -134,6 +134,8 @@ class SyncStatus implements SyncStatusInterface {
   latestIndexedBlockNumber: number;
   latestCanonicalBlockHash: string;
   latestCanonicalBlockNumber: number;
+  initialIndexedBlockHash: string;
+  initialIndexedBlockNumber: number;
 
   constructor () {
     this.id = 0;
@@ -143,6 +145,8 @@ class SyncStatus implements SyncStatusInterface {
     this.latestIndexedBlockNumber = 0;
     this.latestCanonicalBlockHash = '0';
     this.latestCanonicalBlockNumber = 0;
+    this.initialIndexedBlockHash = '0';
+    this.initialIndexedBlockNumber = 0;
   }
 }
 

diff --git a/packages/graph-test-watcher/src/entity/SyncStatus.ts b/packages/graph-test-watcher/src/entity/SyncStatus.ts
@@ -27,4 +27,10 @@ export class SyncStatus implements SyncStatusInterface {
 
   @Column('integer')
   latestCanonicalBlockNumber!: number;
+
+  @Column('varchar', { length: 66 })
+  initialIndexedBlockHash!: string;
+
+  @Column('integer')
+  initialIndexedBlockNumber!: number;
 }
diff --git a/packages/mobymask-watcher/src/database.ts b/packages/mobymask-watcher/src/database.ts
@@ -3,7 +3,7 @@
 //
 
 import assert from 'assert';
-import { Connection, ConnectionOptions, DeepPartial, FindConditions, QueryRunner, FindManyOptions } from 'typeorm';
+import { Connection, ConnectionOptions, DeepPartial, FindConditions, QueryRunner, FindManyOptions, LessThanOrEqual } from 'typeorm';
 import path from 'path';
 
 import { IPLDDatabase as BaseDatabase, IPLDDatabaseInterface, QueryOptions, StateKind, Where } from '@vulcanize/util';
@@ -101,6 +101,16 @@ export class Database implements IPLDDatabaseInterface {
       });
   }
 
+  async getPrevEntity<Entity> (entity: new () => Entity, fields: { blockNumber: number } & DeepPartial<Entity>): Promise<Entity | undefined> {
+    return this._conn.getRepository(entity)
+      .findOne({
+        where: {
+          ...fields,
+          blockNumber: LessThanOrEqual(fields.blockNumber)
+        }
+      });
+  }
+
   async saveDomainHash ({ blockHash, blockNumber, contractAddress, value, proof }: DeepPartial<DomainHash>): Promise<DomainHash> {
     const repo = this._conn.getRepository(DomainHash);
     const entity = repo.create({ blockHash, blockNumber, contractAddress, value, proof });

diff --git a/packages/mobymask-watcher/src/entity/SyncStatus.ts b/packages/mobymask-watcher/src/entity/SyncStatus.ts
@@ -27,4 +27,10 @@ export class SyncStatus implements SyncStatusInterface {
 
   @Column('integer')
   latestCanonicalBlockNumber!: number;
+
+  @Column('varchar', { length: 66 })
+  initialIndexedBlockHash!: string;
+
+  @Column('integer')
+  initialIndexedBlockNumber!: number;
 }