Bisonai · martinkersner · Mar 23, 2023 · Mar 22, 2023 · Mar 22, 2023 · Mar 22, 2023
@@ -0,0 +1,17 @@
+-- CreateTable
+CREATE TABLE "reporters" (
+    "reporter_id" BIGSERIAL NOT NULL,
+    "address" VARCHAR(42) NOT NULL,
+    "privateKey" VARCHAR(66) NOT NULL,
+    "oracleAddress" VARCHAR(42) NOT NULL,
+    "chain_id" BIGINT NOT NULL,
+    "service_id" BIGINT NOT NULL,
+
+    CONSTRAINT "reporters_pkey" PRIMARY KEY ("reporter_id")
+);
+
+-- AddForeignKey
+ALTER TABLE "reporters" ADD CONSTRAINT "reporters_chain_id_fkey" FOREIGN KEY ("chain_id") REFERENCES "chains"("chain_id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "reporters" ADD CONSTRAINT "reporters_service_id_fkey" FOREIGN KEY ("service_id") REFERENCES "services"("service_id") ON DELETE RESTRICT ON UPDATE CASCADE;
@@ -0,0 +1,8 @@
+/*
+  Warnings:
+
+  - A unique constraint covering the columns `[address,chain_id,service_id]` on the table `reporters` will be added. If there are existing duplicate values, this will fail.
+
+*/
+-- CreateIndex
+CREATE UNIQUE INDEX "reporters_address_chain_id_service_id_key" ON "reporters"("address", "chain_id", "service_id");
@@ -2,7 +2,7 @@
 // learn more about it in the docs: https://pris.ly/d/prisma-schema
 
 generator client {
-  provider = "prisma-client-js"
+  provider   = "prisma-client-js"
   engineType = "binary"
 }
 
@@ -15,38 +15,44 @@ model Chain {
   id         BigInt       @id @default(autoincrement()) @map("chain_id")
   name       String       @unique
   Aggregator Aggregator[]
-  Listener   Listener[]   
-  VrfKey     VrfKey[]     
+  Listener   Listener[]
+  VrfKey     VrfKey[]
+  Reporter   Reporter[]
+
   @@map("chains")
 }
 
 model Service {
   id       BigInt     @id @default(autoincrement()) @map("service_id")
   name     String     @unique
-  Listener Listener[] 
+  Listener Listener[]
+  Reporter Reporter[]
+
   @@map("services")
 }
 
 model Listener {
   id        BigInt  @id @default(autoincrement()) @map("listener_id")
   address   String  @db.VarChar(42)
-  eventName String  @db.VarChar(255) @map("event_name")
+  eventName String  @map("event_name") @db.VarChar(255)
   chain     Chain   @relation(fields: [chainId], references: [id])
   chainId   BigInt  @map("chain_id")
   service   Service @relation(fields: [serviceId], references: [id])
   serviceId BigInt  @map("service_id")
+
   @@map("listeners")
 }
 
 model VrfKey {
   id      BigInt @id @default(autoincrement()) @map("vrf_key_id")
   sk      String @db.VarChar(64)
   pk      String @db.VarChar(130)
-  pkX     String @db.VarChar(77) @map("pk_x")
-  pkY     String @db.VarChar(77) @map("pk_y")
-  keyHash String @db.VarChar(66) @map("key_hash")
+  pkX     String @map("pk_x") @db.VarChar(77)
+  pkY     String @map("pk_y") @db.VarChar(77)
+  keyHash String @map("key_hash") @db.VarChar(66)
   chain   Chain  @relation(fields: [chainId], references: [id])
   chainId BigInt @map("chain_id")
+
   @@map("vrf_keys")
 }
 
@@ -55,8 +61,9 @@ model Feed {
   name       String
   definition Json
   adapter    Adapter @relation(fields: [adapterId], references: [id], onDelete: Cascade)
-  adapterId  BigInt @map("adapter_id")
-  Data       Data[] 
+  adapterId  BigInt  @map("adapter_id")
+  Data       Data[]
+
   @@map("feeds")
 }
 
@@ -66,7 +73,8 @@ model Adapter {
   name        String
   decimals    Int
   feeds       Feed[]
-  Aggregator  Aggregator[] 
+  Aggregator  Aggregator[]
+
   @@map("adapters")
 }
 
@@ -79,12 +87,12 @@ model Aggregator {
   heartbeat         Int
   threshold         Float
   absoluteThreshold Float       @map("absolute_threshold")
-  Data              Data[]      
+  Data              Data[]
   adapter           Adapter     @relation(fields: [adapterId], references: [id])
   adapterId         BigInt      @map("adapter_id")
   chain             Chain       @relation(fields: [chainId], references: [id])
   chainId           BigInt      @map("chain_id")
-  Aggregate         Aggregate[] 
+  Aggregate         Aggregate[]
 
   @@unique([aggregatorHash, chainId])
   @@map("aggregators")
@@ -98,7 +106,8 @@ model Data {
   aggregatorId BigInt     @map("aggregator_id")
   feed         Feed       @relation(fields: [feedId], references: [id])
   feedId       BigInt     @map("feed_id")
-  @@map("data")  
+
+  @@map("data")
 }
 
 model Aggregate {
@@ -111,3 +120,17 @@ model Aggregate {
   @@index([aggregatorId, timestamp(sort: Desc)])
   @@map("aggregates")
 }
+
+model Reporter {
+  id            BigInt  @id @default(autoincrement()) @map("reporter_id")
+  address       String  @db.VarChar(42)
+  privateKey    String  @db.VarChar(66)
+  oracleAddress String  @db.VarChar(42)
+  chain         Chain   @relation(fields: [chainId], references: [id])
+  chainId       BigInt  @map("chain_id")
+  service       Service @relation(fields: [serviceId], references: [id])
+  serviceId     BigInt  @map("service_id")
+
+  @@unique([address, chainId, serviceId])
+  @@map("reporters")
+}
@@ -11,6 +11,7 @@ import { AggregateModule } from './aggregate/aggregate.module'
 import { ServiceModule } from './service/service.module'
 import { ListenerModule } from './listener/listener.module'
 import { VrfModule } from './vrf/vrf.module'
+import { ReporterModule } from './reporter/reporter.module'
 
 @Module({
   imports: [
@@ -22,7 +23,8 @@ import { VrfModule } from './vrf/vrf.module'
     AggregateModule,
     ServiceModule,
     ListenerModule,
-    VrfModule
+    VrfModule,
+    ReporterModule
   ],
   controllers: [AppController],
   providers: [AppService, ConfigService]

@@ -0,0 +1,63 @@
+import { HttpStatus, HttpException, Logger } from '@nestjs/common'
+
+/**
+ * Find chain given `chainName`.
+ *
+ * @params {PrismaService.chain} prisma client for chain
+ * @params {string} chain name
+ * @params {Logger} NestJS logger
+ * @return {Chain} chain object represented by a `chainName`
+ * @exception {HttpException} raise when there is no chain with `chainName`
+ */
+export async function getChain({
+  chain,
+  chainName,
+  logger
+}: {
+  chain
+  chainName: string
+  logger: Logger
+}) {
+  const chainObj = await chain.findUnique({
+    where: { name: chainName }
+  })
+
+  if (chainObj == null) {
+    const msg = `chain.name [${chainName}] not found`
+    logger.error(msg)
+    throw new HttpException(msg, HttpStatus.NOT_FOUND)
+  }
+
+  return chainObj
+}
+
+/**
+ * Find service given `serviceName`.
+ *
+ * @params {PrismaService.service} prisma client for service
+ * @params {string} service name
+ * @params {Logger} NestJS logger
+ * @return {Service} service object represented by a `serviceName`
+ * @exception {HttpException} raise when there is no service with `serviceName`
+ */
+export async function getService({
+  service,
+  serviceName,
+  logger
+}: {
+  service
+  serviceName: string
+  logger: Logger
+}) {
+  const serviceObj = await service.findUnique({
+    where: { name: serviceName }
+  })
+
+  if (serviceObj == null) {
+    const msg = `service.name [${serviceName}] not found`
+    logger.error(msg)
+    throw new HttpException(msg, HttpStatus.NOT_FOUND)
+  }
+
+  return serviceObj
+}
@@ -8,8 +8,8 @@ export class CreateListenerDto {
   eventName: string
 
   @ApiProperty()
-  chain: string | bigint
+  chain: string
 
   @ApiProperty()
-  service: string | bigint
+  service: string
 }
@@ -15,6 +15,7 @@ describe('ListenerService', () => {
     const module: TestingModule = await Test.createTestingModule({
       providers: [ListenerService, ServiceService, ChainService, PrismaService]
     }).compile()
+
     chain = module.get<ChainService>(ChainService)
     service = module.get<ServiceService>(ServiceService)
     listener = module.get<ListenerService>(ListenerService)
@@ -37,6 +38,7 @@ describe('ListenerService', () => {
     // Service
     const serviceObj = await service.create({ name: 'listener-test-service' })
 
+    // Listener
     const listenerObj = await listener.create({
       address: '0x',
       eventName: 'TestEventName',

@@ -1,9 +1,10 @@
-import { Injectable, HttpStatus, HttpException, Logger } from '@nestjs/common'
+import { Injectable, Logger } from '@nestjs/common'
 import { Prisma } from '@prisma/client'
 import { PrismaService } from '../prisma.service'
 import { CreateListenerDto } from './dto/create-listener.dto'
 import { UpdateListenerDto } from './dto/update-listener.dto'
 import { flattenListener } from './listener.utils'
+import { getChain, getService } from '../common/utils'
 
 @Injectable()
 export class ListenerService {
@@ -13,29 +14,18 @@ export class ListenerService {
 
   async create(createListenerDto: CreateListenerDto) {
     // chain
-    const chainName = createListenerDto.chain.toString()
-    const chain = await this.prisma.chain.findUnique({
-      where: { name: chainName }
-    })
-
-    if (chain == null) {
-      const msg = `chain.name [${chainName}] not found`
-      this.logger.error(msg)
-      throw new HttpException(msg, HttpStatus.NOT_FOUND)
-    }
+    const chainName = createListenerDto.chain
+    const chain = await getChain({ chain: this.prisma.chain, chainName, logger: this.logger })
 
-    // chain
-    const serviceName = createListenerDto.service.toString()
-    const service = await this.prisma.service.findUnique({
-      where: { name: serviceName }
+    // service
+    const serviceName = createListenerDto.service
+    const service = await getService({
+      service: this.prisma.service,
+      serviceName,
+      logger: this.logger
     })
 
-    if (service == null) {
-      const msg = `service.name [${serviceName}] not found`
-      this.logger.error(msg)
-      throw new HttpException(msg, HttpStatus.NOT_FOUND)
-    }
-
+    // listener
     const data: Prisma.ListenerUncheckedCreateInput = {
       address: createListenerDto.address,
       eventName: createListenerDto.eventName,

@@ -0,0 +1,18 @@
+import { ApiProperty } from '@nestjs/swagger'
+
+export class CreateReporterDto {
+  @ApiProperty()
+  address: string
+
+  @ApiProperty()
+  privateKey: string
+
+  @ApiProperty()
+  oracleAddress: string
+
+  @ApiProperty()
+  chain: string
+
+  @ApiProperty()
+  service: string
+}
@@ -0,0 +1,12 @@
+import { ApiProperty } from '@nestjs/swagger'
+
+export class UpdateReporterDto {
+  @ApiProperty()
+  address: string
+
+  @ApiProperty()
+  privateKey: string
+
+  @ApiProperty()
+  oracleAddress: string
+}