feat(db): add tx index to BlobsOnTransactions model (#584)

* chore: add changeset * chore: merge changesets * chore(db): refactor database generator * feat(db): add tx index to `BlobsOnTransactions` model * feat: make tx index mandatory * perf(api): add block timestamp and transaction index as ordering clauses when fetching blobs * chore: add changeset * fix(api): return tx index when fetching a single blob * perf(db): improve tx index backfilling migration
Blobscan · Oct 13, 2024 · 3c17ee0 · 3c17ee0
1 parent f1c9406
commit 3c17ee0
Show file tree

Hide file tree

Showing 24 changed files with 909 additions and 399 deletions.
diff --git a/.changeset/sixty-pillows-melt.md b/.changeset/sixty-pillows-melt.md
@@ -0,0 +1,5 @@
+---
+"@blobscan/db": minor
+---
+
+Added tx index to `BlobsOnTransactions` model
diff --git a/.changeset/yellow-peas-search.md b/.changeset/yellow-peas-search.md
@@ -0,0 +1,5 @@
+---
+"@blobscan/api": patch
+---
+
+Enhanced blob fetching performance by adding sorting based on block timestamps and transaction index
diff --git a/packages/api/src/routers/blob/common/selects.ts b/packages/api/src/routers/blob/common/selects.ts
@@ -23,6 +23,7 @@ export function createBlobSelect(expands: Expands) {
         blockTimestamp: true,
         index: true,
         txHash: true,
+        txIndex: true,
         transaction: {
           select: {
             rollup: true,
@@ -48,6 +49,7 @@ export function createBlobsOnTransactionsSelect(expands: Expands) {
     blockNumber: true,
     blockTimestamp: true,
     txHash: true,
+    txIndex: true,
     blob: {
       select: baseBlobSelect,
     },

diff --git a/packages/api/src/routers/blob/common/serializers.ts b/packages/api/src/routers/blob/common/serializers.ts
@@ -67,6 +67,7 @@ export const serializedBlobOnTransactionSchema = serializedBaseBlobSchema.merge(
   z.object({
     index: blobIndexSchema,
     txHash: z.string(),
+    txIndex: z.number().nonnegative(),
     blockHash: z.string(),
     blockNumber: blockNumberSchema,
     blockTimestamp: z.string(),
@@ -86,6 +87,7 @@ export const serializedBlobSchema = serializedBaseBlobSchema.merge(
       z
         .object({
           hash: z.string(),
+          txIndex: z.number().nonnegative(),
           index: blobIndexSchema,
           blockHash: z.string(),
           blockNumber: z.number().nonnegative(),
@@ -127,6 +129,7 @@ export function serializeBlobOnTransaction(
     blockTimestamp,
     index,
     txHash,
+    txIndex,
     block,
     transaction,
   } = blobOnTransaction;
@@ -136,6 +139,7 @@ export function serializeBlobOnTransaction(
     blockNumber,
     blockTimestamp: serializeDate(blockTimestamp),
     txHash,
+    txIndex,
     index,
   };
 
@@ -167,13 +171,15 @@ export function serializeBlob(blob: QueriedBlob): SerializedBlob {
           blockHash,
           blockNumber,
           blockTimestamp,
+          txIndex,
           index,
           txHash,
           block,
           transaction,
         }) => {
           return {
             index,
+            txIndex,
             hash: txHash,
             blockHash,
             blockNumber,

diff --git a/packages/api/src/routers/blob/getAll.ts b/packages/api/src/routers/blob/getAll.ts
@@ -70,12 +70,8 @@ export const getAll = publicProcedure
           : undefined,
       },
       orderBy: [
-        { blockNumber: filters.sort },
-        {
-          transaction: {
-            index: filters.sort,
-          },
-        },
+        { blockTimestamp: filters.sort },
+        { txIndex: filters.sort },
         {
           index: filters.sort,
         },

diff --git a/packages/api/src/routers/indexer/indexData.utils.ts b/packages/api/src/routers/indexer/indexData.utils.ts
@@ -171,14 +171,24 @@ export function createDBBlobs({
 
 export function createDBBlobsOnTransactions({
   block,
+  transactions,
   blobs,
 }: IndexDataFormattedInput): BlobsOnTransactions[] {
-  return blobs.map(({ versionedHash, txHash, index }) => ({
-    blobHash: versionedHash,
-    blockHash: block.hash,
-    blockNumber: block.number,
-    blockTimestamp: timestampToDate(block.timestamp),
-    txHash: txHash,
-    index,
-  }));
+  return blobs.map(({ versionedHash, txHash, index }) => {
+    const tx = transactions.find((t) => t.hash === txHash);
+
+    if (!tx) {
+      throw new Error(`Transaction ${txHash} not found`);
+    }
+
+    return {
+      blobHash: versionedHash,
+      blockHash: block.hash,
+      blockNumber: block.number,
+      blockTimestamp: timestampToDate(block.timestamp),
+      txHash: txHash,
+      txIndex: tx.index,
+      index,
+    };
+  });
 }