Skip to content
This repository has been archived by the owner on Jul 2, 2024. It is now read-only.

Fix double PositionFeeCharged event emission #193

Merged
merged 1 commit into from
Jun 2, 2023
Merged

Fix double PositionFeeCharged event emission #193

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 4 additions & 16 deletions packages/perennial/contracts/product/Product.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,10 +221,7 @@ contract Product is IProduct, UInitializable, UParamProvider, UPayoffProvider, U
_position.pre.openTake(latestOracleVersion.version, amount);

UFixed18 positionFee = amount.mul(latestOracleVersion.price.abs()).mul(takerFee());
if (!positionFee.isZero()) {
controller().collateral().settleAccount(account, Fixed18Lib.from(-1, positionFee));
emit PositionFeeCharged(account, latestOracleVersion.version, positionFee);
}
if (!positionFee.isZero()) controller().collateral().settleAccount(account, Fixed18Lib.from(-1, positionFee));

emit PositionFeeCharged(account, latestOracleVersion.version, positionFee);
emit TakeOpened(account, latestOracleVersion.version, amount);
Expand Down Expand Up @@ -262,10 +259,7 @@ contract Product is IProduct, UInitializable, UParamProvider, UPayoffProvider, U
_position.pre.closeTake(latestOracleVersion.version, amount);

UFixed18 positionFee = amount.mul(latestOracleVersion.price.abs()).mul(takerFee());
if (!positionFee.isZero()) {
controller().collateral().settleAccount(account, Fixed18Lib.from(-1, positionFee));
emit PositionFeeCharged(account, latestOracleVersion.version, positionFee);
}
if (!positionFee.isZero()) controller().collateral().settleAccount(account, Fixed18Lib.from(-1, positionFee));

emit PositionFeeCharged(account, latestOracleVersion.version, positionFee);
emit TakeClosed(account, latestOracleVersion.version, amount);
Expand Down Expand Up @@ -303,10 +297,7 @@ contract Product is IProduct, UInitializable, UParamProvider, UPayoffProvider, U
_position.pre.openMake(latestOracleVersion.version, amount);

UFixed18 positionFee = amount.mul(latestOracleVersion.price.abs()).mul(makerFee());
if (!positionFee.isZero()) {
controller().collateral().settleAccount(account, Fixed18Lib.from(-1, positionFee));
emit PositionFeeCharged(account, latestOracleVersion.version, positionFee);
}
if (!positionFee.isZero()) controller().collateral().settleAccount(account, Fixed18Lib.from(-1, positionFee));

emit PositionFeeCharged(account, latestOracleVersion.version, positionFee);
emit MakeOpened(account, latestOracleVersion.version, amount);
Expand Down Expand Up @@ -345,10 +336,7 @@ contract Product is IProduct, UInitializable, UParamProvider, UPayoffProvider, U
_position.pre.closeMake(latestOracleVersion.version, amount);

UFixed18 positionFee = amount.mul(latestOracleVersion.price.abs()).mul(makerFee());
if (!positionFee.isZero()) {
controller().collateral().settleAccount(account, Fixed18Lib.from(-1, positionFee));
emit PositionFeeCharged(account, latestOracleVersion.version, positionFee);
}
if (!positionFee.isZero()) controller().collateral().settleAccount(account, Fixed18Lib.from(-1, positionFee));

emit PositionFeeCharged(account, latestOracleVersion.version, positionFee);
emit MakeClosed(account, latestOracleVersion.version, amount);
Expand Down