fix: nip 11 update

src/modules/config/controllers/config-grpc.controller.ts

@@ -2,9 +2,9 @@ import { Controller, UseInterceptors } from '@nestjs/common';
 
 import type { ConfigController, EmptyRequest, getConfigResponse } from '../../../../src/modules/grpc/gen/ts/kraken';
 import { ConfigControllerMethods } from '../../../../src/modules/grpc/gen/ts/kraken';
+import { GrpcInvalidArgumentException, GrpcToHttpInterceptor } from 'nestjs-grpc-exceptions';
 import { ConfigService } from '../config.service';
 import { Metadata } from '@grpc/grpc-js';
-import { GrpcInvalidArgumentException, GrpcToHttpInterceptor } from 'nestjs-grpc-exceptions';
 
 @Controller()
 @ConfigControllerMethods()
@@ -17,8 +17,26 @@ export class ConfigGrpcController implements ConfigController {
     if (!token) {
       throw new GrpcInvalidArgumentException("input 'x-identifier' is not valid.");
     }
-    const config = await this.configService.getNip11();
+    const { url, limitations } = await this.configService.getNip11();
 
-    return config?.toDto() as getConfigResponse;
+    return {
+      url,
+      limitations: {
+        maxMessageLength: limitations?.max_message_length,
+        maxSubscriptions: limitations?.max_subscriptions,
+        maxFilters: limitations?.max_filters,
+        maxSubidLength: limitations?.max_subid_length,
+        minPowDifficulty: limitations?.min_pow_difficulty,
+        authRequired: limitations?.auth_required,
+        paymentRequired: limitations?.payment_required,
+        restrictedWrites: limitations?.restricted_writes,
+        maxEventTags: limitations?.max_event_tags,
+        maxContentLength: limitations?.max_content_length,
+        createdAtLowerLimit: limitations?.created_at_lower_limit,
+        createdAtUpperLimit: limitations?.created_at_upper_limit,
+        defaultQueryLimit: limitations?.default_query_limit,
+        maxQueryLimit: limitations?.max_limit,
+      },
+    } as getConfigResponse;
   }
 }

src/modules/config/dto/nip11.dto.ts

