NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change sha3 and suicide methods to keccak256 and selfdestruct

Browse Source 
see ethereum/solidity#1476
This commit is contained in:
Francisco Giordano
2017-04-03 11:30:32 -03:00
parent a344d42a00
commit 6f311e72b3
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
contracts/MultisigWallet.sol
View File

@ -25,8 +25,8 @@ contract MultisigWallet is Multisig, Shareable, DayLimit {
DayLimit(_daylimit) { } DayLimit(_daylimit) { }
// kills the contract sending everything to `_to`. // kills the contract sending everything to `_to`.
function kill(address _to) onlymanyowners(sha3(msg.data)) external { function kill(address _to) onlymanyowners(keccak256(msg.data)) external {
suicide(_to); selfdestruct(_to);
} }
// gets called when no other function matches // gets called when no other function matches
@ -51,7 +51,7 @@ contract MultisigWallet is Multisig, Shareable, DayLimit {
return 0; return 0;
} }
// determine our operation hash. // determine our operation hash.
_r = sha3(msg.data, block.number); _r = keccak256(msg.data, block.number);
if (!confirm(_r) && txs[_r].to == 0) { if (!confirm(_r) && txs[_r].to == 0) {
txs[_r].to = _to; txs[_r].to = _to;
txs[_r].value = _value; txs[_r].value = _value;
@ -73,11 +73,11 @@ contract MultisigWallet is Multisig, Shareable, DayLimit {
} }
} }
function setDailyLimit(uint _newLimit) onlymanyowners(sha3(msg.data)) external { function setDailyLimit(uint _newLimit) onlymanyowners(keccak256(msg.data)) external {
_setDailyLimit(_newLimit); _setDailyLimit(_newLimit);
} }
function resetSpentToday() onlymanyowners(sha3(msg.data)) external { function resetSpentToday() onlymanyowners(keccak256(msg.data)) external {
_resetSpentToday(); _resetSpentToday();
} }