Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions MultiSigWalletWithDailyLimit.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
pragma solidity 0.4.10;

pragma solidity ^0.4.10;

/// @title Multisignature wallet - Allows multiple parties to agree on transactions before execution.
/// @author Stefan George - <stefan.george@consensys.net>
Expand Down Expand Up @@ -33,49 +32,49 @@ contract MultiSigWallet {

modifier onlyWallet() {
if (msg.sender != address(this))
throw;
revert();
_;
}

modifier ownerDoesNotExist(address owner) {
if (isOwner[owner])
throw;
revert();
_;
}

modifier ownerExists(address owner) {
if (!isOwner[owner])
throw;
revert();
_;
}

modifier transactionExists(uint transactionId) {
if (transactions[transactionId].destination == 0)
throw;
revert();
_;
}

modifier confirmed(uint transactionId, address owner) {
if (!confirmations[transactionId][owner])
throw;
revert();
_;
}

modifier notConfirmed(uint transactionId, address owner) {
if (confirmations[transactionId][owner])
throw;
revert();
_;
}

modifier notExecuted(uint transactionId) {
if (transactions[transactionId].executed)
throw;
revert();
_;
}

modifier notNull(address _address) {
if (_address == 0)
throw;
revert();
_;
}

Expand All @@ -84,7 +83,7 @@ contract MultiSigWallet {
|| _required > ownerCount
|| _required == 0
|| ownerCount == 0)
throw;
revert();
_;
}

Expand All @@ -108,7 +107,7 @@ contract MultiSigWallet {
{
for (uint i=0; i<_owners.length; i++) {
if (isOwner[_owners[i]] || _owners[i] == 0)
throw;
revert();
isOwner[_owners[i]] = true;
}
owners = _owners;
Expand Down