Merge branch 'develop' into feature/tx-validation

# Conflicts: # packages/sequencer/src/mempool/private/PrivateMempool.ts
proto-kit · Nov 2, 2023 · cf3dc89 · cf3dc89
2 parents 5a0b67f + 8d51b8b
commit cf3dc89
Show file tree

Hide file tree

Showing 28 changed files with 654 additions and 266 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/api/package.json b/packages/api/package.json
@@ -24,6 +24,7 @@
     "graphql-scalars": "^1.22.4",
     "humanize-duration": "^3.30.0",
     "lodash": "^4.17.21",
+    "koa": "^2.14.2",
     "reflect-metadata": "^0.1.13",
     "type-graphql": "2.0.0-beta.1"
   },
@@ -36,6 +37,7 @@
   "devDependencies": {
     "@jest/globals": "^29.5.0",
     "@types/lodash": "^4.14.194",
+    "@types/koa": "^2.13.10",
     "@types/ws": "^8.5.4"
   },
   "gitHead": "b2528538c73747d000cc3ea99ee26ee415d8248d"

diff --git a/packages/api/src/graphql/GraphqlModule.ts b/packages/api/src/graphql/GraphqlModule.ts
@@ -1,7 +1,4 @@
-import {
-  ConfigurableModule,
-  TypedClass,
-} from "@proto-kit/common";
+import { ConfigurableModule, TypedClass } from "@proto-kit/common";
 import { GraphQLSchema } from "graphql/type";
 import { injectable, Lifecycle, scoped } from "tsyringe";
 import { Resolver } from "type-graphql";
@@ -31,7 +28,7 @@ export abstract class SchemaGeneratingGraphqlModule<
 export function graphqlModule() {
   return (
     /**
-     * Check if the target class extends RuntimeModule, while
+     * Check if the target class extends GraphqlModule, while
      * also providing static config presets
      */
     target: TypedClass<GraphqlModule<unknown>>

diff --git a/packages/api/src/graphql/GraphqlSequencerModule.ts b/packages/api/src/graphql/GraphqlSequencerModule.ts
@@ -12,9 +12,11 @@ import {
 } from "@proto-kit/common";
 
 import { GraphqlServer } from "./GraphqlServer";
-import { SchemaGeneratingGraphqlModule } from "./GraphqlModule";
+import { GraphqlModule, SchemaGeneratingGraphqlModule } from "./GraphqlModule";
 
-export type GraphqlModulesRecord = ModulesRecord<any>;
+export type GraphqlModulesRecord = ModulesRecord<
+  TypedClass<GraphqlModule<unknown>>
+>;
 
 export interface GraphqlModulesDefintion<
   GraphQLModules extends GraphqlModulesRecord
@@ -48,7 +50,7 @@ export class GraphqlSequencerModule<GraphQLModules extends GraphqlModulesRecord>
   public async start(): Promise<void> {
     assert(this.graphqlServer !== undefined);
 
-    this.graphqlServer.setContext(this.container);
+    this.graphqlServer.setContainer(this.container);
 
     // eslint-disable-next-line guard-for-in
     for (const moduleName in this.definition.modules) {
@@ -62,8 +64,11 @@ export class GraphqlSequencerModule<GraphQLModules extends GraphqlModulesRecord>
         )
       ) {
         log.debug(`Registering manual schema for ${moduleName}`);
-        const module: SchemaGeneratingGraphqlModule<unknown> =
-          this.resolve(moduleName);
+        // eslint-disable-next-line max-len
+        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+        const module = this.resolve(
+          moduleName
+        ) as SchemaGeneratingGraphqlModule<unknown>;
         this.graphqlServer.registerSchema(module.generateSchema());
       }
     }

diff --git a/packages/api/src/graphql/GraphqlServer.ts b/packages/api/src/graphql/GraphqlServer.ts
@@ -12,6 +12,7 @@ import type { GraphqlModule } from "./GraphqlModule";
 interface GraphqlServerOptions {
   host: string;
   port: number;
+  graphiql: boolean;
 }
 
 function assertArrayIsNotEmpty<T>(
@@ -31,7 +32,7 @@ export class GraphqlServer extends SequencerModule<GraphqlServerOptions> {
 
   private dependencyContainer?: DependencyContainer;
 
-  public setContext(container: DependencyContainer) {
+  public setContainer(container: DependencyContainer) {
     this.dependencyContainer = container;
   }
 
@@ -78,6 +79,14 @@ export class GraphqlServer extends SequencerModule<GraphqlServerOptions> {
       },
     });
 
+    // eslint-disable-next-line no-warning-comments
+    // TODO Injection token of Graphql Container not respected atm, only class is used
+
+    // Instantiate all modules at startup
+    modules.forEach((module) => {
+      dependencyContainer?.resolve(module);
+    });
+
     const schema = [resolverSchema, ...this.schemas].reduce(
       (schema1, schema2) =>
         stitchSchemas({
@@ -89,7 +98,7 @@ export class GraphqlServer extends SequencerModule<GraphqlServerOptions> {
 
     const yoga = createYoga<Koa.ParameterizedContext>({
       schema,
-      graphiql: true,
+      graphiql: this.config.graphiql,
     });
 
     // Bind GraphQL Yoga to `/graphql` endpoint

diff --git a/packages/api/src/graphql/modules/MempoolResolver.ts b/packages/api/src/graphql/modules/MempoolResolver.ts
@@ -73,11 +73,8 @@ export class TransactionObject {
 
 @graphqlModule()
 export class MempoolResolver extends GraphqlModule<object> {
-  private readonly mempool: Mempool;
-
-  public constructor(@inject("Mempool") mempool: Mempool) {
+  public constructor(@inject("Mempool") private readonly mempool: Mempool) {
     super();
-    this.mempool = mempool;
   }
 
   @Mutation(() => String)