Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Candles HLOC Data (backport #1887) #1990

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions indexer/packages/postgres/__tests__/helpers/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -717,6 +717,8 @@ export const defaultCandle: CandleCreateObject = {
usdVolume: '2200000',
trades: 300,
startingOpenInterest: '200000',
orderbookMidPriceOpen: '11500',
orderbookMidPriceClose: '12500',
};

export const defaultCandleId: string = CandleTable.uuid(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,11 @@ describe('CandleTable', () => {
const updatedCandle: CandleUpdateObject = {
id: defaultCandleId,
open: '100',
orderbookMidPriceClose: '200',
orderbookMidPriceOpen: '300',
};

await CandleTable.update({
id: defaultCandleId,
open: '100',
});
await CandleTable.update(updatedCandle);

const candle: CandleFromDatabase | undefined = await CandleTable.findById(
defaultCandleId,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import * as Knex from 'knex';

export async function up(knex: Knex): Promise<void> {
return knex
.schema
.alterTable('candles', (table) => {
table.decimal('orderbookMidPriceOpen', null);
table.decimal('orderbookMidPriceClose', null);
});
}

export async function down(knex: Knex): Promise<void> {
return knex
.schema
.alterTable('candles', (table) => {
table.dropColumn('orderbookMidPriceOpen');
table.dropColumn('orderbookMidPriceClose');
});
}
6 changes: 6 additions & 0 deletions indexer/packages/postgres/src/models/candle-model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ export default class CandleModel extends Model {
usdVolume: { type: 'string', pattern: NonNegativeNumericPattern },
trades: { type: 'integer' },
startingOpenInterest: { type: 'string', pattern: NonNegativeNumericPattern },
orderbookMidPriceOpen: { type: ['string', 'null'], pattern: NonNegativeNumericPattern },
orderbookMidPriceClose: { type: ['string', 'null'], pattern: NonNegativeNumericPattern },
},
};
}
Expand Down Expand Up @@ -77,4 +79,8 @@ export default class CandleModel extends Model {
trades!: number;

startingOpenInterest!: string;

orderbookMidPriceOpen?: string;

orderbookMidPriceClose?: string;
}
4 changes: 4 additions & 0 deletions indexer/packages/postgres/src/types/candle-types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ export interface CandleCreateObject {
usdVolume: string;
trades: number;
startingOpenInterest: string;
orderbookMidPriceOpen: string | undefined;
orderbookMidPriceClose: string | undefined;
}

export interface CandleUpdateObject {
Expand All @@ -24,6 +26,8 @@ export interface CandleUpdateObject {
usdVolume?: string;
trades?: number;
startingOpenInterest?: string;
orderbookMidPriceOpen?: string;
orderbookMidPriceClose?: string;
}

export enum CandleResolution {
Expand Down
2 changes: 2 additions & 0 deletions indexer/packages/postgres/src/types/db-model-types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,8 @@ export interface CandleFromDatabase extends IdBasedModelFromDatabase {
usdVolume: string;
trades: number;
startingOpenInterest: string;
orderbookMidPriceOpen?: string | null;
orderbookMidPriceClose?: string | null;
}

export interface PnlTicksFromDatabase extends IdBasedModelFromDatabase {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
deleteZeroPriceLevel,
getLastUpdatedKey,
deleteStalePriceLevel,
getOrderBookMidPrice,
} from '../../src/caches/orderbook-levels-cache';
import { OrderSide } from '@dydxprotocol-indexer/postgres';
import { OrderbookLevels, PriceLevel } from '../../src/types';
Expand Down Expand Up @@ -684,4 +685,93 @@ describe('orderbookLevelsCache', () => {
expect(size).toEqual('10');
});
});

describe('getMidPrice', () => {
beforeEach(() => {
jest.restoreAllMocks();
jest.restoreAllMocks();
});
afterEach(() => {
jest.restoreAllMocks();
jest.restoreAllMocks();
});

it('returns the correct mid price', async () => {
await Promise.all([
updatePriceLevel({
ticker,
side: OrderSide.BUY,
humanPrice: '45200',
sizeDeltaInQuantums: '2000',
client,
}),
updatePriceLevel({
ticker,
side: OrderSide.BUY,
humanPrice: '45100',
sizeDeltaInQuantums: '2000',
client,
}),
updatePriceLevel({
ticker,
side: OrderSide.BUY,
humanPrice: '45300',
sizeDeltaInQuantums: '2000',
client,
}),
updatePriceLevel({
ticker,
side: OrderSide.SELL,
humanPrice: '45500',
sizeDeltaInQuantums: '2000',
client,
}),
updatePriceLevel({
ticker,
side: OrderSide.SELL,
humanPrice: '45400',
sizeDeltaInQuantums: '2000',
client,
}),
updatePriceLevel({
ticker,
side: OrderSide.SELL,
humanPrice: '45600',
sizeDeltaInQuantums: '2000',
client,
}),
]);

const midPrice = await getOrderBookMidPrice(ticker, client);
expect(midPrice).toEqual(45350);
});

});

it('returns undefined if there are no bids or asks', async () => {
await updatePriceLevel({
ticker,
side: OrderSide.SELL,
humanPrice: '45400',
sizeDeltaInQuantums: '2000',
client,
});

const midPrice = await getOrderBookMidPrice(ticker, client);
expect(midPrice).toBeUndefined();
});

it('returns undefined if humanPrice is NaN', async () => {
await updatePriceLevel({
ticker,
side: OrderSide.SELL,
humanPrice: 'nan',
sizeDeltaInQuantums: '2000',
client,
});

const midPrice = await getOrderBookMidPrice(ticker, client);

expect(midPrice).toBeUndefined();
});
});
35 changes: 35 additions & 0 deletions indexer/packages/redis/src/caches/orderbook-levels-cache.ts
Original file line number Diff line number Diff line change
Expand Up @@ -529,3 +529,38 @@ function convertToPriceLevels(
};
});
}

