address comment

Author: CoderZhi

README.md

@@ -48,7 +48,7 @@ $ anvil
 ### Deploy
 
 ```shell
-$ forge script script/Counter.s.sol:CounterScript --rpc-url <your_rpc_url> --private-key <your_private_key>
+$ TGE=$timestamp forge script script/NubilaNetwork.s.sol:NubilaNetworkScript --rpc-url <your_rpc_url> --private-key <your_private_key> 
 ```
 
 ### Cast

script/Counter.s.sol

@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.13;
+
+import {Script, console} from "forge-std/Script.sol";
+import {NubilaNetwork} from "../src/NubilaNetwork.sol";
+import {VestingManager} from "../src/VestingManager.sol";
+contract NubilaNetworkScript is Script {
+
+    function setUp() public {}
+
+    function run() public {
+        vm.startBroadcast();
+        uint256 tge = uint256(vm.envUint("TGE"));
+        console.log("TGE read from env:", tge);
+        NubilaNetwork nubilaNetwork = new NubilaNetwork(msg.sender);
+        console.log("NubilaNetwork deployed to:", address(nubilaNetwork));
+        address[] memory beneficiaries = new address[](12);
+        for (uint256 i = 0; i < 12; i++) {
+            beneficiaries[i] = msg.sender;
+        }
+        VestingManager vestingManager = new VestingManager(address(nubilaNetwork), tge, beneficiaries);
+        console.log("VestingManager deployed to:", address(vestingManager));
+        vm.assertTrue(nubilaNetwork.transfer(address(vestingManager), nubilaNetwork.balanceOf(msg.sender)));
+
+        vm.stopBroadcast();
+    }
+}

script/NubilaNetwork.s.sol

@@ -3,9 +3,10 @@ pragma solidity ^0.8.20;
 
 import "openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
 import "openzeppelin-contracts/contracts/access/Ownable.sol";
+import "openzeppelin-contracts/contracts/utils/Pausable.sol";
 
 /// @title Vesting Manager with Vesting Schedules
-contract VestingManager is Ownable {
+contract VestingManager is Ownable, Pausable {
     IERC20 public immutable token;
     uint256 public immutable tgeTimestamp;
 
@@ -38,6 +39,7 @@ contract VestingManager is Ownable {
 
     constructor(address _token, uint256 _tgeTimestamp, address[] memory beneficiaries) Ownable(msg.sender) {
         require(_token != address(0), "token zero");
+        require(_tgeTimestamp > block.timestamp, "tge in past");
         require(beneficiaries.length == 12, "need 12 addresses");
         token = IERC20(_token);
         tgeTimestamp = _tgeTimestamp;
@@ -126,6 +128,7 @@ contract VestingManager is Ownable {
         require(scheduleId < schedules.length, "invalid index");
         require(newBeneficiary != address(0), "new beneficiary is zero");
         VestingSchedule storage s = schedules[scheduleId];
+        require(s.beneficiary != newBeneficiary, "same beneficiary");
         s.beneficiary = newBeneficiary;
         emit BeneficiaryUpdated(scheduleId, newBeneficiary);
     }
@@ -134,7 +137,8 @@ contract VestingManager is Ownable {
         address beneficiary,
         uint256 totalAmount,
         Term[] memory terms
-    ) internal {        
+    ) internal {
+        require(beneficiary != address(0), "beneficiary is zero");
         uint256 sumWeight = 0;
         for (uint i = 0; i < terms.length; ++i) {
             if (terms[i].period == 0) {
@@ -159,7 +163,7 @@ contract VestingManager is Ownable {
         emit BeneficiaryUpdated(schedules.length - 1, beneficiary);
     }
 
-    function claim(uint256 scheduleId) external {
+    function claim(uint256 scheduleId) external whenNotPaused {
         require(scheduleId < schedules.length, "invalid index");
         VestingSchedule storage s = schedules[scheduleId];
         require(s.termIndex < s.terms.length, "invalid term index");
@@ -182,6 +186,20 @@ contract VestingManager is Ownable {
         emit Vested(scheduleId, termIdx, periodIdx, s.beneficiary, amount);
     }
 
+    function pause() external onlyOwner {
+        _pause();
+    }
+
+    function unpause() external onlyOwner {
+        _unpause();
+    }
+
+    function emergencyWithdraw(uint256 amount) external onlyOwner {
+        uint256 balance = token.balanceOf(address(this));
+        require(amount > 0 && amount <= balance, "invalid amount");
+        require(token.transfer(owner(), amount), "transfer failed");
+    }
+
     function numOfSchedules() external view returns (uint256) {
         return schedules.length;
     }

src/Counter.sol

@@ -15,6 +15,8 @@ contract VestingManagerTest is Test {
     event ScheduleCreated(uint256 indexed id, uint256 totalAmount);
     event Vested(uint256 indexed id, uint256 indexed termIndex, uint256 indexed periodIdx, address beneficiary, uint256 amount);
     event BeneficiaryUpdated(uint256 indexed id, address indexed newBeneficiary);
+    event Paused(address account);
+    event Unpaused(address account);
 
     function setUp() public {
         beneficiaries.push(address(0x1));
@@ -28,11 +30,20 @@ contract VestingManagerTest is Test {
         beneficiaries.push(address(0x9));
         beneficiaries.push(address(0xA));
         beneficiaries.push(address(0xB));
-        beneficiaries.push(address(0xC));
         vm.expectEmit(true, true, false, true);
         emit Transfer(address(0), address(this), 1_000_000_000 ether);
         token = new NubilaNetwork(address(this));
+        tge = block.timestamp;
+        vm.expectRevert("tge in past");
+        vm.warp(block.timestamp + 30 seconds);
+        manager = new VestingManager(address(token), tge, beneficiaries);
+        vm.expectRevert("need 12 addresses");
         tge = block.timestamp + 1 minutes;
+        manager = new VestingManager(address(token), tge, beneficiaries);
+        beneficiaries.push(address(0x0));
+        vm.expectRevert("beneficiary is zero");
+        manager = new VestingManager(address(token), tge, beneficiaries);
+        beneficiaries[11] = address(0xC);
         vm.expectEmit(true, false, false, true);
         emit ScheduleCreated(0, 210_000_000 ether);
         emit BeneficiaryUpdated(0, address(0x1));
@@ -73,6 +84,8 @@ contract VestingManagerTest is Test {
         manager.updateBeneficiary(12, address(0x456));
         vm.expectRevert("new beneficiary is zero");
         manager.updateBeneficiary(0, address(0));
+        vm.expectRevert("same beneficiary");
+        manager.updateBeneficiary(0, address(0x1));
 
         vm.expectEmit(true, true, false, true, address(manager));
         emit BeneficiaryUpdated(0, address(0x456));
@@ -274,6 +287,14 @@ contract VestingManagerTest is Test {
             assertEq(manager.claimable(10), 18_750_000 ether);
             assertEq(manager.claimable(11), 62_000_000 ether);
             vm.expectEmit(true, true, true, true, address(manager));
+            emit Paused(address(this));
+            manager.pause();
+            vm.expectRevert();
+            manager.claim(0);
+            vm.expectEmit(true, true, true, true, address(manager));
+            emit Unpaused(address(this));
+            manager.unpause();
+            vm.expectEmit(true, true, true, true, address(manager));
             emit Vested(0, 0, 0, beneficiaries[0], 10_500_000 ether);
             manager.claim(0);
             vm.expectEmit(true, true, true, true, address(manager));