Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
743b54b
rename ERC20 to IERC20
frangio Aug 28, 2018
74ed563
move ERC20.sol to IERC20.sol
frangio Aug 28, 2018
e2cd31e
rename StandardToken to ERC20
frangio Aug 28, 2018
9891e06
rename StandardTokenMock to ERC20Mock
frangio Aug 29, 2018
9ff5308
move StandardToken.sol to ERC20.sol, likewise test and mock files
frangio Aug 29, 2018
0da0906
rename MintableToken to ERC20Mintable
frangio Aug 29, 2018
f0b10ed
move MintableToken.sol to ERC20Mintable.sol, likewise test and mock f…
frangio Aug 29, 2018
05a3484
rename BurnableToken to ERC20Burnable
frangio Aug 29, 2018
06cc72c
move BurnableToken.sol to ERC20Burnable.sol, likewise for related files
frangio Aug 29, 2018
d422ca0
rename CappedToken to ERC20Capped
frangio Aug 29, 2018
1b176ee
move CappedToken.sol to ERC20Capped.sol, likewise for related files
frangio Aug 29, 2018
b537307
rename PausableToken to ERC20Pausable
frangio Aug 29, 2018
890574c
move PausableToken.sol to ERC20Pausable.sol, likewise for related files
frangio Aug 29, 2018
f76cfae
rename DetailedERC20 to ERC20Detailed
frangio Aug 29, 2018
50c43fe
move DetailedERC20.sol to ERC20Detailed.sol, likewise for related files
frangio Aug 29, 2018
7f4cb7d
rename ERC721 to IERC721, and likewise for other related interfaces
frangio Aug 29, 2018
1e79c63
move ERC721.sol to IERC721.sol, likewise for other 721 interfaces
frangio Aug 29, 2018
af192a7
rename ERC721Token to ERC721
frangio Aug 29, 2018
47f542a
move ERC721Token.sol to ERC721.sol, likewise for related files
frangio Aug 29, 2018
276bfb9
rename ERC721BasicToken to ERC721Basic
frangio Aug 29, 2018
463a01b
move ERC721BasicToken.sol to ERC721Basic.sol, likewise for related files
frangio Aug 29, 2018
05d9ae8
rename ERC721PausableToken to ERC721Pausable
frangio Aug 29, 2018
6795ac4
move ERC721PausableToken.sol to ERC721Pausable.sol
frangio Aug 29, 2018
ef3bffe
rename ERC165 to IERC165
frangio Aug 29, 2018
81ea4a8
move ERC165.sol to IERC165.sol
frangio Aug 29, 2018
2cc6332
amend comment that ERC20 is based on FirstBlood
frangio Aug 29, 2018
bb65756
fix comments mentioning IERC721Receiver
frangio Aug 30, 2018
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
Next Next commit
rename StandardToken to ERC20
  • Loading branch information
