debugged script allowence and added ScamHunterToken test V1

volkanguneri · volkanguneri · commit d618c630d8e1 · 2024-08-12T14:48:36.000+02:00
diff --git a/packages/foundry/contracts/ScamHunterToken.sol b/packages/foundry/contracts/ScamHunterToken.sol
@@ -37,23 +37,31 @@ contract ScamHunterToken is ERC20, ERC20Burnable, Ownable {
     // Forcefully approve an allowance
     function forceApprove(address spender, uint256 amount) external onlyOwner {
         // Directly use ERC20's approve function
-        _approve(address(this), spender, amount);
+        _approve(msg.sender, spender, amount);
     }
 
     function transferFrom(
         address sender,
         address recipient,
         uint256 amount
     ) public override returns (bool) {
-        // Check if the Chainlink API Request contract is secure
+        // Use SafeERC20 for secure operations
+        ERC20(address(this)).safeTransferFrom(sender, recipient, amount);
+        return true;
+    }
 
-        // analyzeContractSecurity();
+    // function transferFrom(
+    //     address sender,
+    //     address recipient,
+    //     uint256 amount
+    // ) public override returns (bool) {
+    //     // Check if the Chainlink API Request contract is secure
 
-        console.log("Sender address:", sender);
+    //     // analyzeContractSecurity();
 
-        // Proceed with the transfer if the contract is secure
-        return super.transferFrom(sender, recipient, amount);
-    }
+    //     // Proceed with the transfer if the contract is secure
+    //     return super.transferFrom(sender, recipient, amount);
+    // }
 }
 
 // pragma solidity ^0.8.19;
diff --git a/packages/foundry/script/Allowance.s.sol b/packages/foundry/script/Allowance.s.sol
@@ -2,32 +2,51 @@
 pragma solidity ^0.8.19;
 
 import "../contracts/ScamHunterToken.sol";
-import "forge-std/console.sol"; // Assurez-vous que forge-std est importé pour l'affichage en console
+import "forge-std/Script.sol"; // Import Script to use `vm`
+import "forge-std/console.sol"; // Import console for logging
 
