fetch before cached events in case that we only cached a later range

gitcoinco · Feb 6, 2024 · f7d24fc · f7d24fc
1 parent 8bd5116
commit f7d24fc
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/src/cache/sqlite.ts b/src/cache/sqlite.ts
@@ -191,8 +191,8 @@ export function createSqliteCache(dbPath: string): Cache {
 
         // Remove old overlapping ranges
         db.prepare(
-          `DELETE FROM logRanges WHERE chainId = ? AND address = ?`
-        ).run(chainId, address);
+          `DELETE FROM logRanges WHERE chainId = ? AND address = ? AND fromBlock >= ? AND toBlock <= ?`
+        ).run(chainId, address, newFrom, newTo);
 
         // Insert the new merged range
         db.prepare(

diff --git a/src/subscriptions.ts b/src/subscriptions.ts
@@ -295,21 +295,26 @@ export async function getSubscriptionEvents(args: {
             pushEvent(event);
           }
 
-          const cachedToBlock = result.toBlock + 1n;
+          const fetchRanges = [];
 
-          // we got all events from the cache
-          if (cachedToBlock >= to) {
-            return [];
+          if (result.fromBlock > from) {
+            fetchRanges.push({
+              from: from,
+              to: result.fromBlock - 1n,
+              subscription: subscription,
+            });
           }
 
-          // fetch the remaining events
-          return [
-            {
-              from: cachedToBlock,
+          if (result.toBlock < to) {
+            fetchRanges.push({
+              from: result.toBlock + 1n,
               to: to,
               subscription: subscription,
-            },
-          ];
+            });
+          }
+
+          // fetch the remaining events
+          return fetchRanges;
         }
 
         // no cache at all, fetch all events