From d4acaea8a0abaee151c696d2670ffd4681018d43 Mon Sep 17 00:00:00 2001
From: CounterFire2023 <136581895+CounterFire2023@users.noreply.github.com>
Date: Fri, 14 Jun 2024 17:24:09 +0800
Subject: [PATCH] =?UTF-8?q?2=E6=9C=9Fmint=E5=90=88=E7=BA=A6=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=80=E4=B8=AA=E7=94=A8=E4=BA=8E=E6=A0=87=E8=AF=86?=
 =?UTF-8?q?=E7=A9=BA=E6=8A=95=E6=95=B0=E9=87=8F=E7=9A=84=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/config_imtbl_test.js             | 6 ++++--
 contracts/activity/NFTClaimStage2WL.sol | 3 ++-
 deploy/2_1_deploy_nftclaimer_wl.ts      | 3 ++-
 out/imtbl_test_dev.json                 | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/config/config_imtbl_test.js b/config/config_imtbl_test.js
index b8c5cc7..6b95fa3 100644
--- a/config/config_imtbl_test.js
+++ b/config/config_imtbl_test.js
@@ -36,13 +36,15 @@ const mint = {
   // 2期mint支付的代币
   mintCurrency: '0xFd42bfb03212dA7e1A4608a44d7658641D99CF34',
   // 2期mint, 单个nft价格
-  mintPrice: '100',
+  mintPrice: '80000000000000000',
   // 2期mint接收代币的钱包地址
   mintFeeAddress: '0x50A8e60041A206AcaA5F844a1104896224be6F39',
   // 2期mint nftid 开始
-  mintStartNftId: '6240603010000001',
+  mintStartNftId: '6240603010010001',
   // 2期mint 最大可mint数量
   maxSupply: 2000,
+  // 2期mint airdrop数量
+  airdropCount: 500,
 }
 
 var config = {
diff --git a/contracts/activity/NFTClaimStage2WL.sol b/contracts/activity/NFTClaimStage2WL.sol
index bf62551..352f911 100644
--- a/contracts/activity/NFTClaimStage2WL.sol
+++ b/contracts/activity/NFTClaimStage2WL.sol
@@ -24,6 +24,7 @@ contract NFTClaimStage2WL is ReentrancyGuard, AccessControl {
     address currency; // token address which user must pay to mint
     uint256 mintPrice; // in wei
     address feeToAddress; // wallet address to receive mint fee
+    uint256 airdropCount; // airdrop count
   }
   // parse: 0: not open or end, 1: phase1, 2: phase2
   uint256 public mintParse = 0;
@@ -101,7 +102,7 @@ contract NFTClaimStage2WL is ReentrancyGuard, AccessControl {
     uint256 nftCount
   ) external nonReentrant whenNotPaused {
     require(nftCount > 0, "NFTClaimer: nft count must be greater than 0");
-    require(nftCount <= mintConfig.maxSupply - totalCount, "NFTClaimer: exceed max supply");
+    require(nftCount <= mintConfig.maxSupply - mintConfig.airdropCount - totalCount, "NFTClaimer: exceed max supply");
     address to = _msgSender();
     uint256 _mintedCount = _mintedRecords[to].length();
     if (mintParse == 1) {
diff --git a/deploy/2_1_deploy_nftclaimer_wl.ts b/deploy/2_1_deploy_nftclaimer_wl.ts
index 3656825..cfbb5a0 100644
--- a/deploy/2_1_deploy_nftclaimer_wl.ts
+++ b/deploy/2_1_deploy_nftclaimer_wl.ts
@@ -14,7 +14,8 @@ const deployNFTClaim: DeployFunction =
       config.mint.maxSupply,
       config.mint.mintCurrency,
       config.mint.mintPrice,
-      config.mint.mintFeeAddress
+      config.mint.mintFeeAddress,
+      config.mint.airdropCount
     ]
     const startNftId = config.mint.mintStartNftId
     const ret = await hre.deployments.deploy("NFTClaimStage2WL", {
diff --git a/out/imtbl_test_dev.json b/out/imtbl_test_dev.json
index 5dd3f0a..6d87125 100644
--- a/out/imtbl_test_dev.json
+++ b/out/imtbl_test_dev.json
@@ -21,7 +21,7 @@
     "name": "NFTClaimStage2WL",
     "type": "logic",
     "json": "assets/contracts/NFTClaimStage2WL.json",
-    "address": "0x09F2D6CAf92860a1f79049E2552eFa54186c883c"
+    "address": "0x20204A3df0c3191Ee93f4DB328Ca92aEe148Ce24"
   },
   {
     "name": "CFHero",