Merge pull request OpenZeppelin#178 from frangio/fix-solidity-renamed…

…-methods Change sha3 and suicide methods to keccak256 and selfdestruct respectively
Binaryify · Apr 3, 2017 · 025e7db · 025e7db
2 parents a344d42 + 6f311e7
commit 025e7db
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/contracts/MultisigWallet.sol b/contracts/MultisigWallet.sol
@@ -25,8 +25,8 @@ contract MultisigWallet is Multisig, Shareable, DayLimit {
     DayLimit(_daylimit) { }
 
   // kills the contract sending everything to `_to`.
-  function kill(address _to) onlymanyowners(sha3(msg.data)) external {
-    suicide(_to);
+  function kill(address _to) onlymanyowners(keccak256(msg.data)) external {
+    selfdestruct(_to);
   }
 
   // gets called when no other function matches
@@ -51,7 +51,7 @@ contract MultisigWallet is Multisig, Shareable, DayLimit {
       return 0;
     }
     // determine our operation hash.
-    _r = sha3(msg.data, block.number);
+    _r = keccak256(msg.data, block.number);
     if (!confirm(_r) && txs[_r].to == 0) {
       txs[_r].to = _to;
       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);
   }
 
-  function resetSpentToday() onlymanyowners(sha3(msg.data)) external {
+  function resetSpentToday() onlymanyowners(keccak256(msg.data)) external {
     _resetSpentToday();
   }