Migrate PrizeDistributorV2 & Unit Tests #264
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
PierrickGT
suggested changes
May 13, 2022
| @@ -32,6 +32,8 @@ contract DrawCalculatorV3 is IDrawCalculatorV3, Manageable { | |||
|
|
|||
| /// @notice DrawBuffer address | |||
| IDrawBuffer public immutable drawBuffer; | |||
|
|
|||
| IPrizeConfigHistory public immutable prizeConfigHistory; | |||
| @@ -67,6 +70,7 @@ contract DrawCalculatorV3 is IDrawCalculatorV3, Manageable { | |||
|
|
|||
| gaugeController = _gaugeController; | |||
| drawBuffer = _drawBuffer; | |||
| prizeConfigHistory = _prizeConfigHistory; | |||
|
|
|||
| emit Deployed(_gaugeController, _drawBuffer); | |||
There was a problem hiding this comment.
Log the _prizeConfigHistory address in the Deployed event.
| * @notice The PrizeDistributorV2 contract holds Tickets (captured interest) and distributes tickets to users with winning draw claims. | ||
| PrizeDistributorV2 uses an external IDrawCalculatorV3 to validate a users draw claim, before awarding payouts. To prevent users | ||
| from reclaiming prizes, a payout history for each draw claim is mapped to user accounts. Reclaiming a draw can occur | ||
| if an "optimal" prize was not included in previous claim pick indices and the new claims updated payout is greater then |
There was a problem hiding this comment.
Suggested change
| if an "optimal" prize was not included in previous claim pick indices and the new claims updated payout is greater then | |
| if an "optimal" prize was not included in previous claim pick indices and the new claims updated payout is greater than |
| IDrawCalculatorV3 _drawCalculator | ||
| ) Ownable(_owner) { | ||
| _setDrawCalculator(_drawCalculator); | ||
| require(address(_token) != address(0), "PrizeDistributorV2/token-not-zero-address"); |
There was a problem hiding this comment.
Update to fit in 32 bytes.
Suggested change
| require(address(_token) != address(0), "PrizeDistributorV2/token-not-zero-address"); | |
| require(address(_token) != address(0), "PrizeDist/token-not-zero-address"); |
| uint32[] calldata _drawIds, | ||
| bytes calldata _data | ||
| ) external returns (uint256) { | ||
|
|
| return token; | ||
| } | ||
|
|
||
| function setDrawCalculator(IDrawCalculatorV3 _newCalculator) |
|
|
||
| /* ============ Internal Functions ============ */ | ||
|
|
||
| function _getDrawPayoutBalanceOf(address _user, uint32 _drawId) |
| return userDrawPayouts[_user][_drawId]; | ||
| } | ||
|
|
||
| function _setDrawPayoutBalanceOf( |
| * @param _newCalculator IDrawCalculatorV3 address | ||
| */ | ||
| function _setDrawCalculator(IDrawCalculatorV3 _newCalculator) internal { | ||
| require(address(_newCalculator) != address(0), "PrizeDistributorV2/calc-not-zero"); |
There was a problem hiding this comment.
Suggested change
| require(address(_newCalculator) != address(0), "PrizeDistributorV2/calc-not-zero"); | |
| require(address(_newCalculator) != address(0), "PrizeDist/calc-not-zero-address"); |
| * @param _to User address | ||
| * @param _amount Transfer amount | ||
| */ | ||
| function _awardPayout(address _to, uint256 _amount) internal { |
There was a problem hiding this comment.
This function is only called once, we could inline it in the claim function.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.