Skip to content

Create CappedToken, a capped MintableToken #515

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
frangio merged 4 commits into from
Nov 22, 2017
Merged

Create CappedToken, a capped MintableToken #515

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7a26a0e
Add capped token contract
cwhinfrey Oct 26, 2017
575372f
Add Capped Token tests
cwhinfrey Oct 26, 2017
61b5921
Fix typo
cwhinfrey Nov 11, 2017
8765e2a
Use instead of directly calling on
cwhinfrey Nov 15, 2017
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
Prev Previous commit
Use instead of directly calling on
  • Loading branch information
@cwhinfrey
cwhinfrey committed Nov 15, 2017
commit 8765e2a53ff26414972197fc015c4fb910703157
2 changes: 1 addition & 1 deletion contracts/token/CappedToken.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ contract CappedToken is MintableToken {
function mint(address _to, uint256 _amount) onlyOwner canMint public returns (bool) {
require(totalSupply.add(_amount) <= cap);

return MintableToken.mint(_to, _amount);
return super.mint(_to, _amount);
}

}