Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
openzeppelin-contracts-upgradeable
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
俞永鹏
openzeppelin-contracts-upgradeable
Commits
c4796bb9
Commit
c4796bb9
authored
May 24, 2017
by
maurelian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix comments again
parent
111f13f0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
13 deletions
+12
-13
MintableToken.sol
contracts/token/MintableToken.sol
+1
-1
VestedToken.sol
contracts/token/VestedToken.sol
+11
-12
No files found.
contracts/token/MintableToken.sol
View file @
c4796bb9
...
@@ -40,7 +40,7 @@ contract MintableToken is StandardToken, Ownable {
...
@@ -40,7 +40,7 @@ contract MintableToken is StandardToken, Ownable {
}
}
/**
/**
* @dev Function to s
pot
minting new tokens.
* @dev Function to s
top
minting new tokens.
* @return True if the operation was successful.
* @return True if the operation was successful.
*/
*/
function finishMinting() onlyOwner returns (bool) {
function finishMinting() onlyOwner returns (bool) {
...
...
contracts/token/VestedToken.sol
View file @
c4796bb9
...
@@ -9,7 +9,6 @@ import "./LimitedTransferToken.sol";
...
@@ -9,7 +9,6 @@ import "./LimitedTransferToken.sol";
* @dev Tokens that can be vested for a group of addresses.
* @dev Tokens that can be vested for a group of addresses.
*/
*/
contract VestedToken is StandardToken, LimitedTransferToken {
contract VestedToken is StandardToken, LimitedTransferToken {
struct TokenGrant {
struct TokenGrant {
address granter;
address granter;
uint256 value;
uint256 value;
...
@@ -24,9 +23,9 @@ contract VestedToken is StandardToken, LimitedTransferToken {
...
@@ -24,9 +23,9 @@ contract VestedToken is StandardToken, LimitedTransferToken {
* @dev Grant tokens to a specified address
* @dev Grant tokens to a specified address
* @param _to address The address which the tokens will be granted to.
* @param _to address The address which the tokens will be granted to.
* @param _value uint256 The amount of tokens to be granted.
* @param _value uint256 The amount of tokens to be granted.
* @param _start uint64
Represents time of the begi
ning of the grant.
* @param _start uint64
Time of the begin
ning of the grant.
* @param _cliff uint64
Represents
the cliff period.
* @param _cliff uint64
Time of
the cliff period.
* @param _vesting uint64
Represents t
he vesting period.
* @param _vesting uint64
T
he vesting period.
*/
*/
function grantVestedTokens(
function grantVestedTokens(
address _to,
address _to,
...
@@ -121,14 +120,14 @@ contract VestedToken is StandardToken, LimitedTransferToken {
...
@@ -121,14 +120,14 @@ contract VestedToken is StandardToken, LimitedTransferToken {
}
}
/**
/**
* @dev Calculate amount of vested tokens at a specifc time.
* @dev Calculate amount of vested tokens at a specifc time.
* @param tokens uint256 The amount of tokens grantted.
* @param tokens uint256 The amount of tokens grantted.
* @param time uint64 The time to be checked
* @param time uint64 The time to be checked
* @param start uint64 A time representing the begining of the grant
* @param start uint64 A time representing the begining of the grant
* @param _cliff uint64 Represents t
he cliff period.
* @param _cliff uint64 T
he cliff period.
* @param _vesting uint64 Represents t
he vesting period.
* @param _vesting uint64 T
he vesting period.
* @return An uint representing the amount of vested tokensof a specif grant.
* @return An uint representing the amount of vested tokensof a specif grant.
*/
*/
function calculateVestedTokens(
function calculateVestedTokens(
uint256 tokens,
uint256 tokens,
uint256 time,
uint256 time,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment