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
54268bfe
Commit
54268bfe
authored
Oct 19, 2018
by
Facundo Spagnuolo
Committed by
Leo Arias
Oct 19, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move standalone ERC20 and ERC721 to token dir (#38)
parent
0c05ce0e
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
13 deletions
+13
-13
StandaloneERC20.sol
contracts/token/ERC20/StandaloneERC20.sol
+4
-4
StandaloneERC721.sol
contracts/token/ERC721/StandaloneERC721.sol
+7
-7
StandaloneERC20.test.js
test/token/ERC20/StandaloneERC20.test.js
+2
-2
StandaloneERC721.test.js
test/token/ERC721/StandaloneERC721.test.js
+0
-0
No files found.
contracts/
examples
/StandaloneERC20.sol
→
contracts/
token/ERC20
/StandaloneERC20.sol
View file @
54268bfe
pragma solidity ^0.4.24;
pragma solidity ^0.4.24;
import "zos-lib/contracts/Initializable.sol";
import "zos-lib/contracts/Initializable.sol";
import ".
./token/ERC20
/ERC20Detailed.sol";
import "./ERC20Detailed.sol";
import ".
./token/ERC20
/ERC20Mintable.sol";
import "./ERC20Mintable.sol";
import ".
./token/ERC20
/ERC20Pausable.sol";
import "./ERC20Pausable.sol";
/**
/**
...
@@ -12,7 +12,7 @@ import "../token/ERC20/ERC20Pausable.sol";
...
@@ -12,7 +12,7 @@ import "../token/ERC20/ERC20Pausable.sol";
*/
*/
contract StandaloneERC20 is Initializable, ERC20Detailed, ERC20Mintable, ERC20Pausable {
contract StandaloneERC20 is Initializable, ERC20Detailed, ERC20Mintable, ERC20Pausable {
function initialize(
function initialize(
string name, string symbol, uint8 decimals, uint256 initialSupply, address initialHolder,
string name, string symbol, uint8 decimals, uint256 initialSupply, address initialHolder,
address[] minters, address[] pausers
address[] minters, address[] pausers
) public initializer {
) public initializer {
require(initialSupply > 0);
require(initialSupply > 0);
...
...
contracts/
examples
/StandaloneERC721.sol
→
contracts/
token/ERC721
/StandaloneERC721.sol
View file @
54268bfe
pragma solidity ^0.4.24;
pragma solidity ^0.4.24;
import "zos-lib/contracts/Initializable.sol";
import "zos-lib/contracts/Initializable.sol";
import ".
./token/ERC721
/ERC721.sol";
import "./ERC721.sol";
import ".
./token/ERC721
/ERC721Enumerable.sol";
import "./ERC721Enumerable.sol";
import ".
./token/ERC721
/ERC721Metadata.sol";
import "./ERC721Metadata.sol";
import ".
./token/ERC721
/ERC721MetadataMintable.sol";
import "./ERC721MetadataMintable.sol";
import ".
./token/ERC721
/ERC721Pausable.sol";
import "./ERC721Pausable.sol";
/**
/**
* @title Standard ERC721 token, with minting and pause functionality.
* @title Standard ERC721 token, with minting and pause functionality.
*
*
*/
*/
contract StandaloneERC721
contract StandaloneERC721
is Initializable, ERC721, ERC721Enumerable, ERC721Metadata, ERC721MetadataMintable, ERC721Pausable
is Initializable, ERC721, ERC721Enumerable, ERC721Metadata, ERC721MetadataMintable, ERC721Pausable
{
{
function initialize(string name, string symbol, address[] minters, address[] pausers) public initializer {
function initialize(string name, string symbol, address[] minters, address[] pausers) public initializer {
ERC721.initialize();
ERC721.initialize();
...
...
test/
examples
/StandaloneERC20.test.js
→
test/
token/ERC20
/StandaloneERC20.test.js
View file @
54268bfe
const
encodeCall
=
require
(
'zos-lib/lib/helpers/encodeCall'
).
default
;
const
encodeCall
=
require
(
'zos-lib/lib/helpers/encodeCall'
).
default
;
const
{
shouldBehaveLikeERC20Mintable
}
=
require
(
'.
./token/ERC20
/behaviors/ERC20Mintable.behavior'
);
const
{
shouldBehaveLikeERC20Mintable
}
=
require
(
'./behaviors/ERC20Mintable.behavior'
);
const
{
assertRevert
}
=
require
(
'../helpers/assertRevert'
);
const
{
assertRevert
}
=
require
(
'../
../
helpers/assertRevert'
);
const
BigNumber
=
web3
.
BigNumber
;
const
BigNumber
=
web3
.
BigNumber
;
...
...
test/
examples
/StandaloneERC721.test.js
→
test/
token/ERC721
/StandaloneERC721.test.js
View file @
54268bfe
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