From d14b872c27cd23f403d4858538189e8fd5abb584 Mon Sep 17 00:00:00 2001 From: Demid Date: Wed, 11 Jan 2023 03:37:06 +0300 Subject: [PATCH] CFD balances schema update --- package.json | 2 +- .../ws/schemas/cfdBalancesSchema.ts | 20 +++++++++++++------ src/types.ts | 10 +++++++--- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 5815078..e2f7bb5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@orionprotocol/sdk", - "version": "0.16.0-rc.14", + "version": "0.16.0-rc.15", "description": "Orion Protocol SDK", "main": "./lib/esm/index.js", "module": "./lib/esm/index.js", diff --git a/src/services/OrionAggregator/ws/schemas/cfdBalancesSchema.ts b/src/services/OrionAggregator/ws/schemas/cfdBalancesSchema.ts index 2876435..1869c9e 100644 --- a/src/services/OrionAggregator/ws/schemas/cfdBalancesSchema.ts +++ b/src/services/OrionAggregator/ws/schemas/cfdBalancesSchema.ts @@ -3,21 +3,29 @@ import { z } from 'zod'; const cfdBalanceSchema = z.object({ i: z.string(), b: z.string(), + pnl: z.string(), + fr: z.string(), + e: z.string(), p: z.string(), pp: z.string(), - fr: z.string(), - sfrl: z.string(), - lfrl: z.string(), + r: z.string(), + m: z.string(), + mu: z.string(), + fmu: z.string(), awb: z.string(), }) .transform((obj) => ({ instrument: obj.i, balance: obj.b, + profitLoss: obj.pnl, + fundingRate: obj.fr, + equity: obj.e, position: obj.p, positionPrice: obj.pp, - fundingRate: obj.fr, - lastShortFundingRate: obj.sfrl, - lastLongFundingRate: obj.lfrl, + reserves: obj.r, + margin: obj.m, + marginUSD: obj.mu, + freeMarginUSD: obj.fmu, availableWithdrawBalance: obj.awb, })); diff --git a/src/types.ts b/src/types.ts index d67b210..c64a076 100644 --- a/src/types.ts +++ b/src/types.ts @@ -29,11 +29,15 @@ export type Balance = { export type CFDBalance = { instrument: string, balance: string, + profitLoss: string, + fundingRate: string, + equity: string, position: string, positionPrice: string, - fundingRate: string, - lastShortFundingRate: string, - lastLongFundingRate: string, + reserves: string, + margin: string, + marginUSD: string, + freeMarginUSD: string, availableWithdrawBalance: string, }