diff --git a/config/rinkeby-config.js b/config/rinkeby-config.js index 5357b10..23adc72 100644 --- a/config/rinkeby-config.js +++ b/config/rinkeby-config.js @@ -102,11 +102,11 @@ module.exports = { // DropsERC1155: "0x3a8EcF30428bd4e33Cd7011533DFd596F7705c8F", //=================== NFTPool ================== - DODONFTApprove: "0xe4915ABF03d56743c7e66B1CFda4C58bAAc0963C", + DODONFTApprove: "0xBDAcEcF886a4F0C509260d9678D5673C3E8fa4b7", FilterAdmin: "0x3893c38aFa42E492b134888c79CAE52744Eb3ab0", FilterERC721V1: "0x3F87f3d4EeD2C466CCA6E722a3153875C3f2822b", FilterERC1155V1: "0xf71F758e2c4417758588CA6ff803036cA1EeB396", - DODONFTPoolProxy: "0x4587F2039bfb47D76000b23743993962518Ee0c2", + DODONFTPoolProxy: "0x41Eb1FFC3d6474Ee4f4Aaf335a09cD411ADDDf1f", NFTPoolController: "0xf5d24499dD76C3791ee6D19aa206f55b72270415" } diff --git a/contracts/NFTPool/impl/FilterAdmin.sol b/contracts/NFTPool/impl/FilterAdmin.sol index 1716f39..927b48e 100644 --- a/contracts/NFTPool/impl/FilterAdmin.sol +++ b/contracts/NFTPool/impl/FilterAdmin.sol @@ -27,7 +27,6 @@ contract FilterAdmin is InitializableInternalMintableERC20 { // ============ Event ============ event ChangeFeeRate(uint256 fee); event AddFilter(address filter); - event FilterAdminInit(address owner, uint256 feeRate); function init( address owner, @@ -48,8 +47,6 @@ contract FilterAdmin is InitializableInternalMintableERC20 { for (uint256 i = 0; i < filters.length; i++) { _FILTER_REGISTRY_[filters[i]] = true; } - - emit FilterAdminInit(owner, feeRate); } function mintFragTo(address to, uint256 rawAmount) external returns (uint256) { diff --git a/contracts/SmartRoute/proxies/DODONFTPoolProxy.sol b/contracts/SmartRoute/proxies/DODONFTPoolProxy.sol index bcee646..6de2a63 100644 --- a/contracts/SmartRoute/proxies/DODONFTPoolProxy.sol +++ b/contracts/SmartRoute/proxies/DODONFTPoolProxy.sol @@ -158,6 +158,8 @@ contract DODONFTPoolProxy is ReentrancyGuard, InitializableOwnable { string[] memory infos, // 0 => fragName, 1 => fragSymbol uint256[] memory numParams //0 - initSupply, 1 - fee ) external returns(address newFilterAdmin) { + newFilterAdmin = ICloneFactory(_CLONE_FACTORY_).clone(_FILTER_ADMIN_TEMPLATE_); + address[] memory filters = new address[](0); IFilterAdmin(newFilterAdmin).init(