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

add event && redeploy

Browse Source
This commit is contained in:
owen05
2021-09-18 23:08:03 +08:00
parent 98e6cfab16
commit cc57ee2c14
4 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/NFTPool/impl/BaseFilterV1.sol
View File

@@ -16,6 +16,10 @@ contract BaseFilterV1 is InitializableOwnable, ReentrancyGuard {
using SafeMath for uint256;
//=================== Event ===================
event NftInOrder(address user, uint256 receiveAmount);
event TargetOutOrder(address user, uint256 paidAmount);
event RandomOutOrder(address user, uint256 paidAmount);
event ChangeNFTInPrice(uint256 newGsStart, uint256 newCr, bool toggleFlag);
event ChangeNFTRandomOutPrice(uint256 newGsStart, uint256 newCr, bool toggleFlag);
event ChangeNFTTargetOutPrice(uint256 newGsStart, uint256 newCr, bool toggleFlag);

6
contracts/NFTPool/impl/FilterERC1155V1.sol
View File

@@ -70,6 +70,8 @@ contract FilterERC1155V1 is IERC1155Receiver, BaseFilterV1 {
}
(uint256 rawReceive, ) = queryNFTIn(totalAmount);
received = IFilterAdmin(_OWNER_).mintFragTo(to, rawReceive);
emit NftInOrder(to, received);
}
function ERC1155TargetOut(
@@ -85,6 +87,8 @@ contract FilterERC1155V1 is IERC1155Receiver, BaseFilterV1 {
}
(uint256 rawPay, ) = queryNFTTargetOut(totalAmount);
paid = IFilterAdmin(_OWNER_).burnFragFrom(to, rawPay);
emit TargetOutOrder(to, paid);
}
function ERC1155RandomOut(uint256 amount, address to)
@@ -106,6 +110,8 @@ contract FilterERC1155V1 is IERC1155Receiver, BaseFilterV1 {
}
}
}
emit RandomOutOrder(to, paid);
}
// ============ Transfer =============

6
contracts/NFTPool/impl/FilterERC721V1.sol
View File

@@ -79,6 +79,8 @@ contract FilterERC721V1 is IERC721Receiver, BaseFilterV1 {
_TOTAL_NFT_AMOUNT_ = _NFT_IDS_.length;
(uint256 rawReceive, ) = queryNFTIn(tokenIds.length);
received = IFilterAdmin(_OWNER_).mintFragTo(to, rawReceive);
emit NftInOrder(to, received);
}
function ERC721TargetOut(uint256[] memory tokenIds, address to)
@@ -94,6 +96,8 @@ contract FilterERC721V1 is IERC721Receiver, BaseFilterV1 {
emit TargetOut(tokenIds[i]);
}
_TOTAL_NFT_AMOUNT_ = _NFT_IDS_.length;
emit TargetOutOrder(to, paid);
}
function ERC721RandomOut(uint256 amount, address to)
@@ -110,6 +114,8 @@ contract FilterERC721V1 is IERC721Receiver, BaseFilterV1 {
emit RandomOut(_NFT_IDS_[index]);
}
_TOTAL_NFT_AMOUNT_ = _NFT_IDS_.length;
emit RandomOutOrder(to, paid);
}
// ============ Transfer =============