Ensure that a valid child can reedem perk and do tasks

Author: danitome24

packages/foundry/contracts/KiddoPerks.sol

@@ -26,11 +26,13 @@ contract KiddoPerks is Ownable {
     uint256 id, address by, uint256 tokensRequired
   );
   error KiddoPerks__PerkAlreadyRedemmed(uint256 id, address by);
+  error KiddoPerks__NoValidChild(address childAddr);
 
   KDOToken token;
   address public parent;
 
   mapping(uint256 => Child) public s_children;
+  mapping(address child => bool isActive) s_validChildAddresses;
   uint256 public s_childrenNextId = 0;
 
   mapping(uint256 => Perk) public s_perks;
@@ -136,7 +138,7 @@ contract KiddoPerks is Ownable {
   function isTaskCompletedBy(
     uint256 taskId,
     address by
-  ) public view returns (bool) {
+  ) public view onlyValidChild(by) returns (bool) {
     return s_completedTasksByUser[by][taskId];
   }
 
@@ -196,7 +198,7 @@ contract KiddoPerks is Ownable {
 
   function redeemPerk(
     uint256 perkId
-  ) public {
+  ) public onlyValidChild(msg.sender) {
     Perk memory perk = s_perks[perkId];
     uint256 userTokenBalance = token.balanceOf(msg.sender);
     if (userTokenBalance < perk.tokensRequired) {
@@ -223,6 +225,7 @@ contract KiddoPerks is Ownable {
   function addChild(string memory name, address childAddr) public onlyOwner {
     Child memory newChild = Child(s_childrenNextId, name, childAddr, false);
     s_children[s_childrenNextId] = newChild;
+    s_validChildAddresses[childAddr] = true;
     s_childrenNextId++;
 
     emit ChildAdded(name, childAddr);
@@ -245,6 +248,7 @@ contract KiddoPerks is Ownable {
     }
 
     s_children[id].removed = true;
+    s_validChildAddresses[s_children[id].childAddr] = false;
 
     emit ChildRemoved(id);
   }
@@ -258,4 +262,13 @@ contract KiddoPerks is Ownable {
 
     return allChildren;
   }
+
+  modifier onlyValidChild(
+    address childAddress
+  ) {
+    if (s_validChildAddresses[childAddress] == false) {
+      revert KiddoPerks__NoValidChild(childAddress);
+    }
+    _;
+  }
 }

packages/foundry/test/KiddoPerks.t.sol

@@ -85,7 +85,11 @@ contract KiddoPerksTest is Test {
   event TaskCompleted(address indexed by, string title, uint256 taskId);
   event TokenMinted(address by, uint256 tokenReward);
 
-  function testParentCanMarkTaskAsCompleted() public withTaskCreated {
+  function testParentCanMarkTaskAsCompleted()
+    public
+    withTaskCreated
+    withChildCreated
+  {
     vm.prank(PARENT);
     vm.expectEmit(true, true, false, true);
     emit TaskCompleted(CHILD_ONE, "Clean up room", 0);
@@ -255,7 +259,7 @@ contract KiddoPerksTest is Test {
 
   event PerkRedeemed(uint256 perkId, address by);
 
-  function testChildCanRedeemPerk() public withPerkCreated {
+  function testChildCanRedeemPerk() public withPerkCreated withChildCreated {
     uint256 perkId = 0;
     uint256 initialChildBalance = 5 * 10 ** 18;
     uint256 perkTokensRequired = 2 * 10 ** 18;
@@ -274,7 +278,11 @@ contract KiddoPerksTest is Test {
     assertEq(initialChildBalance, perkTokensRequired + userFinalBalance);
   }
 
-  function testChildCannotReddemMoreThanOnceAPerk() public withPerkCreated {
+  function testChildCannotReddemMoreThanOnceAPerk()
+    public
+    withPerkCreated
+    withChildCreated
+  {
     uint256 perkId = 0;
     uint256 initialChildBalance = 5 * 10 ** 18;
     uint256 perkTokensRequired = 2 * 10 ** 18;
@@ -301,26 +309,69 @@ contract KiddoPerksTest is Test {
   function testRevertsOnRedeemWhenChildHasNotEnoughTokenBalance()
     public
     withPerkCreated
+    withChildCreated
   {
     uint256 perkId = 0;
+    uint256 tokensToMint = 1 * 10 ** 18;
+    uint256 perkTokensRequired = 2 * 10 ** 18;
     vm.prank(address(kiddoPerks));
-    kdoToken.mint(CHILD_ONE, 1 * 10 ** 18);
+    kdoToken.mint(CHILD_ONE, tokensToMint);
 
     vm.prank(CHILD_ONE);
     vm.expectRevert(
       abi.encodeWithSelector(
         KiddoPerks.KiddoPerks__NotEnoughTokenBalance.selector,
         perkId,
         CHILD_ONE,
-        2 * 10 ** 18
+        perkTokensRequired
+      )
+    );
+    kiddoPerks.redeemPerk(perkId);
+  }
+
+  function testRevertIfNoValidChildTriesToRedeemPerk() public withPerkCreated {
+    uint256 perkId = 0;
+    uint256 tokensToMint = 1 * 10 ** 18;
+
+    vm.prank(address(kiddoPerks));
+    kdoToken.mint(CHILD_TWO, tokensToMint);
+
+    vm.prank(CHILD_TWO);
+    vm.expectRevert(
+      abi.encodeWithSelector(
+        KiddoPerks.KiddoPerks__NoValidChild.selector, CHILD_TWO
       )
     );
     kiddoPerks.redeemPerk(perkId);
   }
 
+  function testRevertIfRemovedChildTriesToRedeemPerk()
+    public
+    withPerkCreated
+    withChildCreated
+  {
+    uint256 perkId = 0;
+    uint256 childId = 0;
+    uint256 tokensToMint = 1 * 10 ** 18;
+
+    vm.prank(address(kiddoPerks));
+    kdoToken.mint(CHILD_ONE, tokensToMint);
+
+    vm.prank(PARENT);
+    kiddoPerks.removeChild(childId);
+
+    vm.prank(CHILD_ONE);
+    vm.expectRevert(
+      abi.encodeWithSelector(
+        KiddoPerks.KiddoPerks__NoValidChild.selector, CHILD_ONE
+      )
+    );
+    kiddoPerks.redeemPerk(perkId);
+  }
   /////////////////////
   //// Child test
   /////////////////////
+
   function testRevertsIfNoParentTriesToAddChild() public withTaskCreated {
     string memory childName = "Willy";
     vm.prank(CHILD_ONE);