Merge pull request #79 from liquity/D-A1

fix: Emit both amounts coming from LQTYStaking and total ones on unst…
liquity · Nov 21, 2024 · 1926488 · 1926488
2 parents d6d3edf + f22ce5c
commit 1926488
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/src/UserProxy.sol b/src/UserProxy.sol
@@ -63,6 +63,10 @@ contract UserProxy is IUserProxy {
         onlyStakingV2
         returns (uint256 lusdAmount, uint256 ethAmount)
     {
+        uint256 initialLQTYAmount = lqty.balanceOf(address(this));
+        uint256 initialLUSDAmount = lusd.balanceOf(address(this));
+        uint256 initialETHAmount = address(this).balance;
+
         stakingV1.unstake(_amount);
 
         uint256 lqtyAmount = lqty.balanceOf(address(this));
@@ -75,7 +79,15 @@ contract UserProxy is IUserProxy {
             require(success, "UserProxy: eth-fail");
         }
 
-        emit Unstake(_amount, _recipient, lusdAmount, ethAmount);
+        emit Unstake(
+            _recipient,
+            lqtyAmount - initialLQTYAmount,
+            lqtyAmount,
+            lusdAmount - initialLUSDAmount,
+            lusdAmount,
+            ethAmount - initialETHAmount,
+            ethAmount
+        );
     }
 
     /// @inheritdoc IUserProxy

diff --git a/src/interfaces/IUserProxy.sol b/src/interfaces/IUserProxy.sol
@@ -9,7 +9,15 @@ import {PermitParams} from "../utils/Types.sol";
 
 interface IUserProxy {
     event Stake(uint256 amount, address lqtyFrom);
-    event Unstake(uint256 lqtyUnstaked, address indexed lqtyRecipient, uint256 lusdAmount, uint256 ethAmount);
+    event Unstake(
+        address indexed lqtyRecipient,
+        uint256 lqtyReceived,
+        uint256 lqtySent,
+        uint256 lusdAmountReceived,
+        uint256 lusdAmountSent,
+        uint256 ethAmountReceived,
+        uint256 ethAmountSent
+    );
 
     /// @notice Address of the LQTY token
     /// @return lqty Address of the LQTY token