From 9a45a120a979a1efb5c329e0371f49e279209d80 Mon Sep 17 00:00:00 2001
From: CounterFire2023 <136581895+CounterFire2023@users.noreply.github.com>
Date: Thu, 13 Jun 2024 15:37:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=AE=98=E6=96=B9=E7=9A=84al?=
 =?UTF-8?q?lowlist=E5=8F=91=E5=B8=83=E6=96=B0=E7=9A=84nft?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deploy/1_deploy_nft.ts  | 28 ++++++++++++++--------------
 out/imtbl_test_dev.json | 16 ++++++++--------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/deploy/1_deploy_nft.ts b/deploy/1_deploy_nft.ts
index 2a24c77..1ae8e63 100644
--- a/deploy/1_deploy_nft.ts
+++ b/deploy/1_deploy_nft.ts
@@ -17,7 +17,7 @@ const deployNFTForGame: DeployFunction =
       // });
       // console.log("==OperatorAllowlist addr=", allowListRet.address);
       // operatorAllowlist = allowListRet.address;
-      operatorAllowlist = '0x3c5991E9A0e6c713163cD0a91f246dc61f18d918'
+      operatorAllowlist = '0x6b969FD89dE634d8DE3271EbE97734FEFfcd58eE'
     }
     
     const owner = from;
@@ -28,19 +28,19 @@ const deployNFTForGame: DeployFunction =
     // testnet_CF: 0x3c5991E9A0e6c713163cD0a91f246dc61f18d918
     const { royaltyReceiver, royaltyFee, baseTokenURIHero, baseTokenURIGold, contractURIHero, contractURIGold } = config.token;
     console.log(owner, name, symbol, baseTokenURIHero, contractURIHero, operatorAllowlist, royaltyReceiver, royaltyFee)
-    // const ret = await hre.deployments.deploy("CFNFTGame", {
-    //   from,
-    //   args: [owner, name, symbol, baseTokenURIHero, contractURI, operatorAllowlist, royaltyReceiver, royaltyFee],
-    //   log: true,
-    // });
-    // console.log("==CFNFTGame addr=", ret.address);
-    // updateArray({
-    //   name: "CFHero",
-    //   type: "erc721",
-    //   json: "assets/contracts/CFNFTGame.json",
-    //   address: ret.address,
-    //   network: hre.network.name,
-    // });
+    const ret1 = await hre.deployments.deploy("CFNFTGame", {
+      from,
+      args: [owner, name, symbol, baseTokenURIHero, contractURIHero, operatorAllowlist, royaltyReceiver, royaltyFee],
+      log: true,
+    });
+    console.log("==CFNFTGame addr=", ret1.address);
+    updateArray({
+      name: "CFHero",
+      type: "erc721",
+      json: "assets/contracts/CFNFTGame.json",
+      address: ret1.address,
+      network: hre.network.name,
+    });
     const nameGold = "CFGold brick";
     const symbolGold = "CFG";
     const ret = await hre.deployments.deploy("CFNFTGame", {
diff --git a/out/imtbl_test_dev.json b/out/imtbl_test_dev.json
index 151c22b..5dd3f0a 100644
--- a/out/imtbl_test_dev.json
+++ b/out/imtbl_test_dev.json
@@ -17,22 +17,22 @@
     "json": "assets/contracts/NFTLock.json",
     "address": "0x59e751c2037B710090035B6ea928e0cce80aC03f"
   },
+  {
+    "name": "NFTClaimStage2WL",
+    "type": "logic",
+    "json": "assets/contracts/NFTClaimStage2WL.json",
+    "address": "0x09F2D6CAf92860a1f79049E2552eFa54186c883c"
+  },
   {
     "name": "CFHero",
     "type": "erc721",
     "json": "assets/contracts/CFNFTGame.json",
-    "address": "0x23e7Ef7D6F9bc3305E8EF0Fa1e5e12C1D5a4b06B"
+    "address": "0x65570A86E5aA2B14325f8a13C70b74f7d1E2f5c9"
   },
   {
     "name": "GoldBrick",
     "type": "erc721",
     "json": "assets/contracts/CFNFTGame.json",
-    "address": "0x2036A0708AC2F17F67b08357d8b4A7d47cF49c29"
-  },
-  {
-    "name": "NFTClaimStage2WL",
-    "type": "logic",
-    "json": "assets/contracts/NFTClaimStage2WL.json",
-    "address": "0x09F2D6CAf92860a1f79049E2552eFa54186c883c"
+    "address": "0x75C0c6eD851036DB28c750Bd9bfa3A72B5107801"
   }
 ]
\ No newline at end of file