Skip to content

VestingScheme : mint tokens only when collect or cancel. #609

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

Merged
merged 3 commits into from
Mar 18, 2019
Merged

VestingScheme : mint tokens only when collect or cancel. #609

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
43406fb
VestingScheme : mint tokens only when collect or cancel.
orenyodfat Mar 14, 2019
f92bf1b
Verify the agreement avatar is register as scheme
orenyodfat Mar 14, 2019
7079d03
lint
orenyodfat Mar 14, 2019
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
10 changes: 10 additions & 0 deletions contracts/universalSchemes/VestingScheme.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ contract VestingScheme is UniversalScheme, VotingMachineCallbacks, ProposalExecu
uint256 signaturesReqToCancel;
uint256 collectedPeriods;
uint256 signaturesReceivedCounter;
Avatar avatar;
mapping(address=>bool) signers;
mapping(address=>bool) signaturesReceived;
}
Expand Down Expand Up @@ -90,6 +91,7 @@ contract VestingScheme is UniversalScheme, VotingMachineCallbacks, ProposalExecu
ControllerInterface controller = ControllerInterface(avatar.owner());
uint256 tokensToMint = proposedAgreement.amountPerPeriod.mul(proposedAgreement.numOfAgreedPeriods);
require(controller.mintTokens(tokensToMint, address(this), address(avatar)));
proposedAgreement.avatar = avatar;
agreements[agreementsCounter] = proposedAgreement;
agreementsCounter++;
// Log the new agreement:
Expand Down Expand Up @@ -291,6 +293,10 @@ contract VestingScheme is UniversalScheme, VotingMachineCallbacks, ProposalExecu
*/
function collect(uint256 _agreementId) public onlyBeneficiary(_agreementId) {
Agreement memory agreement = agreements[_agreementId];
if (agreement.avatar != Avatar(0)) {
require(ControllerInterface(agreement.avatar.owner())
.isSchemeRegistered(address(this), address(agreement.avatar)));
}
uint256 periodsFromStartingBlock = (block.number.sub(agreement.startingBlock)).div(agreement.periodLength);
require(periodsFromStartingBlock >= agreement.cliffInPeriods);

Expand Down Expand Up @@ -319,6 +325,10 @@ contract VestingScheme is UniversalScheme, VotingMachineCallbacks, ProposalExecu
function cancelAgreement(uint256 _agreementId) internal {
Agreement memory agreement = agreements[_agreementId];
delete agreements[_agreementId];
if (agreement.avatar != Avatar(0)) {
require(ControllerInterface(agreement.avatar.owner())
.isSchemeRegistered(address(this), address(agreement.avatar)));
}
uint256 periodsLeft = agreement.numOfAgreedPeriods.sub(agreement.collectedPeriods);
uint256 tokensLeft = periodsLeft.mul(agreement.amountPerPeriod);
address(agreement.token).safeTransfer(agreement.returnOnCancelAddress, tokensLeft);
Expand Down