Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
openzeppelin-contracts-upgradeable
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
俞永鹏
openzeppelin-contracts-upgradeable
Commits
b67856c6
Commit
b67856c6
authored
Jan 17, 2018
by
AugustoL
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Separate ERC20 and ERC827 form tokens implementations in contracts and test folders
parent
4fbd44fd
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
14 additions
and
15 deletions
+14
-15
TokenDestructible.sol
contracts/lifecycle/TokenDestructible.sol
+1
-1
DetailedERC20Mock.sol
contracts/mocks/DetailedERC20Mock.sol
+1
-1
ERC827TokenMock.sol
contracts/mocks/ERC827TokenMock.sol
+1
-1
SafeERC20Helper.sol
contracts/mocks/SafeERC20Helper.sol
+2
-2
CanReclaimToken.sol
contracts/ownership/CanReclaimToken.sol
+2
-2
BasicToken.sol
contracts/token/BasicToken.sol
+1
-1
DetailedERC20.sol
contracts/token/ERC20/DetailedERC20.sol
+0
-0
ERC20.sol
contracts/token/ERC20/ERC20.sol
+0
-0
ERC20Basic.sol
contracts/token/ERC20/ERC20Basic.sol
+0
-0
SafeERC20.sol
contracts/token/ERC20/SafeERC20.sol
+0
-0
ERC827.sol
contracts/token/ERC827/ERC827.sol
+1
-1
ERC827Token.sol
contracts/token/ERC827/ERC827Token.sol
+1
-1
StandardToken.sol
contracts/token/StandardToken.sol
+1
-1
TokenTimelock.sol
contracts/token/TokenTimelock.sol
+1
-2
TokenVesting.sol
contracts/token/TokenVesting.sol
+2
-2
DetailedERC20.test.js
test/token/ERC20/DetailedERC20.test.js
+0
-0
SafeERC20.test.js
test/token/ERC20/SafeERC20.test.js
+0
-0
ERC827Token.js
test/token/ERC827/ERC827Token.js
+0
-0
No files found.
contracts/lifecycle/TokenDestructible.sol
View file @
b67856c6
pragma solidity ^0.4.18;
import "../ownership/Ownable.sol";
import "../token/ERC20Basic.sol";
import "../token/ERC20
/ERC20
Basic.sol";
/**
...
...
contracts/mocks/DetailedERC20Mock.sol
View file @
b67856c6
pragma solidity ^0.4.18;
import "../token/StandardToken.sol";
import "../token/DetailedERC20.sol";
import "../token/
ERC20/
DetailedERC20.sol";
contract DetailedERC20Mock is StandardToken, DetailedERC20 {
...
...
contracts/mocks/ERC827TokenMock.sol
View file @
b67856c6
pragma solidity ^0.4.13;
import "../token/ERC827Token.sol";
import "../token/ERC827
/ERC827
Token.sol";
// mock class using ERC827 Token
...
...
contracts/mocks/SafeERC20Helper.sol
View file @
b67856c6
pragma solidity ^0.4.18;
import "../token/ERC20.sol";
import "../token/SafeERC20.sol";
import "../token/ERC20
/ERC20
.sol";
import "../token/
ERC20/
SafeERC20.sol";
contract ERC20FailingMock is ERC20 {
...
...
contracts/ownership/CanReclaimToken.sol
View file @
b67856c6
pragma solidity ^0.4.18;
import "./Ownable.sol";
import "../token/ERC20Basic.sol";
import "../token/SafeERC20.sol";
import "../token/ERC20
/ERC20
Basic.sol";
import "../token/
ERC20/
SafeERC20.sol";
/**
...
...
contracts/token/BasicToken.sol
View file @
b67856c6
pragma solidity ^0.4.18;
import "./ERC20Basic.sol";
import "./ERC20
/ERC20
Basic.sol";
import "../math/SafeMath.sol";
...
...
contracts/token/DetailedERC20.sol
→
contracts/token/
ERC20/
DetailedERC20.sol
View file @
b67856c6
File moved
contracts/token/ERC20.sol
→
contracts/token/ERC20
/ERC20
.sol
View file @
b67856c6
File moved
contracts/token/ERC20Basic.sol
→
contracts/token/ERC20
/ERC20
Basic.sol
View file @
b67856c6
File moved
contracts/token/SafeERC20.sol
→
contracts/token/
ERC20/
SafeERC20.sol
View file @
b67856c6
File moved
contracts/token/ERC827.sol
→
contracts/token/ERC827
/ERC827
.sol
View file @
b67856c6
pragma solidity ^0.4.13;
import "./ERC20.sol";
import ".
./ERC20
/ERC20.sol";
/**
...
...
contracts/token/ERC827Token.sol
→
contracts/token/ERC827
/ERC827
Token.sol
View file @
b67856c6
pragma solidity ^0.4.13;
import "./ERC827.sol";
import "./StandardToken.sol";
import ".
.
/StandardToken.sol";
/**
@title ERC827, an extension of ERC20 token standard
...
...
contracts/token/StandardToken.sol
View file @
b67856c6
...
...
@@ -2,7 +2,7 @@ pragma solidity ^0.4.18;
import "./BasicToken.sol";
import "./ERC20.sol";
import "./ERC20
/ERC20
.sol";
/**
...
...
contracts/token/TokenTimelock.sol
View file @
b67856c6
pragma solidity ^0.4.18;
import "./ERC20Basic.sol";
import "../token/SafeERC20.sol";
import "./ERC20/SafeERC20.sol";
/**
...
...
contracts/token/TokenVesting.sol
View file @
b67856c6
pragma solidity ^0.4.18;
import "./ERC20Basic.sol";
import "./SafeERC20.sol";
import "./ERC20
/ERC20
Basic.sol";
import "./
ERC20/
SafeERC20.sol";
import "../ownership/Ownable.sol";
import "../math/SafeMath.sol";
...
...
test/token/
erc
/DetailedERC20.test.js
→
test/token/
ERC20
/DetailedERC20.test.js
View file @
b67856c6
File moved
test/token/
erc
/SafeERC20.test.js
→
test/token/
ERC20
/SafeERC20.test.js
View file @
b67856c6
File moved
test/token/
erc
/ERC827Token.js
→
test/token/
ERC827
/ERC827Token.js
View file @
b67856c6
File moved
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment