proto-kit · rpanic · Apr 13, 2026 · Mar 26, 2026 · Mar 26, 2026 · Mar 27, 2026
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/api/package.json b/packages/api/package.json
@@ -50,7 +50,6 @@
     "@proto-kit/protocol": "*",
     "@proto-kit/sequencer": "*",
     "o1js": "2.10.0-dev.6d3a3",
-    "@o1js/native": "2.10.0-dev.6d3a3",
     "tsyringe": "^4.10.0"
   },
   "devDependencies": {

diff --git a/packages/api/src/graphql/GraphqlSequencerModule.ts b/packages/api/src/graphql/GraphqlSequencerModule.ts
@@ -2,7 +2,6 @@ import { buildSchemaSync, NonEmptyArray } from "type-graphql";
 import { Closeable, closeable, SequencerModule } from "@proto-kit/sequencer";
 import {
   ChildContainerProvider,
-  Configurable,
   CombinedModuleContainerConfig,
   log,
   ModuleContainer,
@@ -48,7 +47,11 @@ function assertArrayIsNotEmpty<T>(
 @closeable()
 export class GraphqlSequencerModule<GraphQLModules extends GraphqlModulesRecord>
   extends ModuleContainer<GraphQLModules, GraphqlServerConfig>
-  implements Configurable<unknown>, SequencerModule<unknown>, Closeable
+  implements
+    SequencerModule<
+      CombinedModuleContainerConfig<GraphQLModules, GraphqlServerConfig>
+    >,
+    Closeable
 {
   private readonly modules: TypedClass<GraphqlModule<unknown>>[] = [];
 

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -43,7 +43,6 @@
     "@proto-kit/stack": "*",
     "@proto-kit/indexer": "*",
     "o1js": "2.10.0-dev.6d3a3",
-    "@o1js/native": "2.10.0-dev.6d3a3",
     "tsyringe": "^4.10.0"
   },
   "devDependencies": {

diff --git a/packages/cli/src/commands/lightnet/initialize.ts b/packages/cli/src/commands/lightnet/initialize.ts
@@ -11,7 +11,7 @@ interface InitializeArgs {
 export const initializeCommand: CommandModule<{}, InitializeArgs> = {
   command: "initialize",
   describe:
-    "Initialize lightnet: wait for network, fund accounts, and deploy settlement\n\nRequires: MINA_NODE_GRAPHQL_HOST, MINA_NODE_GRAPHQL_PORT, MINA_ARCHIVE_GRAPHQL_HOST, MINA_ARCHIVE_GRAPHQL_PORT, MINA_ACCOUNT_MANAGER_HOST, MINA_ACCOUNT_MANAGER_PORT, PROTOKIT_SETTLEMENT_CONTRACT_PRIVATE_KEY, PROTOKIT_DISPATCHER_CONTRACT_PRIVATE_KEY, PROTOKIT_MINA_BRIDGE_CONTRACT_PRIVATE_KEY",
+    "Initialize lightnet: wait for network, fund accounts, and deploy settlement\n\nRequires: MINA_NODE_GRAPHQL, MINA_ARCHIVE_GRAPHQL, MINA_ACCOUNT_MANAGER_URL, PROTOKIT_SETTLEMENT_CONTRACT_PRIVATE_KEY, PROTOKIT_DISPATCHER_CONTRACT_PRIVATE_KEY, PROTOKIT_MINA_BRIDGE_CONTRACT_PRIVATE_KEY",
   builder: (yarg) => addEnvironmentOptions(yarg),
   handler: async (args) => {
     try {

diff --git a/packages/cli/src/commands/lightnet/waitForNetwork.ts b/packages/cli/src/commands/lightnet/waitForNetwork.ts
@@ -10,8 +10,7 @@ interface WaitForNetworkArgs {
 
 export const waitForNetworkCommand: CommandModule<{}, WaitForNetworkArgs> = {
   command: "wait",
-  describe:
-    "Wait for network to be ready\n\nRequires: MINA_NODE_GRAPHQL_HOST, MINA_NODE_GRAPHQL_PORT",
+  describe: "Wait for network to be ready\n\nRequires: MINA_NODE_GRAPHQL",
   builder: (yarg) => addEnvironmentOptions(yarg),
   handler: async (args) => {
     try {

diff --git a/packages/cli/src/scripts/lightnet/faucet.ts b/packages/cli/src/scripts/lightnet/faucet.ts
@@ -9,9 +9,9 @@ export default async function (publicKey: string) {
   const fundingAmount = 1000 * 1e9;
 
   const net = Mina.Network({
-    mina: `${getRequiredEnv("MINA_NODE_GRAPHQL_HOST")}:${getRequiredEnv("MINA_NODE_GRAPHQL_PORT")}/graphql`,
-    archive: `${getRequiredEnv("MINA_ARCHIVE_GRAPHQL_HOST")}:${getRequiredEnv("MINA_ARCHIVE_GRAPHQL_PORT")}/graphql`,
-    lightnetAccountManager: `${getRequiredEnv("MINA_ACCOUNT_MANAGER_HOST")}:${getRequiredEnv("MINA_ACCOUNT_MANAGER_PORT")}`,
+    mina: getRequiredEnv("MINA_NODE_GRAPHQL"),
+    archive: getRequiredEnv("MINA_ARCHIVE_GRAPHQL"),
+    lightnetAccountManager: getRequiredEnv("MINA_ACCOUNT_MANAGER_URL"),
   });
 
   Mina.setActiveInstance(net);

diff --git a/packages/cli/src/scripts/lightnet/wait-for-network.ts b/packages/cli/src/scripts/lightnet/wait-for-network.ts
@@ -9,7 +9,7 @@ export default async function (options: LoadEnvOptions) {
   const { sleep } = await import("@proto-kit/common");
   const { fetchLastBlock, Provable } = await import("o1js");
   loadEnvironmentVariables(options);
-  const graphqlEndpoint = `${getRequiredEnv("MINA_NODE_GRAPHQL_HOST")}:${getRequiredEnv("MINA_NODE_GRAPHQL_PORT")}/graphql`;
+  const graphqlEndpoint = getRequiredEnv("MINA_NODE_GRAPHQL");
   let lastBlock;
   let attempt = 0;
   console.log("Waiting for network to be ready...");

diff --git a/packages/cli/src/scripts/settlement/deploy.ts b/packages/cli/src/scripts/settlement/deploy.ts
@@ -26,7 +26,7 @@ export default async function (options: LoadEnvOptions) {
       MinaBaseLayer,
       PrivateMempool,
       LocalTaskQueue,
-      LocalTaskWorkerModule,
+      WorkerModule,
       VanillaTaskWorkerModules,
       SequencerStartupModule,
     } = await import("@proto-kit/sequencer");
@@ -49,9 +49,7 @@ export default async function (options: LoadEnvOptions) {
         BridgingModule,
         Mempool: PrivateMempool,
         TaskQueue: LocalTaskQueue,
-        LocalTaskWorker: LocalTaskWorkerModule.from(
-          VanillaTaskWorkerModules.allTasks()
-        ),
+        WorkerModule: WorkerModule.from(VanillaTaskWorkerModules.allTasks()),
         SequencerStartupModule,
       }),
     });
@@ -71,7 +69,7 @@ export default async function (options: LoadEnvOptions) {
             type: process.env.MINA_NETWORK as any,
             graphql: process.env.MINA_NODE_GRAPHQL!,
             archive: process.env.MINA_ARCHIVE_GRAPHQL!,
-            accountManager: process.env.MINA_ACCOUNT_MANAGER!,
+            accountManager: process.env.MINA_ACCOUNT_MANAGER_URL!,
           },
         },
         SettlementSigner: {
@@ -102,7 +100,7 @@ export default async function (options: LoadEnvOptions) {
         TaskQueue: {
           simulatedDuration: 0,
         },
-        LocalTaskWorker: VanillaTaskWorkerModules.defaultConfig(),
+        WorkerModule: VanillaTaskWorkerModules.defaultConfig(),
         Mempool: {},
       },
     });

diff --git a/packages/common/package.json b/packages/common/package.json
@@ -27,7 +27,6 @@
   },
   "peerDependencies": {
     "o1js": "2.10.0-dev.6d3a3",
-    "@o1js/native": "2.10.0-dev.6d3a3",
     "tsyringe": "^4.10.0"
   },
   "devDependencies": {

diff --git a/packages/deployment/package.json b/packages/deployment/package.json
@@ -34,7 +34,6 @@
     "@proto-kit/sequencer": "*",
     "bullmq": "^4.18.3",
     "o1js": "2.10.0-dev.6d3a3",
-    "@o1js/native": "2.10.0-dev.6d3a3",
     "tsyringe": "^4.10.0"
   },
   "devDependencies": {

diff --git a/packages/indexer/package.json b/packages/indexer/package.json
@@ -44,7 +44,6 @@
     "@proto-kit/sequencer": "*",
     "koa": "^2.14.2",
     "o1js": "2.10.0-dev.6d3a3",
-    "@o1js/native": "2.10.0-dev.6d3a3",
     "tsyringe": "^4.10.0",
     "type-graphql": "2.0.0-rc.2",
     "typegraphql-prisma": "0.28"

diff --git a/packages/indexer/src/tasks/IndexBatchTask.ts b/packages/indexer/src/tasks/IndexBatchTask.ts
@@ -4,11 +4,13 @@ import {
   TaskWorkerModule,
   Batch,
   BatchStorage,
+  task,
 } from "@proto-kit/sequencer";
 import { inject, injectable } from "tsyringe";
 import { log } from "@proto-kit/common";
 
 @injectable()
+@task()
 export class IndexBatchTask
   extends TaskWorkerModule
   implements Task<Batch, string | void>
@@ -28,11 +30,13 @@ export class IndexBatchTask
   public async compute(input: Batch): Promise<string | void> {
     try {
       await this.batchStorage.pushBatch(input);
+
+      log.info(`Batch ${input.height} indexed successfully`);
       return "";
     } catch (err) {
       log.error("Failed to process settlement task", err);
-      return undefined;
     }
+    return undefined;
   }
 
   public inputSerializer(): TaskSerializer<Batch> {

diff --git a/packages/indexer/src/tasks/IndexBlockTask.ts b/packages/indexer/src/tasks/IndexBlockTask.ts
@@ -1,9 +1,11 @@
 import {
+  Block,
   BlockQueue,
   task,
   Task,
   TaskSerializer,
   TaskWorkerModule,
+  TransactionStorage,
 } from "@proto-kit/sequencer";
 import { log } from "@proto-kit/common";
 import { inject, injectable } from "tsyringe";
@@ -24,26 +26,55 @@ export class IndexBlockTask
   public constructor(
     public taskSerializer: IndexBlockTaskParametersSerializer,
     @inject("BlockQueue")
-    public blockStorage: BlockQueue
+    public blockStorage: BlockQueue,
+    @inject("TransactionStorage")
+    public transactionStorage: TransactionStorage
   ) {
     super();
   }
 
   // eslint-disable-next-line @typescript-eslint/no-empty-function
   public async prepare(): Promise<void> {}
 
+  private async syncTransactions(block: Block) {
+    const results = await Promise.all(
+      block.transactions.map(async ({ tx }) => {
+        return [
+          tx,
+          await this.transactionStorage.findTransaction(tx.hash().toString()),
+        ] as const;
+      })
+    );
+
+    const missingTxs = results
+      .filter(([, result]) => result === undefined)
+      .map(([tx]) => tx);
+
+    const pushResults = await Promise.all(
+      missingTxs.map(
+        async (tx) => await this.transactionStorage.pushUserTransaction(tx, 0)
+      )
+    );
+    if (pushResults.some((x) => !x)) {
+      log.error(
+        "Some transactions haven't been pushed, this will lead to constraint errors!"
+      );
+    }
+  }
+
   public async compute(
     input: IndexBlockTaskParameters
   ): Promise<string | void> {
     try {
+      await this.syncTransactions(input.block);
       await this.blockStorage.pushBlock(input.block);
       await this.blockStorage.pushResult(input.result);
     } catch (error) {
       log.error("Failed to index block", input.block.height.toBigInt(), error);
       return undefined;
     }
 
-    log.info(`Block ${input.block.height.toBigInt()} indexed sucessfully`);
+    log.info(`Block ${input.block.height.toBigInt()} indexed successfully`);
     return "";
   }
 

diff --git a/packages/indexer/src/tasks/IndexPendingTxTask.ts b/packages/indexer/src/tasks/IndexPendingTxTask.ts
@@ -1,5 +1,6 @@
 import {
   PendingTransaction,
+  task,
   Task,
   TaskSerializer,
   TaskWorkerModule,
@@ -11,6 +12,7 @@ import { inject, injectable } from "tsyringe";
 import { IndexPendingTxTaskParametersSerializer } from "./IndexPendingTxTaskParameters";
 
 @injectable()
+@task()
 export class IndexPendingTxTask
   extends TaskWorkerModule
   implements Task<PendingTransaction, string | void>

diff --git a/packages/indexer/src/tasks/IndexSettlementTask.ts b/packages/indexer/src/tasks/IndexSettlementTask.ts
@@ -4,11 +4,13 @@ import {
   TaskWorkerModule,
   Settlement,
   SettlementStorage,
+  task,
 } from "@proto-kit/sequencer";
 import { inject, injectable } from "tsyringe";
 import { log } from "@proto-kit/common";
 
 @injectable()
+@task()
 export class IndexSettlementTask
   extends TaskWorkerModule
   implements Task<Settlement, string | void>
@@ -28,6 +30,8 @@ export class IndexSettlementTask
   public async compute(input: Settlement): Promise<string | void> {
     try {
       await this.settlementStorage.pushSettlement(input);
+
+      log.info(`Settlement ${input.batches.at(-1)!} indexed successfully`);
       return "";
     } catch (err) {
       log.error("Failed to process settlement task", err);

diff --git a/packages/library/package.json b/packages/library/package.json
@@ -29,7 +29,6 @@
     "@proto-kit/protocol": "*",
     "@proto-kit/sequencer": "*",
     "o1js": "2.10.0-dev.6d3a3",
-    "@o1js/native": "2.10.0-dev.6d3a3",
     "tsyringe": "^4.10.0"
   },
   "devDependencies": {

diff --git a/packages/module/package.json b/packages/module/package.json
@@ -30,7 +30,6 @@
     "@proto-kit/common": "*",
     "@proto-kit/protocol": "*",
     "o1js": "2.10.0-dev.6d3a3",
-    "@o1js/native": "2.10.0-dev.6d3a3",
     "tsyringe": "^4.10.0"
   },
   "gitHead": "8a7eca319272a15162dc4ad04bdc134b1017716d"

diff --git a/packages/persistance/package.json b/packages/persistance/package.json
@@ -33,7 +33,6 @@
     "@proto-kit/protocol": "*",
     "@proto-kit/sequencer": "*",
     "o1js": "2.10.0-dev.6d3a3",
-    "@o1js/native": "2.10.0-dev.6d3a3",
     "tsyringe": "^4.10.0"
   },
   "devDependencies": {