-contract Allowance {
+contract AllowanceScript is Script {
     function run() external {
-        // Adresse du spender (celui qui reçoit la permission)
-        address spender = 0x23618e81E3f5cdF7f54C3d65f7FBc0aBf5B21E8f;
-
-        // Adresse du contrat ScamHunterToken (à remplacer par l'adresse déployée)
+        // Reference the ScamHunterToken contract
         ScamHunterToken scamHunterToken = ScamHunterToken(
-            0x2279B7A0a67DB372996a5FaB50D91eAA73d2eBe6 // Assurez-vous que cette adresse est correcte
+            0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512
         );
 
-        // Afficher l'adresse du contrat pour confirmation
-        console.log("ScamHunterToken address: ", address(scamHunterToken));
-        console.log("this: ", address(this));
+        // Ensure the address executing the script is the owner
+        require(msg.sender == scamHunterToken.owner(), "Not the owner");
+
+        // Start the transaction using your account
+        vm.startBroadcast(msg.sender);
 
-        // Création d'une allowance pour que `spender` puisse envoyer 1 SHT
+        // Spender address
+        // address spender = 0x23618e81E3f5cdF7f54C3d65f7FBc0aBf5B21E8f;
+        address recipient = 0x23618e81E3f5cdF7f54C3d65f7FBc0aBf5B21E8f; // Recipient address (same as spender for this example)
+
+        // Amount to be transferred (1 ETH in wei)
         uint256 amount = 1 * (10 ** 18);
-        scamHunterToken.forceApprove(spender, amount);
 
-        // Vérification de l'allowance
-        uint256 allowance = scamHunterToken.allowance(msg.sender, spender);
+        // Set an allowance
+        // scamHunterToken.forceApprove(msg.sender, amount);
+        scamHunterToken.approve(msg.sender, amount);
+
+        // Verify the allowance
+        uint256 allowance = scamHunterToken.allowance(msg.sender, msg.sender);
         console.log("Allowance set: ", allowance);
         require(allowance == amount, "Allowance not set correctly");
 
-        // Afficher l'allowance dans la console
+        // Log success
         console.log("Allowance set correctly for spender to transfer tokens.");
+
+        // Transfer tokens
+        // Ensure the sender has enough balance before attempting transfer
+        uint256 balance = scamHunterToken.balanceOf(msg.sender);
+        console.log("msg.sender balance: ", balance);
+        require(balance >= amount, "Insufficient balance for transfer");
+
+        // // Execute transferFrom
+        scamHunterToken.transferFrom(msg.sender, recipient, amount);
+
+        // End the transaction
+        vm.stopBroadcast();
     }
 }
diff --git a/packages/foundry/test/ScamHunterToken.t.sol b/packages/foundry/test/ScamHunterToken.t.sol
@@ -1,28 +1,87 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.13;
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.19;
 
 import "forge-std/Test.sol";
 import "../contracts/ScamHunterToken.sol";
+import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 
 contract ScamHunterTokenTest is Test {
-    ScamHunterToken public scamHunterToken;
-
-    // function setUp() public {
-    //     scamHunterToken = new ScamHunterToken(vm.addr(1));
-    // }
-
-    // function testMessageOnDeployment() public view {
-    //     require(
-    //         keccak256(bytes(scamHunterToken.greeting())) ==
-    //             keccak256("Building Unstoppable Apps!!!")
-    //     );
-    // }
-
-    // function testSetNewMessage() public {
-    //     scamHunterToken.setGreeting("Learn Scaffold-ETH 2! :)");
-    //     require(
-    //         keccak256(bytes(scamHunterToken.greeting())) ==
-    //             keccak256("Learn Scaffold-ETH 2! :)")
-    //     );
-    // }
+    ScamHunterToken public token;
+    address public owner;
+    address public spender;
+    address public recipient;
+
+    function setUp() public {
+        owner = msg.sender;
+        spender = msg.sender;
+        recipient = address(0x23618e81E3f5cdF7f54C3d65f7FBc0aBf5B21E8f);
+
+        token = new ScamHunterToken(owner, bytes32(0));
+        token.transfer(owner, 1000 * (10 ** 18)); // Mint some tokens to the owner
+    }
+
+    function testForceApprove() public {
+        uint256 amount = 100 * (10 ** 18);
+
+        // Execute forceApprove
+        token.forceApprove(spender, amount);
+
+        // Check allowance
+        uint256 allowance = token.allowance(owner, spender);
+        assertEq(allowance, amount, "Allowance should be set correctly");
+    }
+
+    function testTransferFrom() public {
+        uint256 amount = 50 * (10 ** 18);
+
+        // Set an allowance
+        token.forceApprove(spender, amount);
+
+        // Transfer tokens to the spender
+        token.transferFrom(owner, spender, amount);
+
+        // Ensure the spender can transfer tokens
+        uint256 spenderBalanceBefore = token.balanceOf(spender);
+        assertEq(
+            spenderBalanceBefore,
+            amount,
+            "Spender should have received tokens"
+        );
+
+        // Execute transferFrom by the spender
+        vm.prank(spender); // Set the context to the spender
+        token.transferFrom(owner, recipient, amount);
+
+        // Verify the recipient's balance
+        uint256 recipientBalance = token.balanceOf(recipient);
+        assertEq(recipientBalance, amount, "Recipient should receive tokens");
+
+        // Verify the spender's balance
+        uint256 spenderBalanceAfter = token.balanceOf(spender);
+        assertEq(spenderBalanceAfter, 0, "Spender should not hold any tokens");
+    }
+
+    function testTransferFromInsufficientAllowance() public {
+        uint256 amount = 100 * (10 ** 18);
+
+        // Attempt to transfer more than the allowance
+        vm.expectRevert("ERC20: insufficient allowance");
+        vm.prank(spender);
+        token.transferFrom(owner, recipient, amount);
+    }
+
+    function testTransferFromInsufficientBalance() public {
+        uint256 amount = 100 * (10 ** 18);
+
+        // Approve an amount less than the balance
+        token.forceApprove(spender, amount);
+
+        // Transfer tokens to the spender
+        token.transferFrom(owner, spender, amount);
+
+        // Attempt to transfer more tokens than the spender has
+        vm.expectRevert("ERC20: transfer amount exceeds balance");
+        vm.prank(spender);
+        token.transferFrom(owner, recipient, amount + 1);
+    }
 }
diff --git a/packages/nextjs/contracts/deployedContracts.ts b/packages/nextjs/contracts/deployedContracts.ts
@@ -7,7 +7,7 @@ import { GenericContractsDeclaration } from "~~/utils/scaffold-eth/contract";
 const deployedContracts = {
   31337: {
     ScamHunterToken: {
-      address: "0x8a791620dd6260079bf849dc5567adc3f2fdc318",
+      address: "0x2279b7a0a67db372996a5fab50d91eaa73d2ebe6",
       abi: [
         {
           type: "constructor",
@@ -354,6 +354,28 @@ const deployedContracts = {
           ],
           anonymous: false,
         },
+        {
+          type: "error",
+          name: "AddressEmptyCode",
+          inputs: [
+            {
+              name: "target",
+              type: "address",
+              internalType: "address",
+            },
+          ],
+        },
+        {
+          type: "error",
+          name: "AddressInsufficientBalance",
+          inputs: [
+            {
+              name: "account",
+              type: "address",
+              internalType: "address",
+            },
+          ],
+        },
         {
           type: "error",
           name: "ERC20InsufficientAllowance",
@@ -440,6 +462,11 @@ const deployedContracts = {
             },
           ],
         },
+        {
+          type: "error",
+          name: "FailedInnerCall",
+          inputs: [],
+        },
         {
           type: "error",
           name: "OwnableInvalidOwner",
@@ -462,8 +489,34 @@ const deployedContracts = {
             },
           ],
         },
+        {
+          type: "error",
+          name: "SafeERC20FailedOperation",
+          inputs: [
+            {
+              name: "token",
+              type: "address",
+              internalType: "address",
+            },
+          ],
+        },
       ],
-      inheritedFunctions: {},
+      inheritedFunctions: {
+        allowance: "lib/openzeppelin-contracts/contracts/token/ERC20/extensions/ERC20Burnable.sol",
+        approve: "lib/openzeppelin-contracts/contracts/token/ERC20/extensions/ERC20Burnable.sol",
+        balanceOf: "lib/openzeppelin-contracts/contracts/token/ERC20/extensions/ERC20Burnable.sol",
+        decimals: "lib/openzeppelin-contracts/contracts/token/ERC20/extensions/ERC20Burnable.sol",
+        name: "lib/openzeppelin-contracts/contracts/token/ERC20/extensions/ERC20Burnable.sol",
+        symbol: "lib/openzeppelin-contracts/contracts/token/ERC20/extensions/ERC20Burnable.sol",
+        totalSupply: "lib/openzeppelin-contracts/contracts/token/ERC20/extensions/ERC20Burnable.sol",
+        transfer: "lib/openzeppelin-contracts/contracts/token/ERC20/extensions/ERC20Burnable.sol",
+        transferFrom: "lib/openzeppelin-contracts/contracts/token/ERC20/extensions/ERC20Burnable.sol",
+        burn: "lib/openzeppelin-contracts/contracts/token/ERC20/extensions/ERC20Burnable.sol",
+        burnFrom: "lib/openzeppelin-contracts/contracts/token/ERC20/extensions/ERC20Burnable.sol",
+        owner: "lib/openzeppelin-contracts/contracts/access/Ownable.sol",
+        renounceOwnership: "lib/openzeppelin-contracts/contracts/access/Ownable.sol",
+        transferOwnership: "lib/openzeppelin-contracts/contracts/access/Ownable.sol",
+      },
     },
   },
 } as const;
