From b7217c958b355ee94e6254e9acc9db7e0f21e601 Mon Sep 17 00:00:00 2001 From: Slava Startsev Date: Tue, 18 Jun 2024 15:14:54 +0300 Subject: [PATCH 01/13] Add event horizon test network (#261) * feat: add event horizon test network * chore: bump v --- package.json | 2 +- src/config/chains.json | 13 +++++++++++++ src/config/envs.json | 18 ++++++++++++++++++ src/constants/chains.ts | 1 + src/types.ts | 1 + 5 files changed, 34 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index f628cfe..50a3770 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@orionprotocol/sdk", - "version": "0.22.5", + "version": "0.22.6", "description": "Orion Protocol SDK", "main": "./lib/index.cjs", "module": "./lib/index.js", diff --git a/src/config/chains.json b/src/config/chains.json index 4afb939..5d2b030 100644 --- a/src/config/chains.json +++ b/src/config/chains.json @@ -64,6 +64,19 @@ "curveRegistry": "" } }, + "123420000034": { + "chainId": "123420000034", + "explorer": "https://blockscout-123420000034.raas-testnet.gelato.digital/", + "label": "Event Horizon Testnet", + "shortName": "EH-Testnet", + "code": "eth", + "rpc": "https://rpc-123420000034.raas-testnet.gelato.digital/", + "baseCurrencyName": "ETH", + "contracts": { + "WETH": "0x4200000000000000000000000000000000000006", + "curveRegistry": "" + } + }, "42161": { "chainId": "42161", "explorer": "https://arbiscan.io/", diff --git a/src/config/envs.json b/src/config/envs.json index 445649e..442f771 100644 --- a/src/config/envs.json +++ b/src/config/envs.json @@ -244,6 +244,24 @@ "http": "/orion-indexer/" } } + }, + "123420000034": { + "api": "https://testing.orion.xyz/event-horizon", + "services": { + "aggregator": { + "http": "/backend", + "ws": "/v1" + }, + "blockchain": { + "http": "" + }, + "priceFeed": { + "all": "/price-feed" + }, + "indexer": { + "http": "/orion-indexer/" + } + } } } }, diff --git a/src/constants/chains.ts b/src/constants/chains.ts index 621b947..d875c3f 100644 --- a/src/constants/chains.ts +++ b/src/constants/chains.ts @@ -3,6 +3,7 @@ import { SupportedChainId } from '../types.js'; export const developmentChains = [ SupportedChainId.BSC_TESTNET, SupportedChainId.SEPOLIA, + SupportedChainId.EVENT_HORIZON, ]; export const productionChains = [ SupportedChainId.MAINNET, diff --git a/src/types.ts b/src/types.ts index 72ec8dc..54fdbf4 100644 --- a/src/types.ts +++ b/src/types.ts @@ -95,6 +95,7 @@ export enum SupportedChainId { BSC_TESTNET = '97', SEPOLIA = '11155111', + EVENT_HORIZON = '123420000034', // For testing and debug purpose // BROKEN = '0', From 8dead845d1ff511f948cebc0f483eaa49b95f569 Mon Sep 17 00:00:00 2001 From: Slava Startsev Date: Tue, 18 Jun 2024 18:26:17 +0300 Subject: [PATCH 02/13] Update to event horizon testnet (#262) * chore: update EH variable name for tn * chore: bump v --- package.json | 2 +- src/constants/chains.ts | 2 +- src/types.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 50a3770..670c303 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@orionprotocol/sdk", - "version": "0.22.6", + "version": "0.22.7", "description": "Orion Protocol SDK", "main": "./lib/index.cjs", "module": "./lib/index.js", diff --git a/src/constants/chains.ts b/src/constants/chains.ts index d875c3f..969f15d 100644 --- a/src/constants/chains.ts +++ b/src/constants/chains.ts @@ -3,7 +3,7 @@ import { SupportedChainId } from '../types.js'; export const developmentChains = [ SupportedChainId.BSC_TESTNET, SupportedChainId.SEPOLIA, - SupportedChainId.EVENT_HORIZON, + SupportedChainId.EVENT_HORIZON_TESTNET, ]; export const productionChains = [ SupportedChainId.MAINNET, diff --git a/src/types.ts b/src/types.ts index 54fdbf4..f9639e6 100644 --- a/src/types.ts +++ b/src/types.ts @@ -95,7 +95,7 @@ export enum SupportedChainId { BSC_TESTNET = '97', SEPOLIA = '11155111', - EVENT_HORIZON = '123420000034', + EVENT_HORIZON_TESTNET = '123420000034', // For testing and debug purpose // BROKEN = '0', From 0cc989b41308719636d5c566b518ab875e6bd6cd Mon Sep 17 00:00:00 2001 From: Slava Startsev Date: Tue, 18 Jun 2024 18:57:03 +0300 Subject: [PATCH 03/13] New event horizon api url (#263) * chore: update api url for event horizon * chore: bump v --- package.json | 2 +- src/config/envs.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 670c303..7e330bb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@orionprotocol/sdk", - "version": "0.22.7", + "version": "0.22.9", "description": "Orion Protocol SDK", "main": "./lib/index.cjs", "module": "./lib/index.js", diff --git a/src/config/envs.json b/src/config/envs.json index 442f771..112577e 100644 --- a/src/config/envs.json +++ b/src/config/envs.json @@ -246,7 +246,7 @@ } }, "123420000034": { - "api": "https://testing.orion.xyz/event-horizon", + "api": "https://testing.orion.xyz/event-horizon-testnet", "services": { "aggregator": { "http": "/backend", From b5d0e3f6c6568375834f02204ffd85a837504f7d Mon Sep 17 00:00:00 2001 From: Kirill Litvinov Date: Wed, 19 Jun 2024 10:33:19 +0300 Subject: [PATCH 04/13] indexer update --- package.json | 2 +- src/services/Indexer/index.ts | 40 +++++++++++++++++++ .../Indexer/schemas/get-points-at-schema.ts | 15 +++++++ .../Indexer/schemas/get-points-info-schema.ts | 27 +++++++++++++ src/services/Indexer/schemas/index.ts | 2 + 5 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 src/services/Indexer/schemas/get-points-at-schema.ts create mode 100644 src/services/Indexer/schemas/get-points-info-schema.ts diff --git a/package.json b/package.json index 7e330bb..edd013e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@orionprotocol/sdk", - "version": "0.22.9", + "version": "0.22.10-rc1", "description": "Orion Protocol SDK", "main": "./lib/index.cjs", "module": "./lib/index.js", diff --git a/src/services/Indexer/index.ts b/src/services/Indexer/index.ts index 2791f8a..d1fce85 100644 --- a/src/services/Indexer/index.ts +++ b/src/services/Indexer/index.ts @@ -1,5 +1,7 @@ import { environmentResponseSchema, + getPointsAtResponseSchema, + getPointsInfoResponseSchema, getPoolResponseSchema, listAmountResponseSchema, listNFTOrderResponseSchema, @@ -51,6 +53,18 @@ type VeORNInfoPayload = BasePayload & { params: [string] }; +type GetPointsInfoPayload = BasePayload & { + model: 'veORN' + method: 'pointsInfo' + params: [string] +}; + +type GetPointsAtPayload = BasePayload & { + model: 'veORN' + method: 'pointsInfo' + params: [number, number, number] +}; + type ListAmountPayload = BasePayload & { model: string method: 'listAmount' @@ -68,6 +82,8 @@ type Payload = | GetPoolInfoPayload | ListPoolPayload | VeORNInfoPayload + | GetPointsInfoPayload + | GetPointsAtPayload | ListAmountPayload | GetAmountByORNPayload; @@ -92,6 +108,8 @@ 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); this.getAmountAt = this.getAmountAt.bind(this); @@ -118,6 +136,28 @@ 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) => { + return fetchWithValidation(this.apiUrl, getPointsAtResponseSchema, { + method: 'POST', + body: this.makeRPCPayload({ + model: 'veORN', + method: 'pointsAt', + params: [timestamp, page, pageSize], + }), + }); + }; + /** * @param {number} amount - amount * @param {number} [timestamp = Date.now()] - timestamp, defaults to current time diff --git a/src/services/Indexer/schemas/get-points-at-schema.ts b/src/services/Indexer/schemas/get-points-at-schema.ts new file mode 100644 index 0000000..ce25e3d --- /dev/null +++ b/src/services/Indexer/schemas/get-points-at-schema.ts @@ -0,0 +1,15 @@ +import { z } from 'zod'; +import infoSchema from './info-schema.js'; + +const getPointsAtResultSchema = z.object({ + points: z.record(z.string(), z.number()), + pageSize: z.number(), + totalElements: z.number(), +}); + +const getPointsAtSchema = z.object({ + result: getPointsAtResultSchema, + info: infoSchema, +}).nullable(); + +export default getPointsAtSchema; diff --git a/src/services/Indexer/schemas/get-points-info-schema.ts b/src/services/Indexer/schemas/get-points-info-schema.ts new file mode 100644 index 0000000..38e37c8 --- /dev/null +++ b/src/services/Indexer/schemas/get-points-info-schema.ts @@ -0,0 +1,27 @@ +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 8690e93..911ddb2 100644 --- a/src/services/Indexer/schemas/index.ts +++ b/src/services/Indexer/schemas/index.ts @@ -9,3 +9,5 @@ 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'; From f91f87e376f000ac71de6ea062ffd6c19a08fab0 Mon Sep 17 00:00:00 2001 From: Kirill Litvinov Date: Thu, 20 Jun 2024 13:21:45 +0300 Subject: [PATCH 05/13] 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({ From fad890eeab77a5a7e2a5f87885ec5efe57a28b46 Mon Sep 17 00:00:00 2001 From: Kirill Litvinov Date: Fri, 21 Jun 2024 10:01:37 +0300 Subject: [PATCH 06/13] update --- package.json | 2 +- src/services/Indexer/schemas/get-points-at-schema.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index edd013e..53cccf4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@orionprotocol/sdk", - "version": "0.22.10-rc1", + "version": "0.22.10-rc2", "description": "Orion Protocol SDK", "main": "./lib/index.cjs", "module": "./lib/index.js", diff --git a/src/services/Indexer/schemas/get-points-at-schema.ts b/src/services/Indexer/schemas/get-points-at-schema.ts index ce25e3d..34a71c1 100644 --- a/src/services/Indexer/schemas/get-points-at-schema.ts +++ b/src/services/Indexer/schemas/get-points-at-schema.ts @@ -2,8 +2,8 @@ import { z } from 'zod'; import infoSchema from './info-schema.js'; const getPointsAtResultSchema = z.object({ - points: z.record(z.string(), z.number()), - pageSize: z.number(), + pointsObject: z.record(z.string(), z.number()), + currentPage: z.number(), totalElements: z.number(), }); From 6db981dc797f715f9f186bc9c31085fc7bb90db1 Mon Sep 17 00:00:00 2001 From: Kirill Litvinov Date: Fri, 21 Jun 2024 10:38:58 +0300 Subject: [PATCH 07/13] update --- package.json | 2 +- src/services/Indexer/index.ts | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 53cccf4..92e5983 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@orionprotocol/sdk", - "version": "0.22.10-rc2", + "version": "0.22.10-rc3", "description": "Orion Protocol SDK", "main": "./lib/index.cjs", "module": "./lib/index.js", diff --git a/src/services/Indexer/index.ts b/src/services/Indexer/index.ts index 2d13be7..607d641 100644 --- a/src/services/Indexer/index.ts +++ b/src/services/Indexer/index.ts @@ -55,7 +55,7 @@ type VeORNInfoPayload = BasePayload & { type GetPointsAtPayload = BasePayload & { model: 'veORN' method: 'pointsInfo' - params: [number, number, number] + params: [number, number] }; type ListAmountPayload = BasePayload & { @@ -127,13 +127,17 @@ class IndexerService { }); }; - readonly getPointsAt = (timestamp = Date.now(), page = 1, pageSize = 1000) => { + /** + * @param {number} page - current page + * @param {number} [pageSize] - amount of items on one page + */ + readonly getPointsAt = (page = 1, pageSize = 1000) => { return fetchWithValidation(this.apiUrl, getPointsAtResponseSchema, { method: 'POST', body: this.makeRPCPayload({ model: 'veORN', method: 'pointsAt', - params: [timestamp, page, pageSize], + params: [page, pageSize], }), }); }; From e5a41aada6d0f74431fbc1a8364fb63640acfe8a Mon Sep 17 00:00:00 2001 From: Mikhail Gladchenko Date: Wed, 3 Jul 2024 17:09:19 +0100 Subject: [PATCH 08/13] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 92e5983..670c303 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@orionprotocol/sdk", - "version": "0.22.10-rc3", + "version": "0.22.7", "description": "Orion Protocol SDK", "main": "./lib/index.cjs", "module": "./lib/index.js", From 208db5cf47f815ab0c61d0979fd68835b61851cf Mon Sep 17 00:00:00 2001 From: Mikhail Gladchenko Date: Wed, 3 Jul 2024 17:45:10 +0100 Subject: [PATCH 09/13] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 670c303..4e1b3a5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@orionprotocol/sdk", - "version": "0.22.7", + "version": "0.22.10", "description": "Orion Protocol SDK", "main": "./lib/index.cjs", "module": "./lib/index.js", From 4feb13fc695852f596f86933e523a6febdffea90 Mon Sep 17 00:00:00 2001 From: Mikhail Gladchenko Date: Fri, 5 Jul 2024 14:24:03 +0100 Subject: [PATCH 10/13] feat: updated infoSchema --- src/services/BlockchainService/schemas/infoSchema.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/services/BlockchainService/schemas/infoSchema.ts b/src/services/BlockchainService/schemas/infoSchema.ts index 472a895..257b0b7 100644 --- a/src/services/BlockchainService/schemas/infoSchema.ts +++ b/src/services/BlockchainService/schemas/infoSchema.ts @@ -1,5 +1,5 @@ import { z } from 'zod'; -import { makePartial } from '../../../utils/index.js'; +import { makePartial } from '../../../utils'; const internalFeeAssetSchema = z.object({ type: z.enum(['percent', 'plain']), @@ -10,8 +10,9 @@ const internalFeeAssetSchema = z.object({ const infoSchema = z.object({ chainId: z.number(), chainName: z.string(), - exchangeContractAddress: z.string(), swapExecutorContractAddress: z.string(), + libValidatorContractAddress: z.string(), + exchangeContractAddress: z.string(), oracleContractAddress: z.string(), matcherAddress: z.string(), orderFeePercent: z.number(), From 68fc41afbd2eb889a28d7c9b63ab3e214ce54f5c Mon Sep 17 00:00:00 2001 From: Mikhail Gladchenko Date: Fri, 5 Jul 2024 14:29:42 +0100 Subject: [PATCH 11/13] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4e1b3a5..094ba50 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@orionprotocol/sdk", - "version": "0.22.10", + "version": "0.22.11", "description": "Orion Protocol SDK", "main": "./lib/index.cjs", "module": "./lib/index.js", From 99650e9e7f53e33595211dbe9dcacacb7f1dbc82 Mon Sep 17 00:00:00 2001 From: Mikhail Gladchenko Date: Mon, 8 Jul 2024 10:17:24 +0100 Subject: [PATCH 12/13] feat: fix bugs that may appear on production if a release needs to be rolled out --- .../BlockchainService/schemas/infoSchema.ts | 2 +- src/services/Indexer/schemas/veORN-info-schema.ts | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/services/BlockchainService/schemas/infoSchema.ts b/src/services/BlockchainService/schemas/infoSchema.ts index 257b0b7..c2c2e3b 100644 --- a/src/services/BlockchainService/schemas/infoSchema.ts +++ b/src/services/BlockchainService/schemas/infoSchema.ts @@ -11,7 +11,7 @@ const infoSchema = z.object({ chainId: z.number(), chainName: z.string(), swapExecutorContractAddress: z.string(), - libValidatorContractAddress: z.string(), + libValidatorContractAddress: z.string().optional(), exchangeContractAddress: z.string(), oracleContractAddress: z.string(), matcherAddress: z.string(), diff --git a/src/services/Indexer/schemas/veORN-info-schema.ts b/src/services/Indexer/schemas/veORN-info-schema.ts index f3f9dba..38fb6ee 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(), @@ -12,14 +12,15 @@ const veORNResultSchema = z.object({ weeklyReward: z.number(), userAPR: z.number(), userVeORN: z.number(), + userVeORNBalance: z.number(), userORNLocked: z.number(), userLockEndDate: z.number(), userReward: z.number(), userWeeklyReward: z.number(), userMinLockPeriod: z.number(), - dropLock: z.boolean(), - pointsReward: z.number(), -}); + dropLock: z.boolean().optional(), + pointsReward: z.number().optional(), +}).passthrough(); const veORNInfoSchema = z.object({ result: veORNResultSchema, From 7664409aae18cac37a79eef2f4bc2c52703a8b42 Mon Sep 17 00:00:00 2001 From: Mikhail Gladchenko Date: Mon, 8 Jul 2024 10:17:57 +0100 Subject: [PATCH 13/13] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 094ba50..2286c17 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@orionprotocol/sdk", - "version": "0.22.11", + "version": "0.22.12", "description": "Orion Protocol SDK", "main": "./lib/index.cjs", "module": "./lib/index.js",