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

dev

Browse Source
This commit is contained in:
owen05
2021-09-09 11:07:21 +08:00
parent 6dfb96b86e
commit 66891972b1
3 changed files with 10 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,8 +134,6 @@ contract FilterAdmin is InitializableInternalMintableERC20, ReentrancyGuard {
require(IFilterModel(filter).getAvaliableNFTOut() >= times, "EXCEED_MAX_AMOUNT");
uint256 totalPrice = 0;
uint256[] memory tokenIds;
uint256[] memory amounts;
for(uint256 i = 0; i < times; i++) {
totalPrice = totalPrice.add(IFilterModel(filter).getNFTRandomOutPrice());
(address nftContract, uint256 tokenId) = IFilterModel(filter).getRandomOutId();
@@ -222,10 +220,7 @@ contract FilterAdmin is InitializableInternalMintableERC20, ReentrancyGuard {
require(!isIncludeFilter(filter), "FILTER_NOT_INCLUDE");
_FILTER_REGISTRY_.push(filter);
}
//TODO: remove Filter是否有必要？
//=============== Internal ==============
function _nftInFeeTransfer(uint256 totalPrice) internal returns (uint256 poolFeeAmount, uint256 mtFeeAmount) {
uint256 mtFeeRate = IFeeModel(_MT_FEE_MODEL_).getNFTInFee(address(this), msg.sender);

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

@@ -169,6 +169,10 @@ contract FilterModel01 is InitializableOwnable, IERC721Receiver {
(, totalPrice) = geometricCalc(base, _CR_RANDOM_OUT_, amount);
}
function version() virtual external pure returns (string memory) {
return "FILTER_01 1.0.0";
}
// ================= Ownable ================
function transferOutERC721(address nftContract, address assetTo, uint256 nftId) external onlyOwner {
require(nftContract == _NFT_COLLECTION_, "WRONG_NFT_COLLECTION");