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

@@ -295,3 +295,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/IndexBlockTask.ts

@@ -37,12 +37,11 @@ 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> {

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

@@ -22,6 +22,7 @@ import {
 } from "@proto-kit/sdk";
 import {
   LocalTaskQueue,
+  PendingTransaction,
   Sequencer,
   TaskPayload,
   VanillaTaskWorkerModules,
@@ -130,7 +131,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 +142,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();
@@ -183,7 +184,7 @@ describe.skip("IndexerNotifier", () => {
       .resolve(IndexBlockTaskParametersSerializer)
       .fromJSON(addTaskSpy.mock.lastCall?.[0].payload!);
 
-    expect(block.height.toBigInt()).toBe(0n);
+    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 {

packages/library/src/hooks/TransactionFeeHook.ts

@@ -131,14 +131,14 @@ export class TransactionFeeHook extends ProvableTransactionHook<TransactionFeeHo
   ): Promise<void> {
     const feeConfig = Provable.witness(MethodFeeConfigData, () =>
       this.feeAnalyzer.getFeeConfig(
-        executionData.transaction.methodId.toBigInt()
+        executionData.transaction.methodId.toString()
       )
     );
     const witness = Provable.witness(
       RuntimeFeeAnalyzerService.getWitnessType(),
       () =>
         this.feeAnalyzer.getWitness(
-          executionData.transaction.methodId.toBigInt()
+          executionData.transaction.methodId.toString()
         )
     );
 
@@ -167,7 +167,7 @@ export class TransactionFeeHook extends ProvableTransactionHook<TransactionFeeHo
     args: BeforeTransactionHookArguments
   ): Promise<boolean> {
     const feeConfig = this.feeAnalyzer.getFeeConfig(
-      args.transaction.methodId.toBigInt()
+      args.transaction.methodId.toString()
     );
 
     const fee = this.getFee(feeConfig);

packages/library/test/math/State.test.ts

@@ -4,7 +4,7 @@ import {
   StateServiceProvider,
   RuntimeMethodExecutionContext,
   RuntimeTransaction,
-  NetworkState,
+  ProvableNetworkState,
 } from "@proto-kit/protocol";
 import { UInt64, Field } from "o1js";
 import { InMemoryStateService } from "@proto-kit/module";
@@ -24,7 +24,7 @@ describe("interop uint <-> state", () => {
     const context = container.resolve(RuntimeMethodExecutionContext);
     context.setup({
       transaction: RuntimeTransaction.dummyTransaction(),
-      networkState: NetworkState.empty(),
+      networkState: ProvableNetworkState.empty(),
     });
 
     const uint = await state.get();

packages/module/src/method/MethodParameterEncoder.ts

@@ -128,7 +128,7 @@ export class MethodParameterEncoder {
 
   public constructor(private readonly types: ArgTypeArray) {}
 
-  public decode(fields: Field[], auxiliary: string[]): Promise<ArgArray> {
+  public decode(fields: string[], auxiliary: string[]): Promise<ArgArray> {
     if (fields.length < this.fieldSize()) {
       throw errors.fieldLengthNotMatching(this.fieldSize(), fields.length);
     }
@@ -155,12 +155,8 @@ export class MethodParameterEncoder {
           const inputFieldSize = MethodParameterEncoder.fieldSize(
             type.publicInputType
           )!;
-          const input = structFields
-            .slice(0, inputFieldSize)
-            .map((x) => x.toString());
-          const output = structFields
-            .slice(inputFieldSize)
-            .map((x) => x.toString());
+          const input = structFields.slice(0, inputFieldSize);
+          const output = structFields.slice(inputFieldSize);
 
           // fromJSON has incompatible signature for Proof and DynamicProof
           if (isProofType(type)) {
@@ -180,7 +176,7 @@ export class MethodParameterEncoder {
         }
 
         return (type as FlexibleProvable<unknown>).fromFields(
-          structFields,
+          structFields.map(Field),
           []
         ) as any;
       })

packages/module/src/runtime/MethodIdResolver.ts

@@ -29,7 +29,7 @@ export class MethodIdResolver {
       this.runtime.assertIsValidModuleName(moduleName);
 
       runtime.resolve(moduleName).runtimeMethodNames.forEach((methodName) => {
-        dict[this.getMethodId(moduleName, methodName).toString()] = {
+        dict[this.getMethodId(moduleName, methodName)] = {
           moduleName,
           methodName,
         };
@@ -83,8 +83,8 @@ export class MethodIdResolver {
       }, {});
   }
 
-  public getMethodNameFromId(methodId: bigint): [string, string] | undefined {
-    const methodPath = this.dictionary[methodId.toString()];
+  public getMethodNameFromId(methodId: string): [string, string] | undefined {
+    const methodPath = this.dictionary[methodId];
 
     if (methodPath === undefined) {
       return undefined;
@@ -97,12 +97,12 @@ export class MethodIdResolver {
     return [moduleName, methodName];
   }
 
-  public getMethodId(moduleName: string, methodName: string): bigint {
+  public getMethodId(moduleName: string, methodName: string): string {
     this.runtime.assertIsValidModuleName(moduleName);
 
     return Poseidon.hash([
       stringToField(moduleName),
       stringToField(methodName),
-    ]).toBigInt();
+    ]).toString();
   }
 }

packages/module/src/runtime/Runtime.ts

@@ -19,7 +19,7 @@ import {
   SimpleAsyncStateService,
   RuntimeMethodExecutionContext,
   RuntimeTransaction,
-  NetworkState,
+  ProvableNetworkState,
 } from "@proto-kit/protocol";
 
 import {
@@ -337,7 +337,7 @@ export class Runtime<Modules extends RuntimeModulesRecord>
    * Encoding: "stringToField(module.name) << 128 + stringToField(method-name)"
    */
   public getMethodById(
-    methodId: bigint
+    methodId: string
   ): ((...args: unknown[]) => Promise<unknown>) | undefined {
     const methodDescriptor =
       this.methodIdResolver.getMethodNameFromId(methodId);
@@ -388,7 +388,7 @@ export class Runtime<Modules extends RuntimeModulesRecord>
     const context = container.resolve(RuntimeMethodExecutionContext);
     context.setup({
       transaction: RuntimeTransaction.dummyTransaction(),
-      networkState: NetworkState.empty(),
+      networkState: ProvableNetworkState.empty(),
     });
     return await this.zkProgrammable.compile(registry);
   }