Skip to content

O
openzeppelin-contracts-upgradeable
Commit b67856c6 by AugustoL
Options

Separate ERC20 and ERC827 form tokens implementations in contracts and test folders

parent 4fbd44fd
Showing with 14 additions and 15 deletions
contracts/lifecycle/TokenDestructible.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import "../ownership/Ownable.sol"; import "../ownership/Ownable.sol";
import "../token/ERC20Basic.sol"; import "../token/ERC20/ERC20Basic.sol";
/** /**
......
contracts/mocks/DetailedERC20Mock.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import "../token/StandardToken.sol"; import "../token/StandardToken.sol";
import "../token/DetailedERC20.sol"; import "../token/ERC20/DetailedERC20.sol";
contract DetailedERC20Mock is StandardToken, DetailedERC20 { contract DetailedERC20Mock is StandardToken, DetailedERC20 {
......
contracts/mocks/ERC827TokenMock.sol
pragma solidity ^0.4.13; pragma solidity ^0.4.13;
import "../token/ERC827Token.sol"; import "../token/ERC827/ERC827Token.sol";
// mock class using ERC827 Token // mock class using ERC827 Token
......
contracts/mocks/SafeERC20Helper.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import "../token/ERC20.sol"; import "../token/ERC20/ERC20.sol";
import "../token/SafeERC20.sol"; import "../token/ERC20/SafeERC20.sol";
contract ERC20FailingMock is ERC20 { contract ERC20FailingMock is ERC20 {
......
contracts/ownership/CanReclaimToken.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import "./Ownable.sol"; import "./Ownable.sol";
import "../token/ERC20Basic.sol"; import "../token/ERC20/ERC20Basic.sol";
import "../token/SafeERC20.sol"; import "../token/ERC20/SafeERC20.sol";
/** /**
......
contracts/token/BasicToken.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import "./ERC20Basic.sol"; import "./ERC20/ERC20Basic.sol";
import "../math/SafeMath.sol"; import "../math/SafeMath.sol";
......
contracts/token/ERC827.sol → contracts/token/ERC827/ERC827.sol
pragma solidity ^0.4.13; pragma solidity ^0.4.13;
import "./ERC20.sol"; import "../ERC20/ERC20.sol";
/** /**
......
contracts/token/ERC827Token.sol → contracts/token/ERC827/ERC827Token.sol
pragma solidity ^0.4.13; pragma solidity ^0.4.13;
import "./ERC827.sol"; import "./ERC827.sol";
import "./StandardToken.sol"; import "../StandardToken.sol";
/** /**
@title ERC827, an extension of ERC20 token standard @title ERC827, an extension of ERC20 token standard
......
contracts/token/StandardToken.sol
...@@ -2,7 +2,7 @@ pragma solidity ^0.4.18; ...@@ -2,7 +2,7 @@ pragma solidity ^0.4.18;
import "./BasicToken.sol"; import "./BasicToken.sol";
import "./ERC20.sol"; import "./ERC20/ERC20.sol";
/** /**
......
contracts/token/TokenTimelock.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import "./ERC20Basic.sol"; import "./ERC20/SafeERC20.sol";
import "../token/SafeERC20.sol";
/** /**
......
contracts/token/TokenVesting.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import "./ERC20Basic.sol"; import "./ERC20/ERC20Basic.sol";
import "./SafeERC20.sol"; import "./ERC20/SafeERC20.sol";
import "../ownership/Ownable.sol"; import "../ownership/Ownable.sol";
import "../math/SafeMath.sol"; import "../math/SafeMath.sol";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment