Skip to content

Commit

Permalink
Revert "[CT-629] Fix entryPrice calc" (#2425)
Browse files Browse the repository at this point in the history
(cherry picked from commit a282777)
  • Loading branch information
dydxwill authored and mergify[bot] committed Oct 1, 2024
1 parent 6005a0d commit 960f732
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ describe('LiquidationHandler', () => {
perpetualId: testConstants.defaultPerpetualMarket.id,
side: PositionSide.LONG,
status: PerpetualPositionStatus.OPEN,
size: '5',
size: '10',
maxSize: '25',
sumOpen: '10',
entryPrice: '15000',
Expand Down Expand Up @@ -392,7 +392,7 @@ describe('LiquidationHandler', () => {
defaultPerpetualPosition.openEventId,
),
{
sumOpen: Big(defaultPerpetualPosition.sumOpen!).plus(totalFilled).toFixed(),
sumOpen: Big(defaultPerpetualPosition.size).plus(totalFilled).toFixed(),
entryPrice: getWeightedAverage(
defaultPerpetualPosition.entryPrice!,
defaultPerpetualPosition.size,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ describe('OrderHandler', () => {
perpetualId: testConstants.defaultPerpetualMarket.id,
side: PositionSide.LONG,
status: PerpetualPositionStatus.OPEN,
size: '5',
size: '10',
maxSize: '25',
sumOpen: '10',
entryPrice: '15000',
Expand Down Expand Up @@ -439,7 +439,7 @@ describe('OrderHandler', () => {
defaultPerpetualPosition.openEventId,
),
{
sumOpen: Big(defaultPerpetualPosition.sumOpen!).plus(totalFilled).toFixed(),
sumOpen: Big(defaultPerpetualPosition.size).plus(totalFilled).toFixed(),
entryPrice: getWeightedAverage(
defaultPerpetualPosition.entryPrice!,
defaultPerpetualPosition.size,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ BEGIN
perpetual_position_record."side", order_side) THEN
sum_open = dydx_trim_scale(perpetual_position_record."sumOpen" + fill_amount);
entry_price = dydx_get_weighted_average(
perpetual_position_record."entryPrice", perpetual_position_record."size",
perpetual_position_record."entryPrice", perpetual_position_record."sumOpen",
maker_price, fill_amount);
perpetual_position_record."sumOpen" = sum_open;
perpetual_position_record."entryPrice" = entry_price;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ BEGIN
IF dydx_perpetual_position_and_order_side_matching(perpetual_position_record."side", side) THEN
sum_open := dydx_trim_scale(perpetual_position_record."sumOpen" + size);
entry_price := dydx_get_weighted_average(
perpetual_position_record."entryPrice", perpetual_position_record."size", price, size
perpetual_position_record."entryPrice", perpetual_position_record."sumOpen", price, size
);
perpetual_position_record."sumOpen" = sum_open;
perpetual_position_record."entryPrice" = entry_price;
Expand Down

0 comments on commit 960f732

Please sign in to comment.