add players address to promotions (#93)

PaintSwap · Nov 1, 2024 · 9e0853c · 9e0853c
1 parent ad26d6a
commit 9e0853c
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 48 deletions.
diff --git a/contracts/Promotions.sol b/contracts/Promotions.sol
@@ -64,6 +64,7 @@ contract Promotions is UUPSUpgradeable, OwnableUpgradeable {
   error PercentNotTotal100();
 
   AdminAccess private _adminAccess;
+  IPlayers private _players;
   ItemNFT private _itemNFT;
   PlayerNFT private _playerNFT;
   IBrushToken private _brush;
@@ -85,10 +86,7 @@ contract Promotions is UUPSUpgradeable, OwnableUpgradeable {
   uint256 public constant FINAL_PROMOTION_DAY_INDEX = 31;
 
   modifier isOwnerOfPlayerAndActive(uint256 playerId) {
-    require(
-      IPlayers(_itemNFT.getPlayersAddress()).isOwnerOfPlayerAndActive(_msgSender(), playerId),
-      NotOwnerOfPlayerAndActive()
-    );
+    require(_players.isOwnerOfPlayerAndActive(_msgSender(), playerId), NotOwnerOfPlayerAndActive());
     _;
   }
 
@@ -98,6 +96,7 @@ contract Promotions is UUPSUpgradeable, OwnableUpgradeable {
   }
 
   function initialize(
+    IPlayers players,
     ItemNFT itemNFT,
     PlayerNFT playerNFT,
     IBrushToken brush,
@@ -109,6 +108,7 @@ contract Promotions is UUPSUpgradeable, OwnableUpgradeable {
     __UUPSUpgradeable_init();
     __Ownable_init(_msgSender());
 
+    _players = players;
     _itemNFT = itemNFT;
     _playerNFT = playerNFT;
     _brush = brush;

diff --git a/data/abi/Promotions.json b/data/abi/Promotions.json
@@ -1260,6 +1260,11 @@
   },
   {
     "inputs": [
+      {
+        "internalType": "contract IPlayers",
+        "name": "players",
+        "type": "address"
+      },
       {
         "internalType": "contract ItemNFT",
         "name": "itemNFT",

diff --git a/scripts/deploy.ts b/scripts/deploy.ts
@@ -366,29 +366,6 @@ async function main() {
   await promotionsLibrary.waitForDeployment();
   console.log(`promotionsLibrary = "${(await promotionsLibrary.getAddress()).toLowerCase()}"`);
 
-  const Promotions = await ethers.getContractFactory("Promotions", {
-    libraries: {PromotionsLibrary: await promotionsLibrary.getAddress()}
-  });
-  const promotions = (await upgrades.deployProxy(
-    Promotions,
-    [
-      await itemNFT.getAddress(),
-      await playerNFT.getAddress(),
-      await brush.getAddress(),
-      await treasury.getAddress(),
-      DEV_ADDRESS,
-      await adminAccess.getAddress(),
-      isBeta
-    ],
-    {
-      kind: "uups",
-      unsafeAllow: ["external-library-linking"],
-      timeout
-    }
-  )) as unknown as Promotions;
-  await promotions.waitForDeployment();
-  console.log(`promotions = "${(await promotions.getAddress()).toLowerCase()}"`);
-
   const buyPath: [string, string] = [await wftm.getAddress(), await brush.getAddress()];
   const Quests = await ethers.getContractFactory("Quests");
   const quests = (await upgrades.deployProxy(Quests, [await world.getAddress(), await router.getAddress(), buyPath], {
@@ -511,6 +488,30 @@ async function main() {
   await players.waitForDeployment();
   console.log(`players = "${(await players.getAddress()).toLowerCase()}"`);
 
+  const Promotions = await ethers.getContractFactory("Promotions", {
+    libraries: {PromotionsLibrary: await promotionsLibrary.getAddress()}
+  });
+  const promotions = (await upgrades.deployProxy(
+    Promotions,
+    [
+      await players.getAddress(),
+      await itemNFT.getAddress(),
+      await playerNFT.getAddress(),
+      await brush.getAddress(),
+      await treasury.getAddress(),
+      DEV_ADDRESS,
+      await adminAccess.getAddress(),
+      isBeta
+    ],
+    {
+      kind: "uups",
+      unsafeAllow: ["external-library-linking"],
+      timeout
+    }
+  )) as unknown as Promotions;
+  await promotions.waitForDeployment();
+  console.log(`promotions = "${(await promotions.getAddress()).toLowerCase()}"`);
+
   const PassiveActions = await ethers.getContractFactory("PassiveActions", {
     libraries: {WorldLibrary: await worldLibrary.getAddress()}
   });

diff --git a/test/Players/PlayersFixture.ts b/test/Players/PlayersFixture.ts
@@ -157,27 +157,6 @@ export const playersFixture = async function () {
     }
   )) as unknown as PlayerNFT;
 
-  const promotionsLibrary = (await ethers.deployContract("PromotionsLibrary")) as PromotionsLibrary;
-  const Promotions = await ethers.getContractFactory("Promotions", {
-    libraries: {PromotionsLibrary: await promotionsLibrary.getAddress()}
-  });
-  const promotions = (await upgrades.deployProxy(
-    Promotions,
-    [
-      await itemNFT.getAddress(),
-      await playerNFT.getAddress(),
-      await brush.getAddress(),
-      await treasury.getAddress(),
-      await dev.getAddress(),
-      await adminAccess.getAddress(),
-      isBeta
-    ],
-    {
-      kind: "uups",
-      unsafeAllow: ["external-library-linking"]
-    }
-  )) as unknown as Promotions;
-
   const buyPath: [string, string] = [alice.address, await brush.getAddress()];
   const Quests = await ethers.getContractFactory("Quests");
   const quests = (await upgrades.deployProxy(Quests, [await world.getAddress(), await router.getAddress(), buyPath], {
@@ -290,6 +269,28 @@ export const playersFixture = async function () {
     }
   )) as unknown as Players;
 
+  const promotionsLibrary = (await ethers.deployContract("PromotionsLibrary")) as PromotionsLibrary;
+  const Promotions = await ethers.getContractFactory("Promotions", {
+    libraries: {PromotionsLibrary: await promotionsLibrary.getAddress()}
+  });
+  const promotions = (await upgrades.deployProxy(
+    Promotions,
+    [
+      await players.getAddress(),
+      await itemNFT.getAddress(),
+      await playerNFT.getAddress(),
+      await brush.getAddress(),
+      await treasury.getAddress(),
+      await dev.getAddress(),
+      await adminAccess.getAddress(),
+      isBeta
+    ],
+    {
+      kind: "uups",
+      unsafeAllow: ["external-library-linking"]
+    }
+  )) as unknown as Promotions;
+
   const InstantActions = await ethers.getContractFactory("InstantActions");
   const instantActions = (await upgrades.deployProxy(
     InstantActions,