Skip to content
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

Jump to bottom

VRTM audit fixes #617

Merged
merged 12 commits into from
Mar 29, 2019
Merged

VRTM audit fixes #617

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c4afe28
audit fixes 1..9
SatyamSB Mar 26, 2019
95e7b2c
add test cases for the major issue
SatyamSB Mar 26, 2019
de6decc
test fix
SatyamSB Mar 26, 2019
1191f38
improve the test run
SatyamSB Mar 27, 2019
60b2aa0
add the startTime == 0 check
SatyamSB Mar 28, 2019
031f5dd
resolve the edge case when the investors restriction changes
SatyamSB Mar 29, 2019
3672305
Minor change
maxsam4 Mar 29, 2019
6aba6b9
VRTM size reduction to 24.21KB
maxsam4 Mar 29, 2019
5a2231a
Reduced VRTM size to be under the limit
maxsam4 Mar 29, 2019
7309dcb
add the code comments
SatyamSB Mar 29, 2019
4c43cf5
increase the time to fix the coverage
SatyamSB Mar 29, 2019
8d87605
optimize the code
SatyamSB Mar 29, 2019
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
35 changes: 28 additions & 7 deletions contracts/libraries/VolumeRestrictionLib.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ library VolumeRestrictionLib {
uint256[] _startTimes,
uint256[] _rollingPeriodInDays,
uint256[] _endTimes,
uint256[] _restrictionTypes
VolumeRestrictionTMStorage.RestrictionType[] _restrictionTypes
)
internal
pure
Expand All @@ -30,14 +30,20 @@ library VolumeRestrictionLib {
);
}

function deleteHolderFromList(VolumeRestrictionTMStorage.RestrictedData storage data, address _holder, uint8 _typeOfPeriod) public {
function deleteHolderFromList(
VolumeRestrictionTMStorage.RestrictedData storage data,
address _holder,
VolumeRestrictionTMStorage.TypeOfPeriod _typeOfPeriod
)
public
{
// Deleting the holder if holder's type of Period is `Both` type otherwise
// it will assign the given type `_typeOfPeriod` to the _holder typeOfPeriod
// `_typeOfPeriod` it always be contrary to the removing restriction
// if removing restriction is individual then typeOfPeriod is TypeOfPeriod.OneDay
// in uint8 its value is 1. if removing restriction is daily individual then typeOfPeriod
// is TypeOfPeriod.MultipleDays in uint8 its value is 0.
if (data.restrictedHolders[_holder].typeOfPeriod != uint8(VolumeRestrictionTMStorage.TypeOfPeriod.Both)) {
if (data.restrictedHolders[_holder].typeOfPeriod != VolumeRestrictionTMStorage.TypeOfPeriod.Both) {
uint128 index = data.restrictedHolders[_holder].index;
uint256 _len = data.restrictedAddresses.length;
if (index != _len) {
Expand All @@ -51,19 +57,34 @@ library VolumeRestrictionLib {
}
}

function addRestrictionData(VolumeRestrictionTMStorage.RestrictedData storage data, address _holder, uint8 _callFrom, uint256 _endTime) public {
function addRestrictionData(
VolumeRestrictionTMStorage.RestrictedData storage data,
address _holder,
VolumeRestrictionTMStorage.TypeOfPeriod _callFrom,
uint256 _endTime
)
public
{
uint128 index = data.restrictedHolders[_holder].index;
if (data.restrictedHolders[_holder].seen == 0) {
data.restrictedAddresses.push(_holder);
index = uint128(data.restrictedAddresses.length);
}
uint8 _type = _getTypeOfPeriod(data.restrictedHolders[_holder].typeOfPeriod, _callFrom, _endTime);
VolumeRestrictionTMStorage.TypeOfPeriod _type = _getTypeOfPeriod(data.restrictedHolders[_holder].typeOfPeriod, _callFrom, _endTime);
data.restrictedHolders[_holder] = VolumeRestrictionTMStorage.RestrictedHolder(uint8(1), _type, index);
}

function _getTypeOfPeriod(uint8 _currentTypeOfPeriod, uint8 _callFrom, uint256 _endTime) internal pure returns(uint8) {
function _getTypeOfPeriod(
VolumeRestrictionTMStorage.TypeOfPeriod _currentTypeOfPeriod,
VolumeRestrictionTMStorage.TypeOfPeriod _callFrom,
uint256 _endTime
)
internal
pure
returns(VolumeRestrictionTMStorage.TypeOfPeriod)
{
if (_currentTypeOfPeriod != _callFrom && _endTime != uint256(0))
return uint8(VolumeRestrictionTMStorage.TypeOfPeriod.Both);
return VolumeRestrictionTMStorage.TypeOfPeriod.Both;
else
return _callFrom;
}
Expand Down
Loading