Skip to content
Open
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: 1 addition & 1 deletion packages/bot/src/processing/bot/normalizer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { nullToUndefined, required } from "../utils/index.js";
export class OrderNormalizer {
static normalize(order: Order): StrategyOrder {
const quantityExecuted = order.status === XOrderStatus.Filled ? order.quantity : 0;
const filledOrLimitPrice = order.filledPrice || order.price || 0;
const filledOrLimitPrice = Number(order.filledPrice || order.price || 0);
const volume = order.quantity * filledOrLimitPrice;
const volumeExecuted = order.status === XOrderStatus.Filled ? volume : 0;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ export class ExchangeAccountProcessor {
orderId: order.id,
filledPrice: exchangeOrder.filledPrice,
filledAt: new Date(exchangeOrder.lastTradeTimestamp),
fee: exchangeOrder.fee,
fee: Number(exchangeOrder.fee),
});
logger.info(` -> Filled with price ${exchangeOrder.filledPrice} and fee ${exchangeOrder.fee}`);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ export class SmartTradeSynchronizer {
orderId: order.id,
filledPrice: exchangeOrder.filledPrice,
filledAt: new Date(exchangeOrder.lastTradeTimestamp),
fee: exchangeOrder.fee,
fee: Number(exchangeOrder.fee),
});
console.log(` -> Filled with price ${exchangeOrder.filledPrice} and fee ${exchangeOrder.fee}`);

Expand Down
2 changes: 1 addition & 1 deletion packages/bot/src/streams/orders.stream.ts
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ export class OrdersStream extends EventEmitter {
orderId: order.id,
filledPrice: exchangeOrder.filledPrice,
filledAt: new Date(exchangeOrder.lastTradeTimestamp || Date.now()),
fee: exchangeOrder.fee,
fee: Number(exchangeOrder.fee),
});

this.emit("order", {
Expand Down
8 changes: 4 additions & 4 deletions packages/exchanges/src/exchanges/ccxt/normalize.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const getLimitOrder: Normalize["getLimitOrder"] = {
price: order.price, // could be undefined for market order, in case not filled yet?
filledPrice: order.average || null,
status: normalizeOrderStatus(order),
fee: order.fee?.cost || 0,
fee: Number(order.fee?.cost) || 0,
createdAt: order.timestamp,
lastTradeTimestamp: order.lastTradeTimestamp,
}),
Expand Down Expand Up @@ -116,7 +116,7 @@ const getOpenOrders: Normalize["getOpenOrders"] = {
price: order.price,
filledPrice: null,
status: normalizeOrderStatus(order) as "open",
fee: order.fee?.cost || 0,
fee: Number(order.fee?.cost) || 0,
createdAt: order.timestamp,
lastTradeTimestamp: order.lastTradeTimestamp,
})),
Expand All @@ -137,7 +137,7 @@ const getClosedOrders: Normalize["getClosedOrders"] = {
price: order.price,
filledPrice: order.average || order.price, // assume that filled order must always contain `order.average`
status: normalizeOrderStatus(order) as "filled" | "canceled",
fee: order.fee?.cost || 0,
fee: Number(order.fee?.cost) || 0,
createdAt: order.timestamp,
lastTradeTimestamp: order.lastTradeTimestamp,
})),
Expand Down Expand Up @@ -223,7 +223,7 @@ const watchOrders: Normalize["watchOrders"] = {
price: order.price,
filledPrice: order.average || null,
status: normalizeOrderStatus(order),
fee: order.fee?.cost || 0,
fee: Number(order.fee?.cost) || 0,
createdAt: order.timestamp,
lastTradeTimestamp: order.lastTradeTimestamp,
})),
Expand Down