NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'v1.9.0' into zos-release

Browse Source 
1.9.0
This commit is contained in:
Francisco Giordano
2018-05-17 20:04:00 -03:00
parent ff69c54497 4a10f727c4
commit 11d2bbc092
13 changed files with 50 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
contracts/lifecycle/Migrations.sol
View File

@ -1,25 +0,0 @@
pragma solidity ^0.4.21;
import "../ownership/Ownable.sol";
/**
* @title Migrations
* @dev This is a truffle contract, needed for truffle integration, not meant for use by Zeppelin users.
*/
contract Migrations is Ownable {
uint256 public lastCompletedMigration;
function Migrations() public {
Ownable.initialize(msg.sender);
}
function setCompleted(uint256 completed) onlyOwner public {
lastCompletedMigration = completed;
}
function upgrade(address newAddress) onlyOwner public {
Migrations upgraded = Migrations(newAddress);
upgraded.setCompleted(lastCompletedMigration);
}
}

2
contracts/token/ERC20/BasicToken.sol
View File

@ -43,7 +43,7 @@ contract BasicToken is ERC20Basic {
* @param _owner The address to query the the balance of.
* @return An uint256 representing the amount owned by the passed address.
*/
function balanceOf(address _owner) public view returns (uint256 balance) {
function balanceOf(address _owner) public view returns (uint256) {
return balances[_owner];
}

2
contracts/token/ERC20/MintableToken.sol
View File

@ -7,7 +7,7 @@ import "zos-lib/contracts/migrations/Migratable.sol";
/**
* @title Mintable token
* @dev Simple ERC20 Token example, with mintable token creation
* @dev Issue: * https://github.com/OpenZeppelin/zeppelin-solidity/issues/120
* @dev Issue: * https://github.com/OpenZeppelin/openzeppelin-solidity/issues/120
* Based on code by TokenMarketNet: https://github.com/TokenMarketNet/ico/blob/master/contracts/MintableToken.sol
*/
contract MintableToken is Migratable, Ownable, StandardToken {