From 2755de57404690de2832b51aa9f8a31bc53297f1 Mon Sep 17 00:00:00 2001
From: owen05 <liuhongnan53@163.com>
Date: Sat, 18 Sep 2021 11:52:39 +0800
Subject: [PATCH] update event && redeploy

---
 config/rinkeby-config.js                          |  8 ++++----
 contracts/NFTPool/impl/FilterERC1155V1.sol        |  1 +
 contracts/NFTPool/impl/FilterERC721V1.sol         |  1 +
 contracts/SmartRoute/proxies/DODONFTPoolProxy.sol | 12 ++++++------
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/config/rinkeby-config.js b/config/rinkeby-config.js
index 23adc72..8bb4bdf 100644
--- a/config/rinkeby-config.js
+++ b/config/rinkeby-config.js
@@ -102,11 +102,11 @@ module.exports = {
         // DropsERC1155: "0x3a8EcF30428bd4e33Cd7011533DFd596F7705c8F",
 
         //=================== NFTPool ==================
-        DODONFTApprove: "0xBDAcEcF886a4F0C509260d9678D5673C3E8fa4b7",
+        DODONFTApprove: "0xb971B0df71fB1778351F25a0e3bfe0C3eF06E1d1",
         FilterAdmin: "0x3893c38aFa42E492b134888c79CAE52744Eb3ab0",
-        FilterERC721V1: "0x3F87f3d4EeD2C466CCA6E722a3153875C3f2822b",
-        FilterERC1155V1: "0xf71F758e2c4417758588CA6ff803036cA1EeB396",
-        DODONFTPoolProxy: "0x41Eb1FFC3d6474Ee4f4Aaf335a09cD411ADDDf1f",
+        FilterERC721V1: "0x5a317a617FBF89d55bBfe40A76E526FCD74E4545",
+        FilterERC1155V1: "0x41c5eDe987bd61c75925Ab2657256D75270a55D4",
+        DODONFTPoolProxy: "0x38c109aF4f3454172BA4eecf5676aA213b589e75",
         NFTPoolController: "0xf5d24499dD76C3791ee6D19aa206f55b72270415"
 
     }
diff --git a/contracts/NFTPool/impl/FilterERC1155V1.sol b/contracts/NFTPool/impl/FilterERC1155V1.sol
index 8274166..113ec85 100644
--- a/contracts/NFTPool/impl/FilterERC1155V1.sol
+++ b/contracts/NFTPool/impl/FilterERC1155V1.sol
@@ -47,6 +47,7 @@ contract FilterERC1155V1 is IERC1155Receiver, BaseFilterV1 {
         _changeTokenIdRange(numParams[0], numParams[1]);
         for (uint256 i = 0; i < spreadIds.length; i++) {
             _SPREAD_IDS_REGISTRY_[spreadIds[i]] = true;
+            emit ChangeTokenIdMap(spreadIds[i], true);
         }
 
         emit FilterInit(filterAdmin, nftCollection, filterName);
diff --git a/contracts/NFTPool/impl/FilterERC721V1.sol b/contracts/NFTPool/impl/FilterERC721V1.sol
index 715f4a3..5e9cbe5 100644
--- a/contracts/NFTPool/impl/FilterERC721V1.sol
+++ b/contracts/NFTPool/impl/FilterERC721V1.sol
@@ -49,6 +49,7 @@ contract FilterERC721V1 is IERC721Receiver, BaseFilterV1 {
         _changeTokenIdRange(numParams[0], numParams[1]);
         for (uint256 i = 0; i < spreadIds.length; i++) {
             _SPREAD_IDS_REGISTRY_[spreadIds[i]] = true;
+            emit ChangeTokenIdMap(spreadIds[i], true);
         }
 
         emit FilterInit(filterAdmin, nftCollection, filterName);
diff --git a/contracts/SmartRoute/proxies/DODONFTPoolProxy.sol b/contracts/SmartRoute/proxies/DODONFTPoolProxy.sol
index 6de2a63..6c6a793 100644
--- a/contracts/SmartRoute/proxies/DODONFTPoolProxy.sol
+++ b/contracts/SmartRoute/proxies/DODONFTPoolProxy.sol
@@ -40,9 +40,9 @@ contract DODONFTPoolProxy is ReentrancyGuard, InitializableOwnable {
     event Erc721RandomOut(address filter, address to, uint256 paid); 
     event Erc1155RandomOut(address filter, address to, uint256 paid); 
 
-    event CreateLiteNFTPool(address newFilterAdmin);
-    event CreateNFTPool(address newFilterAdmin, address filter);
-    event CreateFilterV1(address newFilterV1, uint256 filterTemplateKey);
+    event CreateLiteNFTPool(address newFilterAdmin, address filterAdminOwner);
+    event CreateNFTPool(address newFilterAdmin, address filterAdminOwner, address filter);
+    event CreateFilterV1(address newFilterAdmin, address newFilterV1, address nftCollection, uint256 filterTemplateKey);
     event Erc721toErc20(address nftContract, uint256 tokenId, address toToken, uint256 returnAmount);
 
     event ChangeMaintainer(address newMaintainer);
@@ -173,7 +173,7 @@ contract DODONFTPoolProxy is ReentrancyGuard, InitializableOwnable {
             filters
         );
 
-        emit CreateLiteNFTPool(newFilterAdmin);
+        emit CreateLiteNFTPool(newFilterAdmin, filterAdminOwner);
     }
 
 
@@ -216,7 +216,7 @@ contract DODONFTPoolProxy is ReentrancyGuard, InitializableOwnable {
             filters
         );
 
-        emit CreateNFTPool(newFilterAdmin, filterV1);
+        emit CreateNFTPool(newFilterAdmin, filterAdminOwner, filterV1);
     }
 
     // ================== Create Filter ===================
@@ -241,7 +241,7 @@ contract DODONFTPoolProxy is ReentrancyGuard, InitializableOwnable {
             spreadIds
         );
 
-        emit CreateFilterV1(newFilterV1, key);
+        emit CreateFilterV1(filterAdmin, newFilterV1, nftCollection, key);
     }