d-bis/dodo-contractV2
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix nftFactory && test ing

Browse Source
This commit is contained in:
owen05
2021-04-09 00:27:53 +08:00
parent 2e1b0e0e9b
commit 7f3932d8f3
11 changed files with 135 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/Factory/NFTTokenFactory.sol
View File

@@ -49,7 +49,7 @@ contract NFTTokenFactory {
string memory baseUrl
) external returns (address newERC721) {
newERC721 = ICloneFactory(_CLONE_FACTORY_).clone(_ERC721_TEMPLATE_);
InitializableERC721(newERC721).init("DODONFT", "DODONFT", baseUrl);
InitializableERC721(newERC721).init(msg.sender, "DODONFT", "DODONFT", baseUrl);
_USER_ERC721_REGISTRY_[msg.sender].push(newERC721);
emit NewERC721(newERC721, msg.sender);
}
@@ -59,7 +59,7 @@ contract NFTTokenFactory {
string memory baseUrl
) external returns (address newERC1155) {
newERC1155 = ICloneFactory(_CLONE_FACTORY_).clone(_ERC1155_TEMPLATE_);
InitializableERC1155(newERC1155).init(amount, baseUrl);
InitializableERC1155(newERC1155).init(msg.sender, amount, baseUrl);
_USER_ERC1155_REGISTRY_[msg.sender].push(newERC1155);
emit NewERC1155(newERC1155, msg.sender);
}

4
contracts/external/ERC1155/InitializableERC1155.sol vendored
View File

@@ -24,13 +24,13 @@ contract InitializableERC1155 is IERC165, IERC1155, IERC1155MetadataURI {
string private _uri;
function init(
address creator,
uint256 amount,
string memory baseUrI
) public {
_setURI(baseUrI);
_mint(msg.sender, 0, amount ,"");
_mint(creator, 0, amount ,"");
}
function supportsInterface(bytes4 interfaceId) public view override returns (bool) {

3
contracts/external/ERC721/InitializableERC721.sol vendored
View File

@@ -43,6 +43,7 @@ contract InitializableERC721 is IERC165, IERC721, IERC721Metadata {
function init(
address creator,
string memory name,
string memory symbol,
string memory baseUrI
@@ -50,7 +51,7 @@ contract InitializableERC721 is IERC165, IERC721, IERC721Metadata {
_name = name;
_symbol = symbol;
_baseURI = baseUrI;
_safeMint(msg.sender, 0);
_mint(creator, 0);
}