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

Jump to bottom

Payroll: Add reentrancy guard to payment transfers #778

Merged
merged 1 commit into from
Apr 17, 2019
Merged

Payroll: Add reentrancy guard to payment transfers #778

merged 1 commit into from
Apr 17, 2019

Conversation

facuspagnuolo
Copy link
Contributor

@facuspagnuolo facuspagnuolo commented Apr 8, 2019 •
edited
Loading

Fixes #759

The CI failed because we reached the max size limit of a contract, I'm proposing to simplify the external interface removing some redundant functions. I'm dropping addEmployeeNow and terminateEmployeeNow, in favour of leaving simply addEmployee and terminateEmployee.

@facuspagnuolo facuspagnuolo requested a review from sohkai April 8, 2019 11:55
@coveralls
Copy link

Coverage Status

Coverage remained the same at 96.734% when pulling 740d2e4 on add_reentracy_guard_payroll into 77261c8 on ensure_payroll_divisions.

sohkai
sohkai approved these changes Apr 15, 2019
View reviewed changes
Copy link
Contributor

@sohkai sohkai left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

future-apps/payroll/contracts/Payroll.sol Outdated Show resolved Hide resolved
@facuspagnuolo facuspagnuolo changed the base branch from ensure_payroll_divisions to master April 16, 2019 01:48
@facuspagnuolo facuspagnuolo force-pushed the add_reentracy_guard_payroll branch from 740d2e4 to 19e5e72 Compare April 16, 2019 02:26
@facuspagnuolo facuspagnuolo changed the title [DO NOT MERGE] Payroll: Add reentrancy guard to payment transfers Payroll: Add reentrancy guard to payment transfers Apr 16, 2019
@facuspagnuolo facuspagnuolo force-pushed the add_reentracy_guard_payroll branch from 19e5e72 to cbf9d7f Compare April 16, 2019 16:41
@facuspagnuolo
Copy link
Contributor Author

@sohkai would be great if you can take another look at these changes. I updated the description and added some tests.

@facuspagnuolo facuspagnuolo force-pushed the add_reentracy_guard_payroll branch from cbf9d7f to db60d64 Compare April 16, 2019 16:43
@facuspagnuolo facuspagnuolo changed the base branch from master to fix_price_feed_usage April 16, 2019 16:44
@facuspagnuolo facuspagnuolo changed the base branch from fix_price_feed_usage to master April 16, 2019 16:44
@facuspagnuolo facuspagnuolo force-pushed the add_reentracy_guard_payroll branch from db60d64 to f61723e Compare April 16, 2019 16:45
@facuspagnuolo facuspagnuolo changed the base branch from master to fix_price_feed_usage April 16, 2019 16:45
sohkai
sohkai approved these changes Apr 16, 2019
View reviewed changes
future-apps/payroll/contracts/test/mocks/MaliciousEmployee.sol

return true;
}
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😍 😍 😍

@facuspagnuolo facuspagnuolo changed the base branch from fix_price_feed_usage to master April 17, 2019 00:11
@facuspagnuolo facuspagnuolo force-pushed the add_reentracy_guard_payroll branch from f61723e to f136731 Compare April 17, 2019 00:27
@facuspagnuolo facuspagnuolo force-pushed the add_reentracy_guard_payroll branch from f136731 to 9d29a02 Compare April 17, 2019 11:14
@facuspagnuolo facuspagnuolo merged commit eaf09e7 into master Apr 17, 2019
@facuspagnuolo facuspagnuolo deleted the add_reentracy_guard_payroll branch April 17, 2019 14:21
ramilexe pushed a commit to ConsiderItDone/aragon-apps that referenced this pull request Dec 9, 2021
@facuspagnuolo
Payroll: Add reentracy guards (aragon#778)
837c267
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sohkai sohkai sohkai approved these changes

Assignees
No one assigned
Labels
component: contract security
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Payroll: Add reentrancy guard to transfers loop
3 participants
@facuspagnuolo @coveralls @sohkai