Added retry logic to minaTransactionSender

console-jest.config.js

@@ -1,3 +1,3 @@
-import console from "console";
+import "reflect-metadata";
 
-global.console = console;
+globalThis.console = console;

package.json

@@ -57,7 +57,7 @@
     "ts-jest": "^29.0.5",
     "typedoc": "^0.26.11",
     "typedoc-plugin-frontmatter": "1.0.0",
-    "typedoc-plugin-inline-sources": "1.2.0",
+    "typedoc-plugin-inline-sources": "^1.2.0",
     "typedoc-plugin-markdown": "4.2.10",
     "typescript": "5.1"
   },
@@ -75,6 +75,7 @@
     ]
   },
   "dependencies": {
+    "o1js": "https://pkg.pr.new/o1-labs/o1js@c6af2a2",
     "react-json-view-lite": "^1.4.0"
   }
 }

packages/indexer/prisma/migrations/20260115122055_transaction_id/migration.sql

@@ -0,0 +1,31 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `settlementTransactionHash` on the `Batch` table. All the data in the column will be lost.
+  - You are about to drop the column `blockStateTransitions` on the `BlockResult` table. All the data in the column will be lost.
+  - The primary key for the `Settlement` table will be changed. If it partially fails, the table could be left without primary key constraint.
+  - You are about to drop the column `transactionHash` on the `Settlement` table. All the data in the column will be lost.
+  - Added the required column `afterBlockStateTransitions` to the `BlockResult` table without a default value. This is not possible if the table is not empty.
+  - Added the required column `transactionId` to the `Settlement` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- DropForeignKey
+ALTER TABLE "Batch" DROP CONSTRAINT "Batch_settlementTransactionHash_fkey";
+
+-- AlterTable
+ALTER TABLE "Batch" DROP COLUMN "settlementTransactionHash",
+ADD COLUMN     "settlementTransactionId" TEXT;
+
+-- AlterTable
+ALTER TABLE "BlockResult" DROP COLUMN "blockStateTransitions",
+ADD COLUMN     "afterBlockStateTransitions" JSON NOT NULL,
+ADD COLUMN     "witnessedRoots" TEXT[];
+
+-- AlterTable
+ALTER TABLE "Settlement" DROP CONSTRAINT "Settlement_pkey",
+DROP COLUMN "transactionHash",
+ADD COLUMN     "transactionId" TEXT NOT NULL,
+ADD CONSTRAINT "Settlement_pkey" PRIMARY KEY ("transactionId");
+
+-- AddForeignKey
+ALTER TABLE "Batch" ADD CONSTRAINT "Batch_settlementTransactionId_fkey" FOREIGN KEY ("settlementTransactionId") REFERENCES "Settlement"("transactionId") ON DELETE SET NULL ON UPDATE CASCADE;

packages/indexer/prisma/schema.prisma

@@ -96,8 +96,8 @@ model Batch {
 
   blocks Block[]
 
-  settlementTransactionHash String?
-  settlement                Settlement? @relation(fields: [settlementTransactionHash], references: [transactionHash])
+  settlementTransactionId String?
+  settlement              Settlement? @relation(fields: [settlementTransactionId], references: [transactionId])
 }
 
 model BlockResult {
@@ -114,8 +114,7 @@ model BlockResult {
 }
 
 model Settlement {
-  // transaction String
-  transactionHash      String @id
+  transactionId        String @id
   promisedMessagesHash String
 
   batches Batch[]

packages/indexer/src/IndexerNotifier.ts

@@ -109,7 +109,7 @@ export class IndexerNotifier extends SequencerModule<Record<never, never>> {
     this.sequencer.events.on("settlement-submitted", async (settlement) => {
       log.debug(
         "Notifiying the indexer about settlement",
-        settlement.transactionHash
+        settlement.transactionId
       );
       try {
         const settlementQueue = await this.taskQueue.getQueue(
@@ -129,7 +129,7 @@ export class IndexerNotifier extends SequencerModule<Record<never, never>> {
         await settlementQueue.addTask(task);
       } catch (err) {
         log.error(
-          `Failed to add index settlement: ${settlement.transactionHash} ${err}`
+          `Failed to add index settlement: ${settlement.transactionId} ${err}`
         );
       }
     });

packages/indexer/src/api/GeneratedResolverFactoryGraphqlModule.ts

@@ -105,6 +105,7 @@ export class GeneratedResolverFactoryGraphqlModule extends ResolverFactoryGraphq
   public async initializePrismaClient() {
     // setup the prisma client and feed it to the server,
     // since this is necessary for the returned resolvers to work
+
     const prismaClient = new PrismaClient({
       // datasourceUrl: 'postgresql://admin:password@localhost:5433/protokit-indexer?schema=public'
     });

packages/persistance/prisma/migrations/20251222105633_pending_l1_transactions/migration.sql

@@ -0,0 +1,44 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `settlementTransactionHash` on the `Batch` table. All the data in the column will be lost.
+  - The primary key for the `Settlement` table will be changed. If it partially fails, the table could be left without primary key constraint.
+  - You are about to drop the column `transactionHash` on the `Settlement` table. All the data in the column will be lost.
+  - Added the required column `transactionId` to the `Settlement` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- DropForeignKey
+ALTER TABLE "Batch" DROP CONSTRAINT "Batch_settlementTransactionHash_fkey";
+
+-- AlterTable
+ALTER TABLE "Batch" DROP COLUMN "settlementTransactionHash",
+ADD COLUMN     "settlementTransactionId" TEXT;
+
+-- AlterTable
+ALTER TABLE "Settlement" DROP CONSTRAINT "Settlement_pkey",
+DROP COLUMN "transactionHash",
+ADD COLUMN     "transactionId" TEXT NOT NULL,
+ADD CONSTRAINT "Settlement_pkey" PRIMARY KEY ("transactionId");
+
+-- CreateTable
+CREATE TABLE "PendingL1Transaction" (
+    "id" TEXT NOT NULL,
+    "sender" TEXT NOT NULL,
+    "nonce" INTEGER NOT NULL,
+    "attempts" INTEGER NOT NULL,
+    "status" VARCHAR(32) NOT NULL,
+    "transaction" JSON NOT NULL,
+    "lastError" TEXT,
+    "sentAt" TIMESTAMP(3),
+
+    CONSTRAINT "PendingL1Transaction_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "PendingL1Transaction_sender_nonce_key" ON "PendingL1Transaction"("sender", "nonce");
+
+-- AddForeignKey
+ALTER TABLE "Batch" ADD CONSTRAINT "Batch_settlementTransactionId_fkey" FOREIGN KEY ("settlementTransactionId") REFERENCES "Settlement"("transactionId") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "Settlement" ADD CONSTRAINT "Settlement_transactionId_fkey" FOREIGN KEY ("transactionId") REFERENCES "PendingL1Transaction"("id") ON DELETE RESTRICT ON UPDATE CASCADE;

packages/persistance/prisma/schema.prisma

@@ -105,8 +105,8 @@ model Batch {
 
   blocks Block[]
 
-  settlementTransactionHash String?
-  settlement                Settlement? @relation(fields: [settlementTransactionHash], references: [transactionHash])
+  settlementTransactionId String?
+  settlement              Settlement? @relation(fields: [settlementTransactionId], references: [transactionId])
 }
 
 model BlockResult {
@@ -123,11 +123,11 @@ model BlockResult {
 }
 
 model Settlement {
-  // transaction String
-  transactionHash      String @id
+  transactionId        String @id
   promisedMessagesHash String
 
-  batches Batch[]
+  batches              Batch[]
+  pendingL1Transaction PendingL1Transaction? @relation(fields: [transactionId], references: [id])
 }
 
 model IncomingMessageBatchTransaction {
@@ -148,3 +148,20 @@ model IncomingMessageBatch {
 
   messages IncomingMessageBatchTransaction[]
 }
+
+model PendingL1Transaction {
+  id          String    @id @default(cuid())
+  sender      String
+  nonce       Int
+  attempts    Int
+  status      String    @db.VarChar(32)
+  transaction Json      @db.Json
+  lastError   String?
+  sentAt      DateTime?
+  queuedAt    DateTime?
+  nextActionAt DateTime?
+
+  settlement Settlement?
+
+  @@unique([sender, nonce])
+}

packages/persistance/src/PrismaDatabaseConnection.ts

@@ -13,6 +13,7 @@ import { PrismaBlockStorage } from "./services/prisma/PrismaBlockStorage";
 import { PrismaSettlementStorage } from "./services/prisma/PrismaSettlementStorage";
 import { PrismaMessageStorage } from "./services/prisma/PrismaMessageStorage";
 import { PrismaTransactionStorage } from "./services/prisma/PrismaTransactionStorage";
+import { PrismaPendingL1TransactionStorage } from "./services/prisma/PrismaPendingL1TransactionStorage";
 
 export interface PrismaDatabaseConfig {
   // Either object-based config or connection string
@@ -82,6 +83,9 @@ export class PrismaDatabaseConnection
       transactionStorage: {
         useClass: PrismaTransactionStorage,
       },
+      pendingL1TransactionStorage: {
+        useClass: PrismaPendingL1TransactionStorage,
+      },
     };
   }
 
@@ -97,6 +101,7 @@ export class PrismaDatabaseConnection
       "IncomingMessageBatch",
       "IncomingMessageBatchTransaction",
       "LinkedLeaf",
+      "PendingL1Transaction",
     ];
 
     await this.prismaClient.$transaction(

packages/persistance/src/index.ts

@@ -7,6 +7,7 @@ export * from "./services/prisma/PrismaBatchStore";
 export * from "./services/prisma/PrismaSettlementStorage";
 export * from "./services/prisma/PrismaMessageStorage";
 export * from "./services/prisma/PrismaTransactionStorage";
+export * from "./services/prisma/PrismaPendingL1TransactionStorage";
 export * from "./services/prisma/mappers/BatchMapper";
 export * from "./services/prisma/mappers/BlockMapper";
 export * from "./services/prisma/mappers/FieldMapper";