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.

Sign up for GitHub

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

Adam/remove candles main #2045

Merged
merged 2 commits into from
Aug 6, 2024
Merged

Adam/remove candles main #2045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d10317a
Revert "Adam/ct 1059 address issue with orderbookmidprice calculation…
adamfraser Aug 6, 2024
79345d6
Revert "Candles HLOC Data (#1887)"
adamfraser Aug 6, 2024
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: 0 additions & 2 deletions indexer/packages/postgres/__tests__/helpers/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,8 +725,6 @@ export const defaultCandle: CandleCreateObject = {
usdVolume: '2200000',
trades: 300,
startingOpenInterest: '200000',
orderbookMidPriceOpen: '11500',
orderbookMidPriceClose: '12500',
};

export const defaultCandleId: string = CandleTable.uuid(
Expand Down
7 changes: 4 additions & 3 deletions indexer/packages/postgres/__tests__/stores/candle-table.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,12 @@ describe('CandleTable', () => {
const updatedCandle: CandleUpdateObject = {
id: defaultCandleId,
open: '100',
orderbookMidPriceClose: '200',
orderbookMidPriceOpen: '300',
};

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

const candle: CandleFromDatabase | undefined = await CandleTable.findById(
defaultCandleId,
Expand Down
19 changes: 0 additions & 19 deletions ...db/migrations/migration_files/20240627152937_candles_add_mid_book_price_open_and_close.ts
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions indexer/packages/postgres/src/models/candle-model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ 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 @@ -79,8 +77,4 @@ export default class CandleModel extends Model {
trades!: number;

startingOpenInterest!: string;

orderbookMidPriceOpen?: string;

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

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

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

export interface PnlTicksFromDatabase extends IdBasedModelFromDatabase {
Expand Down
133 changes: 0 additions & 133 deletions indexer/packages/redis/__tests__/caches/orderbook-levels-cache.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ 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 @@ -686,136 +685,4 @@ 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 the correct mid price for very small numbers', async () => {
await Promise.all([
updatePriceLevel({
ticker,
side: OrderSide.SELL,
humanPrice: '0.000000002346',
sizeDeltaInQuantums: '2000',
client,
}),
updatePriceLevel({
ticker,
side: OrderSide.BUY,
humanPrice: '0.000000002344',
sizeDeltaInQuantums: '2000',
client,
}),
]);

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

it('returns the approprite amount of decimal precision', async () => {
await Promise.all([
updatePriceLevel({
ticker,
side: OrderSide.SELL,
humanPrice: '1.02',
sizeDeltaInQuantums: '2000',
client,
}),
updatePriceLevel({
ticker,
side: OrderSide.BUY,
humanPrice: '1.01',
sizeDeltaInQuantums: '2000',
client,
}),
]);

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

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();
});
});
24 changes: 0 additions & 24 deletions indexer/packages/redis/src/caches/orderbook-levels-cache.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,27 +529,3 @@ function convertToPriceLevels(
};
});
}

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

if (levels.bids.length === 0 || levels.asks.length === 0) {
return undefined;
}

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

if (bestAsk === undefined || bestBid === undefined) {
return undefined;
}
return bestBid.plus(bestAsk).div(2).toFixed();
}
8 changes: 0 additions & 8 deletions indexer/services/comlink/public/api-documentation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,8 +692,6 @@ fetch(`${baseURL}/candles/perpetualMarkets/{ticker}?resolution=1MIN`,
"usdVolume": "string",
"trades": 0.1,
"startingOpenInterest": "string",
"orderbookMidPriceOpen": "string",
"orderbookMidPriceClose": "string",
"id": "string"
}
]
Expand Down Expand Up @@ -3657,8 +3655,6 @@ This operation does not require authentication
"usdVolume": "string",
"trades": 0.1,
"startingOpenInterest": "string",
"orderbookMidPriceOpen": "string",
"orderbookMidPriceClose": "string",
"id": "string"
}

Expand All @@ -3679,8 +3675,6 @@ 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 @@ -3705,8 +3699,6 @@ This operation does not require authentication
"usdVolume": "string",
"trades": 0.1,
"startingOpenInterest": "string",
"orderbookMidPriceOpen": "string",
"orderbookMidPriceClose": "string",
"id": "string"
}
]
Expand Down
8 changes: 0 additions & 8 deletions indexer/services/comlink/public/swagger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,14 +303,6 @@
"startingOpenInterest": {
"type": "string"
},
"orderbookMidPriceOpen": {
"type": "string",
"nullable": true
},
"orderbookMidPriceClose": {
"type": "string",
"nullable": true
},
"id": {
"type": "string"
}
Expand Down
18 changes: 0 additions & 18 deletions indexer/services/ender/__tests__/helpers/redis-helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import { OrderSide } from '@dydxprotocol-indexer/postgres';
import {
NextFundingCache,
OrderbookLevelsCache,
StateFilledQuantumsCache,
} from '@dydxprotocol-indexer/redis';
import Big from 'big.js';
Expand Down Expand Up @@ -31,19 +29,3 @@ 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