From f91f87e376f000ac71de6ea062ffd6c19a08fab0 Mon Sep 17 00:00:00 2001
From: Kirill Litvinov <kigastu@gmail.com>
Date: Thu, 20 Jun 2024 13:21:45 +0300
Subject: [PATCH] update

---
 src/services/Indexer/index.ts                 | 22 +--------------
 .../Indexer/schemas/get-points-info-schema.ts | 27 -------------------
 src/services/Indexer/schemas/index.ts         |  1 -
 .../Indexer/schemas/veORN-info-schema.ts      |  8 +++---
 4 files changed, 6 insertions(+), 52 deletions(-)
 delete mode 100644 src/services/Indexer/schemas/get-points-info-schema.ts

diff --git a/src/services/Indexer/index.ts b/src/services/Indexer/index.ts
index d1fce85..2d13be7 100644
--- a/src/services/Indexer/index.ts
+++ b/src/services/Indexer/index.ts
@@ -1,7 +1,6 @@
 import {
   environmentResponseSchema,
   getPointsAtResponseSchema,
-  getPointsInfoResponseSchema,
   getPoolResponseSchema,
   listAmountResponseSchema,
   listNFTOrderResponseSchema,
@@ -53,12 +52,6 @@ type VeORNInfoPayload = BasePayload & {
   params: [string]
 };
 
-type GetPointsInfoPayload = BasePayload & {
-  model: 'veORN'
-  method: 'pointsInfo'
-  params: [string]
-};
-
 type GetPointsAtPayload = BasePayload & {
   model: 'veORN'
   method: 'pointsInfo'
@@ -82,7 +75,6 @@ type Payload =
   | GetPoolInfoPayload
   | ListPoolPayload
   | VeORNInfoPayload
-  | GetPointsInfoPayload
   | GetPointsAtPayload
   | ListAmountPayload
   | GetAmountByORNPayload;
@@ -108,7 +100,6 @@ class IndexerService {
     this.poolV2Info = this.poolV2Info.bind(this);
     this.listPoolV3 = this.listPoolV3.bind(this);
     this.veORNInfo = this.veORNInfo.bind(this);
-    this.getPointsInfo = this.getPointsInfo.bind(this);
     this.getPointsAt = this.getPointsAt.bind(this);
     this.listAmount = this.listAmount.bind(this);
     this.getAmountByORN = this.getAmountByORN.bind(this);
@@ -136,18 +127,7 @@ class IndexerService {
     });
   };
 
-  readonly getPointsInfo = (address: string) => {
-    return fetchWithValidation(this.apiUrl, getPointsInfoResponseSchema, {
-      method: 'POST',
-      body: this.makeRPCPayload({
-        model: 'veORN',
-        method: 'pointsInfo',
-        params: [address],
-      }),
-    });
-  };
-
-  readonly getPointsAt = (timestamp = Date.now(), page?: number, pageSize?: number) => {
+  readonly getPointsAt = (timestamp = Date.now(), page = 1, pageSize = 1000) => {
     return fetchWithValidation(this.apiUrl, getPointsAtResponseSchema, {
       method: 'POST',
       body: this.makeRPCPayload({
diff --git a/src/services/Indexer/schemas/get-points-info-schema.ts b/src/services/Indexer/schemas/get-points-info-schema.ts
deleted file mode 100644
index 38e37c8..0000000
--- a/src/services/Indexer/schemas/get-points-info-schema.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { z } from 'zod';
-import { evmAddressSchema } from './util-schemas.js';
-import infoSchema from './info-schema.js';
-
-const getPointsResultSchema = z.object({
-  avgAPR: z.number(),
-  minAPR: z.number(),
-  maxAPR: z.number(),
-  veTokenAddress: evmAddressSchema,
-  totalPointsLocked: z.number(),
-  totalPoints: z.number(),
-  weeklyReward: z.number(),
-  userAPR: z.number(),
-  userPoints: z.number(),
-  userPointsLocked: z.number(),
-  userLockEndDate: z.number(),
-  userReward: z.number(),
-  userWeeklyReward: z.number(),
-  userMinLockPeriod: z.number(),
-});
-
-const getPointsInfoSchema = z.object({
-  result: getPointsResultSchema,
-  info: infoSchema,
-}).nullable();
-
-export default getPointsInfoSchema;
diff --git a/src/services/Indexer/schemas/index.ts b/src/services/Indexer/schemas/index.ts
index 911ddb2..deec8a5 100644
--- a/src/services/Indexer/schemas/index.ts
+++ b/src/services/Indexer/schemas/index.ts
@@ -9,5 +9,4 @@ export { default as veORNInfoResponseSchema } from './veORN-info-schema';
 export { default as listAmountResponseSchema } from './list-amount-schema';
 export { default as votingInfoResponseSchema } from './voting-info-schema';
 export { default as testIncrementorSchema } from './test-incrementor-schema';
-export { default as getPointsInfoResponseSchema } from './get-points-info-schema';
 export { default as getPointsAtResponseSchema } from './get-points-at-schema';
diff --git a/src/services/Indexer/schemas/veORN-info-schema.ts b/src/services/Indexer/schemas/veORN-info-schema.ts
index 5c4d018..f3f9dba 100644
--- a/src/services/Indexer/schemas/veORN-info-schema.ts
+++ b/src/services/Indexer/schemas/veORN-info-schema.ts
@@ -1,6 +1,6 @@
-import { z } from 'zod';
-import { evmAddressSchema } from './util-schemas.js';
-import infoSchema from './info-schema.js';
+import { z } from "zod";
+import { evmAddressSchema } from "./util-schemas.js";
+import infoSchema from "./info-schema.js";
 
 const veORNResultSchema = z.object({
   avgAPR: z.number(),
@@ -17,6 +17,8 @@ const veORNResultSchema = z.object({
   userReward: z.number(),
   userWeeklyReward: z.number(),
   userMinLockPeriod: z.number(),
+  dropLock: z.boolean(),
+  pointsReward: z.number(),
 });
 
 const veORNInfoSchema = z.object({