Skip to content

Move beneficiary zero address check to Ownable #4531

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

Merged
frangio merged 9 commits into from
Sep 4, 2023
Merged

Move beneficiary zero address check to Ownable #4531

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a55eac5
moved beneficiary zero address check to Ownable
NishantKoyalwar Aug 17, 2023
eeb6ec2
formatted code using prettier
NishantKoyalwar Aug 17, 2023
72b508c
Remove unused error
Amxx Aug 25, 2023
e03cfa9
added changeset
NishantKoyalwar Aug 31, 2023
861be75
Merge remote-tracking branch 'origin'
NishantKoyalwar Aug 31, 2023
1d111c8
Update .changeset/clever-bats-kick.md
NishantKoyalwar Aug 31, 2023
e37d5b4
update tests
Amxx Sep 1, 2023
67d1a7c
lint
frangio Sep 4, 2023
edf487a
Update clever-bats-kick.md
frangio Sep 4, 2023
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
Next Next commit
moved beneficiary zero address check to Ownable
  • Loading branch information
@NishantKoyalwar
NishantKoyalwar committed Aug 17, 2023
commit a55eac5a63a630b3fbe3a71680971818e78c6440
3 changes: 3 additions & 0 deletions contracts/access/Ownable.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ abstract contract Ownable is Context {
* @dev Initializes the contract setting the address provided by the deployer as the initial owner.
*/
constructor(address initialOwner) {
if (initialOwner == address(0)) {
revert OwnableInvalidOwner(address(0));
}
_transferOwnership(initialOwner);
}

Expand Down
5 changes: 1 addition & 4 deletions contracts/finance/VestingWallet.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,7 @@ contract VestingWallet is Context, Ownable {
* vesting duration of the vesting wallet.
*/
constructor(address beneficiary, uint64 startTimestamp, uint64 durationSeconds) payable Ownable(beneficiary) {
if (beneficiary == address(0)) {
revert VestingWalletInvalidBeneficiary(address(0));
}


_start = startTimestamp;
_duration = durationSeconds;
}
Expand Down