trade/trade-drift-dlob
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

address PR comments

Browse Source
This commit is contained in:
Nour Alharithi
2023-11-17 09:38:39 -08:00
parent 7a88935070
commit 4a3941d374
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/publishers/tradesPublisher.ts
View File

@@ -12,12 +12,11 @@ import {
BulkAccountLoader, BulkAccountLoader,
EventSubscriber, EventSubscriber,
OrderAction, OrderAction,
MarketType,
convertToNumber, convertToNumber,
BASE_PRECISION, BASE_PRECISION,
QUOTE_PRECISION, QUOTE_PRECISION,
PRICE_PRECISION, PRICE_PRECISION,
isVariant, getVariant,
} from '@drift-labs/sdk'; } from '@drift-labs/sdk';
import { logger, setLogLevel } from '../utils/logger'; import { logger, setLogLevel } from '../utils/logger';
@@ -129,12 +128,10 @@ const main = async () => {
return { return {
ts: fill.ts.toNumber(), ts: fill.ts.toNumber(),
marketIndex: fill.marketIndex, marketIndex: fill.marketIndex,
marketType: isVariant(fill.marketType as MarketType, 'perp') marketType: getVariant(fill.marketType),
? 'perp'
: 'spot',
filler: fill.filler?.toBase58(), filler: fill.filler?.toBase58(),
takerFee: convertToNumber(fill.takerFee, BASE_PRECISION), takerFee: convertToNumber(fill.takerFee, QUOTE_PRECISION),
makerFee: convertToNumber(fill.makerFee, BASE_PRECISION), makerFee: convertToNumber(fill.makerFee, QUOTE_PRECISION),
quoteAssetAmountSurplus: convertToNumber( quoteAssetAmountSurplus: convertToNumber(
fill.quoteAssetAmountSurplus, fill.quoteAssetAmountSurplus,
QUOTE_PRECISION QUOTE_PRECISION
@@ -149,9 +146,7 @@ const main = async () => {
), ),
taker: fill.taker?.toBase58(), taker: fill.taker?.toBase58(),
takerOrderId: fill.takerOrderId, takerOrderId: fill.takerOrderId,
takerOrderDirection: isVariant(fill.takerOrderDirection, 'short') takerOrderDirection: getVariant(fill.takerOrderDirection),
? 'short'
: 'long',
takerOrderBaseAssetAmount: convertToNumber( takerOrderBaseAssetAmount: convertToNumber(
fill.takerOrderBaseAssetAmount, fill.takerOrderBaseAssetAmount,
BASE_PRECISION BASE_PRECISION
@@ -166,7 +161,7 @@ const main = async () => {
), ),
maker: fill.maker?.toBase58(), maker: fill.maker?.toBase58(),
makerOrderId: fill.makerOrderId, makerOrderId: fill.makerOrderId,
makerOrderDirection: fill.makerOrderDirection, makerOrderDirection: getVariant(fill.makerOrderDirection),
makerOrderBaseAssetAmount: convertToNumber( makerOrderBaseAssetAmount: convertToNumber(
fill.makerOrderBaseAssetAmount, fill.makerOrderBaseAssetAmount,
BASE_PRECISION BASE_PRECISION
@@ -182,6 +177,9 @@ const main = async () => {
oraclePrice: convertToNumber(fill.oraclePrice, PRICE_PRECISION), oraclePrice: convertToNumber(fill.oraclePrice, PRICE_PRECISION),
txSig: fill.txSig, txSig: fill.txSig,
slot: fill.slot, slot: fill.slot,
action: 'fill',
actionExplanation: getVariant(fill.actionExplanation),
referrerReward: convertToNumber(fill.referrerReward, QUOTE_PRECISION),
}; };
}) })
) )

16
src/wsConnectionManager.ts
View File

@@ -41,11 +41,11 @@ const getRedisChannelFromMessage = (message: any): string => {
let marketIndex: number; let marketIndex: number;
if (marketType === 'spot') { if (marketType === 'spot') {
marketIndex = SpotMarkets[driftEnv].find( marketIndex = SpotMarkets[driftEnv].find(
(market) => market.symbol === marketName (market) => market.symbol.toUpperCase() === marketName
).marketIndex; ).marketIndex;
} else if (marketType === 'perp') { } else if (marketType === 'perp') {
marketIndex = PerpMarkets[driftEnv].find( marketIndex = PerpMarkets[driftEnv].find(
(market) => market.symbol === marketName (market) => market.symbol.toUpperCase() === marketName
).marketIndex; ).marketIndex;
} }
@@ -154,11 +154,13 @@ async function main() {
channelSubscribers.get(redisChannel).add(ws); channelSubscribers.get(redisChannel).add(ws);
// Fetch and send last message // Fetch and send last message
const lastMessage = await lastMessageRetriever.client.get( if (redisChannel.includes('orderbook')) {
`last_update_${redisChannel}` const lastMessage = await lastMessageRetriever.client.get(
); `last_update_${redisChannel}`
if (lastMessage !== null) { );
ws.send(JSON.stringify({ redisChannel, data: lastMessage })); if (lastMessage !== null) {
ws.send(JSON.stringify({ redisChannel, data: lastMessage }));
}
} }
break; break;
} }