Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Normalizing by decimal delta between asset and vault #123

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+11 −3
Open

Normalizing by decimal delta between asset and vault #123

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5b15d63
Normalizing by decimal delta between asset and vault
Nov 11, 2024
0aee06e
Let's remove a couple CALL on the constructor
Nov 11, 2024
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
14 changes: 11 additions & 3 deletions src/WrappedVault.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,9 @@ contract WrappedVault is Owned, ERC20, IWrappedVault {
/// @dev Maps a reward (either token or points) to a claimant, to accrued fees
mapping(address => mapping(address => uint256)) public rewardToClaimantToFees;

/// @dev Normalizes rewardsPerToken for vaults with high decimals or decimals offset
uint256 public immutable DECIMAL_NORMALIZATION_FACTOR;

/*//////////////////////////////////////////////////////////////
CONSTRUCTOR
//////////////////////////////////////////////////////////////*/
Expand Down Expand Up @@ -137,6 +140,11 @@ contract WrappedVault is Owned, ERC20, IWrappedVault {
DEPOSIT_ASSET = ERC20(VAULT.asset());
POINTS_FACTORY = PointsFactory(pointsFactory);

uint256 vaultDecimals = ERC20(vault).decimals();
uint256 assetDecimals = DEPOSIT_ASSET.decimals();
uint256 decimalOffset = vaultDecimals > assetDecimals ? vaultDecimals - assetDecimals : 0;
DECIMAL_NORMALIZATION_FACTOR = 10 ** decimalOffset;

_mint(address(0), 10_000); // Burn 10,000 wei to stop 'first share' front running attacks on depositors

DEPOSIT_ASSET.approve(vault, type(uint256).max);
Expand Down Expand Up @@ -351,7 +359,7 @@ contract WrappedVault is Owned, ERC20, IWrappedVault {

uint256 elapsedWAD = elapsed * 1e18;
// Calculate and update the new value of the accumulator.
rewardsPerTokenOut.accumulated = (rewardsPerTokenIn.accumulated + (elapsedWAD.mulDivDown(rewardsInterval_.rate, totalSupply))); // The
rewardsPerTokenOut.accumulated = (rewardsPerTokenIn.accumulated + (elapsedWAD.mulDivDown(rewardsInterval_.rate * DECIMAL_NORMALIZATION_FACTOR, totalSupply))); // The
// rewards per token are scaled up for precision

return rewardsPerTokenOut;
Expand Down Expand Up @@ -397,7 +405,7 @@ contract WrappedVault is Owned, ERC20, IWrappedVault {
if (userRewards_.checkpoint == rewardsPerToken_.accumulated) return userRewards_;

// Calculate and update the new value user reserves.
userRewards_.accumulated += _calculateUserRewards(balanceOf[user], userRewards_.checkpoint, rewardsPerToken_.accumulated).toUint128();
userRewards_.accumulated += _calculateUserRewards(balanceOf[user], userRewards_.checkpoint, rewardsPerToken_.accumulated).toUint128() / DECIMAL_NORMALIZATION_FACTOR;
userRewards_.checkpoint = rewardsPerToken_.accumulated;

rewardToUserToAR[reward][user] = userRewards_;
Expand Down Expand Up @@ -473,7 +481,7 @@ contract WrappedVault is Owned, ERC20, IWrappedVault {
function currentUserRewards(address reward, address user) public view returns (uint256) {
UserRewards memory accumulatedRewards_ = rewardToUserToAR[reward][user];
RewardsPerToken memory rewardsPerToken_ = _calculateRewardsPerToken(rewardToRPT[reward], rewardToInterval[reward]);
return accumulatedRewards_.accumulated + _calculateUserRewards(balanceOf[user], accumulatedRewards_.checkpoint, rewardsPerToken_.accumulated);
return accumulatedRewards_.accumulated + (_calculateUserRewards(balanceOf[user], accumulatedRewards_.checkpoint, rewardsPerToken_.accumulated) / DECIMAL_NORMALIZATION_FACTOR);
}

/// @notice Calculates the rate a user would receive in rewards after depositing assets
Expand Down
Loading