From 89d407b895924836f1c288262a29917423645886 Mon Sep 17 00:00:00 2001
From: CounterFire2023 <136581895+CounterFire2023@users.noreply.github.com>
Date: Wed, 12 Jun 2024 13:07:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9whiteCount=E6=96=B9=E6=B3=95,?=
 =?UTF-8?q?=20=E9=98=B2=E6=AD=A2=E7=99=BD=E5=90=8D=E5=8D=95=E8=A2=ABrevoke?=
 =?UTF-8?q?=E5=90=8E,=20whitecount=E4=B8=BA=E8=B4=9F=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 contracts/activity/NFTClaimStage2WL.sol      | 12 +++--
 deploy/2_1_deploy_nftclaimer_wl.ts           |  4 ++
 deployments/imtbl_test/NFTClaimStage2WL.json | 50 ++++++++++----------
 out/imtbl_test_dev.json                      |  2 +-
 4 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/contracts/activity/NFTClaimStage2WL.sol b/contracts/activity/NFTClaimStage2WL.sol
index e72b299..bf62551 100644
--- a/contracts/activity/NFTClaimStage2WL.sol
+++ b/contracts/activity/NFTClaimStage2WL.sol
@@ -124,13 +124,15 @@ contract NFTClaimStage2WL is ReentrancyGuard, AccessControl {
   }
 
   function whiteCount() external view returns (uint256){
-    uint256 _count1 = _whitelist1[_msgSender()];
-    uint256 _count2 = _whitelist2[_msgSender()];
+    uint256 _whiteCount = _whitelist1[_msgSender()];
     if (mintParse == 2) {
-      return _count1 + _count2 - _mintedRecords[_msgSender()].length();
-    } else {
-      return _count1 - _mintedRecords[_msgSender()].length();
+      _whiteCount += _whitelist2[_msgSender()];
     }
+    uint256 _minted = _mintedRecords[_msgSender()].length();
+    if (_whiteCount > _minted) {
+      return _whiteCount - _minted;
+    }
+    return 0;
   }
 
   function mintedNum() external view returns (uint256){
diff --git a/deploy/2_1_deploy_nftclaimer_wl.ts b/deploy/2_1_deploy_nftclaimer_wl.ts
index 4ae5bb8..3656825 100644
--- a/deploy/2_1_deploy_nftclaimer_wl.ts
+++ b/deploy/2_1_deploy_nftclaimer_wl.ts
@@ -22,6 +22,10 @@ const deployNFTClaim: DeployFunction =
       args: [nftAddress, startNftId, mintConfig],
       log: true,
     });
