diff --git a/contracts/crowdsale/Crowdsale.sol b/contracts/crowdsale/Crowdsale.sol index 012ee4eed..676812268 100644 --- a/contracts/crowdsale/Crowdsale.sol +++ b/contracts/crowdsale/Crowdsale.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.18; -import "../token/MintableToken.sol"; +import "../token/ERC20/MintableToken.sol"; import "../math/SafeMath.sol"; diff --git a/contracts/examples/SampleCrowdsale.sol b/contracts/examples/SampleCrowdsale.sol index 9b506695f..7827bf8dd 100644 --- a/contracts/examples/SampleCrowdsale.sol +++ b/contracts/examples/SampleCrowdsale.sol @@ -2,7 +2,7 @@ pragma solidity ^0.4.18; import "../crowdsale/CappedCrowdsale.sol"; import "../crowdsale/RefundableCrowdsale.sol"; -import "../token/MintableToken.sol"; +import "../token/ERC20/MintableToken.sol"; /** diff --git a/contracts/examples/SimpleToken.sol b/contracts/examples/SimpleToken.sol index 4f03e06dc..cd5a0e9ca 100644 --- a/contracts/examples/SimpleToken.sol +++ b/contracts/examples/SimpleToken.sol @@ -1,7 +1,7 @@ pragma solidity ^0.4.18; -import "../token/StandardToken.sol"; +import "../token/ERC20/StandardToken.sol"; /** diff --git a/contracts/mocks/BasicTokenMock.sol b/contracts/mocks/BasicTokenMock.sol index 073f16289..18aacee38 100644 --- a/contracts/mocks/BasicTokenMock.sol +++ b/contracts/mocks/BasicTokenMock.sol @@ -1,7 +1,7 @@ pragma solidity ^0.4.18; -import "../token/BasicToken.sol"; +import "../token/ERC20/BasicToken.sol"; // mock class using BasicToken diff --git a/contracts/mocks/BurnableTokenMock.sol b/contracts/mocks/BurnableTokenMock.sol index 2cbb03603..2a162200d 100644 --- a/contracts/mocks/BurnableTokenMock.sol +++ b/contracts/mocks/BurnableTokenMock.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.18; -import "../token/BurnableToken.sol"; +import "../token/ERC20/BurnableToken.sol"; contract BurnableTokenMock is BurnableToken { diff --git a/contracts/mocks/DetailedERC20Mock.sol b/contracts/mocks/DetailedERC20Mock.sol index 81aca044a..f92b54b46 100644 --- a/contracts/mocks/DetailedERC20Mock.sol +++ b/contracts/mocks/DetailedERC20Mock.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.18; -import "../token/StandardToken.sol"; +import "../token/ERC20/StandardToken.sol"; import "../token/ERC20/DetailedERC20.sol"; diff --git a/contracts/mocks/ERC223TokenMock.sol b/contracts/mocks/ERC223TokenMock.sol index d400e29d4..809520716 100644 --- a/contracts/mocks/ERC223TokenMock.sol +++ b/contracts/mocks/ERC223TokenMock.sol @@ -1,8 +1,6 @@ pragma solidity ^0.4.18; - -import "../token/BasicToken.sol"; - +import "../token/ERC20/BasicToken.sol"; contract ERC223ContractInterface { function tokenFallback(address _from, uint256 _value, bytes _data) external; diff --git a/contracts/mocks/PausableTokenMock.sol b/contracts/mocks/PausableTokenMock.sol index 447577bcd..889ec5fae 100644 --- a/contracts/mocks/PausableTokenMock.sol +++ b/contracts/mocks/PausableTokenMock.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.18; -import "../token/PausableToken.sol"; +import "../token/ERC20/PausableToken.sol"; // mock class using PausableToken diff --git a/contracts/mocks/StandardTokenMock.sol b/contracts/mocks/StandardTokenMock.sol index 7fc996b37..778b78bd9 100644 --- a/contracts/mocks/StandardTokenMock.sol +++ b/contracts/mocks/StandardTokenMock.sol @@ -1,8 +1,6 @@ pragma solidity ^0.4.18; - -import "../token/StandardToken.sol"; - +import "../token/ERC20/StandardToken.sol"; // mock class using StandardToken contract StandardTokenMock is StandardToken { diff --git a/contracts/token/BasicToken.sol b/contracts/token/ERC20/BasicToken.sol similarity index 95% rename from contracts/token/BasicToken.sol rename to contracts/token/ERC20/BasicToken.sol index 4dafb89be..b0769bfb9 100644 --- a/contracts/token/BasicToken.sol +++ b/contracts/token/ERC20/BasicToken.sol @@ -1,8 +1,8 @@ pragma solidity ^0.4.18; -import "./ERC20/ERC20Basic.sol"; -import "../math/SafeMath.sol"; +import "./ERC20Basic.sol"; +import "../../math/SafeMath.sol"; /** diff --git a/contracts/token/BurnableToken.sol b/contracts/token/ERC20/BurnableToken.sol similarity index 100% rename from contracts/token/BurnableToken.sol rename to contracts/token/ERC20/BurnableToken.sol diff --git a/contracts/token/CappedToken.sol b/contracts/token/ERC20/CappedToken.sol similarity index 99% rename from contracts/token/CappedToken.sol rename to contracts/token/ERC20/CappedToken.sol index 9c3b2ebae..f67f9e402 100644 --- a/contracts/token/CappedToken.sol +++ b/contracts/token/ERC20/CappedToken.sol @@ -7,7 +7,6 @@ import "./MintableToken.sol"; * @title Capped token * @dev Mintable token with a token cap. */ - contract CappedToken is MintableToken { uint256 public cap; diff --git a/contracts/token/ERC20/ERC20.sol b/contracts/token/ERC20/ERC20.sol index 770a9689e..732df1f61 100644 --- a/contracts/token/ERC20/ERC20.sol +++ b/contracts/token/ERC20/ERC20.sol @@ -1,6 +1,5 @@ pragma solidity ^0.4.18; - import "./ERC20Basic.sol"; diff --git a/contracts/token/MintableToken.sol b/contracts/token/ERC20/MintableToken.sol similarity index 97% rename from contracts/token/MintableToken.sol rename to contracts/token/ERC20/MintableToken.sol index 3cc4c20ab..21915ea15 100644 --- a/contracts/token/MintableToken.sol +++ b/contracts/token/ERC20/MintableToken.sol @@ -1,9 +1,7 @@ pragma solidity ^0.4.18; - import "./StandardToken.sol"; -import "../ownership/Ownable.sol"; - +import "../../ownership/Ownable.sol"; /** @@ -12,7 +10,6 @@ import "../ownership/Ownable.sol"; * @dev Issue: * https://github.com/OpenZeppelin/zeppelin-solidity/issues/120 * Based on code by TokenMarketNet: https://github.com/TokenMarketNet/ico/blob/master/contracts/MintableToken.sol */ - contract MintableToken is StandardToken, Ownable { event Mint(address indexed to, uint256 amount); event MintFinished(); diff --git a/contracts/token/PausableToken.sol b/contracts/token/ERC20/PausableToken.sol similarity index 96% rename from contracts/token/PausableToken.sol rename to contracts/token/ERC20/PausableToken.sol index 4ba351126..de42f33d1 100644 --- a/contracts/token/PausableToken.sol +++ b/contracts/token/ERC20/PausableToken.sol @@ -1,12 +1,11 @@ pragma solidity ^0.4.18; import "./StandardToken.sol"; -import "../lifecycle/Pausable.sol"; +import "../../lifecycle/Pausable.sol"; /** * @title Pausable token - * * @dev StandardToken modified with pausable transfers. **/ contract PausableToken is StandardToken, Pausable { diff --git a/contracts/token/StandardToken.sol b/contracts/token/ERC20/StandardToken.sol similarity index 99% rename from contracts/token/StandardToken.sol rename to contracts/token/ERC20/StandardToken.sol index a3a1c3445..e118f8cf1 100644 --- a/contracts/token/StandardToken.sol +++ b/contracts/token/ERC20/StandardToken.sol @@ -1,8 +1,7 @@ pragma solidity ^0.4.18; - import "./BasicToken.sol"; -import "./ERC20/ERC20.sol"; +import "./ERC20.sol"; /** diff --git a/contracts/token/TokenTimelock.sol b/contracts/token/ERC20/TokenTimelock.sol similarity index 96% rename from contracts/token/TokenTimelock.sol rename to contracts/token/ERC20/TokenTimelock.sol index 2562b0940..5e00973d6 100644 --- a/contracts/token/TokenTimelock.sol +++ b/contracts/token/ERC20/TokenTimelock.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.18; -import "./ERC20/SafeERC20.sol"; +import "./SafeERC20.sol"; /** diff --git a/contracts/token/TokenVesting.sol b/contracts/token/ERC20/TokenVesting.sol similarity index 96% rename from contracts/token/TokenVesting.sol rename to contracts/token/ERC20/TokenVesting.sol index a8b45c01e..f22e42e8f 100644 --- a/contracts/token/TokenVesting.sol +++ b/contracts/token/ERC20/TokenVesting.sol @@ -1,9 +1,9 @@ pragma solidity ^0.4.18; -import "./ERC20/ERC20Basic.sol"; -import "./ERC20/SafeERC20.sol"; -import "../ownership/Ownable.sol"; -import "../math/SafeMath.sol"; +import "./ERC20Basic.sol"; +import "./SafeERC20.sol"; +import "../../ownership/Ownable.sol"; +import "../../math/SafeMath.sol"; /** diff --git a/contracts/token/ERC827/ERC827Token.sol b/contracts/token/ERC827/ERC827Token.sol index f027c80ff..bed4968ea 100644 --- a/contracts/token/ERC827/ERC827Token.sol +++ b/contracts/token/ERC827/ERC827Token.sol @@ -1,7 +1,7 @@ pragma solidity ^0.4.13; import "./ERC827.sol"; -import "../StandardToken.sol"; +import "../ERC20/StandardToken.sol"; /** @title ERC827, an extension of ERC20 token standard