From 8c3d5f03acae3247467666bc9bc6d7b56a97a370 Mon Sep 17 00:00:00 2001 From: Dmitry Leleko Date: Wed, 19 Apr 2023 10:33:18 +0300 Subject: [PATCH 1/3] OP-3783 Update pools endpoints --- package.json | 2 +- .../OrionBlockchain/schemas/governancePoolSchema.ts | 4 ++-- .../OrionBlockchain/schemas/governancePoolsSchema.ts | 8 +++++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index e2638a1..a412e74 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@orionprotocol/sdk", - "version": "0.18.18", + "version": "0.18.17-rc0", "description": "Orion Protocol SDK", "main": "./lib/index.cjs", "module": "./lib/index.js", diff --git a/src/services/OrionBlockchain/schemas/governancePoolSchema.ts b/src/services/OrionBlockchain/schemas/governancePoolSchema.ts index d9967fd..dd613b6 100644 --- a/src/services/OrionBlockchain/schemas/governancePoolSchema.ts +++ b/src/services/OrionBlockchain/schemas/governancePoolSchema.ts @@ -1,8 +1,8 @@ import { z } from 'zod'; const governancePoolSchema = z.object({ - base_apr: z.union([z.null(), z.number()]), - max_apr: z.union([z.null(), z.number()]), + min_apr: z.string(), + max_apr: z.string(), tvl: z.string(), lp_supply: z.string(), lp_staked: z.string(), diff --git a/src/services/OrionBlockchain/schemas/governancePoolsSchema.ts b/src/services/OrionBlockchain/schemas/governancePoolsSchema.ts index 5008b55..6a1f308 100644 --- a/src/services/OrionBlockchain/schemas/governancePoolsSchema.ts +++ b/src/services/OrionBlockchain/schemas/governancePoolsSchema.ts @@ -2,12 +2,14 @@ import { z } from 'zod'; const governancePoolsSchema = z.array( z.object({ + slug: z.string(), identifier: z.string(), chain: z.string(), platform: z.string(), logo: z.string(), pair: z.string(), lp_address: z.string(), + lp_staked: z.string(), lp_staked_with_boost: z.string(), lp_total_supply: z.string(), lp_price_in_usd: z.string(), @@ -15,9 +17,9 @@ const governancePoolsSchema = z.array( pool_tokens: z.tuple([z.string(), z.string()]), pool_rewards: z.array(z.string()), tvl: z.string(), - base_apr: z.union([z.null(), z.number()]), - max_apr: z.union([z.null(), z.number()]), - reward_per_period: z.string(), + min_apr: z.string(), + max_apr: z.string(), + reward_per_period: z.array(z.string()), weight: z.string(), liquidity: z.string(), }) From d8948d2e052f50ae6bc6c69a6e63f319b388b07f Mon Sep 17 00:00:00 2001 From: Dmitry Leleko Date: Wed, 19 Apr 2023 10:33:18 +0300 Subject: [PATCH 2/3] OP-3783 Fixup --- package.json | 2 +- src/services/OrionBlockchain/schemas/governancePoolsSchema.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index a412e74..386af5b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@orionprotocol/sdk", - "version": "0.18.17-rc0", + "version": "0.18.17-rc1", "description": "Orion Protocol SDK", "main": "./lib/index.cjs", "module": "./lib/index.js", diff --git a/src/services/OrionBlockchain/schemas/governancePoolsSchema.ts b/src/services/OrionBlockchain/schemas/governancePoolsSchema.ts index 6a1f308..8b3bcb3 100644 --- a/src/services/OrionBlockchain/schemas/governancePoolsSchema.ts +++ b/src/services/OrionBlockchain/schemas/governancePoolsSchema.ts @@ -11,7 +11,7 @@ const governancePoolsSchema = z.array( lp_address: z.string(), lp_staked: z.string(), lp_staked_with_boost: z.string(), - lp_total_supply: z.string(), + lp_supply: z.string(), lp_price_in_usd: z.string(), farm_address: z.string(), pool_tokens: z.tuple([z.string(), z.string()]), From 682fc93490b733d2d389e71be7db013cb097d8bf Mon Sep 17 00:00:00 2001 From: Dmitry Leleko Date: Wed, 19 Apr 2023 10:34:41 +0300 Subject: [PATCH 3/3] Fix futuresTradeInfoSchema --- .../OrionAggregator/ws/schemas/futuresTradeInfoSchema.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/services/OrionAggregator/ws/schemas/futuresTradeInfoSchema.ts b/src/services/OrionAggregator/ws/schemas/futuresTradeInfoSchema.ts index 37bdf21..5aed068 100644 --- a/src/services/OrionAggregator/ws/schemas/futuresTradeInfoSchema.ts +++ b/src/services/OrionAggregator/ws/schemas/futuresTradeInfoSchema.ts @@ -6,8 +6,8 @@ const futuresTradeInfoSchema = z.object({ id: z.string(), // trade info request UUID, set by client side S: z.string(), // sender i: z.string(), // instrument - bp: z.number().nullable(), // buy price - sp: z.number().nullable(), // sell price + bp: z.number().optional(), // buy price + sp: z.number().optional(), // sell price bpw: z.number(), // buy power spw: z.number(), // sell power ma: z.number(), // min amount