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
3f51d342
Commit
3f51d342
authored
Sep 25, 2018
by
Francisco Giordano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
convert ERC20Mintable
parent
1f54c72d
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
2 deletions
+13
-2
ERC20MintableMock.sol
contracts/mocks/ERC20MintableMock.sol
+7
-1
ERC20Mintable.sol
contracts/token/ERC20/ERC20Mintable.sol
+6
-1
No files found.
contracts/mocks/ERC20MintableMock.sol
View file @
3f51d342
pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../token/ERC20/ERC20Mintable.sol";
import "./MinterRoleMock.sol";
contract ERC20MintableMock is ERC20Mintable, MinterRoleMock {
contract ERC20MintableMock is Initializable, ERC20Mintable, MinterRoleMock {
constructor() public {
ERC20Mintable.initialize();
}
}
contracts/token/ERC20/ERC20Mintable.sol
View file @
3f51d342
pragma solidity ^0.4.24;
import "../../Initializable.sol";
import "./ERC20.sol";
import "../../access/roles/MinterRole.sol";
...
...
@@ -8,7 +9,7 @@ import "../../access/roles/MinterRole.sol";
* @title ERC20Mintable
* @dev ERC20 minting logic
*/
contract ERC20Mintable is ERC20, MinterRole {
contract ERC20Mintable is
Initializable,
ERC20, MinterRole {
event MintingFinished();
bool private _mintingFinished = false;
...
...
@@ -18,6 +19,10 @@ contract ERC20Mintable is ERC20, MinterRole {
_;
}
function initialize() public initializer {
MinterRole.initialize();
}
/**
* @return true if the minting is finished.
*/
...
...
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