+    console.log("==NFTClaimStage2WL addr=", ret.address);
+    const _contract = new hre.ethers.Contract(ret.address, ret.abi, provider);
+    var mintCfg= await _contract.mintConfig();
+    console.log("list", mintCfg);
     updateArray({
       name: "NFTClaimStage2WL",
       type: "logic",
diff --git a/deployments/imtbl_test/NFTClaimStage2WL.json b/deployments/imtbl_test/NFTClaimStage2WL.json
index 474fc5f..642de4b 100644
--- a/deployments/imtbl_test/NFTClaimStage2WL.json
+++ b/deployments/imtbl_test/NFTClaimStage2WL.json
@@ -1,5 +1,5 @@
 {
-  "address": "0x31F29C9A3D0c1c13C825475aebF0d964b5B47c45",
+  "address": "0x09F2D6CAf92860a1f79049E2552eFa54186c883c",
   "abi": [
     {
       "inputs": [
@@ -585,22 +585,22 @@
       "type": "function"
     }
   ],
-  "transactionHash": "0x961a7fd0f3fa0a870f19e74f975ba869aa77fde6ea8a83a3af2614757b0098aa",
+  "transactionHash": "0x2cc1fcafc37ce2b3ba277bf4032f4b72df804cd8ebf09bf5b50c3aeeaaf00473",
   "receipt": {
     "to": null,
     "from": "0x50A8e60041A206AcaA5F844a1104896224be6F39",
-    "contractAddress": "0x31F29C9A3D0c1c13C825475aebF0d964b5B47c45",
+    "contractAddress": "0x09F2D6CAf92860a1f79049E2552eFa54186c883c",
     "transactionIndex": 0,
-    "gasUsed": "1508317",
-    "logsBloom": "0x00000004000000000000000000000000000000000000020000000000000820000000000000000000000000000000100000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000020000000000000000000800000000000000400000000000000000000000000000000000000000000004000000000000000000000000000000000000080000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000180000000400020000000000000000000000000000000000000020000000000000000000000000000",
-    "blockHash": "0x73675ef0eb9158c28daea54273bc36408ae217df1af00382a76c79d6985478f6",
-    "transactionHash": "0x961a7fd0f3fa0a870f19e74f975ba869aa77fde6ea8a83a3af2614757b0098aa",
+    "gasUsed": "1508329",
+    "logsBloom": "0x00000004000000000000000001000000000000000000020000000000000820000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000800000004000000400000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000100000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000180000000400020000000000000000000000000000000000000020000000000000000000000000000",
+    "blockHash": "0x1e882a8f7226ee68209ab20a3f240623aad476d68ec8dbfdde4010f41b20ccfe",
+    "transactionHash": "0x2cc1fcafc37ce2b3ba277bf4032f4b72df804cd8ebf09bf5b50c3aeeaaf00473",
     "logs": [
       {
         "transactionIndex": 0,
-        "blockNumber": 9326237,
-        "transactionHash": "0x961a7fd0f3fa0a870f19e74f975ba869aa77fde6ea8a83a3af2614757b0098aa",
-        "address": "0x31F29C9A3D0c1c13C825475aebF0d964b5B47c45",
+        "blockNumber": 9331362,
+        "transactionHash": "0x2cc1fcafc37ce2b3ba277bf4032f4b72df804cd8ebf09bf5b50c3aeeaaf00473",
+        "address": "0x09F2D6CAf92860a1f79049E2552eFa54186c883c",
         "topics": [
           "0x2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d",
           "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -609,13 +609,13 @@
         ],
         "data": "0x",
         "logIndex": 0,
-        "blockHash": "0x73675ef0eb9158c28daea54273bc36408ae217df1af00382a76c79d6985478f6"
+        "blockHash": "0x1e882a8f7226ee68209ab20a3f240623aad476d68ec8dbfdde4010f41b20ccfe"
       },
       {
         "transactionIndex": 0,
-        "blockNumber": 9326237,
-        "transactionHash": "0x961a7fd0f3fa0a870f19e74f975ba869aa77fde6ea8a83a3af2614757b0098aa",
-        "address": "0x31F29C9A3D0c1c13C825475aebF0d964b5B47c45",
+        "blockNumber": 9331362,
+        "transactionHash": "0x2cc1fcafc37ce2b3ba277bf4032f4b72df804cd8ebf09bf5b50c3aeeaaf00473",
+        "address": "0x09F2D6CAf92860a1f79049E2552eFa54186c883c",
         "topics": [
           "0x2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d",
           "0x5550444154455f574c5f524f4c45000000000000000000000000000000000000",
@@ -624,13 +624,13 @@
         ],
         "data": "0x",
         "logIndex": 1,
-        "blockHash": "0x73675ef0eb9158c28daea54273bc36408ae217df1af00382a76c79d6985478f6"
+        "blockHash": "0x1e882a8f7226ee68209ab20a3f240623aad476d68ec8dbfdde4010f41b20ccfe"
       },
       {
         "transactionIndex": 0,
-        "blockNumber": 9326237,
-        "transactionHash": "0x961a7fd0f3fa0a870f19e74f975ba869aa77fde6ea8a83a3af2614757b0098aa",
-        "address": "0x31F29C9A3D0c1c13C825475aebF0d964b5B47c45",
+        "blockNumber": 9331362,
+        "transactionHash": "0x2cc1fcafc37ce2b3ba277bf4032f4b72df804cd8ebf09bf5b50c3aeeaaf00473",
+        "address": "0x09F2D6CAf92860a1f79049E2552eFa54186c883c",
         "topics": [
           "0x2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d",
           "0xa076a07f65bcd51bcb15a0f01a65bc18f2d922acb81bcfd8af4caf5adb557091",
@@ -639,22 +639,22 @@
         ],
         "data": "0x",
         "logIndex": 2,
-        "blockHash": "0x73675ef0eb9158c28daea54273bc36408ae217df1af00382a76c79d6985478f6"
+        "blockHash": "0x1e882a8f7226ee68209ab20a3f240623aad476d68ec8dbfdde4010f41b20ccfe"
       }
     ],
-    "blockNumber": 9326237,
-    "cumulativeGasUsed": "1508317",
+    "blockNumber": 9331362,
+    "cumulativeGasUsed": "1508329",
     "status": 1,
     "byzantium": true
   },
   "args": [
-    "0xaa34B79A0Ab433eaC900fB3CB9f191F5Cd27501D",
+    "0x23e7Ef7D6F9bc3305E8EF0Fa1e5e12C1D5a4b06B",
     "6240603010000001",
     [
       2000,
-      "0xaa34B79A0Ab433eaC900fB3CB9f191F5Cd27501D",
-      100,
-      "0x5Ab03Aa79Ab91B7420b5CFF134a4188388888888"
+      "0xFd42bfb03212dA7e1A4608a44d7658641D99CF34",
+      "100",
+      "0x50A8e60041A206AcaA5F844a1104896224be6F39"
     ]
   ],
   "numDeployments": 1,
diff --git a/out/imtbl_test_dev.json b/out/imtbl_test_dev.json
index b246fac..151c22b 100644
--- a/out/imtbl_test_dev.json
+++ b/out/imtbl_test_dev.json
@@ -33,6 +33,6 @@
     "name": "NFTClaimStage2WL",
     "type": "logic",
     "json": "assets/contracts/NFTClaimStage2WL.json",
-    "address": "0x31F29C9A3D0c1c13C825475aebF0d964b5B47c45"
+    "address": "0x09F2D6CAf92860a1f79049E2552eFa54186c883c"
   }
 ]
\ No newline at end of file