Skip to content

merged the fix to ST from PR 327 #382

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

merged the fix to ST from PR 327 #382

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbd2850
merged the fix to ST from PR 327
pabloruiz55 Oct 25, 2018
2605ac0
typo fix
maxsam4 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
12 changes: 10 additions & 2 deletions contracts/tokens/SecurityToken.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,11 +521,19 @@ contract SecurityToken is StandardToken, DetailedERC20, ReentrancyGuard, Registr
* @param _data data to indicate validation
* @return bool success
*/
function _updateTransfer(address _from, address _to, uint256 _value, bytes _data) internal returns(bool) {
function _updateTransfer(address _from, address _to, uint256 _value, bytes _data) internal nonReentrant returns(bool) {
// NB - the ordering in this function implies the following:
// - investor counts are updated before transfer managers are called - i.e. transfer managers will see
//investor counts including the current transfer.
// - checkpoints are updated after the transfer managers are called. This allows TMs to create
//checkpoints as though they have been created before the current transactions,
// - to avoid the situation where a transfer manager transfers tokens, and this function is called recursively,
//the function is marked as nonReentrant. This means that no TM can transfer (or mint / burn) tokens.
_adjustInvestorCount(_from, _to, _value);
bool verified = _verifyTransfer(_from, _to, _value, _data, true);
_adjustBalanceCheckpoints(_from);
_adjustBalanceCheckpoints(_to);
return _verifyTransfer(_from, _to, _value, _data, true);
return verified;
}

/**
Expand Down