Refactor/refactor provable types

packages/api/src/graphql/modules/BlockResolver.ts

@@ -10,17 +10,17 @@ import { BatchTransactionModel } from "./model/BatchTransactionModel";
 export class BlockModel {
   public static fromServiceLayerModel(block: Block) {
     return new BlockModel(
-      Number(block.networkState.during.block.height.toBigInt()),
+      Number(block.networkState.during.block.height),
       block.transactions.map((tx) =>
         BatchTransactionModel.fromServiceLayerModel({
           tx: tx.tx,
-          status: tx.status.toBoolean(),
+          status: tx.status,
           statusMessage: tx.statusMessage,
         })
       ),
-      block.transactionsHash.toString(),
-      block.hash.toString(),
-      block.previousBlockHash?.toString()
+      block.transactionsHash,
+      block.hash,
+      block.previousBlockHash
     );
   }
 

packages/api/src/graphql/modules/MempoolResolver.ts

@@ -49,7 +49,7 @@ export class TransactionObject {
       isMessage,
     } = pt.toJSON();
     return new TransactionObject(
-      pt.hash().toString(),
+      pt.hash,
       methodId,
       sender,
       nonce,
@@ -128,7 +128,7 @@ export class MempoolResolver extends GraphqlModule {
     const decoded = PendingTransaction.fromJSON(tx);
     await this.mempool.add(decoded);
 
-    return decoded.hash().toString();
+    return decoded.hash;
   }
 
   // TODO Add retrieval of pending messages somewhere as well
@@ -162,6 +162,6 @@ export class MempoolResolver extends GraphqlModule {
   })
   public async transactions() {
     const txs = await this.transactionStorage.getPendingUserTransactions();
-    return txs.map((x) => x.hash().toString());
+    return txs.map((x) => x.hash);
   }
 }

packages/api/src/graphql/modules/QueryGraphqlModule.ts

@@ -24,7 +24,7 @@ import {
 } from "@proto-kit/module";
 import {
   MandatoryProtocolModulesRecord,
-  NetworkState,
+  ProvableNetworkState,
   Protocol,
   ProtocolModulesRecord,
   State,
@@ -385,7 +385,7 @@ export class QueryGraphqlModule<
       this.networkStateTransportModule
     );
     const networkType = this.flexiblePureToGraphql(
-      NetworkState,
+      ProvableNetworkState,
       "Network",
       this.jsonToGraphQl.bind(this)
     );

packages/api/src/metrics/SequencerInstrumentation.ts

@@ -15,7 +15,7 @@ export class SequencerInstrumentation extends InstrumentationBase<{}> {
     super("protokit", "canary", {});
     if (trigger !== undefined) {
       trigger.events.on("block-produced", (block) => {
-        this.blockProduced(parseInt(block.height.toString(), 10));
+        this.blockProduced(block.height);
       });
     }
   }

packages/common/src/utils.ts

@@ -311,3 +311,17 @@ export function assertDefined<T>(
     throw new Error(msg ?? "Value is undefined");
   }
 }
+
+/**
+ * Type for serialized {@link Field}.
+ */
+export type FieldString = string;
+/**
+ *
+ * @param value Value to be converted to {@link Field}.
+ * @returns
+ */
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+export const FieldString = (
+  value: number | string | bigint | Field
+): FieldString => String(value);

packages/indexer/src/IndexerNotifier.ts

