/// @title Contracts that should not own Contracts
/** @title Contracts that should not own Contracts
/// @author Remco Bloemen <remco@2π.com>
* @author Remco Bloemen <remco@2π.com>
///
* @dev Should contracts (anything Ownable) end up being owned by this contract, it allows the owner of this contract to reclaim ownership of the contracts.
/// Should contracts (anything Ownable) end up being owned by
*/
/// this contract, it allows the owner of this contract to
/// reclaim ownership of the contracts.
contract HasNoContracts is Ownable {
contract HasNoContracts is Ownable {
/// Reclaim ownership of Ownable contracts
/**
* @dev Reclaim ownership of Ownable contracts
* @param contractAddr address The Ownable contract address wished to
be reclaimed
*/
function reclaimContract(address contractAddr) external onlyOwner {
function reclaimContract(address contractAddr) external onlyOwner {
/// @title Base contract for contracts that should not own things.
/** @title Base contract for contracts that should not own things.
/// @author Remco Bloemen <remco@2π.com>
* @author Remco Bloemen <remco@2π.com>
///
* @devSolves a class of errors where a contract accidentally becomes owner of Ether, Tokens or Owned contracts. See respective base contracts for details.
/// Solves a class of errors where a contract accidentally
*/
/// becomes owner of Ether, Tokens or Owned contracts. See
/// respective base contracts for details.
contract NoOwner is HasNoEther, HasNoTokens, HasNoContracts {
contract NoOwner is HasNoEther, HasNoTokens, HasNoContracts {
* @dev inheritable "property" contract that enables methods to be protected by requiring the acquiescence of either a single, or, crucially, each of a number of, designated owners.
*
*
* Based on https://github.com/ethereum/dapp-bin/blob/master/wallet/wallet.sol
* @dev Usage: use modifiers onlyowner (just own owned) or onlymanyowners(hash), whereby the same hash must be provided by some number (specified in constructor) of the set of owners (specified in the constructor) before the interior is executed.
*
* inheritable "property" contract that enables methods to be protected by requiring the acquiescence of either a single, or, crucially, each of a number of, designated owners.
*
* usage:
* use modifiers onlyowner (just own owned) or onlymanyowners(hash), whereby the same hash must be provided by some number (specified in constructor) of the set of owners (specified in the constructor) before the interior is executed.
*/
*/
contract Shareable {
contract Shareable {
// struct for the status of a pending operation.
// struct for the status of a pending operation.
struct PendingState {
struct PendingState {
uint yetNeeded;
uint yetNeeded;
...
@@ -54,8 +51,11 @@ contract Shareable {
...
@@ -54,8 +51,11 @@ contract Shareable {
}
}
}
}
// constructor is given number of sigs required to do protected "onlymanyowners" transactions
/** @dev Constructor is given number of sigs required to do protected "onlymanyowners" transactions
// as well as the selection of addresses capable of confirming them.
* as well as the selection of addresses capable of confirming them.
* @param _owners address[] A list of owners
* @param _required Uint The amout required for a transaction to be approved.
*/
function Shareable(address[] _owners, uint _required) {
function Shareable(address[] _owners, uint _required) {
owners[1] = msg.sender;
owners[1] = msg.sender;
ownerIndex[msg.sender] = 1;
ownerIndex[msg.sender] = 1;
...
@@ -69,7 +69,10 @@ contract Shareable {
...
@@ -69,7 +69,10 @@ contract Shareable {
}
}
}
}
// Revokes a prior confirmation of the given operation
/**
* @dev Revokes a prior confirmation of the given operation
* @param _operation bytes32 A string the identfies the operation.
*/
function revoke(bytes32 _operation) external {
function revoke(bytes32 _operation) external {
uint index = ownerIndex[msg.sender];
uint index = ownerIndex[msg.sender];
// make sure they're an owner
// make sure they're an owner
...
@@ -85,15 +88,30 @@ contract Shareable {
...
@@ -85,15 +88,30 @@ contract Shareable {
}
}
}
}
// Gets an owner by 0-indexed position (using numOwners as the count)
/**
* @dev Gets an owner by 0-indexed position (using numOwners as the count)
* @param ownerIndex Uint The index of the owner
* @return The address of the owner
*/
function getOwner(uint ownerIndex) external constant returns (address) {
function getOwner(uint ownerIndex) external constant returns (address) {
return address(owners[ownerIndex + 1]);
return address(owners[ownerIndex + 1]);
}
}
/**
* @dev Checks if given address is an owner.
* @param _addr address The address which you want to check.
* @return True if the address is an owner and fase otherwise.
*/
function isOwner(address _addr) constant returns (bool) {
function isOwner(address _addr) constant returns (bool) {
return ownerIndex[_addr] > 0;
return ownerIndex[_addr] > 0;
}
}
/**
* @dev Function to check is specific owner has already confirme the operation
* @param _operation bytes32 The operation identifier
* @param _owner address The owner address
* @return True if the owner has confirmed and flase otherwise
*/
function hasConfirmed(bytes32 _operation, address _owner) constant returns (bool) {
function hasConfirmed(bytes32 _operation, address _owner) constant returns (bool) {