pull/457/head
sot528 7 years ago
parent 74e416f04f
commit b069827bad
  1. 2
      contracts/Bounty.sol
  2. 2
      contracts/DayLimit.sol
  3. 2
      contracts/crowdsale/CappedCrowdsale.sol
  4. 4
      contracts/crowdsale/FinalizableCrowdsale.sol
  5. 2
      contracts/examples/SimpleToken.sol
  6. 2
      contracts/ownership/CanReclaimToken.sol
  7. 4
      contracts/token/LimitedTransferToken.sol
  8. 6
      contracts/token/VestedToken.sol

@ -16,7 +16,7 @@ contract Bounty is PullPayment, Destructible {
event TargetCreated(address createdAddress);
/**
* @dev Fallback function allowing the contract to recieve funds, if they haven't already been claimed.
* @dev Fallback function allowing the contract to receive funds, if they haven't already been claimed.
*/
function() payable {
require(!claimed);

@ -38,7 +38,7 @@ contract DayLimit {
/**
* @dev Checks to see if there is enough resource to spend today. If true, the resource may be expended.
* @param _value uint256 representing the amount of resource to spend.
* @return A boolean that is True if the resource was spended and false otherwise.
* @return A boolean that is True if the resource was spent and false otherwise.
*/
function underLimit(uint256 _value) internal returns (bool) {
// reset the spend limit if we're on a different day to last time.

@ -5,7 +5,7 @@ import './Crowdsale.sol';
/**
* @title CappedCrowdsale
* @dev Extension of Crowsdale with a max amount of funds raised
* @dev Extension of Crowdsale with a max amount of funds raised
*/
contract CappedCrowdsale is Crowdsale {
using SafeMath for uint256;

@ -6,7 +6,7 @@ import './Crowdsale.sol';
/**
* @title FinalizableCrowdsale
* @dev Extension of Crowsdale where an owner can do extra work
* @dev Extension of Crowdsale where an owner can do extra work
* after finishing.
*/
contract FinalizableCrowdsale is Crowdsale, Ownable {
@ -31,7 +31,7 @@ contract FinalizableCrowdsale is Crowdsale, Ownable {
}
/**
* @dev Can be overriden to add finalization logic. The overriding function
* @dev Can be overridden to add finalization logic. The overriding function
* should call super.finalization() to ensure the chain of finalization is
* executed entirely.
*/

@ -19,7 +19,7 @@ contract SimpleToken is StandardToken {
uint256 public constant INITIAL_SUPPLY = 10000 * (10 ** uint256(decimals));
/**
* @dev Contructor that gives msg.sender all of existing tokens.
* @dev Constructor that gives msg.sender all of existing tokens.
*/
function SimpleToken() {
totalSupply = INITIAL_SUPPLY;

@ -7,7 +7,7 @@ import "../token/SafeERC20.sol";
/**
* @title Contracts that should be able to recover tokens
* @author SylTi
* @dev This allow a contract to recover any ERC20 token received in a contract by transfering the balance to the contract owner.
* @dev This allow a contract to recover any ERC20 token received in a contract by transferring the balance to the contract owner.
* This will prevent any accidental loss of tokens.
*/
contract CanReclaimToken is Ownable {

@ -29,7 +29,7 @@ contract LimitedTransferToken is ERC20 {
/**
* @dev Checks modifier and allows transfer if tokens are not locked.
* @param _to The address that will recieve the tokens.
* @param _to The address that will receive the tokens.
* @param _value The amount of tokens to be transferred.
*/
function transfer(address _to, uint256 _value) canTransfer(msg.sender, _value) public returns (bool) {
@ -39,7 +39,7 @@ contract LimitedTransferToken is ERC20 {
/**
* @dev Checks modifier and allows transfer if tokens are not locked.
* @param _from The address that will send the tokens.
* @param _to The address that will recieve the tokens.
* @param _to The address that will receive the tokens.
* @param _value The amount of tokens to be transferred.
*/
function transferFrom(address _from, address _to, uint256 _value) canTransfer(_from, _value) public returns (bool) {

@ -179,7 +179,7 @@ contract VestedToken is StandardToken, LimitedTransferToken {
}
/**
* @dev Get all information about a specifc grant.
* @dev Get all information about a specific grant.
* @param _holder The address which will have its tokens revoked.
* @param _grantId The id of the token grant.
* @return Returns all the values that represent a TokenGrant(address, value, start, cliff,
@ -219,7 +219,7 @@ contract VestedToken is StandardToken, LimitedTransferToken {
* @dev Calculate the amount of non vested tokens at a specific time.
* @param grant TokenGrant The grant to be checked.
* @param time uint64 The time to be checked
* @return An uint256 representing the amount of non vested tokens of a specifc grant on the
* @return An uint256 representing the amount of non vested tokens of a specific grant on the
* passed time frame.
*/
function nonVestedTokens(TokenGrant grant, uint64 time) private constant returns (uint256) {
@ -227,7 +227,7 @@ contract VestedToken is StandardToken, LimitedTransferToken {
}
/**
* @dev Calculate the date when the holder can trasfer all its tokens
* @dev Calculate the date when the holder can transfer all its tokens
* @param holder address The address of the holder
* @return An uint256 representing the date of the last transferable tokens.
*/

Loading…
Cancel
Save