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

event tmp

Browse Source
This commit is contained in:
owen05
2021-09-14 13:43:48 +08:00
parent fb64de3a04
commit 4b60736a7b
6 changed files with 236 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
contracts/NFTPool/impl/FilterAdmin.sol
View File

@@ -46,6 +46,9 @@ contract FilterAdmin is InitializableInternalMintableERC20 {
for (uint256 i = 0; i < filters.length; i++) {
_FILTER_REGISTRY_[filters[i]] = true;
}
//event FilterAdminInit(addres owner, uint256 feeRate)
}
function mintFragTo(address to, uint256 rawAmount) external returns (uint256) {
@@ -108,10 +111,12 @@ contract FilterAdmin is InitializableInternalMintableERC20 {
}
//================= Owner ================
function addFilter(address filter) external onlyOwner {
require(!isRegisteredFilter(filter), "FILTER_ALREADY_EXIST");
_FILTERS_.push(filter);
_FILTER_REGISTRY_[filter] = true;
function addFilter(address[] memory filters) external onlyOwner {
for(uint256 i = 0; i < filters.length; i++) {
require(!isRegisteredFilter(filters[i]), "FILTER_ALREADY_EXIST");
_FILTERS_.push(filter[i]);
_FILTER_REGISTRY_[filter[i]] = true;
}
}
function changeFeeRate(uint256 newFeeRate) external onlyOwner {

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

@@ -41,6 +41,8 @@ contract FilterERC1155V1 is IERC1155Receiver, BaseFilterV1 {
for (uint256 i = 0; i < spreadIds.length; i++) {
_SPREAD_IDS_REGISTRY_[spreadIds[i]] = true;
}
//event FilterInit(address filterAdmin, address nftCollection, string memory name);
}
// ================= Trading ================

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

@@ -43,6 +43,8 @@ contract FilterERC721V1 is IERC721Receiver, BaseFilterV1 {
for (uint256 i = 0; i < spreadIds.length; i++) {
_SPREAD_IDS_REGISTRY_[spreadIds[i]] = true;
}
//event FilterInit(address filterAdmin, address nftCollection, string memory name);
}
// ================= Trading ================
@@ -62,6 +64,8 @@ contract FilterERC721V1 is IERC721Receiver, BaseFilterV1 {
);
_NFT_IDS_.push(tokenId);
_NFT_RESERVE_[tokenId] = 1;
//event Erc721TokenIn(uint256 index, uint256 tokenId);
}
_TOTAL_NFT_AMOUNT_ = _NFT_IDS_.length;
(uint256 rawReceive, ) = queryNFTIn(tokenIds.length);
@@ -112,6 +116,9 @@ contract FilterERC721V1 is IERC721Receiver, BaseFilterV1 {
_NFT_IDS_[index] = _NFT_IDS_[_NFT_IDS_.length - 1];
_NFT_IDS_.pop();
_NFT_RESERVE_[tokenId] = 0;
//idx,oldTokenId,newTokenId
//event Erc721Out(uint256 index, uint256 tokenId)
}
function emergencyWithdraw(

13
contracts/SmartRoute/proxies/DODONFTPoolProxy.sol
View File

@@ -64,16 +64,20 @@ contract DODONFTPoolProxy is ReentrancyGuard, InitializableOwnable {
}
uint256 received = IFilter(filter).ERC721In(tokenIds, to);
require(received >= minMintAmount, "MINT_AMOUNT_NOT_ENOUGH");
//event Erc721In(address filter, address to, uint256 received);
}
function erc721TargetOut(
address filter,
uint256[] memory indexes,
uint256[] memory indexes,//tokenId
address to,
uint256 maxBurnAmount
) external {
uint256 paid = IFilter(filter).ERC721TargetOut(indexes, to);
require(paid <= maxBurnAmount, "BURN_AMOUNT_EXCEED");
//event Erc721TargetOut(address filter, address to, uint256 paid);
}
function erc721RandomOut(
@@ -84,6 +88,8 @@ contract DODONFTPoolProxy is ReentrancyGuard, InitializableOwnable {
) external {
uint256 paid = IFilter(filter).ERC721RandomOut(amount, to);
require(paid <= maxBurnAmount, "BURN_AMOUNT_EXCEED");
//event Erc721TargetOut(address filter, address to, uint256 paid);
}
// ================== ERC1155 In and Out ===================
@@ -162,6 +168,8 @@ contract DODONFTPoolProxy is ReentrancyGuard, InitializableOwnable {
_MAINTAINER_,
filters
);
//event CreateNFTPool(address newFilterAdmin, address filterV1);
}
// ================== Create Filter ===================
@@ -185,6 +193,8 @@ contract DODONFTPoolProxy is ReentrancyGuard, InitializableOwnable {
priceRules,
spreadIds
);
//event CreateFilterV1(address newFilterV1, uint256 filterTemplateKey);
}
@@ -230,6 +240,7 @@ contract DODONFTPoolProxy is ReentrancyGuard, InitializableOwnable {
function changeController(address newControllerModel) external onlyOwner {
_CONTROLLER_ = newControllerModel;
//event ChangeContoller(address newController);
}
function setFilterTemplate(uint256 idx, address newFilterTemplate) external onlyOwner {