Skip to content

Optimized verifyTransfer #368

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
maxsam4 merged 5 commits into from
Oct 25, 2018
Merged

Optimized verifyTransfer #368

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
024939a
Optimized verifyTransfer
maxsam4 Oct 22, 2018
5631ae6
minor optimization
maxsam4 Oct 23, 2018
70426ea
Merge branch 'development-1.5.0' into optimize-verifytransfer
maxsam4 Oct 23, 2018
6199a26
Force valid fixed
maxsam4 Oct 25, 2018
b3afa8a
Merge branch 'development-1.5.0' into optimize-verifytransfer
pabloruiz55 Oct 25, 2018
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
13 changes: 4 additions & 9 deletions contracts/tokens/SecurityToken.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -548,28 +548,23 @@ contract SecurityToken is StandardToken, DetailedERC20, ReentrancyGuard, Registr
uint256 _value,
bytes _data,
bool _isTransfer
) internal checkGranularity(_value) returns (bool) {
) internal checkGranularity(_value) returns (bool) {
if (!transfersFrozen) {
if (modules[TRANSFER_KEY].length == 0) {
return true;
}
bool isInvalid = false;
bool isValid = false;
bool isForceValid = false;
bool unarchived = false;
address module;
for (uint8 i = 0; i < modules[TRANSFER_KEY].length; i++) {
for (uint256 i = 0; i < modules[TRANSFER_KEY].length; i++) {
module = modules[TRANSFER_KEY][i];
if (!modulesToData[module].isArchived) {
unarchived = true;
ITransferManager.Result valid = ITransferManager(module).verifyTransfer(_from, _to, _value, _data, _isTransfer);
if (valid == ITransferManager.Result.INVALID) {
isInvalid = true;
}
if (valid == ITransferManager.Result.VALID) {
} else if (valid == ITransferManager.Result.VALID) {
isValid = true;
}
if (valid == ITransferManager.Result.FORCE_VALID) {
} else if (valid == ITransferManager.Result.FORCE_VALID) {
isForceValid = true;
}
}
Expand Down