Merge branch 'feature/configurable_block_size' into fix/mempool-context-clear

# Conflicts:
#	packages/sequencer/src/mempool/private/PrivateMempool.ts

Author: rpanic

.gitignore

@@ -40,4 +40,5 @@ Thumbs.db
 lerna-debug.log
 
 docs/save
-packages/research
+packages/research
+packages/indexer/src/api/generated

.npmrc

@@ -0,0 +1 @@
+v18.17

jest.config.cjs

@@ -5,23 +5,33 @@
 
 module.exports = {
   // because we run tests from within ./packages/<package_name>/
-  rootDir: './../../',
+  rootDir: "./../../",
   moduleDirectories: ["node_modules", "packages"],
-  extensionsToTreatAsEsm: ['.ts'],
+  extensionsToTreatAsEsm: [".ts"],
   moduleNameMapper: {
-    'o1js/dist/(.*)': '<rootDir>/node_modules/o1js/dist/$1',
-    '../../../node_modules/o1js/dist/(.*)': '<rootDir>/node_modules/o1js/dist/$1',
-    '../../../../node_modules/o1js/dist/(.*)': '<rootDir>/node_modules/o1js/dist/$1',
-    '^(\\.{1,2}/.*)\\.js$': '$1',
+    "o1js/dist/(.*)": "<rootDir>/node_modules/o1js/dist/$1",
+    "../../../node_modules/o1js/dist/(.*)":
+      "<rootDir>/node_modules/o1js/dist/$1",
+    "../../../../node_modules/o1js/dist/(.*)":
+      "<rootDir>/node_modules/o1js/dist/$1",
+    "^(\\.{1,2}/.*)\\.js$": "$1",
   },
+
   transform: {
     // '^.+\\.[tj]sx?$' to process js/ts with `ts-jest`
     // '^.+\\.m?[tj]sx?$' to process js/ts/mjs/mts with `ts-jest`
-    '^.+\\.tsx?$': [
-      'ts-jest',
+    "^.+\\.ts?$": [
+      "ts-jest",
+      {
+        useESM: true,
+        tsconfig: "./test/tsconfig.json",
+      },
+    ],
+    "^.+\\.tsx?$": [
+      "ts-jest",
       {
         useESM: true,
-        tsconfig: './test/tsconfig.json'
+        tsconfig: "./test/tsconfig.json",
       },
     ],
   },

package-lock.json

@@ -12,7 +12,7 @@
     "lint:staged": "eslint",
     "test": "npx lerna run test -- --passWithNoTests",
     "test:ci": "npx lerna run test -- --passWithNoTests --forceExit",
-    "test:integration": "npx lerna run integration -- --passWithNoTests --forceExit",
+    "test:integration": "npx lerna run test:integration -- --passWithNoTests --forceExit",
     "test:watch": "npx lerna run test:watch",
     "migrate": "npx lerna run prisma-migrate",
     "prisma-generate": "npx lerna run prisma-generate",
@@ -58,5 +58,8 @@
     "*.ts": [
       "npm run lint:staged"
     ]
+  },
+  "dependencies": {
+    "react-json-view-lite": "^1.4.0"
   }
 }

package.json

@@ -20,14 +20,14 @@
     "@graphql-tools/stitch": "^9.0.3",
     "@types/humanize-duration": "^3.27.2",
     "class-validator": "^0.14.0",
-    "graphql": "16.6.0",
+    "graphql": "^16.9.0",
     "graphql-scalars": "^1.22.4",
     "graphql-yoga": "^5.0.0",
     "humanize-duration": "^3.30.0",
     "koa": "^2.14.2",
     "lodash": "^4.17.21",
     "reflect-metadata": "^0.1.13",
-    "type-graphql": "2.0.0-beta.1"
+    "type-graphql": "2.0.0-rc.2"
   },
   "peerDependencies": {
     "@proto-kit/common": "*",

packages/api/package.json

@@ -1,7 +1,7 @@
 import { ConfigurableModule, NoConfig, TypedClass } from "@proto-kit/common";
 import { GraphQLSchema } from "graphql/type";
 import { injectable, Lifecycle, scoped } from "tsyringe";
-import { Resolver } from "type-graphql";
+import { NonEmptyArray, Resolver } from "type-graphql";
 
 const graphqlModuleMetadataKey = "graphqlModule";
 
@@ -27,6 +27,12 @@ export abstract class SchemaGeneratingGraphqlModule<
   public abstract generateSchema(): GraphQLSchema;
 }
 
