Give precedence to block hash over number in time travel queries

cerc-io · Nov 2, 2023 · a550dc0 · a550dc0
1 parent 5c0f4a9
commit a550dc0
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/packages/util/src/graph/database.ts b/packages/util/src/graph/database.ts
@@ -1235,6 +1235,7 @@ export class GraphDatabase {
     block: CanonicalBlockHeight,
     alias: string
   ): Promise<SelectQueryBuilder<Entity>> {
+    // Block hash takes precedence over number if provided
     if (block.hash) {
       if (!block.canonicalBlockHashes) {
         const { canonicalBlockNumber, blockHashes } = await this._baseDatabase.getFrothyRegion(queryRunner, block.hash);
@@ -1249,9 +1250,7 @@ export class GraphDatabase {
           qb.where(`${alias}.block_hash IN (:...blockHashes)`, { blockHashes: block.canonicalBlockHashes })
             .orWhere(`${alias}.block_number <= :canonicalBlockNumber`, { canonicalBlockNumber: block.number });
         }));
-    }
-
-    if (block.number) {
+    } else if (block.number) {
       queryBuilder = queryBuilder.andWhere(`${alias}.block_number <= :blockNumber`, { blockNumber: block.number });
     }