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
config/rinkeby-config.js
View File

@@ -104,8 +104,8 @@ module.exports = {
//=================== NFTPool ==================
DODONFTApprove: "0xb971B0df71fB1778351F25a0e3bfe0C3eF06E1d1",
FilterAdmin: "0xeD662e5391a3aA6F2FF610a5b33c62815b342B35",
FilterERC721V1: "0xB3b12b077Cb57281E361D52bD8b21fC8A4763316",
FilterERC1155V1: "0xB26897b8CF61D90230Af0f8d3Ab1b59ECd42CFDf",
FilterERC721V1: "0xce5CD3D57d4f9e781e6a6823D64e157B173e91D9",
FilterERC1155V1: "0xef4A80041B9b7b85038170F19367B93a24abe38B",
DODONFTPoolProxy: "0x38c109aF4f3454172BA4eecf5676aA213b589e75",
NFTPoolController: "0xf5d24499dD76C3791ee6D19aa206f55b72270415"

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 =============