@@ -48,10 +48,7 @@ export class IndexerNotifier extends SequencerModule<Record<never, never>> {
       this.indexSettlementTask.inputSerializer();
 
     this.sequencer.events.on("block-metadata-produced", async (block) => {
-      log.debug(
-        "Notifiying the indexer about block",
-        block.block.height.toBigInt()
-      );
+      log.debug("Notifiying the indexer about block", block.block.height);
       const payload = await inputSerializer.toJSON(block);
       const sequencerId = this.sequencerIdProvider.getSequencerId();
 
@@ -69,6 +66,7 @@ export class IndexerNotifier extends SequencerModule<Record<never, never>> {
         const txQueue = await this.taskQueue.getQueue(
           this.indexPendingTxTask.name
         );
+        // This part seems weird
         const payload = await txInputSerializer.toJSON(tx);
         const sequencerId = this.sequencerIdProvider.getSequencerId();
 

packages/indexer/src/tasks/IndexBatchTask.ts

@@ -4,6 +4,7 @@ import {
   TaskWorkerModule,
   Batch,
   BatchStorage,
+  JSONTaskSerializer,
 } from "@proto-kit/sequencer";
 import { inject, injectable } from "tsyringe";
 import { log } from "@proto-kit/common";
@@ -36,15 +37,7 @@ export class IndexBatchTask
   }
 
   public inputSerializer(): TaskSerializer<Batch> {
-    return {
-      toJSON: (parameter: Batch): string => {
-        return JSON.stringify(parameter);
-      },
-      fromJSON: (parameter: string) => {
-        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        return JSON.parse(parameter) as Batch;
-      },
-    };
+    return JSONTaskSerializer.fromType<Batch>();
   }
 
   public resultSerializer(): TaskSerializer<string | void> {

packages/indexer/src/tasks/IndexBlockTask.ts

@@ -1,16 +1,14 @@
 import {
   BlockQueue,
+  JSONTaskSerializer,
   Task,
   TaskSerializer,
   TaskWorkerModule,
 } from "@proto-kit/sequencer";
 import { log } from "@proto-kit/common";
 import { inject, injectable } from "tsyringe";
 
-import {
-  IndexBlockTaskParameters,
-  IndexBlockTaskParametersSerializer,
-} from "./IndexBlockTaskParameters";
+import { IndexBlockTaskParameters } from "./IndexBlockTaskParameters";
 
 @injectable()
 export class IndexBlockTask
@@ -20,7 +18,6 @@ export class IndexBlockTask
   public name = "index-block";
 
   public constructor(
-    public taskSerializer: IndexBlockTaskParametersSerializer,
     @inject("BlockQueue")
     public blockStorage: BlockQueue
   ) {
@@ -37,16 +34,15 @@ export class IndexBlockTask
       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.error("Failed to index block", input.block.height, error);
+      return;
     }
 
-    log.info(`Block ${input.block.height.toBigInt()} indexed sucessfully`);
-    return "";
+    log.info(`Block ${input.block.height} indexed sucessfully`);
   }
 
   public inputSerializer(): TaskSerializer<IndexBlockTaskParameters> {
-    return this.taskSerializer;
+    return JSONTaskSerializer.fromType<IndexBlockTaskParameters>();
   }
 
   public resultSerializer(): TaskSerializer<string | void> {

packages/indexer/src/tasks/IndexPendingTxTask.ts

@@ -1,4 +1,5 @@
 import {
+  JSONTaskSerializer,
   PendingTransaction,
   Task,
   TaskSerializer,
@@ -8,8 +9,6 @@ import {
 import { log } from "@proto-kit/common";
 import { inject, injectable } from "tsyringe";
 
-import { IndexPendingTxTaskParametersSerializer } from "./IndexPendingTxTaskParameters";
-
 @injectable()
 export class IndexPendingTxTask
   extends TaskWorkerModule
@@ -18,7 +17,6 @@ export class IndexPendingTxTask
   public name = "index-pending-tx";
 
   public constructor(
-    public taskSerializer: IndexPendingTxTaskParametersSerializer,
     @inject("TransactionStorage")
     public transactionStorage: TransactionStorage
   ) {
@@ -39,7 +37,7 @@ export class IndexPendingTxTask
   }
 
   public inputSerializer(): TaskSerializer<PendingTransaction> {
-    return this.taskSerializer;
+    return JSONTaskSerializer.fromType<PendingTransaction>();
   }
 
   public resultSerializer(): TaskSerializer<string | void> {

packages/indexer/src/tasks/IndexSettlementTask.ts

@@ -4,6 +4,7 @@ import {
   TaskWorkerModule,
   Settlement,
   SettlementStorage,
+  JSONTaskSerializer,
 } from "@proto-kit/sequencer";
 import { inject, injectable } from "tsyringe";
 import { log } from "@proto-kit/common";
@@ -36,15 +37,7 @@ export class IndexSettlementTask
   }
 
   public inputSerializer(): TaskSerializer<Settlement> {
-    return {
-      toJSON: (parameter: Settlement): string => {
-        return JSON.stringify(parameter);
-      },
-      fromJSON: (parameter: string) => {
-        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-        return JSON.parse(parameter) as Settlement;
-      },
-    };
+    return JSONTaskSerializer.fromType<Settlement>();
   }
 
   public resultSerializer(): TaskSerializer<string | void> {

packages/indexer/test/GeneratedResolverFactoryGraphqlModule.test.ts

@@ -8,7 +8,7 @@ import { log } from "@proto-kit/common";
 import { jest } from "@jest/globals";
 
 import { Indexer } from "../src/Indexer";
-import { GeneratedResolverFactoryGraphqlModule } from "../src/api/GeneratedResolverFactoryGraphqlModule";
+import { GeneratedResolverFactoryGraphqlModule } from "../src";
 
 log.setLevel("info");
 

packages/indexer/test/IndexBlockTask.test.ts

@@ -54,8 +54,6 @@ describe("IndexBlockTask", () => {
     const storage = indexer.resolve("BlockStorage");
     const latestBlock = await storage.getLatestBlock();
 
-    expect(latestBlock?.block.hash.toBigInt()).toBe(
-      block.block.hash.toBigInt()
-    );
+    expect(latestBlock?.block.hash).toBe(block.block.hash);
   });
 });

packages/indexer/test/IndexerNotifier.test.ts

@@ -21,13 +21,15 @@ import {
   TestingAppChain,
 } from "@proto-kit/sdk";
 import {
+  JSONTaskSerializer,
   LocalTaskQueue,
+  PendingTransaction,
   Sequencer,
   TaskPayload,
   VanillaTaskWorkerModules,
 } from "@proto-kit/sequencer";
 
-import { IndexerNotifier, IndexBlockTaskParametersSerializer } from "../src";
+import { IndexerNotifier, IndexBlockTaskParameters } from "../src";
 
 class TestBalances extends Balances {
   @runtimeMethod()
@@ -130,7 +132,7 @@ async function sendTransactions(
       { nonce: i }
     );
 
-    console.log("tx nonce", tx.transaction?.nonce.toBigInt());
+    console.log("tx nonce", (tx.transaction as PendingTransaction).nonce);
 
     await tx.sign();
     await tx.send();
@@ -141,7 +143,7 @@ async function sendTransactions(
   const txs = await mempool.getTxs();
   console.log(
     "txs",
-    txs.map((tx) => tx.nonce.toBigInt())
+    txs.map((tx) => tx.nonce)
   );
 
   return await appChain.produceBlock();
@@ -179,11 +181,13 @@ describe.skip("IndexerNotifier", () => {
   }, 20000);
 
   it("should create a task for every unproven block produced", async () => {
-    const { block } = container
-      .resolve(IndexBlockTaskParametersSerializer)
-      .fromJSON(addTaskSpy.mock.lastCall?.[0].payload!);
+    const serializer = JSONTaskSerializer.fromType<IndexBlockTaskParameters>();
 
-    expect(block.height.toBigInt()).toBe(0n);
+    const { block } = await serializer.fromJSON(
+      addTaskSpy.mock.lastCall?.[0].payload!
+    );
+
+    expect(block.height).toBe(0);
     expect(block.transactions.length).toBe(2);
   });
 });

packages/library/src/hooks/RuntimeFeeAnalyzerService.ts

@@ -8,7 +8,7 @@ import { container, inject } from "tsyringe";
 import {
   RuntimeMethodExecutionContext,
   RuntimeTransaction,
-  NetworkState,
+  ProvableNetworkState,
 } from "@proto-kit/protocol";
 import { Field, Poseidon, Struct } from "o1js";
 
@@ -77,7 +77,7 @@ export class RuntimeFeeAnalyzerService extends ConfigurableModule<RuntimeFeeAnal
 
     context.setup({
       transaction: RuntimeTransaction.dummyTransaction(),
-      networkState: NetworkState.empty(),
+      networkState: ProvableNetworkState.empty(),
     });
 
     container.resolve(RuntimeMethodExecutionContext).clear();
@@ -110,8 +110,8 @@ export class RuntimeFeeAnalyzerService extends ConfigurableModule<RuntimeFeeAnal
                 {
                   ...values,
 
-                  [methodId.toString()]: {
-                    methodId,
+                  [methodId]: {
+                    methodId: BigInt(methodId),
 
                     baseFee:
                       this.config.methods[combinedMethodName]?.baseFee ??
@@ -129,7 +129,7 @@ export class RuntimeFeeAnalyzerService extends ConfigurableModule<RuntimeFeeAnal
                 {
                   ...indexes,
                   // eslint-disable-next-line no-plusplus
-                  [methodId.toString()]: BigInt(methodCounter++),
+                  [methodId]: BigInt(methodCounter++),
                 },
               ];
             },
@@ -166,8 +166,8 @@ export class RuntimeFeeAnalyzerService extends ConfigurableModule<RuntimeFeeAnal
     return this.persistedFeeTree;
   }
 
-  public getFeeConfig(methodId: bigint) {
-    const feeConfig = this.getFeeTree().values[methodId.toString()];
+  public getFeeConfig(methodId: string) {
+    const feeConfig = this.getFeeTree().values[methodId];
 
     return new MethodFeeConfigData({
       methodId: Field(feeConfig.methodId),
@@ -177,9 +177,9 @@ export class RuntimeFeeAnalyzerService extends ConfigurableModule<RuntimeFeeAnal
     });
   }
 
-  public getWitness(methodId: bigint) {
+  public getWitness(methodId: string) {
     const feeTree = this.getFeeTree();
-    return feeTree.tree.getWitness(feeTree.indexes[methodId.toString()]);
+    return feeTree.tree.getWitness(feeTree.indexes[methodId]);
   }
 
   public getRoot(): bigint {