@proto-kit/common 0.1.1-develop.600 → 0.1.1-develop.833

package/dist/utils.js

@@ -1,4 +1,4 @@
-import { Field, Poseidon } from "o1js";
+import { Field, Poseidon, } from "o1js";
 export function requireTrue(condition, errorOrFunction) {
     if (!condition) {
         throw typeof errorOrFunction === "function"
@@ -6,12 +6,28 @@ export function requireTrue(condition, errorOrFunction) {
             : errorOrFunction;
     }
 }
-export function range(startOrEnd, end) {
+export function range(startOrEnd, endOrNothing) {
+    let end = endOrNothing;
+    let start = startOrEnd;
     if (end === undefined) {
         end = startOrEnd;
-        startOrEnd = 0;
+        start = 0;
     }
-    return Array.from({ length: end - startOrEnd }, (ignored, index) => index + startOrEnd);
+    return Array.from({ length: end - start }, (ignored, index) => index + start);
+}
+export function reduceSequential(array, callbackfn, initialValue) {
+    return array.reduce(async (previousPromise, current, index, arr) => {
+        const previous = await previousPromise;
+        return await callbackfn(previous, current, index, arr);
+    }, Promise.resolve(initialValue));
+}
+export function mapSequential(array, f) {
+    return array.reduce(async (r, element, index, a) => {
+        const ret = await r;
+        const next = await f(element, index, a);
+        ret.push(next);
+        return ret;
+    }, Promise.resolve([]));
 }
 /**
  * Computes a dummy value for the given value type.
@@ -25,11 +41,11 @@ export function dummyValue(valueType) {
     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
     return valueType.fromFields(fields);
 }
-// eslint-disable-next-line @typescript-eslint/no-empty-function
 export function noop() { }
 export async function sleep(ms) {
-    // eslint-disable-next-line promise/avoid-new,no-promise-executor-return
-    await new Promise((resolve) => setTimeout(resolve, ms));
+    await new Promise((resolve) => {
+        setTimeout(resolve, ms);
+    });
 }
 export function filterNonNull(value) {
     return value !== null;
@@ -37,16 +53,21 @@ export function filterNonNull(value) {
 export function filterNonUndefined(value) {
     return value !== undefined;
 }
-let encoder = new TextEncoder();
+const encoder = new TextEncoder();
 // Copied from o1js binable.ts:317
 export function prefixToField(prefix) {
-    let fieldSize = Field.sizeInBytes();
+    const fieldSize = Field.sizeInBytes;
     if (prefix.length >= fieldSize)
         throw Error("prefix too long");
-    let stringBytes = [...encoder.encode(prefix)];
+    const stringBytes = [...encoder.encode(prefix)];
     return Field.fromBytes(stringBytes.concat(Array(fieldSize - stringBytes.length).fill(0)));
 }
 export function hashWithPrefix(prefix, input) {
     const salt = Poseidon.update([Field(0), Field(0), Field(0)], [prefixToField(prefix)]);
+    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
     return Poseidon.update(salt, input)[0];
 }
+// end copy
+export function expectDefined(value) {
+    expect(value).toBeDefined();
+}

package/dist/zkProgrammable/ProvableMethodExecutionContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ProvableMethodExecutionContext.d.ts","sourceRoot":"","sources":["../../src/zkProgrammable/ProvableMethodExecutionContext.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAoB,KAAK,EAAE,MAAM,MAAM,CAAC;AAIpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAWtD,qBAAa,6BAA6B;IACjC,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,IAAI,CAAC,EAAE,aAAa,CAAC;IAErB,MAAM,CAAC,EAAE,MAAM,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IAE1C,KAAK,CAEhB,SAAS,SAAS,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,KACtC,OAAO,CAAC,SAAS,CAAC;CAaxB;AAED;;;;GAIG;AACH,qBACa,8BAA8B;IAClC,EAAE,SAAc;IAEhB,OAAO,EAAE,MAAM,EAAE,CAAM;IAEvB,MAAM,EAAE,6BAA6B,CACN;IAItC;;;;;;OAMG;IACI,SAAS,CAAC,MAAM,EAAE,MAAM,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAI/D;;;;;OAKG;IACI,YAAY,CACjB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,aAAa;IAYrB;;;;OAIG;IACI,WAAW;IAIlB,IAAW,UAAU,YAEpB;IAED,IAAW,UAAU,YAEpB;IAED;;OAEG;IACI,OAAO;;;;IAOd;;OAEG;IACI,KAAK;CAGb"}
+{"version":3,"file":"ProvableMethodExecutionContext.d.ts","sourceRoot":"","sources":["../../src/zkProgrammable/ProvableMethodExecutionContext.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAIlC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAWtD,qBAAa,6BAA6B;IACjC,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,IAAI,CAAC,EAAE,aAAa,CAAC;IAErB,MAAM,CAAC,EAAE,MAAM,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IAE1C,KAAK,CAChB,SAAS,SAAS,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,KACtC,OAAO,CAAC,SAAS,CAAC;CAaxB;AAED;;;;GAIG;AACH,qBACa,8BAA8B;IAClC,EAAE,SAAc;IAEhB,OAAO,EAAE,MAAM,EAAE,CAAM;IAEvB,MAAM,EAAE,6BAA6B,CACN;IAGtC;;;;;;OAMG;IACI,SAAS,CAAC,MAAM,EAAE,MAAM,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAI/D;;;;;OAKG;IACI,YAAY,CACjB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,aAAa;IAYrB;;;;OAIG;IACI,WAAW;IAIlB,IAAW,UAAU,YAEpB;IAED,IAAW,UAAU,YAEpB;IAED;;OAEG;IACI,OAAO;;;;IAOd;;OAEG;IACI,KAAK;CAGb"}

package/dist/zkProgrammable/ProvableMethodExecutionContext.js

@@ -29,13 +29,12 @@ export class ProvableMethodExecutionResult {
  * allowing them to post relevant information (such as execution status)
  * into the context without any unnecessary 'prop drilling'.
  */
-let ProvableMethodExecutionContext = class ProvableMethodExecutionContext {
+export let ProvableMethodExecutionContext = class ProvableMethodExecutionContext {
     constructor() {
         this.id = uniqueId();
         this.methods = [];
         this.result = new ProvableMethodExecutionResult();
     }
-    // eslint-disable-next-line no-warning-comments,max-len
     // TODO See if we should make this class generic, bc I think we can persist the type
     /**
      * Adds a method prover to the current execution context,
@@ -95,4 +94,3 @@ let ProvableMethodExecutionContext = class ProvableMethodExecutionContext {
 ProvableMethodExecutionContext = __decorate([
     singleton()
 ], ProvableMethodExecutionContext);
-export { ProvableMethodExecutionContext };

package/dist/zkProgrammable/ZkProgrammable.d.ts

@@ -1,6 +1,9 @@
-import { Experimental, FlexibleProvablePure, Proof } from "o1js";
+import { ZkProgram, FlexibleProvablePure, Proof, Field, Provable } from "o1js";
 export interface CompileArtifact {
-    verificationKey: string;
+    verificationKey: {
+        data: string;
+        hash: Field;
+    };
 }
 export interface AreProofsEnabled {
     areProofsEnabled: boolean;
@@ -15,11 +18,15 @@ export interface Compile {
 export interface PlainZkProgram<PublicInput = undefined, PublicOutput = void> {
     compile: Compile;
     verify: Verify<PublicInput, PublicOutput>;
-    Proof: ReturnType<typeof Experimental.ZkProgram.Proof<FlexibleProvablePure<PublicInput>, FlexibleProvablePure<PublicOutput>>>;
+    Proof: ReturnType<typeof ZkProgram.Proof<FlexibleProvablePure<PublicInput>, FlexibleProvablePure<PublicOutput>>>;
     methods: Record<string, ((...args: any) => Promise<Proof<PublicInput, PublicOutput>>) | ((publicInput: PublicInput, ...args: any) => Promise<Proof<PublicInput, PublicOutput>>)>;
+    analyzeMethods: () => Promise<Record<string, Awaited<ReturnType<typeof Provable.constraintSystem>>>>;
 }
 export declare function verifyToMockable<PublicInput, PublicOutput>(verify: Verify<PublicInput, PublicOutput>, { areProofsEnabled }: AreProofsEnabled): (proof: Proof<PublicInput, PublicOutput>) => Promise<boolean>;
-export declare const MOCK_VERIFICATION_KEY = "mock-verification-key";
+export declare const MOCK_VERIFICATION_KEY: {
+    data: string;
+    hash: import("o1js/dist/node/lib/provable/field").Field;
+};
 export declare function compileToMockable(compile: Compile, { areProofsEnabled }: AreProofsEnabled): () => Promise<CompileArtifact>;
 export declare abstract class ZkProgrammable<PublicInput = undefined, PublicOutput = void> {
     abstract get appChain(): AreProofsEnabled | undefined;

package/dist/zkProgrammable/ZkProgrammable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ZkProgrammable.d.ts","sourceRoot":"","sources":["../../src/zkProgrammable/ZkProgrammable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAUjE,MAAM,WAAW,eAAe;IAC9B,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,gBAAgB;IAC/B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,gBAAgB,EAAE,CAAC,gBAAgB,EAAE,OAAO,KAAK,IAAI,CAAC;CACvD;AAED,MAAM,WAAW,MAAM,CAAC,WAAW,EAAE,YAAY;IAC/C,CAAC,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE,YAAY,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC7D;AAED,MAAM,WAAW,OAAO;IACtB,IAAI,OAAO,CAAC,eAAe,CAAC,CAAC;CAC9B;AAED,MAAM,WAAW,cAAc,CAAC,WAAW,GAAG,SAAS,EAAE,YAAY,GAAG,IAAI;IAC1E,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IAC1C,KAAK,EAAE,UAAU,CACf,OAAO,YAAY,CAAC,SAAS,CAAC,KAAK,CACjC,oBAAoB,CAAC,WAAW,CAAC,EACjC,oBAAoB,CAAC,YAAY,CAAC,CACnC,CACF,CAAC;IACF,OAAO,EAAE,MAAM,CACb,MAAM,EACJ,CAAC,CAEC,GAAG,IAAI,EAAE,GAAG,KACT,OAAO,CAAC,KAAK,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC,GAC/C,CAAC,CACC,WAAW,EAAE,WAAW,EAExB,GAAG,IAAI,EAAE,GAAG,KACT,OAAO,CAAC,KAAK,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC,CAClD,CAAC;CACH;AAED,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,YAAY,EACxD,MAAM,EAAE,MAAM,CAAC,WAAW,EAAE,YAAY,CAAC,EACzC,EAAE,gBAAgB,EAAE,EAAE,gBAAgB,WAEjB,MAAM,WAAW,EAAE,YAAY,CAAC,sBAiBtD;AAED,eAAO,MAAM,qBAAqB,0BAA0B,CAAC;AAE7D,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,OAAO,EAChB,EAAE,gBAAgB,EAAE,EAAE,gBAAgB,GACrC,MAAM,OAAO,CAAC,eAAe,CAAC,CAUhC;AAED,8BAAsB,cAAc,CAClC,WAAW,GAAG,SAAS,EACvB,YAAY,GAAG,IAAI;IAEnB,aAAoB,QAAQ,IAAI,gBAAgB,GAAG,SAAS,CAAC;aAE7C,gBAAgB,IAAI,cAAc,CAAC,WAAW,EAAE,YAAY,CAAC;IAE7E,IACW,SAAS,IAAI,cAAc,CAAC,WAAW,EAAE,YAAY,CAAC,CAYhE;CACF;AAED,MAAM,WAAW,kBAAkB,CACjC,WAAW,GAAG,SAAS,EACvB,YAAY,GAAG,IAAI;IAEnB,cAAc,EAAE,cAAc,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;CAC3D"}
+{"version":3,"file":"ZkProgrammable.d.ts","sourceRoot":"","sources":["../../src/zkProgrammable/ZkProgrammable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAY/E,MAAM,WAAW,eAAe;IAC9B,eAAe,EAAE;QACf,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,KAAK,CAAC;KACb,CAAC;CACH;AAED,MAAM,WAAW,gBAAgB;IAC/B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,gBAAgB,EAAE,CAAC,gBAAgB,EAAE,OAAO,KAAK,IAAI,CAAC;CACvD;AAED,MAAM,WAAW,MAAM,CAAC,WAAW,EAAE,YAAY;IAC/C,CAAC,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE,YAAY,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC7D;AAED,MAAM,WAAW,OAAO;IACtB,IAAI,OAAO,CAAC,eAAe,CAAC,CAAC;CAC9B;AAED,MAAM,WAAW,cAAc,CAAC,WAAW,GAAG,SAAS,EAAE,YAAY,GAAG,IAAI;IAC1E,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IAC1C,KAAK,EAAE,UAAU,CACf,OAAO,SAAS,CAAC,KAAK,CACpB,oBAAoB,CAAC,WAAW,CAAC,EACjC,oBAAoB,CAAC,YAAY,CAAC,CACnC,CACF,CAAC;IACF,OAAO,EAAE,MAAM,CACb,MAAM,EACJ,CAAC,CAAC,GAAG,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,KAAK,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC,GAC7D,CAAC,CACC,WAAW,EAAE,WAAW,EACxB,GAAG,IAAI,EAAE,GAAG,KACT,OAAO,CAAC,KAAK,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC,CAClD,CAAC;IACF,cAAc,EAAE,MAAM,OAAO,CAC3B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,QAAQ,CAAC,gBAAgB,CAAC,CAAC,CAAC,CACtE,CAAC;CACH;AAED,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,YAAY,EACxD,MAAM,EAAE,MAAM,CAAC,WAAW,EAAE,YAAY,CAAC,EACzC,EAAE,gBAAgB,EAAE,EAAE,gBAAgB,WAEjB,MAAM,WAAW,EAAE,YAAY,CAAC,sBAiBtD;AAED,eAAO,MAAM,qBAAqB;;;CAGjC,CAAC;AAEF,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,OAAO,EAChB,EAAE,gBAAgB,EAAE,EAAE,gBAAgB,GACrC,MAAM,OAAO,CAAC,eAAe,CAAC,CAUhC;AAED,8BAAsB,cAAc,CAClC,WAAW,GAAG,SAAS,EACvB,YAAY,GAAG,IAAI;IAEnB,aAAoB,QAAQ,IAAI,gBAAgB,GAAG,SAAS,CAAC;aAE7C,gBAAgB,IAAI,cAAc,CAAC,WAAW,EAAE,YAAY,CAAC;IAE7E,IACW,SAAS,IAAI,cAAc,CAAC,WAAW,EAAE,YAAY,CAAC,CAYhE;CACF;AAED,MAAM,WAAW,kBAAkB,CACjC,WAAW,GAAG,SAAS,EACvB,YAAY,GAAG,IAAI;IAEnB,cAAc,EAAE,cAAc,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;CAC3D"}

package/dist/zkProgrammable/ZkProgrammable.js

@@ -7,7 +7,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+import { Field } from "o1js";
 import { Memoize } from "typescript-memoize";
+import { log } from "../log";
 import { MOCK_PROOF } from "./provableMethod";
 const errors = {
     appChainNotSet: (name) => new Error(`Appchain was not injected for: ${name}`),
@@ -21,7 +23,7 @@ export function verifyToMockable(verify, { areProofsEnabled }) {
             }
             catch (error) {
                 // silently fail verification
-                console.error(error);
+                log.error(error);
                 verified = false;
             }
             return verified;
@@ -29,7 +31,10 @@ export function verifyToMockable(verify, { areProofsEnabled }) {
         return proof.proof === MOCK_PROOF;
     };
 }
-export const MOCK_VERIFICATION_KEY = "mock-verification-key";
+export const MOCK_VERIFICATION_KEY = {
+    data: "mock-verification-key",
+    hash: Field(0),
+};
 export function compileToMockable(compile, { areProofsEnabled }) {
     return async () => {
         if (areProofsEnabled) {

package/dist/zkProgrammable/provableMethod.d.ts

@@ -1,10 +1,9 @@
-import { InferProvable, Proof, ProvableExtended } from "o1js";
+import { Proof, DynamicProof } from "o1js";
 import { ProvableMethodExecutionContext } from "./ProvableMethodExecutionContext";
 import type { WithZkProgrammable, ZkProgrammable } from "./ZkProgrammable";
-import { ToFieldable } from "../utils";
-export type O1JSPrimitive = InferProvable<ProvableExtended<unknown>> & ToFieldable;
-export type ArgumentTypes = (O1JSPrimitive | Proof<unknown, unknown>)[];
-export type DecoratedMethod = (...args: ArgumentTypes) => unknown;
+export type O1JSPrimitive = object | string | boolean | number;
+export type ArgumentTypes = (O1JSPrimitive | Proof<unknown, unknown> | DynamicProof<unknown, unknown>)[];
+export type DecoratedMethod = (...args: ArgumentTypes) => Promise<unknown>;
 export declare const MOCK_PROOF = "mock-proof";
 export declare function toProver(methodName: string, simulatedMethod: DecoratedMethod, isFirstParameterPublicInput: boolean, ...args: ArgumentTypes): (this: ZkProgrammable<any, any>) => Promise<Proof<any, any>>;
 /**
@@ -16,5 +15,5 @@ export declare function toProver(methodName: string, simulatedMethod: DecoratedM
  * @param executionContext
  * @returns
  */
-export declare function provableMethod(isFirstParameterPublicInput?: boolean, executionContext?: ProvableMethodExecutionContext): <Target extends ZkProgrammable<any, any> | WithZkProgrammable<any, any>>(target: Target, methodName: string, descriptor: PropertyDescriptor) => PropertyDescriptor;
+export declare function provableMethod(isFirstParameterPublicInput?: boolean, executionContext?: ProvableMethodExecutionContext): <Target extends ZkProgrammable<any, any> | WithZkProgrammable<any, any>>(target: Target, methodName: string, descriptor: TypedPropertyDescriptor<(...args: any[]) => Promise<any> | any>) => TypedPropertyDescriptor<(...args: any[]) => Promise<any> | any>;
 //# sourceMappingURL=provableMethod.d.ts.map

package/dist/zkProgrammable/provableMethod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provableMethod.d.ts","sourceRoot":"","sources":["../../src/zkProgrammable/provableMethod.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,aAAa,EAAE,KAAK,EAAE,gBAAgB,EAAE,MAAM,MAAM,CAAC;AAGhF,OAAO,EAAE,8BAA8B,EAAE,MAAM,kCAAkC,CAAC;AAClF,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEvC,MAAM,MAAM,aAAa,GAAG,aAAa,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,GAAG,WAAW,CAAC;AACnF,MAAM,MAAM,aAAa,GAAG,CAAC,aAAa,GAAG,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC;AAGxE,MAAM,MAAM,eAAe,GAAG,CAAC,GAAG,IAAI,EAAE,aAAa,KAAK,OAAO,CAAC;AAElE,eAAO,MAAM,UAAU,eAAe,CAAC;AAEvC,wBAAgB,QAAQ,CACtB,UAAU,EAAE,MAAM,EAClB,eAAe,EAAE,eAAe,EAChC,2BAA2B,EAAE,OAAO,EACpC,GAAG,IAAI,EAAE,aAAa,UAGa,eAAe,GAAG,EAAE,GAAG,CAAC,8BAyB5D;AAED;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAC5B,2BAA2B,UAAO,EAClC,gBAAgB,GAAE,8BAEjB,wGAOa,MAAM,cACN,kBAAkB,wBA4CjC"}
+{"version":3,"file":"provableMethod.d.ts","sourceRoot":"","sources":["../../src/zkProgrammable/provableMethod.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AAG3C,OAAO,EAAE,8BAA8B,EAAE,MAAM,kCAAkC,CAAC;AAClF,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAG3E,MAAM,MAAM,aAAa,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;AAC/D,MAAM,MAAM,aAAa,GAAG,CACxB,aAAa,GACb,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,GACvB,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CACjC,EAAE,CAAC;AAEJ,MAAM,MAAM,eAAe,GAAG,CAAC,GAAG,IAAI,EAAE,aAAa,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;AAE3E,eAAO,MAAM,UAAU,eAAe,CAAC;AAEvC,wBAAgB,QAAQ,CACtB,UAAU,EAAE,MAAM,EAClB,eAAe,EAAE,eAAe,EAChC,2BAA2B,EAAE,OAAO,EACpC,GAAG,IAAI,EAAE,aAAa,UAEa,eAAe,GAAG,EAAE,GAAG,CAAC,8BAwB5D;AAED;;;;;;;;GAQG;AACH,wBAAgB,cAAc,CAC5B,2BAA2B,UAAO,EAClC,gBAAgB,GAAE,8BAEjB,wGAMa,MAAM,gDAC4B,GAAG,EAAE,KAAK,QAAQ,GAAG,CAAC,GAAG,GAAG,wCAA5B,GAAG,EAAE,KAAK,QAAQ,GAAG,CAAC,GAAG,GAAG,EA2C7E"}

package/dist/zkProgrammable/provableMethod.js

@@ -2,7 +2,6 @@ import { container } from "tsyringe";
 import { ProvableMethodExecutionContext } from "./ProvableMethodExecutionContext";
 export const MOCK_PROOF = "mock-proof";
 export function toProver(methodName, simulatedMethod, isFirstParameterPublicInput, ...args) {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     return async function prover() {
         const areProofsEnabled = this.appChain?.areProofsEnabled;
         if (areProofsEnabled ?? false) {
@@ -10,10 +9,9 @@ export function toProver(methodName, simulatedMethod, isFirstParameterPublicInpu
             return await Reflect.apply(programProvableMethod, this, args);
         }
         // create a mock proof by simulating method execution in JS
-        const publicOutput = Reflect.apply(simulatedMethod, this, args);
+        const publicOutput = await Reflect.apply(simulatedMethod, this, args);
         return new this.zkProgram.Proof({
             proof: MOCK_PROOF,
-            // eslint-disable-next-line no-warning-comments
             // TODO: provide undefined if public input is not used
             publicInput: isFirstParameterPublicInput ? args[0] : undefined,
             publicOutput,
@@ -38,7 +36,7 @@ export function provableMethod(isFirstParameterPublicInput = true, executionCont
     return (target, methodName, descriptor) => {
         // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
         const simulatedMethod = descriptor.value;
-        descriptor.value = function value(...args) {
+        descriptor.value = async function value(...args) {
             const prover = toProver(methodName, simulatedMethod, isFirstParameterPublicInput, ...args);
             executionContext.beforeMethod(this.constructor.name, methodName, args);
             /**
@@ -53,7 +51,6 @@ export function provableMethod(isFirstParameterPublicInput = true, executionCont
              * or not, execute its simulated (Javascript) version and
              * return the result.
              */
-            // eslint-disable-next-line @typescript-eslint/init-declarations
             let result;
             try {
                 result = Reflect.apply(simulatedMethod, this, args);

package/package.json

@@ -3,14 +3,14 @@
   "license": "MIT",
   "private": false,
   "type": "module",
-  "version": "0.1.1-develop.600+699a7df",
+  "version": "0.1.1-develop.833+397881ed",
   "scripts": {
     "build": "tsc -p tsconfig.json",
     "dev": "tsc -p tsconfig.json --watch",
     "lint": "eslint ./src ./test",
     "test:file": "node --experimental-vm-modules --experimental-wasm-modules --experimental-wasm-threads ../../node_modules/jest/bin/jest.js",
-    "test": "npm run test:file -- ./src/** ./test/**",
-    "test:watch": "npm run test:file -- ./src/** ./test/** --watch"
+    "test": "npm run test:file -- ./test/**",
+    "test:watch": "npm run test:file -- ./test/** --watch"
   },
   "main": "dist/index.js",
   "publishConfig": {
@@ -23,12 +23,12 @@
     "typescript-memoize": "^1.1.1"
   },
   "peerDependencies": {
-    "o1js": "0.13.1",
+    "o1js": "^1.1.0",
     "tsyringe": "^4.7.0"
   },
   "devDependencies": {
     "@jest/globals": "^29.5.0",
     "@types/lodash": "^4.14.194"
   },
-  "gitHead": "699a7dfa3b5d3415ab4500f0cd495d6781365c6a"
+  "gitHead": "397881ed5d8f98f5005bcd7be7f5a12b3bc6f956"
 }

package/src/config/ChildContainerCreatable.ts

@@ -2,4 +2,4 @@ import { ChildContainerProvider } from "./ChildContainerProvider";
 
 export interface ChildContainerCreatable {
   create: (childContainerProvider: ChildContainerProvider) => void;
-}
+}

package/src/config/ConfigurableModule.ts

@@ -11,7 +11,7 @@ const errors = {
 };
 
 // defines how presets can be provided, either a function or a record
-export type Preset<Config> = Config | ((...args: any[]) => Config);
+export type Preset<Config> = Config | ((...args: unknown[]) => Config);
 export type Presets<Config> = Record<string, Preset<Config>>;
 
 // describes the interface of a configurable module
@@ -19,7 +19,7 @@ export interface Configurable<Config> {
   config: Config;
 }
 
-export type NoConfig = Record<string, never>;
+export type NoConfig = Record<never, never>;
 
 /**
  * Used by various module sub-types that may need to be configured
@@ -46,7 +46,6 @@ export class ConfigurableModule<Config = NoConfig>
     this.currentConfig = config;
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   public create(childContainerProvider: ChildContainerProvider): void {
     noop();
   }

package/src/config/ModuleContainer.ts

@@ -1,4 +1,3 @@
-/* eslint-disable max-lines */
 import "reflect-metadata";
 
 import {
@@ -20,6 +19,7 @@ import {
   DependencyFactory,
   InferDependencies,
 } from "../dependencyFactory/DependencyFactory";
+import { EventEmitterProxy } from "../events/EventEmitterProxy";
 
 import {
   Configurable,
@@ -28,7 +28,6 @@ import {
 } from "./ConfigurableModule";
 import { ChildContainerProvider } from "./ChildContainerProvider";
 import { ChildContainerCreatable } from "./ChildContainerCreatable";
-import { EventEmitterProxy } from "../events/EventEmitterProxy";
 
 const errors = {
   configNotSetInContainer: (moduleName: string) =>
@@ -38,8 +37,7 @@ const errors = {
 
   onlyValidModuleNames: (moduleName: NonNullable<unknown>) =>
     new Error(
-      // eslint-disable-next-line max-len
-      // eslint-disable-next-line @typescript-eslint/no-base-to-string,@typescript-eslint/restrict-template-expressions
+      // eslint-disable-next-line @typescript-eslint/no-base-to-string
       `Only known module names are allowed, using unknown module name: ${moduleName}`
     ),
 
@@ -81,7 +79,7 @@ export type BaseModuleType = TypedClass<BaseModuleInstanceType>;
 // allows to specify what kind of modules can be passed into a container
 export interface ModulesRecord<
   // use the default configurable module type
-  ModuleType extends BaseModuleType = BaseModuleType
+  ModuleType extends BaseModuleType = BaseModuleType,
 > {
   [name: string]: ModuleType;
 }
@@ -98,8 +96,16 @@ export type ModulesConfig<Modules extends ModulesRecord> = {
     : never;
 };
 
+/**
+ * This type make any config partial (i.e. optional) up to the first level
+ * So { Module: { a: { b: string } } }
+ * will become
+ * { Module?: { a?: { b: string } } }
+ * Note that b does not become optional, as we don't want nested objects to
+ * become unreasonably partialized (for example Field).
+ */
 export type RecursivePartial<T> = {
-  [Key in keyof T]?: T[Key] extends object ? RecursivePartial<T[Key]> : T[Key];
+  [Key in keyof T]?: Partial<T[Key]>;
 };
 
 /**
@@ -108,6 +114,9 @@ export type RecursivePartial<T> = {
 export interface ModuleContainerDefinition<Modules extends ModulesRecord> {
   modules: Modules;
   // config is optional, as it may be provided by the parent/wrapper class
+  /**
+   * @deprecated
+   */
   config?: ModulesConfig<Modules>;
 }
 
@@ -133,7 +142,7 @@ export type ResolvableModules<Modules extends ModulesRecord> = MergeObjects<
  * configuration, decoration and validation of modules
  */
 export class ModuleContainer<
-  Modules extends ModulesRecord
+  Modules extends ModulesRecord,
 > extends ConfigurableModule<ModulesConfig<Modules>> {
   /**
    * Determines how often are modules decorated upon resolution
@@ -148,9 +157,6 @@ export class ModuleContainer<
 
   public constructor(public definition: ModuleContainerDefinition<Modules>) {
     super();
-    if (definition.config !== undefined) {
-      this.config = definition.config;
-    }
   }
 
   /**
@@ -230,7 +236,7 @@ export class ModuleContainer<
    * @param modules
    */
   protected registerModules(modules: Modules) {
-    for (const moduleName in modules) {
+    Object.keys(modules).forEach((moduleName) => {
       if (Object.prototype.hasOwnProperty.call(modules, moduleName)) {
         this.assertIsValidModuleName(moduleName);
 
@@ -245,7 +251,7 @@ export class ModuleContainer<
         );
         this.onAfterModuleResolution(moduleName);
       }
-    }
+    });
   }
 
   public get events(): EventEmitterProxy<Modules> {
@@ -259,7 +265,6 @@ export class ModuleContainer<
    * Register a non-module value into the current container
    * @param modules
    */
-  // eslint-disable-next-line no-warning-comments
   // TODO Rename to plural since object is param
   public registerValue<Value>(modules: Record<string, Value>) {
     Object.entries(modules).forEach(([moduleName, useValue]) => {
@@ -296,7 +301,10 @@ export class ModuleContainer<
     >(this.currentConfig ?? {}, config);
   }
 
-  // eslint-disable-next-line accessor-pairs
+  public get config() {
+    return super.config;
+  }
+
   public set config(config: ModulesConfig<Modules>) {
     super.config = merge<
       ModulesConfig<Modules> | NoConfig,
@@ -344,9 +352,7 @@ export class ModuleContainer<
     moduleName: StringKeyOf<Modules>,
     containedModule: InstanceType<Modules[StringKeyOf<Modules>]>
   ) {
-    // Has to be super.config, getters behave really weird when subtyping
     const config = super.config?.[moduleName];
-
     // eslint-disable-next-line @typescript-eslint/strict-boolean-expressions
     if (!config) {
       throw errors.configNotSetInContainer(moduleName.toString());
@@ -359,7 +365,6 @@ export class ModuleContainer<
     }
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   private isDependencyFactory(type: any): type is DependencyFactory {
     return "dependencies" in type;
   }
@@ -407,6 +412,7 @@ export class ModuleContainer<
           this.container.register(key, declaration, {
             lifecycle: Lifecycle.Singleton,
           });
+          // eslint-disable-next-line sonarjs/no-duplicated-branches
         } else if (isTokenProvider(declaration)) {
           this.container.register(key, declaration, {
             lifecycle: Lifecycle.Singleton,

package/src/dependencyFactory/DependencyFactory.ts

@@ -36,10 +36,11 @@ export interface DependencyFactory {
 }
 
 export type TypeFromDependencyDeclaration<
-  Declaration extends DependencyDeclaration<unknown>
-> = Declaration extends DependencyDeclaration<infer Dependency>
-  ? Dependency
-  : never;
+  Declaration extends DependencyDeclaration<unknown>,
+> =
+  Declaration extends DependencyDeclaration<infer Dependency>
+    ? Dependency
+    : never;
 
 export type CapitalizeAny<Key extends string | number | symbol> =
   Key extends string ? Capitalize<Key> : Key;

package/src/dependencyFactory/injectOptional.ts

@@ -0,0 +1,41 @@
+import {
+  container,
+  injectable,
+  injectWithTransform,
+  Lifecycle,
+  scoped,
+} from "tsyringe";
+
+@injectable()
+@scoped(Lifecycle.ResolutionScoped)
+class UndefinedDisguise {}
+
+class UndefinedTransform<Dependency> {
+  public transform(
+    incoming: Dependency | UndefinedDisguise
+  ): Dependency | undefined {
+    if (incoming instanceof UndefinedDisguise) {
+      return undefined;
+    }
+    return incoming;
+  }
+}
+
+/**
+ * This function injects a dependency only if it has been registered, otherwise
+ * injects undefined. This can be useful for having optional dependencies, where
+ * tsyringe would normally error out and not be able to resolve. With this
+ * decorator, we can now do this.
+ *
+ * The strategy we employ here is that we inject a dummy into the global
+ * container that is of type UndefinedDisguise. We can't inject undefined
+ * directly, therefore we use this object to disguise itself as undefined.
+ * Then a child container registers something under the same token, it by
+ * default resolves that new dependency. If that doesn't happen, the
+ * resolution hits our disguise, which we then convert into undefined
+ * using the Transform
+ */
+export function injectOptional<T>(token: string) {
+  container.register(token, { useClass: UndefinedDisguise });
+  return injectWithTransform(token, UndefinedTransform<T>);
+}

package/src/events/EventEmitter.ts

@@ -1,14 +1,12 @@
 import { EventsRecord } from "./EventEmittingComponent";
 
 type ListenersHolder<Events extends EventsRecord> = {
-  // eslint-disable-next-line putout/putout
   [key in keyof Events]?: ((...args: Events[key]) => void)[];
 };
 
 export class EventEmitter<Events extends EventsRecord> {
   private readonly listeners: ListenersHolder<Events> = {};
 
-  // eslint-disable-next-line putout/putout
   private readonly wildcardListeners: ((
     event: keyof Events,
     args: Events[keyof Events]

package/src/events/EventEmitterProxy.ts

@@ -16,8 +16,8 @@ export type ModuleEvents<ModuleType extends BaseModuleType> =
   InstanceType<ModuleType> extends EventEmittingComponent<infer Events>
     ? Events
     : InstanceType<ModuleType> extends ModuleContainer<infer NestedModules>
-    ? CastToEventsRecord<ContainerEvents<NestedModules>>
-    : EventsRecord;
+      ? CastToEventsRecord<ContainerEvents<NestedModules>>
+      : EventsRecord;
 
 export type ContainerEvents<Modules extends ModulesRecord> = {
   [Key in StringKeyOf<Modules>]: ModuleEvents<Modules[Key]>;
@@ -30,7 +30,7 @@ export type FlattenedContainerEvents<Modules extends ModulesRecord> =
   FlattenObject<ContainerEvents<Modules>>;
 
 export class EventEmitterProxy<
-  Modules extends ModulesRecord
+  Modules extends ModulesRecord,
 > extends EventEmitter<CastToEventsRecord<FlattenedContainerEvents<Modules>>> {
   public constructor(private readonly container: ModuleContainer<Modules>) {
     super();
@@ -40,8 +40,9 @@ export class EventEmitterProxy<
       ) {
         const module = container.resolve(moduleName);
         if (this.isEventEmitter(module)) {
-          module.events.onAll((events: any, args: unknown[]) => {
-            this.emit(events, ...(args as any));
+          module.events.onAll((events: any, args: any[]) => {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+            this.emit(events, ...args);
           });
         }
       }
@@ -51,6 +52,7 @@ export class EventEmitterProxy<
   private isEventEmitter(
     module: any
   ): module is EventEmittingComponent<EventsRecord> {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const emitter = module.events;
     return emitter !== undefined && emitter instanceof EventEmitter;
   }

package/src/index.ts

@@ -8,6 +8,7 @@ export * from "./zkProgrammable/ProvableMethodExecutionContext";
 export * from "./zkProgrammable/provableMethod";
 export * from "./utils";
 export * from "./dependencyFactory/DependencyFactory";
+export * from "./dependencyFactory/injectOptional";
 export * from "./log";
 export * from "./events/EventEmittingComponent";
 export * from "./events/EventEmitter";

package/src/log.ts

@@ -1,14 +1,15 @@
-/* eslint-disable @typescript-eslint/unbound-method, putout/putout */
-import loglevel, { LogLevelDesc } from "loglevel";
+import loglevel, { LogLevelDesc, LogLevelNames } from "loglevel";
 import { Provable } from "o1js";
 
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 function logProvable(
   logFunction: (...args: unknown[]) => void,
   ...args: any[]
 ) {
   Provable.asProver(() => {
-    const prettyArguments = [];
-    for (const argument of args) {
+    const prettyArguments: string[] = [];
+
+    args.forEach((argument) => {
       if (argument?.toPretty !== undefined) {
         prettyArguments.push(argument.toPretty());
       } else {
@@ -18,11 +19,11 @@ function logProvable(
           prettyArguments.push(argument);
         }
       }
-    }
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+    });
     logFunction(...prettyArguments);
   });
 }
+/* eslint-enable */
 
 export const log = {
   provable: {
@@ -81,3 +82,16 @@ export const log = {
 
   getLevel: () => loglevel.getLevel(),
 };
+
+const validLogLevels = ["TRACE", "DEBUG", "INFO", "WARN", "ERROR", "SILENT"];
+
+export function assertValidTextLogLevel(
+  level: string | number
+): asserts level is LogLevelNames {
+  if (
+    typeof level === "number" ||
+    !validLogLevels.includes(level.toUpperCase())
+  ) {
+    throw new Error(`${level} is not a valid loglevel`);
+  }
+}

package/src/trees/MockAsyncMerkleStore.ts

@@ -1,5 +1,6 @@
+import { noop } from "../utils";
+
 import { InMemoryMerkleTreeStorage } from "./InMemoryMerkleTreeStorage";
-import { noop } from "./../utils";
 
 export class MockAsyncMerkleTreeStore {
   public readonly store = new InMemoryMerkleTreeStorage();