+export abstract class ResolverFactoryGraphqlModule<
+  Config = NoConfig,
+> extends GraphqlModule<Config> {
+  public abstract resolvers(): Promise<NonEmptyArray<Function>>;
+}
+
 export function graphqlModule() {
   return (
     /**

packages/api/src/graphql/GraphqlModule.ts

@@ -12,7 +12,11 @@ import {
 } from "@proto-kit/common";
 
 import { GraphqlServer } from "./GraphqlServer";
-import { GraphqlModule, SchemaGeneratingGraphqlModule } from "./GraphqlModule";
+import {
+  GraphqlModule,
+  ResolverFactoryGraphqlModule,
+  SchemaGeneratingGraphqlModule,
+} from "./GraphqlModule";
 
 export type GraphqlModulesRecord = ModulesRecord<
   TypedClass<GraphqlModule<unknown>>
@@ -55,22 +59,38 @@ export class GraphqlSequencerModule<GraphQLModules extends GraphqlModulesRecord>
     // eslint-disable-next-line guard-for-in
     for (const moduleName in this.definition.modules) {
       const moduleClass = this.definition.modules[moduleName];
-      this.graphqlServer.registerModule(moduleClass);
 
       if (
         Object.prototype.isPrototypeOf.call(
-          SchemaGeneratingGraphqlModule,
+          ResolverFactoryGraphqlModule,
           moduleClass
         )
       ) {
-        log.debug(`Registering manual schema for ${moduleName}`);
+        log.debug(`Registering resolvers factory from ${moduleName}`);
         // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
         const module = this.resolve(
           moduleName
-        ) as SchemaGeneratingGraphqlModule<unknown>;
-        this.graphqlServer.registerSchema(module.generateSchema());
+        ) as ResolverFactoryGraphqlModule<unknown>;
+        // eslint-disable-next-line no-await-in-loop
+        this.graphqlServer.registerResolvers(await module.resolvers());
+      } else {
+        this.graphqlServer.registerModule(moduleClass);
+
+        if (
+          Object.prototype.isPrototypeOf.call(
+            SchemaGeneratingGraphqlModule,
+            moduleClass
+          )
+        ) {
+          log.debug(`Registering manual schema for ${moduleName}`);
+          // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+          const module = this.resolve(
+            moduleName
+          ) as SchemaGeneratingGraphqlModule<unknown>;
+          this.graphqlServer.registerSchema(module.generateSchema());
+        }
       }
     }
-    void this.graphqlServer.startServer();
+    await this.graphqlServer.startServer();
   }
 }

packages/api/src/graphql/GraphqlSequencerModule.ts

@@ -32,10 +32,14 @@ export class GraphqlServer extends SequencerModule<GraphqlServerOptions> {
 
   private readonly schemas: GraphQLSchema[] = [];
 
+  private resolvers: NonEmptyArray<Function> | undefined;
+
   private dependencyContainer?: DependencyContainer;
 
   private server?: Server;
 
+  private context: {} = {};
+
   public setContainer(container: DependencyContainer) {
     this.dependencyContainer = container;
   }
@@ -56,6 +60,18 @@ export class GraphqlServer extends SequencerModule<GraphqlServerOptions> {
     this.schemas.push(schema);
   }
 
+  public registerResolvers(resolvers: NonEmptyArray<Function>) {
+    if (this.resolvers === undefined) {
+      this.resolvers = resolvers;
+    } else {
+      this.resolvers = [...this.resolvers, ...resolvers];
+    }
+  }
+
+  public setContext(context: {}) {
+    this.context = context;
+  }
+
   public async start() {
     noop();
   }
@@ -64,16 +80,17 @@ export class GraphqlServer extends SequencerModule<GraphqlServerOptions> {
     const { dependencyContainer, modules } = this;
     this.assertDependencyContainerSet(dependencyContainer);
 
+    const resolvers = [...modules, ...(this.resolvers || [])];
+
     assertArrayIsNotEmpty(
-      modules,
+      resolvers,
       "At least one module has to be provided to GraphqlServer"
     );
 
     // Building schema
     const resolverSchema = buildSchemaSync({
-      resolvers: modules,
+      resolvers,
 
-      // resolvers: [MempoolResolver as Function],
       // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
       container: { get: (cls) => dependencyContainer.resolve(cls) },
 
@@ -101,6 +118,7 @@ export class GraphqlServer extends SequencerModule<GraphqlServerOptions> {
     const yoga = createYoga<Koa.ParameterizedContext>({
       schema,
       graphiql: this.config.graphiql,
+      context: this.context,
     });
 
     // Bind GraphQL Yoga to `/graphql` endpoint

packages/api/src/graphql/GraphqlServer.ts

@@ -440,7 +440,6 @@ export class ModuleContainer<
           throw errors.unableToDecorateModule(containedModuleName);
         }
         this.decorateModule(moduleName, containedModule);
-
         containedModule.create(() => {
           const container = this.container.createChildContainer();
           container.reset();