@@ -455,7 +455,7 @@ contract DAO is DAOInterface, Token, TokenCreation {
455
455
p.recipient = _recipient;
456
456
p.amount = _amount;
457
457
p.description = _description;
458
- p.proposalHash = keccak256 (_recipient, _amount, _transactionData);
458
+ p.proposalHash = keccak256 (abi.encodePacked ( _recipient, _amount, _transactionData) );
459
459
p.votingDeadline = now + _debatingPeriod;
460
460
p.open = true ;
461
461
//p.proposalPassed = False; // that's default
@@ -484,7 +484,7 @@ contract DAO is DAOInterface, Token, TokenCreation {
484
484
bytes _transactionData
485
485
) noEther view returns (bool _codeChecksOut ) {
486
486
Proposal p = proposals[_proposalID];
487
- return p.proposalHash == keccak256 (_recipient, _amount, _transactionData);
487
+ return p.proposalHash == keccak256 (abi.encodePacked ( _recipient, _amount, _transactionData) );
488
488
}
489
489
490
490
@@ -543,7 +543,7 @@ contract DAO is DAOInterface, Token, TokenCreation {
543
543
|| ! p.open
544
544
|| p.proposalPassed // anyone trying to call us recursively?
545
545
// Does the transaction code match the proposal?
546
- || p.proposalHash != keccak256 (p.recipient, p.amount, _transactionData)) {
546
+ || p.proposalHash != keccak256 (abi.encodePacked ( p.recipient, p.amount, _transactionData) )) {
547
547
548
548
revert ();
549
549
}
@@ -699,7 +699,7 @@ contract DAO is DAOInterface, Token, TokenCreation {
699
699
function newContract (address _newContract ){
700
700
if (msg .sender != address (this ) || ! allowedRecipients[_newContract]) return ;
701
701
// move all ether
702
- if (! _newContract.call.value (address (this ).balance)()) {
702
+ if (! _newContract.call.value (address (this ).balance)("" )) {
703
703
revert ();
704
704
}
705
705
0 commit comments