frangio committed Aug 29, 2018
commit e2cd31e9e0a04d42f441c09063d99888ed272547
4 changes: 2 additions & 2 deletions contracts/examples/SimpleToken.sol
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import "../token/ERC20/StandardToken.sol";
* @title SimpleToken
* @dev Very simple ERC20 Token example, where all tokens are pre-assigned to the creator.
* Note they can later distribute these tokens as they wish using `transfer` and other
* `StandardToken` functions.
* `ERC20` functions.
*/
contract SimpleToken is StandardToken {
contract SimpleToken is ERC20 {

string public constant name = "SimpleToken";
string public constant symbol = "SIM";
Expand Down
2 changes: 1 addition & 1 deletion contracts/mocks/DetailedERC20Mock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import "../token/ERC20/StandardToken.sol";
import "../token/ERC20/DetailedERC20.sol";


contract DetailedERC20Mock is StandardToken, DetailedERC20 {
contract DetailedERC20Mock is ERC20, DetailedERC20 {
constructor(
string _name,
string _symbol,
Expand Down
2 changes: 1 addition & 1 deletion contracts/mocks/ERC20WithMetadataMock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import "../token/ERC20/StandardToken.sol";
import "../proposals/ERC1046/TokenMetadata.sol";


contract ERC20WithMetadataMock is StandardToken, ERC20WithMetadata {
contract ERC20WithMetadataMock is ERC20, ERC20WithMetadata {
constructor(string _tokenURI) public
ERC20WithMetadata(_tokenURI)
{
Expand Down
2 changes: 1 addition & 1 deletion contracts/mocks/ERC223TokenMock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ contract ERC223ContractInterface {
}


contract ERC223TokenMock is StandardToken {
contract ERC223TokenMock is ERC20 {

constructor(address _initialAccount, uint256 _initialBalance) public {
_mint(_initialAccount, _initialBalance);
Expand Down
4 changes: 2 additions & 2 deletions contracts/mocks/StandardTokenMock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ pragma solidity ^0.4.24;
import "../token/ERC20/StandardToken.sol";


// mock class using StandardToken
contract StandardTokenMock is StandardToken {
// mock class using ERC20
contract StandardTokenMock is ERC20 {

constructor(address _initialAccount, uint256 _initialBalance) public {
_mint(_initialAccount, _initialBalance);
Expand Down
4 changes: 2 additions & 2 deletions contracts/token/ERC20/BurnableToken.sol
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import "./StandardToken.sol";
* @title Burnable Token
* @dev Token that can be irreversibly burned (destroyed).
*/
contract BurnableToken is StandardToken {
contract BurnableToken is ERC20 {

event TokensBurned(address indexed burner, uint256 value);

Expand All @@ -29,7 +29,7 @@ contract BurnableToken is StandardToken {
}

/**
* @dev Overrides StandardToken._burn in order for burn and burnFrom to emit
* @dev Overrides ERC20._burn in order for burn and burnFrom to emit
* an additional Burn event.
*/
function _burn(address _who, uint256 _value) internal {
Expand Down
2 changes: 1 addition & 1 deletion contracts/token/ERC20/MintableToken.sol
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import "../../ownership/Ownable.sol";
* @dev Simple ERC20 Token example, with mintable token creation
* Based on code by TokenMarketNet: https://github.com/TokenMarketNet/ico/blob/master/contracts/MintableToken.sol
*/
contract MintableToken is StandardToken, Ownable {
contract MintableToken is ERC20, Ownable {
event Mint(address indexed to, uint256 amount);
event MintFinished();

Expand Down
4 changes: 2 additions & 2 deletions contracts/token/ERC20/PausableToken.sol
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import "../../lifecycle/Pausable.sol";

/**
* @title Pausable token
* @dev StandardToken modified with pausable transfers.
* @dev ERC20 modified with pausable transfers.
**/
contract PausableToken is StandardToken, Pausable {
contract PausableToken is ERC20, Pausable {

function transfer(
address _to,
Expand Down
2 changes: 1 addition & 1 deletion contracts/token/ERC20/StandardToken.sol
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import "../../math/SafeMath.sol";
* https://github.com/ethereum/EIPs/blob/master/EIPS/eip-20.md
* Based on code by FirstBlood: https://github.com/Firstbloodio/token/blob/master/smart_contract/FirstBloodToken.sol
*/
contract StandardToken is IERC20 {
contract ERC20 is IERC20 {
using SafeMath for uint256;

mapping (address => uint256) private balances_;
Expand Down
4 changes: 2 additions & 2 deletions test/crowdsale/MintedCrowdsale.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const BigNumber = web3.BigNumber;
const MintedCrowdsale = artifacts.require('MintedCrowdsaleImpl');
const MintableToken = artifacts.require('MintableToken');
const RBACMintableToken = artifacts.require('RBACMintableToken');
const StandardToken = artifacts.require('StandardToken');
const ERC20 = artifacts.require('ERC20');

contract('MintedCrowdsale', function ([_, investor, wallet, purchaser]) {
const rate = new BigNumber(1000);
Expand Down Expand Up @@ -45,7 +45,7 @@ contract('MintedCrowdsale', function ([_, investor, wallet, purchaser]) {

describe('using non-mintable token', function () {
beforeEach(async function () {
this.token = await StandardToken.new();
this.token = await ERC20.new();
this.crowdsale = await MintedCrowdsale.new(rate, wallet, this.token.address);
});

Expand Down
6 changes: 3 additions & 3 deletions test/token/ERC20/StandardToken.test.js
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
const { assertRevert } = require('../../helpers/assertRevert');
const expectEvent = require('../../helpers/expectEvent');

const StandardToken = artifacts.require('StandardTokenMock');
const ERC20 = artifacts.require('StandardTokenMock');

const BigNumber = web3.BigNumber;

require('chai')
.use(require('chai-bignumber')(BigNumber))
.should();

contract('StandardToken', function ([_, owner, recipient, anotherAccount]) {
contract('ERC20', function ([_, owner, recipient, anotherAccount]) {
const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000';

beforeEach(async function () {
this.token = await StandardToken.new(owner, 100);
this.token = await ERC20.new(owner, 100);
});

describe('total supply', function () {
Expand Down