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.

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

Add Payroll app #81

Merged
merged 27 commits into from Feb 12, 2018

Conversation

Projects
None yet
3 participants
@bingen
Contributor

bingen commented Jan 30, 2018

No description provided.

bingen added some commits Jan 2, 2018

payroll: several improvements
Address changes proposed by @izqui:

Reorganize roles, move allowed tokens to global, remove employer
field, remove Oracle dependency, get rid of escapeHatch, fix
payrollRunway and some other minor fixes.
Change Salary denomination
to a generic token and convert it to 'per second'. Now employee can
call payday at any time and will receive proportional amount owed.
Besides:
- Adapted to Aragon OS 3.0
- Removed ERC677 dependency
@coveralls

This comment has been minimized.

Show comment
Hide comment
@coveralls

coveralls Jan 30, 2018

Coverage Status

Coverage increased (+0.02%) to 94.864% when pulling 1942dfb on bingen:payroll3 into c44aaff on aragon:master.

coveralls commented Jan 30, 2018

Coverage Status

Coverage increased (+0.02%) to 94.864% when pulling 1942dfb on bingen:payroll3 into c44aaff on aragon:master.

@izqui

Looking great 💯 !

Adding some comments and suggestions

Show outdated Hide outdated README.md
Show outdated Hide outdated README.md
Show outdated Hide outdated future-apps/payroll/build/contracts/App.json
Show outdated Hide outdated future-apps/payroll/coverage/base.css
Show outdated Hide outdated future-apps/payroll/module.json
Show outdated Hide outdated future-apps/payroll/contracts/Payroll.sol
Show outdated Hide outdated future-apps/payroll/contracts/Payroll.sol
Show outdated Hide outdated future-apps/payroll/contracts/Payroll.sol
Show outdated Hide outdated future-apps/payroll/contracts/Payroll.sol
Show outdated Hide outdated future-apps/payroll/contracts/Payroll.sol

bingen added some commits Jan 31, 2018

payroll: Address PR review comments
- Fix general README
- Add future apps to .gitignore
- Rename events
- Remove ether and denomination tokens from allowed ones by default
- Use external instead of public
- Remove addFunds
- Other minor fixes
payroll: Address PR review comments
- Fine grain roles and add parameters to them
- Convert addAllowedTokens to single token
- Check out owed salary on employee removal
- Remove metrics storage (to be done on the frontend)
payroll: Address PR review comments
Make the contract forwarder for employees.
payroll: Adapt to new role naming scheme
Besides, update .gitignore to PR #82.
payroll: Remove last allocation restriction
Now employees can determine their token allocation whenever they want.
payroll: minor fixes
- Shrink some uints
- Add some tests
- Add Employee event
payroll: remove receiveApproval function
Not needed as theres the escape Hatch mechanism in depositToFinance.
Besides, remove unnecessary check in getAllocation.

bingen added some commits Feb 6, 2018

payroll: address PR comments
Several style fixes.
Fix payroll and finance global tests
Restart ganache-cli to avoid funds outage.
Restart ganache-cli for the other apps too
Token Manager, Vault and Voting. To make sure they all have a fresh
running ganache instance running on start.
Remove global ganache-cli
No need to start it as every app will do it.

@bingen bingen merged commit e984a64 into aragon:master Feb 12, 2018

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage increased (+0.02%) to 94.864%
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment