Payroll: handle both cases of extra salary being sent to accrued balance #912
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
facuspagnuolo
approved these changes
Jul 8, 2019
Corsaire
reviewed
Jul 14, 2019
| @@ -660,11 +660,14 @@ contract Payroll is EtherTokenConstant, IForwarder, IsContract, AragonApp { | |||
| // If they're being paid an amount that doesn't match perfectly with the adjusted time | |||
| // (up to a seconds' worth of salary), add the second and put the extra remaining salary | |||
| // into their accrued salary | |||
| uint256 extraSalary = currentSalaryPaid % salary; | |||
| // The extra check is to handle the case where someone requested less than one second of their salary | |||
| uint256 extraSalary = currentSalaryPaid < salary ? salary - currentSalaryPaid : currentSalaryPaid % salary; | |||
There was a problem hiding this comment.
salary - extraSalary should go to acrued salary in case when currentSalaryPaid > salary
I think the following code should work fine, or am I missing something?
uint256 extraSalary = currentSalaryPaid % salary;
if (extraSalary > 0) {
timeDiff = timeDiff.add(1);
employee.accruedSalary = salary - extraSalary;
}
Examples:
Salary == 10and you want to getcurrentSalaryPaid == 21.
Time difference would be 3. Contract will transfercurrentSalaryPaid == 21and 10 - 21%10 = 9 will go to the accrued salary.Salary == 10and you want to getcurrentSalaryPaid == 1.
Time difference would be 1. Contract will transfercurrentSalaryPaid == 1and 10 - 1%10 = 9 will go to the accrued salary.
There was a problem hiding this comment.
Yes... this is a good catch. I think the current state doesn't represent the
currentSalaryPaid == 21and 10 - 21%10 = 9
case correctly; it'd put 1 into the accrued salary instead of 9.
cc @facuspagnuolo may also want to double check this, but your judgement on this simplification seems correct @Corsaire :).
There was a problem hiding this comment.
True, we were close in our first attempt here haha 😅
ramilexe
pushed a commit
to ConsiderItDone/aragon-apps
that referenced
this pull request
Dec 9, 2021
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.
Handles both the cases, where someone may: