Skip to content

Prevent VestingWallet bricking from uint256 overflow in vestedAmount #5945

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Prevent VestingWallet bricking from uint256 overflow in vestedAmount #5945

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
edbaad5
Update VestingWallet.sol
DeVikingMark Sep 20, 2025
742876c
linter
DeVikingMark Sep 20, 2025
6c897d4
Update contracts/finance/VestingWallet.sol
DeVikingMark Sep 22, 2025
c37e916
Update contracts/finance/VestingWallet.sol
DeVikingMark Sep 22, 2025
47d73d1
Update contracts/finance/VestingWallet.sol
DeVikingMark Sep 22, 2025
9058959
Update VestingWallet.sol
Amxx Sep 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions contracts/finance/VestingWallet.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ pragma solidity ^0.8.20;

import {IERC20} from "../token/ERC20/IERC20.sol";
import {SafeERC20} from "../token/ERC20/utils/SafeERC20.sol";
import {Math} from "../utils/math/Math.sol";
import {Address} from "../utils/Address.sol";
import {Context} from "../utils/Context.sol";
import {Ownable} from "../access/Ownable.sol";
Expand Down Expand Up @@ -33,6 +34,8 @@ import {Ownable} from "../access/Ownable.sol";
* Consider disabling one of the withdrawal methods.
*/
contract VestingWallet is Context, Ownable {
using Math for uint256;

event EtherReleased(uint256 amount);
event ERC20Released(address indexed token, uint256 amount);

Expand Down Expand Up @@ -133,14 +136,14 @@ contract VestingWallet is Context, Ownable {
* @dev Calculates the amount of ether that has already vested. Default implementation is a linear vesting curve.
*/
function vestedAmount(uint64 timestamp) public view virtual returns (uint256) {
return _vestingSchedule(address(this).balance + released(), timestamp);
return _vestingSchedule(address(this).balance.saturatingAdd(released()), timestamp);
}

/**
* @dev Calculates the amount of tokens that has already vested. Default implementation is a linear vesting curve.
*/
function vestedAmount(address token, uint64 timestamp) public view virtual returns (uint256) {
return _vestingSchedule(IERC20(token).balanceOf(address(this)) + released(token), timestamp);
return _vestingSchedule(IERC20(token).balanceOf(address(this)).saturatingAdd(released(token)), timestamp);
}

/**
Expand All @@ -153,7 +156,7 @@ contract VestingWallet is Context, Ownable {
} else if (timestamp >= end()) {
return totalAllocation;
} else {
return (totalAllocation * (timestamp - start())) / duration();
return totalAllocation.mulDiv(timestamp - start(), duration());
}
}
}
Loading