@@ -9,47 +9,47 @@ import { FeesDto } from './fees.dto';
 export class Nip11DTO extends AbstractDto {
   @ApiProperty()
   @IsString()
-  name: string;
+  name?: string;
 
   @ApiProperty()
   @IsString()
-  description: string;
+  description?: string;
 
   @ApiProperty()
   @IsString()
-  banner: string;
+  banner?: string;
 
   @ApiProperty()
   @IsString()
-  pubkey: string;
+  pubkey?: string;
 
   @ApiProperty()
   @IsString()
-  contact: string;
+  contact?: string;
 
   @ApiProperty()
   @IsString()
-  software: string;
+  software?: string;
 
   @ApiProperty({ type: [Number] })
   @IsArray()
-  supported_nips: number[];
+  supported_nips?: number[];
 
   @ApiProperty()
   @IsString()
-  version: string;
+  version?: string;
 
   @ApiProperty({ type: [String] })
   @IsArray()
-  relay_countries: string[];
+  relay_countries?: string[];
 
   @ApiProperty({ type: [String] })
   @IsArray()
-  language_tags: string[];
+  language_tags?: string[];
 
   @ApiProperty({ type: [String] })
   @IsArray()
-  tags: string[];
+  tags?: string[];
 
   @ApiProperty({ required: false })
   @IsOptional()
@@ -71,9 +71,9 @@ export class Nip11DTO extends AbstractDto {
   @IsString()
   url?: string;
 
-  @ApiProperty({ type: () => RetentionDto, required: false })
+  @ApiProperty({ type: () => [RetentionDto], required: false })
   @IsOptional()
-  retention?: RetentionDto;
+  retention?: RetentionDto[];
 
   @ApiProperty({ type: () => FeesDto, required: false })
   @IsOptional()
@@ -105,33 +105,30 @@ export class Nip11DTO extends AbstractDto {
     this.url = e.url ?? undefined;
 
     // Handle Retention
-    this.retention = e.retention && (e.retention.count || e.retention.kinds || e.retention.time)
-      ? {
-          count: e.retention.count ?? undefined,
-          kinds: e.retention.kinds ?? undefined,
-          time: e.retention.time ?? undefined,
-        }
-      : undefined;
+    if (e.retention) {
+      this.retention = e.retention ?? undefined
+    }
 
     // Handle Fees
-    this.fees = e.fees && (e.fees.admission || e.fees.publication || e.fees.subscription)
-      ? {
-          admission: e.fees.admission?.map(a => ({
-            amount: a.amount ?? undefined,
-            unit: a.unit ?? undefined,
-          })),
-          publication: e.fees.publication?.map(p => ({
-            amount: p.amount ?? undefined,
-            kinds: p.kinds ?? undefined,
-            unit: p.unit ?? undefined,
-          })),
-          subscription: e.fees.subscription?.map(s => ({
-            amount: s.amount ?? undefined,
-            period: s.period ?? undefined,
-            unit: s.unit ?? undefined,
-          })),
-        }
-      : undefined;
+    this.fees =
+      e.fees && (e.fees.admission ?? e.fees.publication ?? e.fees.subscription)
+        ? {
+            admission: e.fees.admission?.map((a) => ({
+              amount: a.amount,
+              unit: a.unit,
+            })),
+            publication: e.fees.publication?.map((p) => ({
+              amount: p.amount,
+              kinds: p.kinds,
+              unit: p.unit,
+            })),
+            subscription: e.fees.subscription?.map((s) => ({
+              amount: s.amount,
+              period: s.period,
+              unit: s.unit,
+            })),
+          }
+        : undefined;
 
     // Handle Limitations
     this.limitations = e.limitations

src/modules/config/dto/retention.dto.ts

@@ -2,11 +2,11 @@ import { NumberFieldOptional } from '../../../../src/decorators';
 
 export class RetentionDto {
   @NumberFieldOptional()
-  time?: number;
+  time: number | null;
 
   @NumberFieldOptional()
-  count?: number;
+  count: number | null;
 
   @NumberFieldOptional({ isArray: true, each: true })
-  kinds?: number[];
+  kinds: number[][] | null;
 }

src/modules/config/entities/fees.entity.ts

@@ -32,11 +32,11 @@ export class AdmissionEntity {
 
 export class FeesEntity {
   @Column({ nullable: true })
-  subscription?: SubscriptionEntity[];
+  subscription?: SubscriptionEntity[] | null;
 
   @Column({ nullable: true })
-  publication?: PublicationEntity[];
+  publication?: PublicationEntity[] | null;
 
   @Column({ nullable: true })
-  admission?: AdmissionEntity[];
+  admission?: AdmissionEntity[] | null;
 }

src/modules/config/entities/limitaion.entity.ts

@@ -1,45 +1,45 @@
 import { Column } from 'typeorm';
 
 export class LimitationEntity {
-  @Column({ type: 'int' })
-  max_message_length?: number;
+  @Column()
+  max_message_length?: number | null;
 
-  @Column({ type: 'int' })
-  max_subscriptions?: number;
+  @Column()
+  max_subscriptions?: number | null;
 
-  @Column({ type: 'int' })
-  max_filters?: number;
+  @Column()
+  max_filters?: number | null;
 
-  @Column({ type: 'int' })
-  max_subid_length?: number;
+  @Column()
+  max_subid_length?: number | null;
 
-  @Column({ type: 'int' })
-  min_pow_difficulty?: number;
+  @Column()
+  min_pow_difficulty?: number | null;
 
-  @Column({ type: 'boolean' })
-  auth_required?: boolean;
+  @Column()
+  auth_required?: boolean | null;
 
-  @Column({ type: 'boolean' })
-  payment_required?: boolean;
+  @Column()
+  payment_required?: boolean | null;
 
-  @Column({ type: 'boolean' })
-  restricted_writes?: boolean;
+  @Column()
+  restricted_writes?: boolean | null;
 
-  @Column({ type: 'int' })
-  max_event_tags?: number;
+  @Column()
+  max_event_tags?: number | null;
 
-  @Column({ type: 'int' })
-  max_content_length?: number;
+  @Column()
+  max_content_length?: number | null;
 
-  @Column({ type: 'bigint' })
-  created_at_lower_limit?: number;
+  @Column()
+  created_at_lower_limit?: number | null;
 
-  @Column({ type: 'bigint' })
-  created_at_upper_limit?: number;
+  @Column()
+  created_at_upper_limit?: number | null;
 
-  @Column({ type: 'int' })
-  max_limit?: number;
+  @Column()
+  max_limit?: number | null;
 
-  @Column({ type: 'int' })
-  default_query_limit?: number;
+  @Column()
+  default_query_limit?: number | null;
 }