Skip to content

feat: implement ERC721Mintable and ERC721Burnable #1276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
frangio merged 11 commits into from
Sep 6, 2018
Merged

feat: implement ERC721Mintable and ERC721Burnable #1276

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3f0d557
feat: implement ERC721Mintable and ERC721Burnable
shrugs Sep 4, 2018
cc33969
fix: linting errors
shrugs Sep 4, 2018
ff4d8a5
fix: remove unused mintable mock for ERC721BasicMock
shrugs Sep 5, 2018
047bc41
fix: add finishMinting tests
shrugs Sep 5, 2018
4852489
fix: catch MintFinished typo
shrugs Sep 5, 2018
2ed86d9
inline ERC721Full behavior
frangio Sep 6, 2018
3948f46
undo pretty formatting
frangio Sep 6, 2018
3e181f2
Merge branch 'rbac-migration' of github.com:OpenZeppelin/openzeppelin…
frangio Sep 6, 2018
0fb67e1
fix lint errors
frangio Sep 6, 2018
e49a1e4
rename canMint to onlyBeforeMintingFinished for consistency with ERC2…
frangio Sep 6, 2018
8b44a79
Merge remote-tracking branch 'upstream/rbac-migration' into feat/mint…
frangio Sep 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge remote-tracking branch 'upstream/rbac-migration' into feat/mint… 
…able-erc721
  • Loading branch information
@frangio
frangio committed Sep 6, 2018
commit 8b44a79cd12d1fe1b68f092c5070e66ad63bb295
2 changes: 1 addition & 1 deletion contracts/token/ERC721/ERC721Mintable.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pragma solidity ^0.4.24;

import "./ERC721.sol";
import "../../access/rbac/MinterRole.sol";
import "../../access/roles/MinterRole.sol";


/**
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.