more predictable ordering

latticexyz · Nov 30, 2023 · 99b0d04 · 99b0d04
1 parent 4ffd60b
commit 99b0d04
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/packages/store-indexer/src/postgres/getLogs.ts b/packages/store-indexer/src/postgres/getLogs.ts
@@ -54,7 +54,12 @@ export async function getLogs(
     .select()
     .from(tables.recordsTable)
     .where(or(...conditions))
-    .orderBy(asc(tables.recordsTable.lastUpdatedBlockNumber));
+    .orderBy(
+      asc(tables.recordsTable.lastUpdatedBlockNumber),
+      // TODO: add logIndex and use that to sort instead of address/tableId?
+      asc(tables.recordsTable.address),
+      asc(tables.recordsTable.tableId)
+    );
 
   const blockNumber = records.reduce(
     (max, record) => bigIntMax(max, record.lastUpdatedBlockNumber ?? 0n),

diff --git a/packages/store-sync/src/sqlite/getTables.ts b/packages/store-sync/src/sqlite/getTables.ts
@@ -1,5 +1,5 @@
 import { BaseSQLiteDatabase } from "drizzle-orm/sqlite-core";
-import { inArray } from "drizzle-orm";
+import { asc, inArray } from "drizzle-orm";
 import { Table } from "../common";
 import { getTableName } from "./getTableName";
 import { mudStoreTables } from "./internalTables";
@@ -15,6 +15,8 @@ export function getTables(
     .select()
     .from(mudStoreTables)
     .where(ids.length ? inArray(mudStoreTables.id, ids) : undefined)
+    // TODO: add logIndex and use that to sort instead of address/tableId?
+    .orderBy(asc(mudStoreTables.lastUpdatedBlockNumber), asc(mudStoreTables.address), asc(mudStoreTables.tableId))
     .all();
 
   return tables;