A

Merge branch 'master' of https://github.com/FlightClubS4/contracts
FlightClubS4 · Dec 1, 2024 · 24e1d7b · 24e1d7b
2 parents 74623f9 + 9efe0cb
commit 24e1d7b
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 3 deletions.
diff --git a/src/fat-token.sol b/src/fat-token.sol
@@ -20,7 +20,7 @@ contract FatToken is ERC20Upgradeable, OwnableUpgradeable, UUPSUpgradeable {
   /********************************************/
 
   /******************* state ********************/
-  mapping(address tokenOwner => address gameCA) private _delegateTo;
+  mapping(address tokenOwner => address gameCA) public _delegateTo;
   /********************************************/
 
   uint constant public FATS_PER_ETH = 10000000;
@@ -87,6 +87,7 @@ contract FatToken is ERC20Upgradeable, OwnableUpgradeable, UUPSUpgradeable {
   function undelegate(address to) public {
     address delegator = _delegateTo[to];
     if (delegator == msg.sender) {
+      _approve(to, delegator, 0);
       delete _delegateTo[to];
     } else {
       revert FatToken_InvalidOperator(delegator, msg.sender);

diff --git a/test/fat-token-test.s.sol b/test/fat-token-test.s.sol
@@ -25,19 +25,54 @@ contract FatTokenTest is Test {
     vm.stopPrank();
   }
 
-  function testMint() public {
+  function _adminMint() internal {
+    deal(admin,1 ether);
+    vm.prank(admin);
+    fatTokenAddress.call{value: 1 ether}("");
+  }
 
+  function testMint() public {
+    _adminMint();
+    assertEq(fatToken.balanceOf(admin), fatToken.FATS_PER_ETH()* 1 ether);
   }
 
   function testBurn() public {
+    _adminMint();
+    uint256 burnAmount = fatToken.balanceOf(admin);
+    vm.prank(admin);
+    fatToken.burn(payable(userA), burnAmount);
+    assertEq(userA.balance, burnAmount / fatToken.FATS_PER_ETH());
+  }
 
+  function _txoriginDelegateToUserA() internal {
+    deal(fatTokenAddress, tx.origin, 3 ether);
+    vm.prank(tx.origin);
+    fatToken.delegateTo(userA);
+    vm.prank(userA);
+    fatToken.transferFrom(tx.origin,userA, 1 ether);
   }
 
   function testDelegateTo() public {
-
+    _txoriginDelegateToUserA();
+    assertEq(fatToken.balanceOf(userA), 1 ether);
+    // only delegator: userA can transfer token.
+    vm.expectRevert();
+    vm.prank(tx.origin);
+    fatToken.transfer(userA, 1 ether);
   }
 
   function testUnDelegateTo() public {
+    _txoriginDelegateToUserA();
+
+    vm.prank(userA);
+    fatToken.undelegate(tx.origin);
+
+    vm.prank(tx.origin);
+    fatToken.transfer(userA, 1 ether);
 
+    // only delegator: userA can transfer token.
+    vm.expectRevert();
+    vm.prank(userA);
+    fatToken.transferFrom(tx.origin, userA,1 ether);
   }
 }