status-im
/
open-bounty
mirror of https://github.com/status-im/open-bounty.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove nonce and assert that withdrawAllTokens will not fail because bad tokens

This commit is contained in:
Ricardo Guilherme Schmidt 2017-11-08 18:18:07 -02:00
parent fb1133ac7f
commit 54fcbed51b
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contracts/MultiSigTokenWallet.sol
View File

@ -8,7 +8,6 @@ contract MultiSigTokenWallet is MultiSigWallet {
address[] public tokens;
mapping (address => uint) watchedPos;
mapping (address => address[]) public userList;
uint public nonce;
event TokenDeposit(address indexed token, address indexed sender, uint value);
@ -39,13 +38,10 @@ contract MultiSigTokenWallet is MultiSigWallet {
{
if (_from == address(this))
return;
uint _nonce = nonce;
bool result = ERC20(_token).transferFrom(_from, this, _amount);
assert(result);
//ERC23 not executed _deposited tokenFallback by
if (nonce == _nonce) {
_deposited(_from, _amount, _token, _data);
}
require(result);
_deposited(_from, _amount, _token, _data);
}
/**
@ -168,7 +164,7 @@ contract MultiSigTokenWallet is MultiSigWallet {
address _tokenAddr = _tokenList[i];
uint _amount = ERC20(_tokenAddr).balanceOf(address(this));
if (_amount > 0) {
ERC20(_tokenAddr).transfer(_dest, _amount);
ERC20(_tokenAddr).call(bytes4(keccak256("transfer(address,uint256)")), _dest, _amount);
}
}
}