@proto-kit/protocol 0.1.1-develop.263 → 0.1.1-develop.298

package/dist/utils/merkletree/MerkleTreeStore.d.ts

@@ -1,8 +1,8 @@
 export interface AsyncMerkleTreeStore {
     openTransaction: () => void;
     commit: () => void;
-    setNode: (key: bigint, level: number, value: bigint) => Promise<void>;
-    getNode: (key: bigint, level: number) => Promise<bigint | undefined>;
+    setNodeAsync: (key: bigint, level: number, value: bigint) => Promise<void>;
+    getNodeAsync: (key: bigint, level: number) => Promise<bigint | undefined>;
 }
 export interface MerkleTreeStore {
     setNode: (key: bigint, level: number, value: bigint) => void;

package/dist/utils/merkletree/MerkleTreeStore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MerkleTreeStore.d.ts","sourceRoot":"","sources":["../../../src/utils/merkletree/MerkleTreeStore.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,oBAAoB;IACnC,eAAe,EAAE,MAAM,IAAI,CAAC;IAE5B,MAAM,EAAE,MAAM,IAAI,CAAC;IAEnB,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtE,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CACtE;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAE7D,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;CAC7D"}
+{"version":3,"file":"MerkleTreeStore.d.ts","sourceRoot":"","sources":["../../../src/utils/merkletree/MerkleTreeStore.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,oBAAoB;IACnC,eAAe,EAAE,MAAM,IAAI,CAAC;IAE5B,MAAM,EAAE,MAAM,IAAI,CAAC;IAEnB,YAAY,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAE3E,YAAY,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CAC3E;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAE7D,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;CAC7D"}

package/dist/utils/merkletree/RollupMerkleTree.d.ts

@@ -1,29 +1,29 @@
-import { Bool, Field } from "snarkyjs";
+import { Bool, Field } from "o1js";
 import { MerkleTreeStore } from "./MerkleTreeStore";
 export { RollupMerkleTree, RollupMerkleWitness };
 export { maybeSwap };
 declare const RollupMerkleWitness_base: (new (value: {
-    path: import("snarkyjs/dist/node/lib/field").Field[];
-    isLeft: import("snarkyjs/dist/node/lib/bool").Bool[];
+    path: import("o1js/dist/node/lib/field").Field[];
+    isLeft: import("o1js/dist/node/lib/bool").Bool[];
 }) => {
-    path: import("snarkyjs/dist/node/lib/field").Field[];
-    isLeft: import("snarkyjs/dist/node/lib/bool").Bool[];
+    path: import("o1js/dist/node/lib/field").Field[];
+    isLeft: import("o1js/dist/node/lib/bool").Bool[];
 }) & {
     _isStruct: true;
-} & import("snarkyjs/dist/node/snarky").ProvablePure<{
-    path: import("snarkyjs/dist/node/lib/field").Field[];
-    isLeft: import("snarkyjs/dist/node/lib/bool").Bool[];
+} & import("o1js/dist/node/snarky").ProvablePure<{
+    path: import("o1js/dist/node/lib/field").Field[];
+    isLeft: import("o1js/dist/node/lib/bool").Bool[];
 }> & {
     toInput: (x: {
-        path: import("snarkyjs/dist/node/lib/field").Field[];
-        isLeft: import("snarkyjs/dist/node/lib/bool").Bool[];
+        path: import("o1js/dist/node/lib/field").Field[];
+        isLeft: import("o1js/dist/node/lib/bool").Bool[];
     }) => {
-        fields?: import("snarkyjs/dist/node/lib/field").Field[] | undefined;
-        packed?: [import("snarkyjs/dist/node/lib/field").Field, number][] | undefined;
+        fields?: import("o1js/dist/node/lib/field").Field[] | undefined;
+        packed?: [import("o1js/dist/node/lib/field").Field, number][] | undefined;
     };
     toJSON: (x: {
-        path: import("snarkyjs/dist/node/lib/field").Field[];
-        isLeft: import("snarkyjs/dist/node/lib/bool").Bool[];
+        path: import("o1js/dist/node/lib/field").Field[];
+        isLeft: import("o1js/dist/node/lib/bool").Bool[];
     }) => {
         path: string[];
         isLeft: boolean[];
@@ -32,8 +32,8 @@ declare const RollupMerkleWitness_base: (new (value: {
         path: string[];
         isLeft: boolean[];
     }) => {
-        path: import("snarkyjs/dist/node/lib/field").Field[];
-        isLeft: import("snarkyjs/dist/node/lib/bool").Bool[];
+        path: import("o1js/dist/node/lib/field").Field[];
+        isLeft: import("o1js/dist/node/lib/bool").Bool[];
     };
 };
 /**
@@ -54,6 +54,7 @@ declare class RollupMerkleWitness extends RollupMerkleWitness_base {
      * @returns Index of the leaf.
      */
     calculateIndex(): Field;
+    toShortenedEntries(): string[];
 }
 /**
  * A [Merkle Tree](https://en.wikipedia.org/wiki/Merkle_tree) is a binary tree in

package/dist/utils/merkletree/RollupMerkleTree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RollupMerkleTree.d.ts","sourceRoot":"","sources":["../../../src/utils/merkletree/RollupMerkleTree.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,IAAI,EAAE,KAAK,EAA8B,MAAM,UAAU,CAAC;AAInE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAIpD,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,CAAC;AAIjD,OAAO,EAAE,SAAS,EAAE,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAErB;;;GAGG;AACH,cAAM,mBAAoB,SAAQ,wBAGhC;IACA,OAAc,MAAM,SAAO;IAEpB,MAAM,IAAI,MAAM;IAIvB;;;;OAIG;IACI,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,KAAK;IAaxC;;;OAGG;IACI,cAAc,IAAI,KAAK;CAiB/B;AAED;;;;;;;;;;;;;GAaG;AACH,cAAM,gBAAgB;IACpB,OAAc,MAAM,SAAO;IAE3B,WAAkB,SAAS,IAAI,MAAM,CAEpC;IAED,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAW;IAElC,SAAgB,KAAK,EAAE,eAAe,CAAC;gBAEpB,KAAK,EAAE,eAAe;IAYzC;;;;;OAKG;IAEI,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,KAAK;IAInD;;;OAGG;IAEI,OAAO,IAAI,KAAK;IAMvB,OAAO,CAAC,OAAO;IAIf;;;OAGG;IAEH;;;;OAIG;IAEI,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK;IAgBzC;;;;;;OAMG;IACI,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,mBAAmB;IAqBrD;;;OAGG;IAEI,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE;IAM3B;;;OAGG;IACH,IAAW,SAAS,IAAI,MAAM,CAE7B;CACF;AAGD,yBAAiB,eAAe,CAAC;IAC/B,SAAgB,YAAY,CAAC,GAAG,EAAE,KAAK,GAAG,KAAK,CAS9C;IAED,SAAgB,eAAe,CAC7B,OAAO,EAAE,mBAAmB,EAC5B,IAAI,EAAE,KAAK,EACX,GAAG,EAAE,KAAK,EACV,KAAK,EAAE,KAAK,GACX,IAAI,CAKN;IAED,SAAgB,uBAAuB,CACrC,OAAO,EAAE,mBAAmB,EAC5B,IAAI,EAAE,KAAK,EACX,GAAG,EAAE,KAAK,EACV,KAAK,EAAE,KAAK,GACX,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAKtB;IAED,SAAgB,WAAW,CACzB,OAAO,EAAE,mBAAmB,EAC5B,KAAK,EAAE,KAAK,GACX,KAAK,CAEP;CACF;AAED;;;GAGG;AACH,iBAAS,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAK9D"}
+{"version":3,"file":"RollupMerkleTree.d.ts","sourceRoot":"","sources":["../../../src/utils/merkletree/RollupMerkleTree.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,IAAI,EAAE,KAAK,EAA8B,MAAM,MAAM,CAAC;AAK/D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAIpD,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,CAAC;AAIjD,OAAO,EAAE,SAAS,EAAE,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAErB;;;GAGG;AACH,cAAM,mBAAoB,SAAQ,wBAGhC;IACA,OAAc,MAAM,SAAO;IAEpB,MAAM,IAAI,MAAM;IAIvB;;;;OAIG;IACI,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,KAAK;IAaxC;;;OAGG;IACI,cAAc,IAAI,KAAK;IAkBvB,kBAAkB;CAO1B;AAED;;;;;;;;;;;;;GAaG;AACH,cAAM,gBAAgB;IACpB,OAAc,MAAM,SAAO;IAE3B,WAAkB,SAAS,IAAI,MAAM,CAEpC;IAED,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAW;IAElC,SAAgB,KAAK,EAAE,eAAe,CAAC;gBAEpB,KAAK,EAAE,eAAe;IAYzC;;;;;OAKG;IAEI,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,KAAK;IAInD;;;OAGG;IAEI,OAAO,IAAI,KAAK;IAMvB,OAAO,CAAC,OAAO;IAIf;;;OAGG;IAEH;;;;OAIG;IAEI,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK;IAgBzC;;;;;;OAMG;IACI,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,mBAAmB;IAqBrD;;;OAGG;IAEI,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE;IAM3B;;;OAGG;IACH,IAAW,SAAS,IAAI,MAAM,CAE7B;CACF;AAGD,yBAAiB,eAAe,CAAC;IAC/B,SAAgB,YAAY,CAAC,GAAG,EAAE,KAAK,GAAG,KAAK,CAS9C;IAED,SAAgB,eAAe,CAC7B,OAAO,EAAE,mBAAmB,EAC5B,IAAI,EAAE,KAAK,EACX,GAAG,EAAE,KAAK,EACV,KAAK,EAAE,KAAK,GACX,IAAI,CAKN;IAED,SAAgB,uBAAuB,CACrC,OAAO,EAAE,mBAAmB,EAC5B,IAAI,EAAE,KAAK,EACX,GAAG,EAAE,KAAK,EACV,KAAK,EAAE,KAAK,GACX,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAKtB;IAED,SAAgB,WAAW,CACzB,OAAO,EAAE,mBAAmB,EAC5B,KAAK,EAAE,KAAK,GACX,KAAK,CAEP;CACF;AAED;;;GAGG;AACH,iBAAS,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAK9D"}

package/dist/utils/merkletree/RollupMerkleTree.js

@@ -11,7 +11,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 /* eslint-disable line-comment-position */
 /* eslint-disable no-inline-comments */
 /* eslint-disable @typescript-eslint/no-magic-numbers */
-import { Bool, Field, Poseidon, Provable, Struct } from "snarkyjs";
+import { Bool, Field, Poseidon, Provable, Struct } from "o1js";
+import { range } from "@proto-kit/common";
 import { notInCircuit } from "../utils";
 // external API
 // eslint-disable-next-line @typescript-eslint/no-use-before-define
@@ -60,6 +61,11 @@ class RollupMerkleWitness extends Struct({
         }
         return index;
     }
+    toShortenedEntries() {
+        return range(0, 5)
+            .concat(range(251, 255))
+            .map((index) => [this.path[index].toString(), this.isLeft[index].toString()].toString());
+    }
 }
 RollupMerkleWitness.height = 256;
 /**

package/dist/utils/utils.d.ts

@@ -1,4 +1,4 @@
-import { Field } from "snarkyjs";
+import { Field } from "o1js";
 export type ReturnType<FunctionType extends Function> = FunctionType extends (...args: any[]) => infer Return ? Return : any;
 export type UnTypedClass = new (...args: any[]) => any;
 export type TypedClass<Class> = new (...args: any[]) => Class;
@@ -8,7 +8,6 @@ export type Subclass<Class extends new (...args: any) => any> = (new (...args: a
     prototype: InstanceType<Class>;
 };
 export declare function notInCircuit(): MethodDecorator;
-export declare function stringToField(value: string): import("snarkyjs/dist/node/lib/field").Field;
+export declare function stringToField(value: string): import("o1js/dist/node/lib/field").Field;
 export declare function singleFieldToString(value: Field | bigint): string;
-export declare function noop(): void;
 //# sourceMappingURL=utils.d.ts.map

package/dist/utils/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils/utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAsB,MAAM,UAAU,CAAC;AAGrD,MAAM,MAAM,UAAU,CAAC,YAAY,SAAS,QAAQ,IAAI,YAAY,SAAS,CAC3E,GAAG,IAAI,EAAE,GAAG,EAAE,KACX,MAAM,MAAM,GACb,MAAM,GACN,GAAG,CAAC;AAER,MAAM,MAAM,YAAY,GAAG,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC;AAEvD,MAAM,MAAM,UAAU,CAAC,KAAK,IAAI,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,KAAK,CAAC;AAE9D,MAAM,MAAM,QAAQ,CAAC,KAAK,SAAS,KAAK,GAAG,IAAI,EAAE,GAAG,KAAK,GAAG,IAAI,CAAC,KAC/D,GAAG,IAAI,EAAE,GAAG,KACT,YAAY,CAAC,KAAK,CAAC,CAAC,GAAG;KACzB,GAAG,IAAI,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC;CACjC,GAAG;IAAE,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC,CAAA;CAAE,CAAC;AAEvC,wBAAgB,YAAY,IAAI,eAAe,CAoB9C;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,gDAgC1C;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,CAKjE;AAED,wBAAgB,IAAI,IAAI,IAAI,CAAG"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils/utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAsB,MAAM,MAAM,CAAC;AAGjD,MAAM,MAAM,UAAU,CAAC,YAAY,SAAS,QAAQ,IAAI,YAAY,SAAS,CAC3E,GAAG,IAAI,EAAE,GAAG,EAAE,KACX,MAAM,MAAM,GACb,MAAM,GACN,GAAG,CAAC;AAER,MAAM,MAAM,YAAY,GAAG,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC;AAEvD,MAAM,MAAM,UAAU,CAAC,KAAK,IAAI,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,KAAK,CAAC;AAE9D,MAAM,MAAM,QAAQ,CAAC,KAAK,SAAS,KAAK,GAAG,IAAI,EAAE,GAAG,KAAK,GAAG,IAAI,CAAC,KAC/D,GAAG,IAAI,EAAE,GAAG,KACT,YAAY,CAAC,KAAK,CAAC,CAAC,GAAG;KACzB,GAAG,IAAI,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC;CACjC,GAAG;IAAE,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC,CAAA;CAAE,CAAC;AAEvC,wBAAgB,YAAY,IAAI,eAAe,CAoB9C;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,4CAgC1C;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,CAKjE"}

package/dist/utils/utils.js

@@ -1,6 +1,6 @@
 // eslint-disable-next-line max-len
-/* eslint-disable @typescript-eslint/no-explicit-any,@typescript-eslint/ban-types, @typescript-eslint/no-unsafe-return,@typescript-eslint/no-empty-function */
-import { Field, Poseidon, Provable } from "snarkyjs";
+/* eslint-disable @typescript-eslint/no-explicit-any,@typescript-eslint/ban-types, @typescript-eslint/no-unsafe-return */
+import { Field, Poseidon, Provable } from "o1js";
 import floor from "lodash/floor";
 export function notInCircuit() {
     return function ReplacedFunction(target, propertyKey, descriptor) {
@@ -47,4 +47,3 @@ export function singleFieldToString(value) {
     }
     return value.toString();
 }
-export function noop() { }

package/package.json

@@ -3,7 +3,7 @@
   "license": "MIT",
   "private": false,
   "type": "module",
-  "version": "0.1.1-develop.263+f167699",
+  "version": "0.1.1-develop.298+188a8c8",
   "scripts": {
     "build": "tsc -p tsconfig.json",
     "dev": "tsc -p tsconfig.json --watch",
@@ -24,12 +24,12 @@
   },
   "peerDependencies": {
     "@proto-kit/common": "*",
-    "snarkyjs": "0.12.0",
+    "o1js": "0.13.1",
     "tsyringe": "^4.7.0"
   },
   "devDependencies": {
     "@jest/globals": "^29.5.0",
     "@types/lodash": "^4.14.194"
   },
-  "gitHead": "f167699bddb5831155c4aa9587b4da032c30db0d"
+  "gitHead": "188a8c85859be7432b5c196219589d559356171b"
 }

package/src/blockmodules/AccountStateModule.ts

@@ -1,4 +1,4 @@
-import { Provable, PublicKey, Struct, UInt64 } from "snarkyjs";
+import { Provable, PublicKey, Struct, UInt64 } from "o1js";
 
 import { BlockProverExecutionData } from "../prover/block/BlockProvable";
 import { StateMap } from "../state/StateMap";
@@ -10,7 +10,7 @@ export class AccountState extends Struct({
   nonce: UInt64,
 }) {}
 
-export class AccountStateModule extends ProvableTransactionHook {
+export class AccountStateModule extends ProvableTransactionHook<object> {
   @protocolState() public accountState = StateMap.from<PublicKey, AccountState>(
     PublicKey,
     AccountState

package/src/blockmodules/NoopTransactionHook.ts

@@ -1,7 +1,7 @@
 import { ProvableTransactionHook } from "../protocol/ProvableTransactionHook";
 import { BlockProverExecutionData } from "../prover/block/BlockProvable";
 
-export class NoopTransactionHook extends ProvableTransactionHook {
+export class NoopTransactionHook extends ProvableTransactionHook<object> {
   public onTransaction(executionData: BlockProverExecutionData): void {
   }
 }

package/src/model/MethodPublicOutput.ts

@@ -1,4 +1,4 @@
-import { Bool, Field, Struct } from "snarkyjs";
+import { Bool, Field, Struct } from "o1js";
 
 /**
  * Public input used to link in-circuit execution with

package/src/model/Option.test.ts

@@ -1,4 +1,4 @@
-import { Bool, Field, Poseidon } from "snarkyjs";
+import { Bool, Field, Poseidon } from "o1js";
 
 import { Option } from "./Option";
 

package/src/model/Option.ts

@@ -5,7 +5,7 @@ import {
   Poseidon,
   Provable,
   Struct,
-} from "snarkyjs";
+} from "o1js";
 
 export class ProvableOption extends Struct({
   isSome: Bool,

package/src/model/Path.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-extraneous-class */
 /* eslint-disable @shopify/no-fully-static-classes */
-import { Field, type FlexibleProvablePure, Poseidon } from "snarkyjs";
+import { Field, type FlexibleProvablePure, Poseidon } from "o1js";
 
 import { stringToField } from "../utils/utils";
 

package/src/model/StateTransition.ts

@@ -1,4 +1,4 @@
-import { Field, Struct } from "snarkyjs";
+import { Field, Struct } from "o1js";
 
 import { Option, ProvableOption } from "./Option";
 

package/src/model/StateTransitionProvableBatch.ts

@@ -1,4 +1,4 @@
-import { Bool, Provable, Struct } from "snarkyjs";
+import { Bool, Provable, Struct } from "o1js";
 import { range } from "@proto-kit/common";
 
 import { constants } from "../Constants";

package/src/model/Transaction.ts

@@ -6,7 +6,7 @@ import {
   Signature,
   Struct,
   UInt64,
-} from "snarkyjs";
+} from "o1js";
 
 function argsToHash(...args: FlexibleProvable<any>[]): Field {
   const fields = args.flatMap((argument) => argument.toFields(argument));

package/src/model/network/NetworkState.ts

@@ -1,4 +1,4 @@
-import { Field, Poseidon, Struct, UInt64 } from "snarkyjs";
+import { Field, Poseidon, Struct, UInt64 } from "o1js";
 
 export class CurrentBlock extends Struct({
   height: UInt64,

package/src/model/transaction/ProtocolTransaction.ts

@@ -1,4 +1,4 @@
-import { Bool, Field, PublicKey, Signature, Struct, UInt64 } from "snarkyjs";
+import { Bool, Field, PublicKey, Signature, Struct, UInt64 } from "o1js";
 
 export class ProtocolTransaction extends Struct({
   methodId: Field,

package/src/model/transaction/RuntimeTransaction.ts

@@ -1,4 +1,4 @@
-import { Field, Poseidon, PublicKey, Struct, UInt64 } from "snarkyjs";
+import { Field, Poseidon, PublicKey, Struct, UInt64 } from "o1js";
 
 import { ProtocolTransaction } from "./ProtocolTransaction";
 

package/src/protocol/Protocol.ts

@@ -1,4 +1,6 @@
 import {
+  AreProofsEnabled,
+  ChildContainerProvider,
   log,
   ModuleContainer,
   ModulesConfig,
@@ -18,15 +20,16 @@ import { StateService } from "../state/StateService";
 import { ProtocolModule } from "./ProtocolModule";
 import { ProvableTransactionHook } from "./ProvableTransactionHook";
 import { NoopTransactionHook } from "../blockmodules/NoopTransactionHook";
+import { ProtocolEnvironment } from "./ProtocolEnvironment";
 
 export type GenericProtocolModuleRecord = ModulesRecord<
-  TypedClass<ProtocolModule>
+  TypedClass<ProtocolModule<unknown>>
 >;
 
-interface BlockProverType extends ProtocolModule, BlockProvable {}
+interface BlockProverType extends ProtocolModule<object>, BlockProvable {}
 
 interface StateTransitionProverType
-  extends ProtocolModule,
+  extends ProtocolModule<object>,
     StateTransitionProvable {}
 
 export interface ProtocolCustomModulesRecord {
@@ -45,34 +48,22 @@ export interface ProtocolDefinition<Modules extends ProtocolModulesRecord> {
    * @deprecated
    */
   state?: StateService;
-  // config: ModulesConfig<Modules>
+  config?: ModulesConfig<Modules>;
 }
 
-export class Protocol<
-  Modules extends ProtocolModulesRecord
-> extends ModuleContainer<Modules> {
+export class Protocol<Modules extends ProtocolModulesRecord>
+  extends ModuleContainer<Modules>
+  implements ProtocolEnvironment
+{
   // .from() to create Protocol
   public static from<Modules extends ProtocolModulesRecord>(
     modules: ProtocolDefinition<Modules>
-  ) {
-    const protocol = new Protocol(modules);
-
-    // Set empty config for all modules, since we don't have that feature yet
-    // eslint-disable-next-line max-len
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-assignment
-    const emptyConfig = Object.keys(modules.modules).reduce<any>(
-      (agg, item: string) => {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-        agg[item] = {};
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-        return agg;
-      },
-      {}
-    );
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    protocol.configure(emptyConfig as ModulesConfig<Modules>);
-
-    return protocol;
+  ): TypedClass<Protocol<Modules>> {
+    return class ScopedProtocol extends Protocol<Modules> {
+      public constructor() {
+        super(modules);
+      }
+    };
   }
 
   public definition: ProtocolDefinition<Modules>;
@@ -85,32 +76,6 @@ export class Protocol<
   public constructor(definition: ProtocolDefinition<Modules>) {
     super(definition);
     this.definition = definition;
-
-    // Register the BlockModules seperately since we need to
-    // inject them differently later
-    let atLeastOneTransactionHookRegistered = false;
-    Object.entries(definition.modules).forEach(([key, value]) => {
-      if (Object.prototype.isPrototypeOf.call(ProvableTransactionHook, value)) {
-        this.container.register(
-          "ProvableTransactionHook",
-          { useToken: key },
-          { lifecycle: Lifecycle.ContainerScoped }
-        );
-        atLeastOneTransactionHookRegistered = true;
-      }
-    });
-
-    // We need this so that tsyringe doesn't throw when no hooks are registered
-    if (!atLeastOneTransactionHookRegistered) {
-      this.container.register(
-        "ProvableTransactionHook",
-        { useClass: NoopTransactionHook },
-        { lifecycle: Lifecycle.ContainerScoped }
-      );
-    }
-    // this.container.afterResolution<ProvableTransactionHook>("ProvableTransactionHook", (token, result) => {
-    //   if ()
-    // })
   }
 
   public get stateService(): StateService {
@@ -128,10 +93,6 @@ export class Protocol<
     log.debug(`Decorated ${moduleName}`);
     containedModule.protocol = this;
 
-    log.debug(
-      "Is instanceof:",
-      containedModule instanceof ProvableTransactionHook
-    );
     if (containedModule instanceof ProvableTransactionHook) {
       containedModule.name = moduleName;
     }
@@ -162,21 +123,67 @@ export class Protocol<
       InstanceType<Modules["StateTransitionProver"]>
     >("StateTransitionProver");
   }
+
+  public getAreProofsEnabled(): AreProofsEnabled {
+    return this.container.resolve<AreProofsEnabled>("AreProofsEnabled");
+  }
+
+  public create(childContainerProvider: ChildContainerProvider) {
+    super.create(childContainerProvider);
+
+    // Register the BlockModules seperately since we need to
+    // inject them differently later
+    let atLeastOneTransactionHookRegistered = false;
+    Object.entries(this.definition.modules).forEach(([key, value]) => {
+      if (Object.prototype.isPrototypeOf.call(ProvableTransactionHook, value)) {
+        this.container.register(
+          "ProvableTransactionHook",
+          { useToken: key },
+          { lifecycle: Lifecycle.ContainerScoped }
+        );
+        atLeastOneTransactionHookRegistered = true;
+      }
+    });
+
+    // We need this so that tsyringe doesn't throw when no hooks are registered
+    if (!atLeastOneTransactionHookRegistered) {
+      this.container.register(
+        "ProvableTransactionHook",
+        { useClass: NoopTransactionHook },
+        { lifecycle: Lifecycle.ContainerScoped }
+      );
+    }
+  }
 }
 
 export const VanillaProtocol = {
   create(stateService?: StateService) {
-    return VanillaProtocol.from({}, stateService);
+    return VanillaProtocol.from(
+      {},
+      {
+        BlockProver: {},
+        StateTransitionProver: {},
+      },
+      stateService
+    );
   },
 
   from<AdditonalModules extends GenericProtocolModuleRecord>(
     additionalModules: AdditonalModules,
+    config: ModulesConfig<
+      AdditonalModules & {
+        StateTransitionProver: typeof StateTransitionProver;
+        BlockProver: typeof BlockProver;
+      }
+    >,
     stateService?: StateService
-  ): Protocol<
-    AdditonalModules & {
-      StateTransitionProver: typeof StateTransitionProver;
-      BlockProver: typeof BlockProver;
-    }
+  ): TypedClass<
+    Protocol<
+      AdditonalModules & {
+        StateTransitionProver: typeof StateTransitionProver;
+        BlockProver: typeof BlockProver;
+      }
+    >
   > {
     return Protocol.from({
       modules: {
@@ -184,7 +191,9 @@ export const VanillaProtocol = {
         BlockProver,
         ...additionalModules,
       },
+
+      config,
       state: stateService,
     });
   },
-};
+};

package/src/protocol/ProtocolEnvironment.ts

@@ -0,0 +1,9 @@
+import { StateService } from "../state/StateService";
+import { StateServiceProvider } from "../state/StateServiceProvider";
+import { AreProofsEnabled } from "@proto-kit/common";
+
+export interface ProtocolEnvironment {
+  get stateService(): StateService
+  get stateServiceProvider(): StateServiceProvider
+  getAreProofsEnabled(): AreProofsEnabled
+}

package/src/protocol/ProtocolModule.ts

@@ -1,20 +1,23 @@
 import {
   AreProofsEnabled,
-  Configurable,
+  ChildContainerProvider,
+  ConfigurableModule,
+  noop,
 } from "@proto-kit/common";
 
-import type { Protocol, ProtocolModulesRecord } from "./Protocol";
+import { ProtocolEnvironment } from "./ProtocolEnvironment";
 
-export abstract class ProtocolModule
-  implements Configurable<unknown>
-{
-  public config = {};
-
-  public protocol?: Protocol<ProtocolModulesRecord>;
+export abstract class ProtocolModule<
+  Config
+> extends ConfigurableModule<Config> {
+  public protocol?: ProtocolEnvironment;
 
   public get appChain(): AreProofsEnabled | undefined {
-    return this.protocol?.dependencyContainer.resolve<AreProofsEnabled>(
-      "AppChain"
-    );
+    return this.protocol?.getAreProofsEnabled();
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  public create(childContainerProvider: ChildContainerProvider): void {
+    noop();
   }
 }

package/src/protocol/ProvableTransactionHook.ts

@@ -2,6 +2,6 @@ import { BlockProverExecutionData } from "../prover/block/BlockProvable";
 
 import { TransitioningProtocolModule } from "./TransitioningProtocolModule";
 
-export abstract class ProvableTransactionHook extends TransitioningProtocolModule {
+export abstract class ProvableTransactionHook<Config> extends TransitioningProtocolModule<Config> {
   public abstract onTransaction(executionData: BlockProverExecutionData): void;
 }

package/src/protocol/TransitioningProtocolModule.ts

@@ -1,5 +1,7 @@
 import { ProtocolModule } from "./ProtocolModule";
 
-export abstract class TransitioningProtocolModule extends ProtocolModule {
+export abstract class TransitioningProtocolModule<
+  Config
+> extends ProtocolModule<Config> {
   public name?: string;
 }

package/src/prover/block/BlockProvable.ts

@@ -1,4 +1,4 @@
-import { Field, Proof, Struct } from "snarkyjs";
+import { Field, Proof, Struct } from "o1js";
 import { WithZkProgrammable } from "@proto-kit/common";
 
 import { StateTransitionProof } from "../statetransition/StateTransitionProvable";

package/src/prover/block/BlockProver.ts

@@ -1,5 +1,5 @@
 /* eslint-disable max-lines */
-import { Experimental, Field, type Proof, Provable, SelfProof } from "snarkyjs";
+import { Experimental, Field, type Proof, Provable, SelfProof } from "o1js";
 import { container, inject, injectable, injectAll } from "tsyringe";
 import {
   AreProofsEnabled,
@@ -75,7 +75,7 @@ export class BlockProverProgrammable extends ZkProgrammable<
       StateTransitionProverPublicOutput
     >,
     public readonly runtime: ZkProgrammable<undefined, MethodPublicOutput>,
-    private readonly blockModules: ProvableTransactionHook[]
+    private readonly blockModules: ProvableTransactionHook<unknown>[]
   ) {
     super();
   }
@@ -377,7 +377,7 @@ export class BlockProverProgrammable extends ZkProgrammable<
  * then be merged to be committed to the base-layer contract
  */
 @injectable()
-export class BlockProver extends ProtocolModule implements BlockProvable {
+export class BlockProver extends ProtocolModule<object> implements BlockProvable {
   public zkProgrammable: BlockProverProgrammable;
 
   public constructor(
@@ -389,7 +389,7 @@ export class BlockProver extends ProtocolModule implements BlockProvable {
     @inject("Runtime")
     public readonly runtime: WithZkProgrammable<undefined, MethodPublicOutput>,
     @injectAll("ProvableTransactionHook")
-    transactionHooks: ProvableTransactionHook[]
+    transactionHooks: ProvableTransactionHook<unknown>[]
   ) {
     super();
     this.zkProgrammable = new BlockProverProgrammable(

package/src/prover/statetransition/StateTransitionProvable.ts

@@ -1,4 +1,4 @@
-import { Field, Proof, Struct } from "snarkyjs";
+import { Field, Proof, Struct } from "o1js";
 import { WithZkProgrammable, ZkProgrammable } from "@proto-kit/common";
 
 import { StateTransitionProvableBatch } from "../../model/StateTransitionProvableBatch";

package/src/prover/statetransition/StateTransitionProver.ts

@@ -1,5 +1,5 @@
 /* eslint-disable max-lines */
-import { Bool, Experimental, Field, Provable, SelfProof } from "snarkyjs";
+import { Bool, Experimental, Field, Provable, SelfProof } from "o1js";
 import { injectable } from "tsyringe";
 import {
   AreProofsEnabled,
@@ -203,12 +203,6 @@ export class StateTransitionProverProgrammable extends ZkProgrammable<
       transition.from.value
     );
 
-    // if (!membershipValid.toBoolean()) {
-    //   console.log(
-    //     `Merklewitness error ${root1.toString()} ${root2.toString()}`
-    //   );
-    // }
-
     membershipValid
       .or(transition.from.isSome.not())
       .assertTrue(
@@ -351,7 +345,7 @@ export class StateTransitionProverProgrammable extends ZkProgrammable<
 
 @injectable()
 export class StateTransitionProver
-  extends ProtocolModule
+  extends ProtocolModule<object>
   implements StateTransitionProvable
 {
   public readonly zkProgrammable: StateTransitionProverProgrammable;

package/src/prover/statetransition/StateTransitionWitnessProvider.ts

@@ -1,4 +1,4 @@
-import type { Field } from "snarkyjs";
+import type { Field } from "o1js";
 import { injectable } from "tsyringe";
 
 import { RollupMerkleWitness } from "../../utils/merkletree/RollupMerkleTree.js";

package/src/state/State.ts

@@ -1,5 +1,5 @@
 import { Mixin } from "ts-mixer";
-import { Bool, Field, Provable, type FlexibleProvablePure } from "snarkyjs";
+import { Bool, Field, Provable, type FlexibleProvablePure } from "o1js";
 import { container } from "tsyringe";
 import { dummyValue } from "@proto-kit/common";
 

package/src/state/StateMap.ts

@@ -1,4 +1,4 @@
-import type { Field, FlexibleProvablePure } from "snarkyjs";
+import type { Field, FlexibleProvablePure } from "o1js";
 import { Mixin } from "ts-mixer";
 
 import { Path } from "../model/Path";