From bbea8d95bbbf50ac000805804b86862f8d6f5aec Mon Sep 17 00:00:00 2001
From: PJColombo <paulo.colombo@pm.me>
Date: Sun, 10 Nov 2024 14:42:51 +0100
Subject: [PATCH 1/9] feat(web): add support for dropdown to hold multiple
 values by option

---
 apps/web/src/components/Dropdown/Option.tsx | 10 ++++++----
 apps/web/src/components/Dropdown/index.tsx  | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/apps/web/src/components/Dropdown/Option.tsx b/apps/web/src/components/Dropdown/Option.tsx
index 97442f11c..ba40b1e70 100644
--- a/apps/web/src/components/Dropdown/Option.tsx
+++ b/apps/web/src/components/Dropdown/Option.tsx
@@ -7,19 +7,21 @@ interface OptionProps {
   option: OptionType;
 }
 
-export const Option: React.FC<OptionProps> = function (props) {
-  const { prefix, label, value } = props.option;
+export const Option: React.FC<OptionProps> = function ({ option }) {
+  const { prefix, label, value } = option;
+  const formattedValue = Array.isArray(value) ? value.join(", ") : value;
+
   return (
     <ListboxOption
       className={`relative cursor-pointer select-none px-4 py-2 text-contentSecondary-light hover:bg-controlActive-light data-[selected]:font-semibold data-[selected]:text-content-light dark:text-contentSecondary-dark  hover:dark:bg-controlActive-dark data-[selected]:dark:font-semibold data-[selected]:dark:text-content-dark`}
-      value={props.option}
+      value={option}
     >
       {({ selected }) => (
         <div className="flex items-center justify-between gap-3">
           <div className="flex flex-row items-center gap-2">
             {prefix && prefix}
             <span className="block truncate text-sm">
-              {label ? label : value}
+              {label ? label : formattedValue}
             </span>
           </div>
           {selected && (
diff --git a/apps/web/src/components/Dropdown/index.tsx b/apps/web/src/components/Dropdown/index.tsx
index 3c255d092..d0febbaa2 100644
--- a/apps/web/src/components/Dropdown/index.tsx
+++ b/apps/web/src/components/Dropdown/index.tsx
@@ -13,7 +13,7 @@ import useOverflow from "~/hooks/useOverflow";
 import { Option } from "./Option";
 
 export interface Option {
-  value: string | number;
+  value: string | number | string[] | number[];
   label?: ReactNode;
   prefix?: ReactNode;
   selectedLabel?: ReactNode;
@@ -69,10 +69,12 @@ export const Dropdown: React.FC<DropdownProps> = function ({
               {hasSelectedValue ? (
                 Array.isArray(selected) ? (
                   <div className="flex flex-row items-center gap-1">
-                    {selected.map((s) => {
+                    {selected.map(({ selectedLabel, label, value }) => {
                       return (
-                        <Fragment key={s.value}>
-                          {s.selectedLabel ? s.selectedLabel : s.label}
+                        <Fragment
+                          key={Array.isArray(value) ? value.join("-") : value}
+                        >
+                          {selectedLabel ? selectedLabel : label}
                         </Fragment>
                       );
                     })}

From 4015b0737502711e3b0229cfd474d8a78b9cb3f3 Mon Sep 17 00:00:00 2001
From: PJColombo <paulo.colombo@pm.me>
Date: Sun, 10 Nov 2024 14:49:39 +0100
Subject: [PATCH 2/9] fix(web): display rollups with more than one address
 properly in the rollup filter

---
 .../src/components/Filters/RollupFilter.tsx   | 10 ++--
 apps/web/src/components/Filters/index.tsx     |  2 +-
 packages/rollups/src/index.ts                 |  4 +-
 packages/rollups/test/rollups.test.ts         | 50 +++++++++++++------
 4 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/apps/web/src/components/Filters/RollupFilter.tsx b/apps/web/src/components/Filters/RollupFilter.tsx
index 532d9b56d..b8a37cfb2 100644
--- a/apps/web/src/components/Filters/RollupFilter.tsx
+++ b/apps/web/src/components/Filters/RollupFilter.tsx
@@ -26,14 +26,14 @@ export const ROLLUP_OPTIONS: Option[] = [
     selectedLabel: <Badge size="sm">None</Badge>,
     label: "None",
   },
-  ...rollups.map(([rollupAddress, rollupName]) => {
+  ...rollups.map(([name, addresses]) => {
     return {
-      value: rollupAddress,
+      value: addresses,
       selectedLabel: (
-        <RollupBadge rollup={rollupName.toLowerCase() as Rollup} size="sm" />
+        <RollupBadge rollup={name.toLowerCase() as Rollup} size="sm" />
       ),
-      prefix: <RollupIcon rollup={rollupName.toLowerCase() as Rollup} />,
-      label: capitalize(rollupName),
+      prefix: <RollupIcon rollup={name.toLowerCase() as Rollup} />,
+      label: capitalize(name),
     };
   }),
 ];
diff --git a/apps/web/src/components/Filters/index.tsx b/apps/web/src/components/Filters/index.tsx
index a56f00455..7b98f82b0 100644
--- a/apps/web/src/components/Filters/index.tsx
+++ b/apps/web/src/components/Filters/index.tsx
@@ -94,7 +94,7 @@ export const Filters: FC = function () {
         query.rollup = rollups[0]?.value;
       } else {
         query.from = rollups
-          .map((r) => r.value)
+          .flatMap((r) => r.value)
           .join(FROM_ADDRESSES_FORMAT_SEPARATOR);
       }
     }
diff --git a/packages/rollups/src/index.ts b/packages/rollups/src/index.ts
index a06207aba..dcbe2a0dc 100644
--- a/packages/rollups/src/index.ts
+++ b/packages/rollups/src/index.ts
@@ -77,8 +77,8 @@ export const ROLLUP_TO_ADDRESSES_MAPPINGS = new Map(
   )
 );
 
-export function getChainRollups(chainId: number): [string, Rollup][] {
-  const addressToRollupMapping = ADDRESS_TO_ROLLUP_MAPPINGS.get(chainId);
+export function getChainRollups(chainId: number): [Rollup, string[]][] {
+  const addressToRollupMapping = ROLLUP_TO_ADDRESSES_MAPPINGS.get(chainId);
 
   if (!addressToRollupMapping) {
     return [];
diff --git a/packages/rollups/test/rollups.test.ts b/packages/rollups/test/rollups.test.ts
index 6433f808e..d855eac9a 100644
--- a/packages/rollups/test/rollups.test.ts
+++ b/packages/rollups/test/rollups.test.ts
@@ -54,21 +54,41 @@ describe("Rollups", () => {
   it("should get all chain's rollups correctly", () => {
     const chainId = 11155111;
     const expectedRollups = [
-      ["0xb2248390842d3c4acf1d8a893954afc0eac586e5", Rollup.ARBITRUM],
-      ["0x1fb1494f5135bb01a698fb3e863dd12f876bb085", Rollup.ARBITRUM],
-      ["0x07f0e1ec1ce152b075fda4a827a9f17851086b25", Rollup.ARBITRUM],
-      ["0xfc56e7272eebbba5bc6c544e159483c4a38f8ba3", Rollup.BASE],
-      ["0x6cdebe940bc0f26850285caca097c11c33103e47", Rollup.BASE],
-      ["0xf15dc770221b99c98d4aaed568f2ab04b9d16e42", Rollup.KROMA],
-      ["0x47c63d1e391fcb3dcdc40c4d7fa58adb172f8c38", Rollup.LINEA],
-      ["0x88584cf948cd51267f220edd9e21e67ccf3fcfa8", Rollup.LINEA],
-      ["0x8f23bb38f531600e5d8fddaaec41f13fab46e98c", Rollup.OPTIMISM],
-      ["0xdf50ccaa4467b61b51d8ed86320d8ca67a56265e", Rollup.OPTIMISM],
-      ["0xe14b3f075ad9377689daf659e04a2a99a4acede4", Rollup.OPTIMISM],
-      ["0x2d567ece699eabe5afcd141edb7a4f2d0d6ce8a0", Rollup.SCROLL],
-      ["0x5b98b836969a60fec50fa925905dd1d382a7db43", Rollup.STARKNET],
-      ["0x4e6bd53883107b063c502ddd49f9600dc51b3ddc", Rollup.MODE],
-      ["0x3cd868e221a3be64b161d596a7482257a99d857f", Rollup.ZORA],
+      [
+        Rollup.ARBITRUM,
+        [
+          "0xb2248390842d3c4acf1d8a893954afc0eac586e5",
+          "0x1fb1494f5135bb01a698fb3e863dd12f876bb085",
+          "0x07f0e1ec1ce152b075fda4a827a9f17851086b25",
+        ],
+      ],
+      [
+        Rollup.BASE,
+        [
+          "0xfc56e7272eebbba5bc6c544e159483c4a38f8ba3",
+          "0x6cdebe940bc0f26850285caca097c11c33103e47",
+        ],
+      ],
+      [Rollup.KROMA, ["0xf15dc770221b99c98d4aaed568f2ab04b9d16e42"]],
+      [
+        Rollup.LINEA,
+        [
+          "0x47c63d1e391fcb3dcdc40c4d7fa58adb172f8c38",
+          "0x88584cf948cd51267f220edd9e21e67ccf3fcfa8",
+        ],
+      ],
+      [
+        Rollup.OPTIMISM,
+        [
+          "0x8f23bb38f531600e5d8fddaaec41f13fab46e98c",
+          "0xdf50ccaa4467b61b51d8ed86320d8ca67a56265e",
+          "0xe14b3f075ad9377689daf659e04a2a99a4acede4",
+        ],
+      ],
+      [Rollup.SCROLL, ["0x2d567ece699eabe5afcd141edb7a4f2d0d6ce8a0"]],
+      [Rollup.STARKNET, ["0x5b98b836969a60fec50fa925905dd1d382a7db43"]],
+      [Rollup.MODE, ["0x4e6bd53883107b063c502ddd49f9600dc51b3ddc"]],
+      [Rollup.ZORA, ["0x3cd868e221a3be64b161d596a7482257a99d857f"]],
     ];
 
     expect(getChainRollups(chainId)).toEqual(expectedRollups);

From b32bed68a430e860ebc5b1d43c9cbcf572c70f3f Mon Sep 17 00:00:00 2001
From: PJColombo <paulo.colombo@pm.me>
Date: Sun, 10 Nov 2024 15:06:18 +0100
Subject: [PATCH 3/9] fix(web): simplify dropdown options by including prefix
 within label props

---
 apps/web/src/components/Dropdown/Option.tsx      |  9 +++------
 apps/web/src/components/Dropdown/index.tsx       |  1 -
 apps/web/src/components/Filters/RollupFilter.tsx | 10 +++++++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/web/src/components/Dropdown/Option.tsx b/apps/web/src/components/Dropdown/Option.tsx
index ba40b1e70..64d5b4a24 100644
--- a/apps/web/src/components/Dropdown/Option.tsx
+++ b/apps/web/src/components/Dropdown/Option.tsx
@@ -8,7 +8,7 @@ interface OptionProps {
 }
 
 export const Option: React.FC<OptionProps> = function ({ option }) {
-  const { prefix, label, value } = option;
+  const { label, value } = option;
   const formattedValue = Array.isArray(value) ? value.join(", ") : value;
 
   return (
@@ -18,11 +18,8 @@ export const Option: React.FC<OptionProps> = function ({ option }) {
     >
       {({ selected }) => (
         <div className="flex items-center justify-between gap-3">
-          <div className="flex flex-row items-center gap-2">
-            {prefix && prefix}
-            <span className="block truncate text-sm">
-              {label ? label : formattedValue}
-            </span>
+          <div className="truncate text-sm">
+            {label ? label : formattedValue}
           </div>
           {selected && (
             <CheckIcon
diff --git a/apps/web/src/components/Dropdown/index.tsx b/apps/web/src/components/Dropdown/index.tsx
index d0febbaa2..90e3f75df 100644
--- a/apps/web/src/components/Dropdown/index.tsx
+++ b/apps/web/src/components/Dropdown/index.tsx
@@ -15,7 +15,6 @@ import { Option } from "./Option";
 export interface Option {
   value: string | number | string[] | number[];
   label?: ReactNode;
-  prefix?: ReactNode;
   selectedLabel?: ReactNode;
 }
 
diff --git a/apps/web/src/components/Filters/RollupFilter.tsx b/apps/web/src/components/Filters/RollupFilter.tsx
index b8a37cfb2..414f0ccd4 100644
--- a/apps/web/src/components/Filters/RollupFilter.tsx
+++ b/apps/web/src/components/Filters/RollupFilter.tsx
@@ -26,14 +26,18 @@ export const ROLLUP_OPTIONS: Option[] = [
     selectedLabel: <Badge size="sm">None</Badge>,
     label: "None",
   },
-  ...rollups.map(([name, addresses]) => {
+  ...rollups.map<Option>(([name, addresses]) => {
     return {
       value: addresses,
       selectedLabel: (
         <RollupBadge rollup={name.toLowerCase() as Rollup} size="sm" />
       ),
-      prefix: <RollupIcon rollup={name.toLowerCase() as Rollup} />,
-      label: capitalize(name),
+      label: (
+        <div className="flex flex-row items-center gap-2">
+          <RollupIcon rollup={name.toLowerCase() as Rollup} />
+          <div>{capitalize(name)}</div>
+        </div>
+      ),
     };
   }),
 ];

From e98b5d5c9125eb863796d5731a9aa9fafab5f410 Mon Sep 17 00:00:00 2001
From: PJColombo <paulo.colombo@pm.me>
Date: Sun, 17 Nov 2024 14:00:13 +0700
Subject: [PATCH 4/9] fix(api): ensure reorged blocks are correctly reindexed

---
 packages/api/src/routers/indexer/indexData.ts |  7 +++++
 packages/api/test/indexer.test.ts             | 26 +++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/packages/api/src/routers/indexer/indexData.ts b/packages/api/src/routers/indexer/indexData.ts
index 141b3ce9e..03cab913e 100644
--- a/packages/api/src/routers/indexer/indexData.ts
+++ b/packages/api/src/routers/indexer/indexData.ts
@@ -125,6 +125,13 @@ export const indexData = jwtAuthedProcedure
       const dbAddressCategoryInfos = createDBAddressCategoryInfo(dbTxs);
 
       operations.push(
+        // We may be indexing a block that was marked as a reorg previously,
+        // so we delete any possible rows from the fork table
+        prisma.transactionFork.deleteMany({
+          where: {
+            blockHash: input.block.hash,
+          },
+        }),
         prisma.block.upsert({
           where: { hash: input.block.hash },
           create: {
diff --git a/packages/api/test/indexer.test.ts b/packages/api/test/indexer.test.ts
index d7ffba28f..407d8ea7d 100644
--- a/packages/api/test/indexer.test.ts
+++ b/packages/api/test/indexer.test.ts
@@ -622,6 +622,32 @@ describe("Indexer router", async () => {
         ).resolves.toBeUndefined();
       });
 
+      it("should reindex a block previously marked as reorged correctly", async () => {
+        const blockHash = INPUT.block.hash;
+        const blockTxHashes = INPUT.transactions.map((tx) => tx.hash);
+
+        // Marked the block as reorged
+        await authorizedContext.prisma.transactionFork.createMany({
+          data: blockTxHashes.map((hash) => ({
+            hash,
+            blockHash,
+          })),
+        });
+
+        // Reindex the block
+        await authorizedCaller.indexer.indexData(INPUT);
+
+        const forkTxs = await authorizedContext.prisma.transactionFork.findMany(
+          {
+            where: {
+              blockHash,
+            },
+          }
+        );
+
+        expect(forkTxs, "Block still has forked transactions").toEqual([]);
+      });
+
       testValidError(
         "should fail when receiving an empty array of transactions",
         async () => {

From 20b6a6e7530e96a41bc89c6fb6068e979833f146 Mon Sep 17 00:00:00 2001
From: PJColombo <paulo.colombo@pm.me>
Date: Wed, 20 Nov 2024 12:09:39 +0700
Subject: [PATCH 5/9] feat(db): add address category info fks constraints tx
 model

---
 .../migration.sql                                |  5 +++++
 packages/db/prisma/schema.prisma                 | 16 ++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 packages/db/prisma/migrations/20241119092259_add_address_category_info_fks/migration.sql

diff --git a/packages/db/prisma/migrations/20241119092259_add_address_category_info_fks/migration.sql b/packages/db/prisma/migrations/20241119092259_add_address_category_info_fks/migration.sql
new file mode 100644
index 000000000..b1e567fa3
--- /dev/null
+++ b/packages/db/prisma/migrations/20241119092259_add_address_category_info_fks/migration.sql
@@ -0,0 +1,5 @@
+-- AddForeignKey
+ALTER TABLE "transaction" ADD CONSTRAINT "transaction_from_id_category_fkey" FOREIGN KEY ("from_id", "category") REFERENCES "address_category_info"("address", "category") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "transaction" ADD CONSTRAINT "transaction_to_id_category_fkey" FOREIGN KEY ("to_id", "category") REFERENCES "address_category_info"("address", "category") ON DELETE RESTRICT ON UPDATE CASCADE;
diff --git a/packages/db/prisma/schema.prisma b/packages/db/prisma/schema.prisma
index 293fb8a7e..1e4ab06b9 100644
--- a/packages/db/prisma/schema.prisma
+++ b/packages/db/prisma/schema.prisma
@@ -4,7 +4,7 @@
 generator client {
   provider        = "prisma-client-js"
   // rhel-openssl-1.0.x is required by Vercel
-  binaryTargets = ["native", "rhel-openssl-1.0.x", "linux-musl-openssl-3.0.x"]
+  binaryTargets   = ["native", "rhel-openssl-1.0.x", "linux-musl-openssl-3.0.x"]
   previewFeatures = ["tracing", "metrics", "typedSql"]
 }
 
@@ -83,7 +83,9 @@ model AddressCategoryInfo {
   firstBlockNumberAsReceiver Int?      @map("first_block_number_as_receiver")
   firstBlockNumberAsSender   Int?      @map("first_block_number_as_sender")
 
-  addressEntity Address @relation(fields: [address], references: [address])
+  addressEntity          Address       @relation(fields: [address], references: [address])
+  transactionsAsSender   Transaction[] @relation("senderAddressCategoryInfoRelation")
+  transactionsAsReceiver Transaction[] @relation("receiverAddressCategoryInfoRelation")
 
   @@unique([address, category])
   @@map("address_category_info")
@@ -176,10 +178,12 @@ model Transaction {
   updatedAt             DateTime @default(now()) @map("updated_at")
   decodedFields         Json     @default("{}") @map("decoded_fields")
 
-  blobs BlobsOnTransactions[]
-  block Block                 @relation(fields: [blockHash], references: [hash])
-  from  Address               @relation("senderAddressRelation", fields: [fromId], references: [address])
-  to    Address               @relation("receiverAddressRelation", fields: [toId], references: [address])
+  blobs                   BlobsOnTransactions[]
+  block                   Block                 @relation(fields: [blockHash], references: [hash])
+  from                    Address               @relation("senderAddressRelation", fields: [fromId], references: [address])
+  to                      Address               @relation("receiverAddressRelation", fields: [toId], references: [address])
+  fromAddressCategoryInfo AddressCategoryInfo   @relation("senderAddressCategoryInfoRelation", fields: [fromId, category], references: [address, category])
+  toAddressCategoryInfo   AddressCategoryInfo   @relation("receiverAddressCategoryInfoRelation", fields: [toId, category], references: [address, category])
 
   transactionForks TransactionFork[]
 

From eb37b208f129f140152b5022f8934da6e0961f49 Mon Sep 17 00:00:00 2001
From: PJColombo <paulo.colombo@pm.me>
Date: Wed, 20 Nov 2024 12:13:02 +0700
Subject: [PATCH 6/9] feat(db): create indexes for block number reference
 fields

---
 .../migration.sql                                         | 8 ++++++++
 packages/db/prisma/schema.prisma                          | 3 +++
 2 files changed, 11 insertions(+)
 create mode 100644 packages/db/prisma/migrations/20241120051254_add_block_number_reference_indexes/migration.sql

diff --git a/packages/db/prisma/migrations/20241120051254_add_block_number_reference_indexes/migration.sql b/packages/db/prisma/migrations/20241120051254_add_block_number_reference_indexes/migration.sql
new file mode 100644
index 000000000..1e53cbe49
--- /dev/null
+++ b/packages/db/prisma/migrations/20241120051254_add_block_number_reference_indexes/migration.sql
@@ -0,0 +1,8 @@
+-- CreateIndex
+CREATE INDEX "address_category_info_first_block_number_as_receiver_idx" ON "address_category_info"("first_block_number_as_receiver");
+
+-- CreateIndex
+CREATE INDEX "address_category_info_first_block_number_as_sender_idx" ON "address_category_info"("first_block_number_as_sender");
+
+-- CreateIndex
+CREATE INDEX "blob_first_block_number_idx" ON "blob"("first_block_number");
diff --git a/packages/db/prisma/schema.prisma b/packages/db/prisma/schema.prisma
index 1e4ab06b9..c1fcceafb 100644
--- a/packages/db/prisma/schema.prisma
+++ b/packages/db/prisma/schema.prisma
@@ -88,6 +88,8 @@ model AddressCategoryInfo {
   transactionsAsReceiver Transaction[] @relation("receiverAddressCategoryInfoRelation")
 
   @@unique([address, category])
+  @@index([firstBlockNumberAsReceiver])
+  @@index([firstBlockNumberAsSender])
   @@map("address_category_info")
 }
 
@@ -116,6 +118,7 @@ model Blob {
   dataStorageReferences BlobDataStorageReference[]
   transactions          BlobsOnTransactions[]
 
+  @@index([firstBlockNumber])
   @@index([proof])
   @@index([insertedAt])
   @@map("blob")

From aa893d4877191cf1d8555edf84a038f2db6d1db5 Mon Sep 17 00:00:00 2001
From: PJColombo <paulo.colombo@pm.me>
Date: Wed, 20 Nov 2024 12:32:10 +0700
Subject: [PATCH 7/9] fix(api): remove all block references across the database
 when marking a block as reorged

---
 .../src/routers/indexer/handleReorgedSlots.ts | 149 +++++++++++++++---
 packages/api/test/indexer.test.ts             |  49 ++++++
 2 files changed, 172 insertions(+), 26 deletions(-)

diff --git a/packages/api/src/routers/indexer/handleReorgedSlots.ts b/packages/api/src/routers/indexer/handleReorgedSlots.ts
index 0324c40ee..9944ef467 100644
--- a/packages/api/src/routers/indexer/handleReorgedSlots.ts
+++ b/packages/api/src/routers/indexer/handleReorgedSlots.ts
@@ -1,5 +1,7 @@
+import type { Prisma } from "@blobscan/db";
 import { z } from "@blobscan/zod";
 
+import type { TRPCInnerContext } from "../../context";
 import { jwtAuthedProcedure } from "../../procedures";
 import { INDEXER_PATH } from "./common";
 
@@ -13,6 +15,112 @@ const outputSchema = z.object({
 
 export type HandleReorgedSlotsInput = z.infer<typeof inputSchema>;
 
+const blockSelect = {
+  hash: true,
+  number: true,
+  transactions: {
+    select: {
+      hash: true,
+    },
+  },
+} satisfies Prisma.BlockSelect;
+
+type BlockPayload = Prisma.BlockGetPayload<{ select: typeof blockSelect }>;
+
+/**
+ * Generates a set of Prisma operations to remove references to reorged blocks from the db.
+ *
+ * When blocks are no longer part of the canonical chain due to reorg, any references to these blocks
+ * must be cleaned up from relevant tables to maintain database integrity.
+ *
+ * @returns An array of Prisma operation promises to be executed for database cleanup.
+ */
+async function generateBlockCleanupOperations(
+  prisma: TRPCInnerContext["prisma"],
+  reorgedBlocks: BlockPayload[]
+) {
+  const reorgedBlockNumbers = reorgedBlocks.map((b) => b.number);
+  const [addressCategoryInfos, blobs] = await Promise.all([
+    prisma.addressCategoryInfo.findMany({
+      where: {
+        OR: [
+          {
+            firstBlockNumberAsSender: {
+              in: reorgedBlockNumbers,
+            },
+          },
+          {
+            firstBlockNumberAsReceiver: {
+              in: reorgedBlockNumbers,
+            },
+          },
+        ],
+      },
+    }),
+    prisma.blob.findMany({
+      where: {
+        firstBlockNumber: {
+          in: reorgedBlockNumbers,
+        },
+      },
+    }),
+  ]);
+
+  const referenceRemovalOps = [];
+
+  for (const {
+    id,
+    firstBlockNumberAsReceiver,
+    firstBlockNumberAsSender,
+  } of addressCategoryInfos) {
+    const data: Prisma.AddressCategoryInfoUpdateInput = {};
+
+    if (
+      firstBlockNumberAsSender &&
+      reorgedBlockNumbers.includes(firstBlockNumberAsSender)
+    ) {
+      data.firstBlockNumberAsSender = null;
+    }
+
+    if (
+      firstBlockNumberAsReceiver &&
+      reorgedBlockNumbers.includes(firstBlockNumberAsReceiver)
+    ) {
+      data.firstBlockNumberAsReceiver = null;
+    }
+
+    const hasBlockReferences = Object.keys(data).length > 0;
+
+    if (hasBlockReferences) {
+      referenceRemovalOps.push(
+        prisma.addressCategoryInfo.update({
+          data,
+          where: {
+            id,
+          },
+        })
+      );
+    }
+  }
+
+  for (const { firstBlockNumber, versionedHash } of blobs) {
+    if (firstBlockNumber && reorgedBlockNumbers.includes(firstBlockNumber)) {
+      referenceRemovalOps.push(
+        prisma.blob.update({
+          where: {
+            versionedHash,
+          },
+          data: {
+            firstBlockNumber: null,
+          },
+        })
+      );
+    }
+  }
+
+  return referenceRemovalOps;
+}
+
 export const handleReorgedSlots = jwtAuthedProcedure
   .meta({
     openapi: {
@@ -28,42 +136,31 @@ export const handleReorgedSlots = jwtAuthedProcedure
   .output(outputSchema)
   .mutation(async ({ ctx: { prisma }, input: { reorgedSlots } }) => {
     const reorgedBlocks = await prisma.block.findMany({
-      select: {
-        hash: true,
-        transactions: {
-          select: {
-            hash: true,
-          },
-        },
-      },
+      select: blockSelect,
       where: {
         slot: {
           in: reorgedSlots,
         },
       },
     });
-
-    const result = await prisma.transactionFork.upsertMany(
-      reorgedBlocks.flatMap((b) =>
-        b.transactions.map((tx) => ({
-          hash: tx.hash,
-          blockHash: b.hash,
-        }))
-      )
+    const reorgedBlockTxs = reorgedBlocks.flatMap((b) =>
+      b.transactions.map((tx) => ({
+        hash: tx.hash,
+        blockHash: b.hash,
+      }))
     );
 
-    let totalUpdatedSlots: number;
+    const blockReferenceRemovalOps = await generateBlockCleanupOperations(
+      prisma,
+      reorgedBlocks
+    );
 
-    if (typeof result === "number") {
-      totalUpdatedSlots = result;
-    } else {
-      totalUpdatedSlots = result.reduce(
-        (acc, totalSlots) => acc + totalSlots.count,
-        0
-      );
-    }
+    await prisma.$transaction([
+      ...blockReferenceRemovalOps,
+      prisma.transactionFork.upsertMany(reorgedBlockTxs),
+    ]);
 
     return {
-      totalUpdatedSlots,
+      totalUpdatedSlots: reorgedBlocks.length,
     };
   });
diff --git a/packages/api/test/indexer.test.ts b/packages/api/test/indexer.test.ts
index 407d8ea7d..2ee60f4be 100644
--- a/packages/api/test/indexer.test.ts
+++ b/packages/api/test/indexer.test.ts
@@ -718,6 +718,55 @@ describe("Indexer router", async () => {
         expect(transactionForks).toEqual(expectedTransactionForks);
       });
 
+      it("should clean up references to the reorged blocks", async () => {
+        const reorgedBlocks = await authorizedContext.prisma.block.findMany({
+          where: {
+            slot: {
+              in: input.reorgedSlots,
+            },
+          },
+        });
+
+        const reorgedBlockNumbers = reorgedBlocks.map((block) => block.number);
+
+        await authorizedCaller.indexer.handleReorgedSlots(input);
+
+        const reorgedBlocksAddressCategoryInfos =
+          await authorizedContext.prisma.addressCategoryInfo.findMany({
+            where: {
+              OR: [
+                {
+                  firstBlockNumberAsSender: {
+                    in: reorgedBlockNumbers,
+                  },
+                },
+                {
+                  firstBlockNumberAsReceiver: {
+                    in: reorgedBlockNumbers,
+                  },
+                },
+              ],
+            },
+          });
+        const blobsWithReorgedBlocks =
+          await authorizedContext.prisma.blob.findMany({
+            where: {
+              firstBlockNumber: {
+                in: reorgedBlockNumbers,
+              },
+            },
+          });
+
+        expect(
+          reorgedBlocksAddressCategoryInfos,
+          "Reorged block references in address category records found"
+        ).toEqual([]);
+        expect(
+          blobsWithReorgedBlocks,
+          "Reorged block references in blob records found"
+        ).toEqual([]);
+      });
+
       it("should return the number of updated slots", async () => {
         const result = await authorizedCaller.indexer.handleReorgedSlots(input);
 

From 8a94e7e00a7420f573ffd472d7a25228ee1a85f8 Mon Sep 17 00:00:00 2001
From: PJColombo <paulo.colombo@pm.me>
Date: Wed, 20 Nov 2024 12:34:41 +0700
Subject: [PATCH 8/9] chore: add changesets

---
 .changeset/brown-emus-hunt.md     | 5 +++++
 .changeset/khaki-rules-applaud.md | 5 +++++
 .changeset/rotten-bears-bathe.md  | 5 +++++
 3 files changed, 15 insertions(+)
 create mode 100644 .changeset/brown-emus-hunt.md
 create mode 100644 .changeset/khaki-rules-applaud.md
 create mode 100644 .changeset/rotten-bears-bathe.md

diff --git a/.changeset/brown-emus-hunt.md b/.changeset/brown-emus-hunt.md
new file mode 100644
index 000000000..8f7930284
--- /dev/null
+++ b/.changeset/brown-emus-hunt.md
@@ -0,0 +1,5 @@
+---
+"@blobscan/db": patch
+---
+
+Added address category info constraints to transaction model
diff --git a/.changeset/khaki-rules-applaud.md b/.changeset/khaki-rules-applaud.md
new file mode 100644
index 000000000..f4e6a33a3
--- /dev/null
+++ b/.changeset/khaki-rules-applaud.md
@@ -0,0 +1,5 @@
+---
+"@blobscan/api": patch
+---
+
+Resolved an issue where blocks flagged as reorged remained marked as reorged after being reindexed
diff --git a/.changeset/rotten-bears-bathe.md b/.changeset/rotten-bears-bathe.md
new file mode 100644
index 000000000..3135a97d3
--- /dev/null
+++ b/.changeset/rotten-bears-bathe.md
@@ -0,0 +1,5 @@
+---
+"@blobscan/db": patch
+---
+
+Created indexes for block number fields

From 7c8ab64eab57b7c5cb02e0760f3ed43b5c038247 Mon Sep 17 00:00:00 2001
From: PJColombo <paulo.colombo@pm.me>
Date: Mon, 25 Nov 2024 14:36:59 +0700
Subject: [PATCH 9/9] test(db): fix ut

---
 packages/db/test/base-extension.test.ts | 35 +++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/packages/db/test/base-extension.test.ts b/packages/db/test/base-extension.test.ts
index 0447accc6..4da3cf135 100644
--- a/packages/db/test/base-extension.test.ts
+++ b/packages/db/test/base-extension.test.ts
@@ -600,6 +600,27 @@ describe("Base Extension", () => {
           },
         ];
 
+        await prisma.addressCategoryInfo.upsertMany([
+          {
+            address: "address1",
+            category: "ROLLUP",
+            firstBlockNumberAsSender: 1002,
+            firstBlockNumberAsReceiver: null,
+          },
+          {
+            address: "address3",
+            category: "ROLLUP",
+            firstBlockNumberAsSender: 1001,
+            firstBlockNumberAsReceiver: null,
+          },
+          {
+            address: "address5",
+            category: "ROLLUP",
+            firstBlockNumberAsReceiver: null,
+            firstBlockNumberAsSender: 1001,
+          },
+        ]);
+
         await prisma.transaction.upsertMany(input);
 
         const insertedTxs = await prisma.transaction
@@ -654,6 +675,20 @@ describe("Base Extension", () => {
           },
         ];
 
+        await prisma.addressCategoryInfo.upsertMany([
+          {
+            address: "address5",
+            category: "ROLLUP",
+            firstBlockNumberAsSender: 1006,
+            firstBlockNumberAsReceiver: 1006,
+          },
+          {
+            address: "address6",
+            category: "ROLLUP",
+            firstBlockNumberAsReceiver: 1006,
+            firstBlockNumberAsSender: 1006,
+          },
+        ]);
         await prisma.transaction.upsertMany(input);
 
         const updatedTxs = await prisma.transaction