export async function getOrderBookMidPrice(
ticker: string,
client: RedisClient,
): Promise<number | undefined> {
const levels = await getOrderBookLevels(ticker, client, {
removeZeros: true,
sortSides: true,
uncrossBook: true,
limitPerSide: 1,
});

if (levels.bids.length === 0 || levels.asks.length === 0) {
const message: string = `Orderbook bid length: ${levels.bids.length}, ask length: ${levels.asks.length}. Expected > 0`;
logger.error({
at: 'orderbook-levels-cache#getOrderBookMidPrice',
message,
});
return undefined;
}

const bestAsk = Number(levels.asks[0].humanPrice);
const bestBid = Number(levels.bids[0].humanPrice);

if (bestAsk === undefined || bestBid === undefined) {
const message: string = `Orderbook bid or ask failed to parse to Number, bid: ${levels.bids[0]}, ask: ${levels.asks[0]}`;
logger.error({
at: 'orderbook-levels-cache#getOrderBookMidPrice',
message,
});
return undefined;
}

return bestBid + (bestAsk - bestBid) / 2;
}
8 changes: 8 additions & 0 deletions indexer/services/comlink/public/api-documentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -641,6 +641,8 @@ fetch('https://dydx-testnet.imperator.co/v4/candles/perpetualMarkets/{ticker}?re
"usdVolume": "string",
"trades": 0,
"startingOpenInterest": "string",
"orderbookMidPriceOpen": "string",
"orderbookMidPriceClose": "string",
"id": "string"
}
]
Expand Down Expand Up @@ -3265,6 +3267,8 @@ This operation does not require authentication
"usdVolume": "string",
"trades": 0,
"startingOpenInterest": "string",
"orderbookMidPriceOpen": "string",
"orderbookMidPriceClose": "string",
"id": "string"
}

Expand All @@ -3285,6 +3289,8 @@ This operation does not require authentication
|usdVolume|string|true|none|none|
|trades|number(double)|true|none|none|
|startingOpenInterest|string|true|none|none|
|orderbookMidPriceOpen|string¦null|false|none|none|
|orderbookMidPriceClose|string¦null|false|none|none|
|id|string|true|none|none|

## CandleResponse
Expand All @@ -3309,6 +3315,8 @@ This operation does not require authentication
"usdVolume": "string",
"trades": 0,
"startingOpenInterest": "string",
"orderbookMidPriceOpen": "string",
"orderbookMidPriceClose": "string",
"id": "string"
}
]
Expand Down
8 changes: 8 additions & 0 deletions indexer/services/comlink/public/swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,14 @@
"startingOpenInterest": {
"type": "string"
},
"orderbookMidPriceOpen": {
"type": "string",
"nullable": true
},
"orderbookMidPriceClose": {
"type": "string",
"nullable": true
},
"id": {
"type": "string"
}
Expand Down
18 changes: 18 additions & 0 deletions indexer/services/ender/__tests__/helpers/redis-helpers.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { OrderSide } from '@dydxprotocol-indexer/postgres';
import {
NextFundingCache,
OrderbookLevelsCache,
StateFilledQuantumsCache,
} from '@dydxprotocol-indexer/redis';
import Big from 'big.js';
Expand Down Expand Up @@ -29,3 +31,19 @@ export async function expectStateFilledQuantums(
expect(stateFilledQuantums).toBeDefined();
expect(stateFilledQuantums).toEqual(quantums);
}

export async function updatePriceLevel(
ticker: string,
price: string,
side: OrderSide,
): Promise<void> {
const quantums: string = '30';

await OrderbookLevelsCache.updatePriceLevel({
ticker,
side,
humanPrice: price,
sizeDeltaInQuantums: quantums,
client: redisClient,
});
}
Loading
Loading