cerc-io/solidity
11
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4097 from ethereum/noPackedExceptForPacked

Browse Source 
[BREAKING] call only takes a single argument and does not pad
This commit is contained in:
chriseth
2018-06-27 18:29:01 +02:00
committed by GitHub
parent ce4b233f8f 92cb4acd8a
commit 4a842ecc82
53 changed files with 358 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/compilationTests/corion/multiOwner.sol
+3 -3
View File
@@ -21,12 +21,12 @@ contract multiOwner is safeMath {
Externals
*/
function insertOwner(address addr) external {
if ( insertAndCheckDo(calcDoHash("insertOwner", keccak256(addr))) ) {
if ( insertAndCheckDo(calcDoHash("insertOwner", keccak256(abi.encodePacked(addr)))) ) {
_addOwner(addr);
}
}
function dropOwner(address addr) external {
if ( insertAndCheckDo(calcDoHash("dropOwner", keccak256(addr))) ) {
if ( insertAndCheckDo(calcDoHash("dropOwner", keccak256(abi.encodePacked(addr)))) ) {
_delOwner(addr);
}
}
@@ -42,7 +42,7 @@ contract multiOwner is safeMath {
return ownerCount * 75 / 100;
}
function calcDoHash(string job, bytes32 data) public constant returns (bytes32 hash) {
return keccak256(job, data);
return keccak256(abi.encodePacked(job, data));
}
function validDoHash(bytes32 doHash) public constant returns (bool valid) {
return doDB[doHash].length > 0;