Fix actualFee in Events

nutsfinance · Oct 23, 2023 · a52f4a1 · a52f4a1
1 parent 8daa646
commit a52f4a1
Showing 1 changed file with 10 additions and 14 deletions.
diff --git a/contracts/StableAsset.sol b/contracts/StableAsset.sol
@@ -545,9 +545,8 @@ contract StableAsset is Initializable, ReentrancyGuardUpgradeable {
  poolToken.setTotalSupply(feeAmount);
  }
 
- collectFeeOrYield(true);
- emit FeeCollected(feeAmount, totalSupply);
- emit Minted(msg.sender, mintAmount, _amounts, feeAmount);
+ uint256 actualFee = collectFeeOrYield(true);
+ emit Minted(msg.sender, mintAmount, _amounts, actualFee);
  return mintAmount;
  }
 
@@ -691,13 +690,13 @@ contract StableAsset is Initializable, ReentrancyGuardUpgradeable {
  amountPositive[_i] = false;
  amountPositive[_j] = true;
 
- uint256 feeAmountActual = collectFeeOrYield(true);
+ uint256 actualFee = collectFeeOrYield(true);
  emit TokenSwapped(
  msg.sender,
  transferAmountJ,
  amounts,
  amountPositive,
- feeAmountActual
+ actualFee
  );
  return transferAmountJ;
  }
@@ -799,9 +798,8 @@ contract StableAsset is Initializable, ReentrancyGuardUpgradeable {
  totalSupply = D - _amount;
  // After reducing the redeem fee, the remaining pool tokens are burned!
  poolToken.burnSharesFrom(msg.sender, _amount);
- collectFeeOrYield(true);
- emit FeeCollected(feeAmount, totalSupply);
- emit Redeemed(msg.sender, _amount, amounts, feeAmount);
+ uint256 actualFee = collectFeeOrYield(true);
+ emit Redeemed(msg.sender, _amount, amounts, actualFee);
  return amounts;
  }
 
@@ -899,9 +897,8 @@ contract StableAsset is Initializable, ReentrancyGuardUpgradeable {
  IERC20Upgradeable(tokens[_i]).safeTransfer(msg.sender, transferAmount);
  totalSupply = D - _amount;
  poolToken.burnSharesFrom(msg.sender, _amount);
- collectFeeOrYield(true);
- emit FeeCollected(feeAmount, totalSupply);
- emit Redeemed(msg.sender, _amount, amounts, feeAmount);
+ uint256 actualFee = collectFeeOrYield(true);
+ emit Redeemed(msg.sender, _amount, amounts, actualFee);
  return transferAmount;
  }
 
@@ -1002,9 +999,8 @@ contract StableAsset is Initializable, ReentrancyGuardUpgradeable {
  IERC20Upgradeable(tokens[i]).safeTransfer(msg.sender, _amounts[i]);
  }
 
- collectFeeOrYield(true);
- emit FeeCollected(feeAmount, totalSupply);
- emit Redeemed(msg.sender, redeemAmount, amounts, feeAmount);
+ uint256 actualFee = collectFeeOrYield(true);
+ emit Redeemed(msg.sender, redeemAmount, amounts, actualFee);
  return amounts;
  }