@proto-kit/module 0.1.1-develop.267 → 0.1.1-develop.298

package/dist/method/MethodParameterDecoder.d.ts

@@ -1,22 +1,9 @@
-import { Field } from "snarkyjs";
+import { FlexibleProvable } from "o1js";
 import { RuntimeModule } from "../runtime/RuntimeModule";
-export interface Fieldable {
-    toFields: () => Field[];
-}
-export interface FromFieldClass {
-    new: (...args: any[]) => any;
-    fromFields: (fields: Field[]) => Fieldable;
-    name: string;
-    prototype: {
-        _fields?: any[];
-    };
-    sizeInFields?: () => number;
-}
 export declare class MethodParameterDecoder {
     private readonly types;
     static fromMethod(target: RuntimeModule<unknown>, methodName: string): MethodParameterDecoder;
     private constructor();
-    fromFields(fields: Field[]): Fieldable[];
-    get fieldSize(): number;
+    fromJSON(argsJSON: string[]): FlexibleProvable<unknown>[];
 }
 //# sourceMappingURL=MethodParameterDecoder.d.ts.map

package/dist/method/MethodParameterDecoder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MethodParameterDecoder.d.ts","sourceRoot":"","sources":["../../src/method/MethodParameterDecoder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAEjC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD,MAAM,WAAW,SAAS;IACxB,QAAQ,EAAE,MAAM,KAAK,EAAE,CAAC;CACzB;AAED,MAAM,WAAW,cAAc;IAC7B,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC;IAC7B,UAAU,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,SAAS,CAAC;IAC3C,IAAI,EAAE,MAAM,CAAC;IAEb,SAAS,EAAE;QACT,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC;KACjB,CAAC;IACF,YAAY,CAAC,EAAE,MAAM,MAAM,CAAC;CAC7B;AAYD,qBAAa,sBAAsB;IAWb,OAAO,CAAC,QAAQ,CAAC,KAAK;WAV5B,UAAU,CAAC,MAAM,EAAE,aAAa,CAAC,OAAO,CAAC,EAAE,UAAU,EAAE,MAAM;IAU3E,OAAO;IAEA,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,SAAS,EAAE;IAmB/C,IAAW,SAAS,IAAI,MAAM,CAM7B;CACF"}
+{"version":3,"file":"MethodParameterDecoder.d.ts","sourceRoot":"","sources":["../../src/method/MethodParameterDecoder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAoB,MAAM,MAAM,CAAC;AAE1D,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AASzD,qBAAa,sBAAsB;IAYb,OAAO,CAAC,QAAQ,CAAC,KAAK;WAX5B,UAAU,CAAC,MAAM,EAAE,aAAa,CAAC,OAAO,CAAC,EAAE,UAAU,EAAE,MAAM;IAW3E,OAAO;IAEA,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,gBAAgB,CAAC,OAAO,CAAC,EAAE;CAkBjE"}

package/dist/method/MethodParameterDecoder.js

@@ -1,33 +1,28 @@
 const errors = {
-    fieldLengthNotMatching: (expected, actual) => new Error(`Expected ${expected} field elements, got ${actual}`),
     typeNotCompatible: (name) => new Error(`Cannot decode type ${name}, it has to be either a Struct, CircuitValue or built-in snarkyjs type`),
 };
 export class MethodParameterDecoder {
     static fromMethod(target, methodName) {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         const paramtypes = Reflect.getMetadata("design:paramtypes", target, methodName);
         return new MethodParameterDecoder(paramtypes);
     }
     constructor(types) {
         this.types = types;
     }
-    fromFields(fields) {
-        if (fields.length < this.fieldSize) {
-            throw errors.fieldLengthNotMatching(this.fieldSize, fields.length);
-        }
-        let stack = fields.slice();
-        return this.types.map((type) => {
-            const numberFieldsNeeded = type.prototype._fields?.length ?? type.sizeInFields?.() ?? -1;
-            if (numberFieldsNeeded === -1) {
-                throw errors.typeNotCompatible(type.name);
+    fromJSON(argsJSON) {
+        return this.types.map((type, index) => {
+            // eslint-disable-next-line @typescript-eslint/init-declarations
+            let value;
+            try {
+                // eslint-disable-next-line max-len
+                // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+                value = type.fromJSON(JSON.parse(argsJSON[index]));
             }
-            const structFields = stack.slice(0, numberFieldsNeeded);
-            stack = stack.slice(numberFieldsNeeded);
-            return type.fromFields(structFields);
+            catch {
+                throw errors.typeNotCompatible(type.constructor.name);
+            }
+            return value;
         });
     }
-    get fieldSize() {
-        return this.types
-            .map((type) => type.prototype._fields?.length ?? type.sizeInFields?.() ?? 0)
-            .reduce((a, b) => a + b, 0);
-    }
 }

package/dist/method/runtimeMethod.d.ts

@@ -1,7 +1,7 @@
 import { StateTransition, MethodPublicOutput } from "@proto-kit/protocol";
 import { ToFieldable } from "@proto-kit/common";
 import type { RuntimeModule } from "../runtime/RuntimeModule.js";
-export declare function toStateTransitionsHash(stateTransitions: StateTransition<any>[]): import("snarkyjs/dist/node/lib/field.js").Field;
+export declare function toStateTransitionsHash(stateTransitions: StateTransition<any>[]): import("o1js/dist/node/lib/field.js").Field;
 export type WrappedMethod = (...args: unknown[]) => MethodPublicOutput;
 export declare function toWrappedMethod(this: RuntimeModule<unknown>, methodName: string, moduleMethod: (...args: unknown[]) => unknown, methodArguments: ToFieldable[]): WrappedMethod;
 export declare function combineMethodName(runtimeModuleName: string, methodName: string): string;

package/dist/method/runtimeMethod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtimeMethod.d.ts","sourceRoot":"","sources":["../../src/method/runtimeMethod.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,eAAe,EAGf,kBAAkB,EAEnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAIL,WAAW,EACZ,MAAM,mBAAmB,CAAC;AAE3B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAoBjE,wBAAgB,sBAAsB,CAEpC,gBAAgB,EAAE,eAAe,CAAC,GAAG,CAAC,EAAE,mDAczC;AAGD,MAAM,MAAM,aAAa,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,kBAAkB,CAAC;AAEvE,wBAAgB,eAAe,CAC7B,IAAI,EAAE,aAAa,CAAC,OAAO,CAAC,EAC5B,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,EAC7C,eAAe,EAAE,WAAW,EAAE,iBAoF/B;AAED,wBAAgB,iBAAiB,CAC/B,iBAAiB,EAAE,MAAM,EACzB,UAAU,EAAE,MAAM,UAGnB;AAED,eAAO,MAAM,wBAAwB,eAAe,CAAC;AACrD,eAAO,MAAM,6BAA6B,8BAA8B,CAAC;AAEzE;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,aAAa,CAAC,OAAO,CAAC,EAC9B,WAAW,EAAE,MAAM,WAKpB;AAED,wBAAgB,aAAa,aAEjB,cAAc,OAAO,CAAC,cAClB,MAAM,cACN,kBAAkB,UAwFjC"}
+{"version":3,"file":"runtimeMethod.d.ts","sourceRoot":"","sources":["../../src/method/runtimeMethod.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,eAAe,EAGf,kBAAkB,EAEnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAIL,WAAW,EACZ,MAAM,mBAAmB,CAAC;AAE3B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAoBjE,wBAAgB,sBAAsB,CAEpC,gBAAgB,EAAE,eAAe,CAAC,GAAG,CAAC,EAAE,+CAczC;AAGD,MAAM,MAAM,aAAa,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,kBAAkB,CAAC;AAEvE,wBAAgB,eAAe,CAC7B,IAAI,EAAE,aAAa,CAAC,OAAO,CAAC,EAC5B,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,EAC7C,eAAe,EAAE,WAAW,EAAE,iBA0F/B;AAED,wBAAgB,iBAAiB,CAC/B,iBAAiB,EAAE,MAAM,EACzB,UAAU,EAAE,MAAM,UAGnB;AAED,eAAO,MAAM,wBAAwB,eAAe,CAAC;AACrD,eAAO,MAAM,6BAA6B,8BAA8B,CAAC;AAEzE;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,aAAa,CAAC,OAAO,CAAC,EAC9B,WAAW,EAAE,MAAM,WAKpB;AAED,wBAAgB,aAAa,aAEjB,cAAc,OAAO,CAAC,cAClB,MAAM,cACN,kBAAkB,UAwFjC"}

package/dist/method/runtimeMethod.js

@@ -1,4 +1,4 @@
-import { Field, Poseidon } from "snarkyjs";
+import { Field, Poseidon, Proof } from "o1js";
 import { container } from "tsyringe";
 import { DefaultProvableHashList, ProvableStateTransition, MethodPublicOutput, RuntimeMethodExecutionContext, } from "@proto-kit/protocol";
 import { toProver, } from "@proto-kit/common";
@@ -34,18 +34,28 @@ export function toWrappedMethod(methodName, moduleMethod, methodArguments) {
             throw errors.runtimeNotProvided(name);
         }
         // Assert that the given transaction has the correct methodId
-        const methodIdResolver = runtime.dependencyContainer.resolve("MethodIdResolver");
+        const { methodIdResolver } = runtime;
         const thisMethodId = Field(methodIdResolver.getMethodId(name, methodName));
         if (!thisMethodId.isConstant()) {
             throw errors.fieldNotConstant("methodId");
         }
         input.transaction.methodId.assertEquals(thisMethodId, "Runtimemethod called with wrong methodId on the transaction object");
-        const paramTypes = Reflect.getMetadata("design:paramtypes", this, methodName);
+        const parameterTypes = Reflect.getMetadata("design:paramtypes", this, methodName);
         /**
          * Use the type info obtained previously to convert
          * the args passed to fields
          */
-        const argsFields = args.flatMap((arg, index) => paramTypes[index].toFields(arg));
+        const argsFields = args.flatMap((argument, index) => {
+            if (argument instanceof Proof) {
+                return [
+                    ...argument.publicInput?.toFields(),
+                    ...argument.publicOutput?.toFields(),
+                ];
+            }
+            else {
+                return parameterTypes[index].toFields(argument);
+            }
+        });
         // Assert that the argsHash that has been signed matches the given arguments
         // We can use js-if here, because methodArguments is statically sizes
         // i.e. the result of the if-statement will be the same for all executions

package/dist/runtime/MethodIdResolver.js

@@ -1,5 +1,5 @@
 import { stringToField } from "@proto-kit/protocol";
-import { Poseidon } from "snarkyjs";
+import { Poseidon } from "o1js";
 /**
  * Please see `getMethodId` to learn more about
  * methodId encoding

package/dist/runtime/Runtime.d.ts

@@ -1,8 +1,10 @@
-import { Experimental } from "snarkyjs";
+import { Experimental } from "o1js";
 import { DependencyContainer } from "tsyringe";
-import { StringKeyOf, ModuleContainer, ModulesConfig, ModulesRecord, TypedClass, ZkProgrammable, PlainZkProgram, WithZkProgrammable, AreProofsEnabled } from "@proto-kit/common";
+import { StringKeyOf, ModuleContainer, ModulesConfig, ModulesRecord, TypedClass, ZkProgrammable, PlainZkProgram, AreProofsEnabled, ChildContainerProvider } from "@proto-kit/common";
 import { MethodPublicOutput, StateServiceProvider, StateService } from "@proto-kit/protocol";
 import { RuntimeModule } from "./RuntimeModule";
+import { MethodIdResolver } from "./MethodIdResolver";
+import { RuntimeEnvironment } from "./RuntimeEnvironment";
 /**
  * Record of modules accepted by the Runtime module container.
  *
@@ -31,8 +33,8 @@ export declare class RuntimeZkProgrammable<Modules extends RuntimeModulesRecord>
  * Wrapper for an application specific runtime, which helps orchestrate
  * runtime modules into an interoperable runtime.
  */
-export declare class Runtime<Modules extends RuntimeModulesRecord> extends ModuleContainer<Modules> implements WithZkProgrammable<undefined, MethodPublicOutput> {
-    static from<Modules extends RuntimeModulesRecord>(definition: RuntimeDefinition<Modules>): Runtime<Modules>;
+export declare class Runtime<Modules extends RuntimeModulesRecord> extends ModuleContainer<Modules> implements RuntimeEnvironment {
+    static from<Modules extends RuntimeModulesRecord>(definition: RuntimeDefinition<Modules>): TypedClass<Runtime<Modules>>;
     program?: ReturnType<typeof Experimental.ZkProgram>;
     definition: RuntimeDefinition<Modules>;
     zkProgrammable: ZkProgrammable<undefined, MethodPublicOutput>;
@@ -43,10 +45,11 @@ export declare class Runtime<Modules extends RuntimeModulesRecord> extends Modul
      * @param modules - Configuration object for the constructed Runtime
      */
     constructor(definition: RuntimeDefinition<Modules>);
-    start(): void;
+    create(childContainerProvider: ChildContainerProvider): void;
     get appChain(): AreProofsEnabled | undefined;
     get stateService(): StateService;
     get stateServiceProvider(): StateServiceProvider;
+    get methodIdResolver(): MethodIdResolver;
     /**
      * @returns The dependency injection container of this runtime
      */

package/dist/runtime/Runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Runtime.d.ts","sourceRoot":"","sources":["../../src/runtime/Runtime.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,mBAAmB,EAAc,MAAM,UAAU,CAAC;AAC3D,OAAO,EACL,WAAW,EACX,eAAe,EACf,aAAa,EACb,aAAa,EACb,UAAU,EACV,cAAc,EACd,cAAc,EACd,kBAAkB,EAClB,gBAAgB,EACjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,YAAY,EACb,MAAM,qBAAqB,CAAC;AAU7B,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGhD;;;;;GAKG;AACH,MAAM,MAAM,oBAAoB,GAAG,aAAa,CAC9C,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CACnC,CAAC;AAOF;;GAEG;AACH,MAAM,WAAW,iBAAiB,CAAC,OAAO,SAAS,oBAAoB;IACrE;;OAEG;IACH,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;CACjC;AAED,qBAAa,qBAAqB,CAChC,OAAO,SAAS,oBAAoB,CACpC,SAAQ,cAAc,CAAC,SAAS,EAAE,kBAAkB,CAAC;IAE3B,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC;gBAAzB,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC;IAInD,IAAW,QAAQ,iCAElB;IAEM,gBAAgB,IAAI,cAAc,CAAC,SAAS,EAAE,kBAAkB,CAAC;CAgHzE;AAED;;;GAGG;AACH,qBACa,OAAO,CAAC,OAAO,SAAS,oBAAoB,CACvD,SAAQ,eAAe,CAAC,OAAO,CAC/B,YAAW,kBAAkB,CAAC,SAAS,EAAE,kBAAkB,CAAC;WAE9C,IAAI,CAAC,OAAO,SAAS,oBAAoB,EACrD,UAAU,EAAE,iBAAiB,CAAC,OAAO,CAAC;IAMjC,OAAO,CAAC,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,SAAS,CAAC,CAAC;IAEpD,UAAU,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAEvC,cAAc,EAAE,cAAc,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC;IAErE,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAG3C;IAEF;;;;OAIG;gBACgB,UAAU,EAAE,iBAAiB,CAAC,OAAO,CAAC;IAQlD,KAAK;IAOZ,IAAW,QAAQ,IAAI,gBAAgB,GAAG,SAAS,CAElD;IAED,IAAW,YAAY,IAAI,YAAY,CAEtC;IAED,IAAW,oBAAoB,IAAI,oBAAoB,CAEtD;IAED;;OAEG;IACH,IAAW,mBAAmB,IAAI,mBAAmB,CAEpD;IAED;;;OAGG;IACI,aAAa,CAClB,QAAQ,EAAE,MAAM,GACf,CAAC,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,GAAG,SAAS;IAwBhD;;;;;;OAMG;IACI,cAAc,CACnB,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,EAChC,eAAe,EAAE,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC;IAQ9D;;OAEG;IACH,IAAW,kBAAkB,aAE5B;CACF"}
+{"version":3,"file":"Runtime.d.ts","sourceRoot":"","sources":["../../src/runtime/Runtime.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AACpC,OAAO,EAAE,mBAAmB,EAAc,MAAM,UAAU,CAAC;AAC3D,OAAO,EACL,WAAW,EACX,eAAe,EACf,aAAa,EACb,aAAa,EACb,UAAU,EACV,cAAc,EACd,cAAc,EAEd,gBAAgB,EAAE,sBAAsB,EACzC,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,YAAY,EACb,MAAM,qBAAqB,CAAC;AAU7B,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D;;;;;GAKG;AACH,MAAM,MAAM,oBAAoB,GAAG,aAAa,CAC9C,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CACnC,CAAC;AAOF;;GAEG;AACH,MAAM,WAAW,iBAAiB,CAAC,OAAO,SAAS,oBAAoB;IACrE;;OAEG;IACH,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC;CACjC;AAED,qBAAa,qBAAqB,CAChC,OAAO,SAAS,oBAAoB,CACpC,SAAQ,cAAc,CAAC,SAAS,EAAE,kBAAkB,CAAC;IAE3B,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC;gBAAzB,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC;IAInD,IAAW,QAAQ,iCAElB;IAEM,gBAAgB,IAAI,cAAc,CAAC,SAAS,EAAE,kBAAkB,CAAC;CAgHzE;AAED;;;GAGG;AACH,qBACa,OAAO,CAAC,OAAO,SAAS,oBAAoB,CACvD,SAAQ,eAAe,CAAC,OAAO,CAC/B,YAAW,kBAAkB;WAEf,IAAI,CAAC,OAAO,SAAS,oBAAoB,EACrD,UAAU,EAAE,iBAAiB,CAAC,OAAO,CAAC,GACrC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IASxB,OAAO,CAAC,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,SAAS,CAAC,CAAC;IAEpD,UAAU,EAAE,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAEvC,cAAc,EAAE,cAAc,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC;IAErE,OAAO,CAAC,QAAQ,CAAC,4BAA4B,CAG3C;IAEF;;;;OAIG;gBACgB,UAAU,EAAE,iBAAiB,CAAC,OAAO,CAAC;IAQlD,MAAM,CAAC,sBAAsB,EAAE,sBAAsB;IAM5D,IAAW,QAAQ,IAAI,gBAAgB,GAAG,SAAS,CAElD;IAED,IAAW,YAAY,IAAI,YAAY,CAEtC;IAED,IAAW,oBAAoB,IAAI,oBAAoB,CAEtD;IAED,IAAW,gBAAgB,IAAI,gBAAgB,CAE9C;IAED;;OAEG;IACH,IAAW,mBAAmB,IAAI,mBAAmB,CAEpD;IAED;;;OAGG;IACI,aAAa,CAClB,QAAQ,EAAE,MAAM,GACf,CAAC,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,GAAG,SAAS;IAwBhD;;;;;;OAMG;IACI,cAAc,CACnB,UAAU,EAAE,WAAW,CAAC,OAAO,CAAC,EAChC,eAAe,EAAE,YAAY,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC;IAQ9D;;OAEG;IACH,IAAW,kBAAkB,aAE5B;CACF"}

package/dist/runtime/Runtime.js

@@ -10,9 +10,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var Runtime_1;
 // eslint-disable-next-line max-len
 /* eslint-disable @typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-assignment,max-lines */
-import { Experimental } from "snarkyjs";
+import { Experimental } from "o1js";
 import { injectable } from "tsyringe";
-import { ModuleContainer, ZkProgrammable, } from "@proto-kit/common";
+import { ModuleContainer, ZkProgrammable } from "@proto-kit/common";
 import { MethodPublicOutput, StateServiceProvider, } from "@proto-kit/protocol";
 import { combineMethodName, isRuntimeMethod, toWrappedMethod, } from "../method/runtimeMethod";
 import { MethodIdFactory } from "../factories/MethodIdFactory";
@@ -97,7 +97,11 @@ export class RuntimeZkProgrammable extends ZkProgrammable {
  */
 let Runtime = Runtime_1 = class Runtime extends ModuleContainer {
     static from(definition) {
-        return new Runtime_1(definition);
+        return class RuntimeScoped extends Runtime_1 {
+            constructor() {
+                super(definition);
+            }
+        };
     }
     /**
      * Creates a new Runtime from the provided config
@@ -114,14 +118,12 @@ let Runtime = Runtime_1 = class Runtime extends ModuleContainer {
     }
     // eslint-disable-next-line no-warning-comments
     // TODO Remove after changing DFs to type-based approach
-    start() {
-        this.registerValue({
-            Runtime: this,
-        });
+    create(childContainerProvider) {
+        super.create(childContainerProvider);
         this.registerDependencyFactories([MethodIdFactory]);
     }
     get appChain() {
-        return this.container.resolve("AppChain");
+        return this.container.resolve("AreProofsEnabled");
     }
     get stateService() {
         return this.stateServiceProviderInstance.stateService;
@@ -129,6 +131,9 @@ let Runtime = Runtime_1 = class Runtime extends ModuleContainer {
     get stateServiceProvider() {
         return this.stateServiceProviderInstance;
     }
+    get methodIdResolver() {
+        return this.container.resolve("MethodIdResolver");
+    }
     /**
      * @returns The dependency injection container of this runtime
      */

package/dist/runtime/RuntimeEnvironment.d.ts

@@ -0,0 +1,10 @@
+import { AreProofsEnabled, WithZkProgrammable } from "@proto-kit/common";
+import { MethodPublicOutput, StateService, StateServiceProvider } from "@proto-kit/protocol";
+import { MethodIdResolver } from "./MethodIdResolver";
+export interface RuntimeEnvironment extends WithZkProgrammable<undefined, MethodPublicOutput> {
+    get appChain(): AreProofsEnabled | undefined;
+    get stateService(): StateService;
+    get stateServiceProvider(): StateServiceProvider;
+    get methodIdResolver(): MethodIdResolver;
+}
+//# sourceMappingURL=RuntimeEnvironment.d.ts.map

package/dist/runtime/RuntimeEnvironment.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"RuntimeEnvironment.d.ts","sourceRoot":"","sources":["../../src/runtime/RuntimeEnvironment.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,kBAAkB,EAEnB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,kBAAkB,EAClB,YAAY,EACZ,oBAAoB,EACrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,MAAM,WAAW,kBACf,SAAQ,kBAAkB,CAAC,SAAS,EAAE,kBAAkB,CAAC;IACzD,IAAI,QAAQ,IAAI,gBAAgB,GAAG,SAAS,CAAC;IAC7C,IAAI,YAAY,IAAI,YAAY,CAAC;IACjC,IAAI,oBAAoB,IAAI,oBAAoB,CAAC;IACjD,IAAI,gBAAgB,IAAI,gBAAgB,CAAC;CAC1C"}

package/dist/runtime/RuntimeEnvironment.js

@@ -0,0 +1 @@
+export {};

package/dist/runtime/RuntimeModule.d.ts

@@ -1,6 +1,7 @@
 import { ConfigurableModule, Presets } from "@proto-kit/common";
 import { NetworkState, RuntimeTransaction, StateService } from "@proto-kit/protocol";
 import type { Runtime, RuntimeDefinition, RuntimeModulesRecord } from "./Runtime";
+import { RuntimeEnvironment } from "./RuntimeEnvironment";
 /**
  * This type exists to carry over certain runtime properties
  * to runtime modules, until we can inject them through DI.
@@ -25,7 +26,7 @@ export declare class RuntimeModule<Config> extends ConfigurableModule<Config> {
      */
     isRuntimeModule: boolean;
     name?: string;
-    runtime?: Runtime<RuntimeModulesRecord>;
+    runtime?: RuntimeEnvironment;
     constructor();
     private getInputs;
     get transaction(): RuntimeTransaction;

package/dist/runtime/RuntimeModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RuntimeModule.d.ts","sourceRoot":"","sources":["../../src/runtime/RuntimeModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAEhE,OAAO,EACL,YAAY,EACZ,kBAAkB,EAClB,YAAY,EAGb,MAAM,qBAAqB,CAAC;AAI7B,OAAO,KAAK,EACV,OAAO,EACP,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,WAAW,CAAC;AAMnB;;;GAGG;AACH,MAAM,WAAW,cACf,SAAQ,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE,gBAAgB,CAAC;IAC7D,UAAU,EAAE,IAAI,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,EAAE,OAAO,CAAC,CAAC;IAEnE,IAAI,YAAY,IAAI,YAAY,CAAC;CAClC;AAED;;GAEG;AACH,qBACa,aAAa,CAAC,MAAM,CAAE,SAAQ,kBAAkB,CAAC,MAAM,CAAC;IACnE,OAAc,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,CAAM;IAE7C;;OAEG;IACH,SAAgB,kBAAkB,EAAE,MAAM,EAAE,CAAM;IAElD;;;;OAIG;IACI,eAAe,UAAQ;IAEvB,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,OAAO,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC;;IAY/C,OAAO,CAAC,SAAS;IAWjB,IAAW,WAAW,IAAI,kBAAkB,CAE3C;IAED,IAAW,OAAO,IAAI,YAAY,CAEjC;CACF"}
+{"version":3,"file":"RuntimeModule.d.ts","sourceRoot":"","sources":["../../src/runtime/RuntimeModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAEhE,OAAO,EACL,YAAY,EACZ,kBAAkB,EAClB,YAAY,EAGb,MAAM,qBAAqB,CAAC;AAI7B,OAAO,KAAK,EACV,OAAO,EACP,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAM1D;;;GAGG;AACH,MAAM,WAAW,cACf,SAAQ,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE,gBAAgB,CAAC;IAC7D,UAAU,EAAE,IAAI,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,EAAE,OAAO,CAAC,CAAC;IAEnE,IAAI,YAAY,IAAI,YAAY,CAAC;CAClC;AAED;;GAEG;AACH,qBACa,aAAa,CAAC,MAAM,CAAE,SAAQ,kBAAkB,CAAC,MAAM,CAAC;IACnE,OAAc,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,CAAM;IAE7C;;OAEG;IACH,SAAgB,kBAAkB,EAAE,MAAM,EAAE,CAAM;IAElD;;;;OAIG;IACI,eAAe,UAAQ;IAEvB,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,OAAO,CAAC,EAAE,kBAAkB,CAAC;;IAYpC,OAAO,CAAC,SAAS;IAWjB,IAAW,WAAW,IAAI,kBAAkB,CAE3C;IAED,IAAW,OAAO,IAAI,YAAY,CAEjC;CACF"}

package/dist/state/InMemoryStateService.d.ts

@@ -1,4 +1,4 @@
-import { Field } from "snarkyjs";
+import { Field } from "o1js";
 import { StateService } from "@proto-kit/protocol";
 /**
  * Naive implementation of a StateService for testing purposes

package/dist/state/InMemoryStateService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InMemoryStateService.d.ts","sourceRoot":"","sources":["../../src/state/InMemoryStateService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD;;GAEG;AACH,qBAAa,oBAAqB,YAAW,YAAY;IAChD,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC,CAAM;IAEjD,GAAG,CAAC,GAAG,EAAE,KAAK,GAAG,KAAK,EAAE,GAAG,SAAS;IAIpC,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,SAAS;CAWlD"}
+{"version":3,"file":"InMemoryStateService.d.ts","sourceRoot":"","sources":["../../src/state/InMemoryStateService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD;;GAEG;AACH,qBAAa,oBAAqB,YAAW,YAAY;IAChD,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,SAAS,CAAC,CAAM;IAEjD,GAAG,CAAC,GAAG,EAAE,KAAK,GAAG,KAAK,EAAE,GAAG,SAAS;IAIpC,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,SAAS;CAWlD"}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@proto-kit/module",
   "license": "MIT",
   "private": false,
-  "version": "0.1.1-develop.267+b252853",
+  "version": "0.1.1-develop.298+188a8c8",
   "type": "module",
   "scripts": {
     "build": "tsc -p tsconfig.json",
@@ -28,8 +28,8 @@
   "peerDependencies": {
     "@proto-kit/common": "*",
     "@proto-kit/protocol": "*",
-    "snarkyjs": "0.12.0",
+    "o1js": "0.13.1",
     "tsyringe": "^4.7.0"
   },
-  "gitHead": "b2528538c73747d000cc3ea99ee26ee415d8248d"
+  "gitHead": "188a8c85859be7432b5c196219589d559356171b"
 }

package/src/method/MethodParameterDecoder.ts

@@ -1,27 +1,9 @@
 /* eslint-disable no-underscore-dangle */
-import { Field } from "snarkyjs";
+import { FlexibleProvable, ProvableExtended } from "o1js";
 
 import { RuntimeModule } from "../runtime/RuntimeModule";
 
-export interface Fieldable {
-  toFields: () => Field[];
-}
-
-export interface FromFieldClass {
-  new: (...args: any[]) => any;
-  fromFields: (fields: Field[]) => Fieldable;
-  name: string;
-  // Maybe this is wrong IDK
-  prototype: {
-    _fields?: any[];
-  };
-  sizeInFields?: () => number;
-}
-
 const errors = {
-  fieldLengthNotMatching: (expected: number, actual: number) =>
-    new Error(`Expected ${expected} field elements, got ${actual}`),
-
   typeNotCompatible: (name: string) =>
     new Error(
       `Cannot decode type ${name}, it has to be either a Struct, CircuitValue or built-in snarkyjs type`
@@ -30,7 +12,8 @@ const errors = {
 
 export class MethodParameterDecoder {
   public static fromMethod(target: RuntimeModule<unknown>, methodName: string) {
-    const paramtypes = Reflect.getMetadata(
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    const paramtypes: ProvableExtended<unknown>[] = Reflect.getMetadata(
       "design:paramtypes",
       target,
       methodName
@@ -39,32 +22,24 @@ export class MethodParameterDecoder {
     return new MethodParameterDecoder(paramtypes);
   }
 
-  private constructor(private readonly types: FromFieldClass[]) {}
-
-  public fromFields(fields: Field[]): Fieldable[] {
-    if (fields.length < this.fieldSize) {
-      throw errors.fieldLengthNotMatching(this.fieldSize, fields.length);
-    }
-
-    let stack = fields.slice();
-
-    return this.types.map((type) => {
-      const numberFieldsNeeded =
-        type.prototype._fields?.length ?? type.sizeInFields?.() ?? -1;
-      if (numberFieldsNeeded === -1) {
-        throw errors.typeNotCompatible(type.name);
+  private constructor(private readonly types: ProvableExtended<unknown>[]) {}
+
+  public fromJSON(argsJSON: string[]): FlexibleProvable<unknown>[] {
+    return this.types.map((type, index) => {
+      // eslint-disable-next-line @typescript-eslint/init-declarations
+      let value: FlexibleProvable<unknown>;
+
+      try {
+        // eslint-disable-next-line max-len
+        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+        value = type.fromJSON(
+          JSON.parse(argsJSON[index])
+        ) as FlexibleProvable<unknown>;
+      } catch {
+        throw errors.typeNotCompatible(type.constructor.name);
       }
-      const structFields = stack.slice(0, numberFieldsNeeded);
-      stack = stack.slice(numberFieldsNeeded);
-      return type.fromFields(structFields);
-    });
-  }
 
-  public get fieldSize(): number {
-    return this.types
-      .map(
-        (type) => type.prototype._fields?.length ?? type.sizeInFields?.() ?? 0
-      )
-      .reduce((a, b) => a + b, 0);
+      return value;
+    });
   }
 }

package/src/method/decorator.test.ts

@@ -1,6 +1,6 @@
 import "reflect-metadata";
 
-import { Bool, Field } from "snarkyjs";
+import { Bool, Field } from "o1js";
 import { Option, StateTransition } from "@proto-kit/protocol";
 
 import { toStateTransitionsHash } from "./runtimeMethod.js";

package/src/method/runtimeMethod.ts

@@ -1,4 +1,4 @@
-import { Field, FlexibleProvable, Poseidon } from "snarkyjs";
+import { Field, FlexibleProvable, Poseidon, Proof } from "o1js";
 import { container } from "tsyringe";
 import {
   StateTransition,
@@ -88,8 +88,7 @@ export function toWrappedMethod(
     }
 
     // Assert that the given transaction has the correct methodId
-    const methodIdResolver =
-      runtime.dependencyContainer.resolve<MethodIdResolver>("MethodIdResolver");
+    const { methodIdResolver } = runtime;
     const thisMethodId = Field(methodIdResolver.getMethodId(name, methodName));
     if (!thisMethodId.isConstant()) {
       throw errors.fieldNotConstant("methodId");
@@ -100,7 +99,7 @@ export function toWrappedMethod(
       "Runtimemethod called with wrong methodId on the transaction object"
     );
 
-    const paramTypes: FlexibleProvable<unknown>[] = Reflect.getMetadata(
+    const parameterTypes: FlexibleProvable<unknown>[] = Reflect.getMetadata(
       "design:paramtypes",
       this,
       methodName
@@ -110,9 +109,16 @@ export function toWrappedMethod(
      * Use the type info obtained previously to convert
      * the args passed to fields
      */
-    const argsFields = args.flatMap((arg, index) =>
-      paramTypes[index].toFields(arg as any)
-    );
+    const argsFields = args.flatMap((argument, index) => {
+      if (argument instanceof Proof) {
+        return [
+          ...argument.publicInput?.toFields(),
+          ...argument.publicOutput?.toFields(),
+        ];
+      } else {
+        return parameterTypes[index].toFields(argument as any);
+      }
+    });
 
     // Assert that the argsHash that has been signed matches the given arguments
     // We can use js-if here, because methodArguments is statically sizes

package/src/runtime/MethodIdResolver.ts

@@ -1,5 +1,5 @@
 import { stringToField } from "@proto-kit/protocol";
-import { Poseidon } from "snarkyjs";
+import { Poseidon } from "o1js";
 
 import type { Runtime, RuntimeModulesRecord } from "./Runtime";
 

package/src/runtime/Runtime.ts

@@ -1,6 +1,6 @@
 // eslint-disable-next-line max-len
 /* eslint-disable @typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-assignment,max-lines */
-import { Experimental } from "snarkyjs";
+import { Experimental } from "o1js";
 import { DependencyContainer, injectable } from "tsyringe";
 import {
   StringKeyOf,
@@ -11,7 +11,7 @@ import {
   ZkProgrammable,
   PlainZkProgram,
   WithZkProgrammable,
-  AreProofsEnabled,
+  AreProofsEnabled, ChildContainerProvider
 } from "@proto-kit/common";
 import {
   MethodPublicOutput,
@@ -29,6 +29,7 @@ import { MethodIdFactory } from "../factories/MethodIdFactory";
 
 import { RuntimeModule } from "./RuntimeModule";
 import { MethodIdResolver } from "./MethodIdResolver";
+import { RuntimeEnvironment } from "./RuntimeEnvironment";
 
 /**
  * Record of modules accepted by the Runtime module container.
@@ -190,12 +191,16 @@ export class RuntimeZkProgrammable<
 @injectable()
 export class Runtime<Modules extends RuntimeModulesRecord>
   extends ModuleContainer<Modules>
-  implements WithZkProgrammable<undefined, MethodPublicOutput>
+  implements RuntimeEnvironment
 {
   public static from<Modules extends RuntimeModulesRecord>(
     definition: RuntimeDefinition<Modules>
-  ) {
-    return new Runtime(definition);
+  ): TypedClass<Runtime<Modules>> {
+    return class RuntimeScoped extends Runtime<Modules> {
+      public constructor() {
+        super(definition);
+      }
+    };
   }
 
   // runtime modules composed into a ZkProgram
@@ -223,15 +228,14 @@ export class Runtime<Modules extends RuntimeModulesRecord>
 
   // eslint-disable-next-line no-warning-comments
   // TODO Remove after changing DFs to type-based approach
-  public start() {
-    this.registerValue({
-      Runtime: this,
-    });
+  public create(childContainerProvider: ChildContainerProvider) {
+    super.create(childContainerProvider);
+
     this.registerDependencyFactories([MethodIdFactory]);
   }
 
   public get appChain(): AreProofsEnabled | undefined {
-    return this.container.resolve<AreProofsEnabled>("AppChain");
+    return this.container.resolve<AreProofsEnabled>("AreProofsEnabled");
   }
 
   public get stateService(): StateService {
@@ -242,6 +246,10 @@ export class Runtime<Modules extends RuntimeModulesRecord>
     return this.stateServiceProviderInstance;
   }
 
+  public get methodIdResolver(): MethodIdResolver {
+    return this.container.resolve<MethodIdResolver>("MethodIdResolver");
+  }
+
   /**
    * @returns The dependency injection container of this runtime
    */

package/src/runtime/RuntimeEnvironment.ts

@@ -0,0 +1,19 @@
+import {
+  AreProofsEnabled,
+  WithZkProgrammable,
+  ZkProgrammable,
+} from "@proto-kit/common";
+import {
+  MethodPublicOutput,
+  StateService,
+  StateServiceProvider,
+} from "@proto-kit/protocol";
+import { MethodIdResolver } from "./MethodIdResolver";
+
+export interface RuntimeEnvironment
+  extends WithZkProgrammable<undefined, MethodPublicOutput> {
+  get appChain(): AreProofsEnabled | undefined;
+  get stateService(): StateService;
+  get stateServiceProvider(): StateServiceProvider;
+  get methodIdResolver(): MethodIdResolver;
+}

package/src/runtime/RuntimeModule.ts

@@ -15,6 +15,7 @@ import type {
   RuntimeDefinition,
   RuntimeModulesRecord,
 } from "./Runtime";
+import { RuntimeEnvironment } from "./RuntimeEnvironment";
 
 const errors = {
   inputDataNotSet: () => new Error("Input data for runtime execution not set"),
@@ -52,7 +53,7 @@ export class RuntimeModule<Config> extends ConfigurableModule<Config> {
 
   public name?: string;
 
-  public runtime?: Runtime<RuntimeModulesRecord>;
+  public runtime?: RuntimeEnvironment;
 
   public constructor() {
     super();

package/src/state/InMemoryStateService.ts

@@ -1,4 +1,4 @@
-import { Field } from "snarkyjs";
+import { Field } from "o1js";
 import { StateService } from "@proto-kit/protocol";
 
 /**

package/test/Runtime.test.ts

@@ -1,4 +1,4 @@
-import { Bool } from "snarkyjs";
+import { Bool } from "o1js";
 
 import { InMemoryStateService, MethodIdResolver, Runtime } from "../src";
 
@@ -32,10 +32,9 @@ describe("runtime", () => {
     const moduleName = "Balances";
     const methodName = "getTotalSupply";
 
-    const methodId = runtime.dependencyContainer.resolve<MethodIdResolver>("MethodIdResolver").getMethodId(
-      moduleName,
-      methodName
-    );
+    const methodId = runtime.dependencyContainer
+      .resolve<MethodIdResolver>("MethodIdResolver")
+      .getMethodId(moduleName, methodName);
     const method = runtime.getMethodById(methodId);
 
     // eslint-disable-next-line jest/no-restricted-matchers

package/test/modules/Admin.ts

@@ -1,4 +1,4 @@
-import { PublicKey } from "snarkyjs";
+import { PublicKey } from "o1js";
 
 import { runtimeModule } from "../../src/module/decorator.js";
 import { RuntimeModule } from "../../src/runtime/RuntimeModule.js";

package/test/modules/Balances.test.ts

@@ -8,7 +8,7 @@ import {
   Proof,
   PublicKey,
   UInt64,
-} from "snarkyjs";
+} from "o1js";
 import { container } from "tsyringe";
 import {
   type ProvableStateTransition,
@@ -60,7 +60,7 @@ describe("balances", () => {
       },
     });
 
-    runtime.dependencyContainer.register("AppChain", {
+    runtime.dependencyContainer.register("AreProofsEnabled", {
       useValue: {
         areProofsEnabled: false,
 

package/test/modules/Balances.ts

@@ -1,4 +1,4 @@
-import { Bool, PublicKey, UInt64 } from "snarkyjs";
+import { Bool, PublicKey, UInt64 } from "o1js";
 import { Option, State, StateMap } from "@proto-kit/protocol";
 import { Presets } from "@proto-kit/common";
 

package/test/modules/State.test.ts

@@ -1,18 +1,15 @@
 import "reflect-metadata";
-import { Bool, PublicKey, UInt64 } from "snarkyjs";
+import { Bool, PublicKey, UInt64 } from "o1js";
 import { container } from "tsyringe";
 import {
   NetworkState,
   Option,
   RuntimeMethodExecutionContext,
   RuntimeTransaction,
-  StateService
+  StateService,
 } from "@proto-kit/protocol";
 
-import {
-  InMemoryStateService,
-  Runtime
-} from "../../src";
+import { InMemoryStateService, Runtime } from "../../src";
 
 import { Admin } from "./Admin";
 import { Balances } from "./Balances";
@@ -39,7 +36,7 @@ describe("transient state", () => {
       },
     });
 
-    runtime.dependencyContainer.register("AppChain", {
+    runtime.dependencyContainer.register("AreProofsEnabled", {
       useValue: {
         areProofsEnabled: false,
 

package/test/modules/methodId.test.ts

@@ -1,5 +1,5 @@
 import "reflect-metadata";
-import { Bool, Field } from "snarkyjs";
+import { Bool, Field } from "o1js";
 import { beforeAll, beforeEach } from "@jest/globals";
 
 import { Runtime } from "../../src/runtime/Runtime";
@@ -56,21 +56,19 @@ describe("methodId", () => {
     ["Admin", "isAdminWithAVeryVeryVeryVeryLongName"],
     ["Balance", "getTotalSupply"],
     ["Balance", "getBalance"],
-  ])(
-    "should pass and encode correctly",
-    (givenModuleName, givenMethodName) => {
-      expect.assertions(2);
+  ])("should pass and encode correctly", (givenModuleName, givenMethodName) => {
+    expect.assertions(2);
 
-      const methodId = resolver.getMethodId(givenModuleName, givenMethodName);
+    const methodId = resolver.getMethodId(givenModuleName, givenMethodName);
 
-      const [moduleName, methodName] = resolver.getMethodNameFromId(
-        methodId
-      ) ?? [undefined, undefined];
+    const [moduleName, methodName] = resolver.getMethodNameFromId(methodId) ?? [
+      undefined,
+      undefined,
+    ];
 
-      expect(moduleName).toBe(givenModuleName);
-      expect(methodName).toBe(givenMethodName);
-    }
-  );
+    expect(moduleName).toBe(givenModuleName);
+    expect(methodName).toBe(givenMethodName);
+  });
 
   it("should fail for invalid module name", () => {
     expect.assertions(1);

package/test/runtimeMethod.test.ts

@@ -1,5 +1,5 @@
 import "reflect-metadata";
-import { Bool, Field, PublicKey, UInt64 } from "snarkyjs";
+import { Bool, Field, PublicKey, UInt64 } from "o1js";
 import {
   NetworkState,
   RuntimeMethodExecutionContext,

package/test/state/MerkleTree.test.ts

@@ -5,7 +5,7 @@ import {
 } from "@proto-kit/protocol";
 import { MockAsyncMerkleTreeStore } from "./MockAsyncMerkleStore";
 import { beforeEach } from "@jest/globals";
-import { Field, Poseidon } from "snarkyjs";
+import { Field, Poseidon } from "o1js";
 import { log } from "@proto-kit/common";
 
 describe("cachedMerkleTree", () => {

package/test/state/MockAsyncMerkleStore.ts

@@ -1,8 +1,5 @@
-import {
-  AsyncMerkleTreeStore,
-  InMemoryMerkleTreeStorage,
-  noop,
-} from "@proto-kit/protocol";
+import { AsyncMerkleTreeStore, InMemoryMerkleTreeStorage } from "@proto-kit/protocol";
+import { noop } from "@proto-kit/common";
 
 export class MockAsyncMerkleTreeStore implements AsyncMerkleTreeStore {
   public readonly store = new InMemoryMerkleTreeStorage();

package/test/transaction.test.ts

@@ -1,5 +1,5 @@
 import "reflect-metadata";
-import { PrivateKey, Proof, PublicKey, UInt64 } from "snarkyjs";
+import { PrivateKey, Proof, PublicKey, UInt64 } from "o1js";
 import { container } from "tsyringe";
 import {
   InMemoryStateService,