@proto-kit/module 0.1.1-develop.339 → 0.1.1-develop.455

package/dist/factories/MethodIdFactory.d.ts

@@ -1,9 +1,10 @@
 import { DependencyFactory } from "@proto-kit/common";
 import { MethodIdResolver } from "../runtime/MethodIdResolver";
-import type { Runtime, RuntimeModulesRecord } from "../runtime/Runtime";
-export declare class MethodIdFactory extends DependencyFactory {
-    private readonly runtime;
-    constructor(runtime: Runtime<RuntimeModulesRecord>);
-    methodIdResolver(): MethodIdResolver;
+export declare class MethodIdFactory implements DependencyFactory {
+    dependencies(): {
+        methodIdResolver: {
+            useClass: typeof MethodIdResolver;
+        };
+    };
 }
 //# sourceMappingURL=MethodIdFactory.d.ts.map

package/dist/factories/MethodIdFactory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MethodIdFactory.d.ts","sourceRoot":"","sources":["../../src/factories/MethodIdFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iBAAiB,EAClB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,KAAK,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAExE,qBACa,eAAgB,SAAQ,iBAAiB;IAE/B,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAP,OAAO,EAAE,OAAO,CAAC,oBAAoB,CAAC;IAMrE,gBAAgB,IAAI,gBAAgB;CAG5C"}
+{"version":3,"file":"MethodIdFactory.d.ts","sourceRoot":"","sources":["../../src/factories/MethodIdFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAoB,MAAM,mBAAmB,CAAC;AAExE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,qBAAa,eAAgB,YAAW,iBAAiB;IAChD,YAAY;;;;;CAOpB"}

package/dist/factories/MethodIdFactory.js

@@ -1,36 +1,10 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-var __param = (this && this.__param) || function (paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-};
-import { dependency, dependencyFactory, DependencyFactory } from "@proto-kit/common";
-import { inject } from "tsyringe";
 import { MethodIdResolver } from "../runtime/MethodIdResolver";
-let MethodIdFactory = class MethodIdFactory extends DependencyFactory {
-    constructor(runtime) {
-        super();
-        this.runtime = runtime;
+export class MethodIdFactory {
+    dependencies() {
+        return {
+            methodIdResolver: {
+                useClass: MethodIdResolver,
+            },
+        };
     }
-    methodIdResolver() {
-        return new MethodIdResolver(this.runtime, this.runtime.definition.modules);
-    }
-};
-__decorate([
-    dependency(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", MethodIdResolver)
-], MethodIdFactory.prototype, "methodIdResolver", null);
-MethodIdFactory = __decorate([
-    dependencyFactory(),
-    __param(0, inject("Runtime")),
-    __metadata("design:paramtypes", [Function])
-], MethodIdFactory);
-export { MethodIdFactory };
+}

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 export * from "./method/runtimeMethod";
 export * from "./module/decorator";
 export * from "./runtime/RuntimeModule";
+export * from "./runtime/RuntimeEnvironment";
 export * from "./runtime/Runtime";
 export * from "./state/InMemoryStateService";
 export * from "./state/decorator";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,yBAAyB,CAAC;AACxC,cAAc,mBAAmB,CAAC;AAClC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,mBAAmB,CAAC;AAClC,cAAc,iCAAiC,CAAC;AAChD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,6BAA6B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,yBAAyB,CAAC;AACxC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,mBAAmB,CAAC;AAClC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,mBAAmB,CAAC;AAClC,cAAc,iCAAiC,CAAC;AAChD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,6BAA6B,CAAC"}

package/dist/index.js

@@ -1,6 +1,7 @@
 export * from "./method/runtimeMethod";
 export * from "./module/decorator";
 export * from "./runtime/RuntimeModule";
+export * from "./runtime/RuntimeEnvironment";
 export * from "./runtime/Runtime";
 export * from "./state/InMemoryStateService";
 export * from "./state/decorator";

package/dist/runtime/MethodIdResolver.d.ts

@@ -5,9 +5,8 @@ import type { Runtime, RuntimeModulesRecord } from "./Runtime";
  */
 export declare class MethodIdResolver {
     private readonly runtime;
-    private readonly modules;
     private readonly dictionary;
-    constructor(runtime: Runtime<RuntimeModulesRecord>, modules: RuntimeModulesRecord);
+    constructor(runtime: Runtime<RuntimeModulesRecord>);
     getMethodNameFromId(methodId: bigint): [string, string] | undefined;
     getMethodId(moduleName: string, methodName: string): bigint;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"MethodIdResolver.d.ts","sourceRoot":"","sources":["../../src/runtime/MethodIdResolver.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AAE/D;;;GAGG;AACH,qBACa,gBAAgB;IAMzB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAN1B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAEpB;gBAGY,OAAO,EAAE,OAAO,CAAC,oBAAoB,CAAC,EACtC,OAAO,EAAE,oBAAoB;IAkBzC,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS;IAcnE,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;CAQnE"}
+{"version":3,"file":"MethodIdResolver.d.ts","sourceRoot":"","sources":["../../src/runtime/MethodIdResolver.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AAE/D;;;GAGG;AACH,qBACa,gBAAgB;IAMN,OAAO,CAAC,QAAQ,CAAC,OAAO;IAL7C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAEpB;gBAG+B,OAAO,EAAE,OAAO,CAAC,oBAAoB,CAAC;IAoBrE,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS;IAiBnE,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;CAWnE"}

package/dist/runtime/MethodIdResolver.js

@@ -7,18 +7,21 @@ 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);
 };
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
 import { stringToField } from "@proto-kit/protocol";
 import { Poseidon } from "o1js";
-import { injectable } from "tsyringe";
+import { inject, injectable } from "tsyringe";
 /**
  * Please see `getMethodId` to learn more about
  * methodId encoding
  */
 let MethodIdResolver = class MethodIdResolver {
-    constructor(runtime, modules) {
+    constructor(runtime) {
         this.runtime = runtime;
-        this.modules = modules;
         this.dictionary = {};
+        const { modules } = runtime.definition;
         this.dictionary = runtime.runtimeModuleNames.reduce((dict, moduleName) => {
             this.runtime.assertIsValidModuleName(modules, moduleName);
             runtime.resolve(moduleName).runtimeMethodNames.forEach((methodName) => {
@@ -36,11 +39,11 @@ let MethodIdResolver = class MethodIdResolver {
             return undefined;
         }
         const { moduleName, methodName } = methodPath;
-        this.runtime.assertIsValidModuleName(this.modules, moduleName);
+        this.runtime.assertIsValidModuleName(this.runtime.definition.modules, moduleName);
         return [moduleName, methodName];
     }
     getMethodId(moduleName, methodName) {
-        this.runtime.assertIsValidModuleName(this.modules, moduleName);
+        this.runtime.assertIsValidModuleName(this.runtime.definition.modules, moduleName);
         return Poseidon.hash([
             stringToField(moduleName),
             stringToField(methodName),
@@ -49,6 +52,7 @@ let MethodIdResolver = class MethodIdResolver {
 };
 MethodIdResolver = __decorate([
     injectable(),
-    __metadata("design:paramtypes", [Function, Object])
+    __param(0, inject("Runtime")),
+    __metadata("design:paramtypes", [Function])
 ], MethodIdResolver);
 export { MethodIdResolver };

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,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,EAChB,sBAAsB,EACvB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,YAAY,EACb,MAAM,qBAAqB,CAAC;AAS7B,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAG1D;;;;;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,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;;;;OAIG;gBACgB,UAAU,EAAE,iBAAiB,CAAC,OAAO,CAAC;IAQlD,MAAM,CAAC,sBAAsB,EAAE,sBAAsB;IAM5D,IAAW,QAAQ,IAAI,gBAAgB,GAAG,SAAS,CAElD;IAED,IAAW,oBAAoB,IAAI,oBAAoB,CAItD;IAED,IAAW,YAAY,IAAI,YAAY,CAEtC;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"}
+{"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,EAChB,sBAAsB,EACvB,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,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;;;;OAIG;gBACgB,UAAU,EAAE,iBAAiB,CAAC,OAAO,CAAC;IAQlD,MAAM,CAAC,sBAAsB,EAAE,sBAAsB;IAM5D,IAAW,QAAQ,IAAI,gBAAgB,GAAG,SAAS,CAElD;IAED,IAAW,oBAAoB,IAAI,oBAAoB,CAItD;IAED,IAAW,YAAY,IAAI,YAAY,CAEtC;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;IAuBhD;;;;;;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

@@ -117,7 +117,7 @@ let Runtime = Runtime_1 = class Runtime extends ModuleContainer {
     // TODO Remove after changing DFs to type-based approach
     create(childContainerProvider) {
         super.create(childContainerProvider);
-        this.registerDependencyFactories([MethodIdFactory]);
+        this.useDependencyFactory(this.container.resolve(MethodIdFactory));
     }
     get appChain() {
         return this.container.resolve("AreProofsEnabled");
@@ -142,14 +142,12 @@ let Runtime = Runtime_1 = class Runtime extends ModuleContainer {
      * Encoding: "stringToField(module.name) << 128 + stringToField(method-name)"
      */
     getMethodById(methodId) {
-        const methodDescriptor = this.container
-            .resolve("MethodIdResolver")
-            .getMethodNameFromId(methodId);
+        const methodDescriptor = this.methodIdResolver.getMethodNameFromId(methodId);
         if (methodDescriptor === undefined) {
             return undefined;
         }
         const [moduleName, methodName] = methodDescriptor;
-        this.isValidModuleName(this.definition.modules, moduleName);
+        this.assertIsValidModuleName(this.definition.modules, moduleName);
         const module = this.resolve(moduleName);
         // eslint-disable-next-line max-len
         // eslint-disable-next-line @typescript-eslint/consistent-type-assertions,@typescript-eslint/no-unsafe-member-access

package/dist/runtime/RuntimeModule.d.ts

@@ -1,10 +1,10 @@
-import { ConfigurableModule, Presets } from "@proto-kit/common";
+import { ConfigurableModule, NoConfig, Presets } from "@proto-kit/common";
 import { NetworkState, RuntimeTransaction } from "@proto-kit/protocol";
 import { RuntimeEnvironment } from "./RuntimeEnvironment";
 /**
  * Base class for runtime modules providing the necessary utilities.
  */
-export declare class RuntimeModule<Config> extends ConfigurableModule<Config> {
+export declare class RuntimeModule<Config = NoConfig> extends ConfigurableModule<Config> {
     static presets: Presets<unknown>;
     /**
      * Holds all method names that are callable throw transactions

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,EAInB,MAAM,qBAAqB,CAAC;AAS7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAM1D;;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"}
+{"version":3,"file":"RuntimeModule.d.ts","sourceRoot":"","sources":["../../src/runtime/RuntimeModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAE1E,OAAO,EACL,YAAY,EACZ,kBAAkB,EAInB,MAAM,qBAAqB,CAAC;AAS7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAM1D;;GAEG;AACH,qBACa,aAAa,CACxB,MAAM,GAAG,QAAQ,CACjB,SAAQ,kBAAkB,CAAC,MAAM,CAAC;IAClC,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/package.json

@@ -2,7 +2,7 @@
   "name": "@proto-kit/module",
   "license": "MIT",
   "private": false,
-  "version": "0.1.1-develop.339+f49c8b8",
+  "version": "0.1.1-develop.455+b020c57",
   "type": "module",
   "scripts": {
     "build": "tsc -p tsconfig.json",
@@ -31,5 +31,5 @@
     "o1js": "0.13.1",
     "tsyringe": "^4.7.0"
   },
-  "gitHead": "f49c8b84c8c0b0d9dfbc5570e0fa2fb0f8590c75"
+  "gitHead": "b020c5717e414d3a02a842cfbe1ac19a62584dbd"
 }

package/src/factories/MethodIdFactory.ts

@@ -1,22 +1,13 @@
-import {
-  dependency, dependencyFactory,
-  DependencyFactory
-} from "@proto-kit/common";
-import { inject, injectable } from "tsyringe";
+import { DependencyFactory, DependencyRecord } from "@proto-kit/common";
 
 import { MethodIdResolver } from "../runtime/MethodIdResolver";
-import type { Runtime, RuntimeModulesRecord } from "../runtime/Runtime";
 
-@dependencyFactory()
-export class MethodIdFactory extends DependencyFactory {
-  public constructor(
-    @inject("Runtime") private readonly runtime: Runtime<RuntimeModulesRecord>
-  ) {
-    super();
-  }
-
-  @dependency()
-  public methodIdResolver(): MethodIdResolver {
-    return new MethodIdResolver(this.runtime, this.runtime.definition.modules);
+export class MethodIdFactory implements DependencyFactory {
+  public dependencies() {
+    return {
+      methodIdResolver: {
+        useClass: MethodIdResolver,
+      },
+    } satisfies DependencyRecord;
   }
 }

package/src/index.ts

@@ -1,6 +1,7 @@
 export * from "./method/runtimeMethod";
 export * from "./module/decorator";
 export * from "./runtime/RuntimeModule";
+export * from "./runtime/RuntimeEnvironment";
 export * from "./runtime/Runtime";
 export * from "./state/InMemoryStateService";
 export * from "./state/decorator";

package/src/runtime/MethodIdResolver.ts

@@ -1,6 +1,6 @@
 import { stringToField } from "@proto-kit/protocol";
 import { Poseidon } from "o1js";
-import { injectable } from "tsyringe";
+import { inject, injectable } from "tsyringe";
 
 import type { Runtime, RuntimeModulesRecord } from "./Runtime";
 
@@ -15,9 +15,10 @@ export class MethodIdResolver {
   } = {};
 
   public constructor(
-    private readonly runtime: Runtime<RuntimeModulesRecord>,
-    private readonly modules: RuntimeModulesRecord
+    @inject("Runtime") private readonly runtime: Runtime<RuntimeModulesRecord>
   ) {
+    const { modules } = runtime.definition;
+
     this.dictionary = runtime.runtimeModuleNames.reduce<
       Record<string, { moduleName: string; methodName: string }>
     >((dict, moduleName) => {
@@ -43,13 +44,19 @@ export class MethodIdResolver {
 
     const { moduleName, methodName } = methodPath;
 
-    this.runtime.assertIsValidModuleName(this.modules, moduleName);
+    this.runtime.assertIsValidModuleName(
+      this.runtime.definition.modules,
+      moduleName
+    );
 
     return [moduleName, methodName];
   }
 
   public getMethodId(moduleName: string, methodName: string): bigint {
-    this.runtime.assertIsValidModuleName(this.modules, moduleName);
+    this.runtime.assertIsValidModuleName(
+      this.runtime.definition.modules,
+      moduleName
+    );
 
     return Poseidon.hash([
       stringToField(moduleName),

package/src/runtime/Runtime.ts

@@ -26,11 +26,11 @@ import {
   toWrappedMethod,
   WrappedMethod,
 } from "../method/runtimeMethod";
+import { MethodIdFactory } from "../factories/MethodIdFactory";
 
 import { RuntimeModule } from "./RuntimeModule";
 import { MethodIdResolver } from "./MethodIdResolver";
 import { RuntimeEnvironment } from "./RuntimeEnvironment";
-import { MethodIdFactory } from "../factories/MethodIdFactory";
 
 /**
  * Record of modules accepted by the Runtime module container.
@@ -223,7 +223,7 @@ export class Runtime<Modules extends RuntimeModulesRecord>
   public create(childContainerProvider: ChildContainerProvider) {
     super.create(childContainerProvider);
 
-    this.registerDependencyFactories([MethodIdFactory])
+    this.useDependencyFactory(this.container.resolve(MethodIdFactory));
   }
 
   public get appChain(): AreProofsEnabled | undefined {
@@ -258,16 +258,15 @@ export class Runtime<Modules extends RuntimeModulesRecord>
   public getMethodById(
     methodId: bigint
   ): ((...args: unknown[]) => unknown) | undefined {
-    const methodDescriptor = this.container
-      .resolve<MethodIdResolver>("MethodIdResolver")
-      .getMethodNameFromId(methodId);
+    const methodDescriptor =
+      this.methodIdResolver.getMethodNameFromId(methodId);
 
     if (methodDescriptor === undefined) {
       return undefined;
     }
     const [moduleName, methodName] = methodDescriptor;
 
-    this.isValidModuleName(this.definition.modules, moduleName);
+    this.assertIsValidModuleName(this.definition.modules, moduleName);
     const module = this.resolve(moduleName);
 
     // eslint-disable-next-line max-len

package/src/runtime/RuntimeModule.ts

@@ -1,4 +1,4 @@
-import { ConfigurableModule, Presets } from "@proto-kit/common";
+import { ConfigurableModule, NoConfig, Presets } from "@proto-kit/common";
 import { container, injectable } from "tsyringe";
 import {
   NetworkState,
@@ -25,7 +25,9 @@ const errors = {
  * Base class for runtime modules providing the necessary utilities.
  */
 @injectable()
-export class RuntimeModule<Config> extends ConfigurableModule<Config> {
+export class RuntimeModule<
+  Config = NoConfig
+> extends ConfigurableModule<Config> {
   public static presets: Presets<unknown> = {};
 
   /**

package/test/state/MerkleTree.test.ts

@@ -1,95 +0,0 @@
-import {
-  CachedMerkleTreeStore,
-  InMemoryMerkleTreeStorage,
-  RollupMerkleTree,
-} from "@proto-kit/protocol";
-import { MockAsyncMerkleTreeStore } from "./MockAsyncMerkleStore";
-import { beforeEach } from "@jest/globals";
-import { Field, Poseidon } from "o1js";
-import { log } from "@proto-kit/common";
-
-describe("cachedMerkleTree", () => {
-  let store: MockAsyncMerkleTreeStore;
-  let syncStore: InMemoryMerkleTreeStorage;
-  let tree: RollupMerkleTree;
-
-  let cached: CachedMerkleTreeStore;
-  let cachedTree: RollupMerkleTree;
-
-  beforeEach(async () => {
-    log.setLevel("DEBUG");
-
-    store = new MockAsyncMerkleTreeStore();
-    syncStore = store.store;
-    tree = new RollupMerkleTree(syncStore);
-
-    tree.setLeaf(1n, Field(10));
-    tree.setLeaf(3n, Field(30));
-    tree.setLeaf(5n, Field(50));
-
-    cached = new CachedMerkleTreeStore(store);
-    await cached.preloadKey(1n);
-    await cached.preloadKey(3n);
-    await cached.preloadKey(5n);
-    cachedTree = new RollupMerkleTree(cached);
-  });
-
-  it("should have the same root", async () => {
-    expect(cached.getNode(1n, 0)).toBe(10n);
-    expect(cached.getNode(3n, 0)).toBe(30n);
-    expect(cached.getNode(5n, 0)).toBe(50n);
-    expect(syncStore.getNode(5n, 0)).toBe(50n);
-
-    expect(cached.getNode(0n, 1)).toBe(
-      Poseidon.hash([Field(0), Field(10)]).toBigInt()
-    );
-
-    expect(cached.getNode(0n, 254)).toBe(await store.getNode(0n, 254));
-    expect(cached.getNode(0n, 254)).toBe(syncStore.getNode(0n, 254));
-
-    expect(cachedTree.getRoot().toBigInt()).toBe(tree.getRoot().toBigInt());
-  });
-
-  it("should load the correct root when only loading a subset of keys", async () => {
-    await cached.preloadKey(3n);
-
-    const correctRoot = tree.getRoot();
-    expect(cachedTree.getRoot().toBigInt()).toBe(correctRoot.toBigInt());
-  });
-
-  it("should generate correct witnesses when only loading a subset of keys", async () => {
-    await cached.preloadKey(5n);
-
-    const correctRoot = tree.getRoot();
-    const witness = tree.getWitness(5n);
-    expect(witness.calculateRoot(Field(50)).toBigInt()).toBe(
-      correctRoot.toBigInt()
-    );
-  });
-
-  it("should generate correct witnesses after merging", async () => {
-    expect(cachedTree.getRoot().toBigInt()).toBe(tree.getRoot().toBigInt());
-
-    await cached.preloadKey(5n);
-    cachedTree.setLeaf(5n, Field(100));
-
-    const correctRoot = cachedTree.getRoot();
-
-    await cached.mergeIntoParent();
-
-    const cached2 = new CachedMerkleTreeStore(store);
-    await cached2.preloadKey(1n);
-    await cached2.preloadKey(3n);
-    await cached2.preloadKey(5n);
-    expect(cached2.getNode(1n, 0)).toBe(10n);
-    expect(cached2.getNode(3n, 0)).toBe(30n);
-    expect(cached2.getNode(5n, 0)).toBe(100n);
-    const tree2 = new RollupMerkleTree(cached2);
-
-    const witness = tree2.getWitness(3n);
-
-    expect(witness.calculateRoot(Field(30)).toBigInt()).toBe(
-      correctRoot.toBigInt()
-    );
-  });
-});

package/test/state/MockAsyncMerkleStore.ts

@@ -1,29 +0,0 @@
-import { AsyncMerkleTreeStore, InMemoryMerkleTreeStorage } from "@proto-kit/protocol";
-import { noop } from "@proto-kit/common";
-
-export class MockAsyncMerkleTreeStore implements AsyncMerkleTreeStore {
-  public readonly store = new InMemoryMerkleTreeStorage();
-
-  public commit(): void {
-    noop();
-  }
-
-  public openTransaction(): void {
-    noop();
-  }
-
-  public async getNodeAsync(
-    key: bigint,
-    level: number
-  ): Promise<bigint | undefined> {
-    return this.store.getNode(key, level);
-  }
-
-  public async setNodeAsync(
-    key: bigint,
-    level: number,
-    value: bigint
-  ): Promise<void> {
-    this.store.setNode(key, level, value);
-  }
-}