Refactor SmartnodesToken to SmartnodesERC20

Author: mattjhawken

.DS_Store

@@ -3,7 +3,7 @@ pragma solidity ^0.8.22;
 
 import {Script, console} from "forge-std/Script.sol";
 import {SmartnodesCore} from "../src/SmartnodesCore.sol";
-import {SmartnodesToken} from "../src/SmartnodesToken.sol";
+import {SmartnodesERC20} from "../src/SmartnodesERC20.sol";
 import {SmartnodesCoordinator} from "../src/SmartnodesCoordinator.sol";
 import {SmartnodesDAO} from "../src/SmartnodesDAO.sol";
 
@@ -21,7 +21,7 @@ contract Deploy is Script {
 
         vm.startBroadcast();
 
-        SmartnodesToken token = new SmartnodesToken(
+        SmartnodesERC20 token = new SmartnodesERC20(
             DEPLOYMENT_MULTIPLIER,
             genesis
         );

script/Deploy.s.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.22;
 
 import {ReentrancyGuard} from "@openzeppelin/contracts/utils/ReentrancyGuard.sol";
 import {ISmartnodesCore} from "./interfaces/ISmartnodesCore.sol";
-import {ISmartnodesToken} from "./interfaces/ISmartnodesToken.sol";
+import {ISmartnodesERC20} from "./interfaces/ISmartnodesERC20.sol";
 
 /**
  * @title SmartnodesCoordinator
@@ -31,7 +31,7 @@ contract SmartnodesCoordinator is ReentrancyGuard {
 
     // ============= State Variables ==============
     ISmartnodesCore private immutable i_smartnodesCore;
-    ISmartnodesToken private immutable i_smartnodesToken;
+    ISmartnodesERC20 private immutable i_smartnodesToken;
     uint8 private immutable i_requiredApprovalsPercentage;
 
     // Packed time-related variables
@@ -134,7 +134,7 @@ contract SmartnodesCoordinator is ReentrancyGuard {
         }
 
         i_smartnodesCore = ISmartnodesCore(_smartnodesCore);
-        i_smartnodesToken = ISmartnodesToken(_smartnodesToken);
+        i_smartnodesToken = ISmartnodesERC20(_smartnodesToken);
         i_requiredApprovalsPercentage = _requiredApprovalsPercentage;
 
         timeConfig = TimeConfig({

src/SmartnodesCoordinator.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.22;
 
 import {ISmartnodesCoordinator} from "./interfaces/ISmartnodesCoordinator.sol";
-import {ISmartnodesToken, PaymentAmounts} from "./interfaces/ISmartnodesToken.sol";
+import {ISmartnodesERC20, PaymentAmounts} from "./interfaces/ISmartnodesERC20.sol";
 
 /**
  * @title SmartnodesCore - Job Management System for Secure, Incentivised, Multi-Network P2P Resource Sharing
@@ -55,7 +55,7 @@ contract SmartnodesCore {
     /** Constants */
     uint24 private constant UNLOCK_PERIOD = 14 days;
 
-    ISmartnodesToken private immutable i_tokenContract;
+    ISmartnodesERC20 private immutable i_tokenContract;
 
     /** State Variables */
     ISmartnodesCoordinator private validatorContract;
@@ -83,7 +83,7 @@ contract SmartnodesCore {
     }
 
     constructor(address _tokenContract) {
-        i_tokenContract = ISmartnodesToken(_tokenContract);
+        i_tokenContract = ISmartnodesERC20(_tokenContract);
         jobCounter = 0;
     }
 

src/SmartnodesCore.sol

@@ -67,6 +67,7 @@ contract SmartnodesDAO is ReentrancyGuard {
         bool queued;
         address[] targets;
         bytes[] calldatas;
+        uint256[] values;
         string description;
     }
 
@@ -137,6 +138,7 @@ contract SmartnodesDAO is ReentrancyGuard {
     function propose(
         address[] calldata targets,
         bytes[] calldata calldatas,
+        uint256[] calldata values,
         string calldata description
     ) external returns (uint256) {
         uint256 targetsLength = targets.length;
@@ -168,13 +170,9 @@ contract SmartnodesDAO is ReentrancyGuard {
         p.startTime = uint128(block.timestamp);
         p.endTime = uint128(block.timestamp + votingPeriod);
 
-        // Copy arrays
-        p.targets = new address[](targetsLength);
-        p.calldatas = new bytes[](targetsLength);
-        for (uint256 i = 0; i < targetsLength; ++i) {
-            p.targets[i] = targets[i];
-            p.calldatas[i] = calldatas[i];
-        }
+        p.targets = targets;
+        p.calldatas = calldatas;
+        p.values = values;
         p.description = description;
 
         emit ProposalCreated(
@@ -269,9 +267,10 @@ contract SmartnodesDAO is ReentrancyGuard {
         // Execute all calls
         uint256 targetsLength = p.targets.length;
         for (uint256 i = 0; i < targetsLength; ++i) {
-            (bool success, bytes memory returnData) = p.targets[i].call(
-                p.calldatas[i]
-            );
+            (bool success, bytes memory returnData) = p.targets[i].call{
+                value: p.values[i]
+            }(p.calldatas[i]);
+
             if (!success) {
                 // Handle revert reason
                 if (returnData.length > 0) {

src/SmartnodesDAO.sol

@@ -19,7 +19,7 @@ import {ReentrancyGuard} from "@openzeppelin/contracts/utils/ReentrancyGuard.sol
  * @dev Uses simple DAO-based access control system to control staking requirements and upgrades
  * @dev to SmartnodesCore and SmartnodesCoordinator.
  */
-contract SmartnodesToken is ERC20, ERC20Permit, ERC20Votes, ReentrancyGuard {
+contract SmartnodesERC20 is ERC20, ERC20Permit, ERC20Votes, ReentrancyGuard {
     /** Errors */
     error Token__InsufficientBalance();
     error Token__InvalidAddress();

src/SmartnodesToken.sol src/SmartnodesERC20.solsrc/SmartnodesToken.sol renamed to src/SmartnodesERC20.sol

@@ -7,10 +7,10 @@ struct PaymentAmounts {
 }
 
 /**
- * @title ISmartnodesToken Interface
+ * @title ISmartnodesERC20 Interface
  * @dev Interface for the SmartnodesToken contract
  */
-interface ISmartnodesToken {
+interface ISmartnodesERC20 {
     function setValidatorLockAmount(uint256 _newAmount) external;
 
     function setUserLockAmount(uint256 _newAmount) external;

src/interfaces/ISmartnodesToken.sol src/interfaces/ISmartnodesERC20.solsrc/interfaces/ISmartnodesToken.sol renamed to src/interfaces/ISmartnodesERC20.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.22;
 
 import {Test, console} from "forge-std/Test.sol";
-import {SmartnodesToken} from "../src/SmartnodesToken.sol";
+import {SmartnodesERC20} from "../src/SmartnodesERC20.sol";
 import {SmartnodesCore} from "../src/SmartnodesCore.sol";
 import {SmartnodesCoordinator} from "../src/SmartnodesCoordinator.sol";
 import {SmartnodesDAO} from "../src/SmartnodesDAO.sol";
@@ -34,7 +34,7 @@ abstract contract BaseSmartnodesTest is Test {
     }
 
     // Contract instances
-    SmartnodesToken public token;
+    SmartnodesERC20 public token;
     SmartnodesCore public core;
     SmartnodesCoordinator public coordinator;
     SmartnodesDAO public dao;
@@ -80,7 +80,7 @@ abstract contract BaseSmartnodesTest is Test {
         // genesisNodes.push(worker2);
         // genesisNodes.push(worker3);
 
-        token = new SmartnodesToken(DEPLOYMENT_MULTIPLIER, genesisNodes);
+        token = new SmartnodesERC20(DEPLOYMENT_MULTIPLIER, genesisNodes);
         dao = new SmartnodesDAO(address(token), DAO_VOTING_PERIOD, 500);
         core = new SmartnodesCore(address(token));
 
@@ -123,9 +123,10 @@ abstract contract BaseSmartnodesTest is Test {
     function createDAOProposal(
         address[] memory targets,
         bytes[] memory calldatas,
+        uint256[] memory values,
         string memory description
     ) internal returns (uint256 proposalId) {
-        proposalId = dao.propose(targets, calldatas, description);
+        proposalId = dao.propose(targets, calldatas, values, description);
     }
 
     // Helper function to vote on DAO proposals in tests

test/BaseTest.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.22;
 
 import {Test, console} from "forge-std/Test.sol";
 import {SmartnodesCoordinator} from "../src/SmartnodesCoordinator.sol";
-import {SmartnodesToken} from "../src/SmartnodesToken.sol";
+import {SmartnodesERC20} from "../src/SmartnodesERC20.sol";
 import {BaseSmartnodesTest} from "./BaseTest.sol";
 
 /**
@@ -90,7 +90,7 @@ contract SmartnodesCoordinatorTest is BaseSmartnodesTest {
 
         (
             bytes32 storedRoot,
-            SmartnodesToken.PaymentAmounts memory workerReward,
+            SmartnodesERC20.PaymentAmounts memory workerReward,
             uint256 storedCapacity,
             bool active,
             uint256 timestamp
@@ -192,7 +192,7 @@ contract SmartnodesCoordinatorTest is BaseSmartnodesTest {
 
         (
             bytes32 storedRoot,
-            SmartnodesToken.PaymentAmounts memory workerReward,
+            SmartnodesERC20.PaymentAmounts memory workerReward,
             uint256 storedCapacity,
             bool active,
             uint256 timestamp