2017-08-01 08:37:25 +00:00
|
|
|
pragma solidity ^0.4.11;
|
2017-08-02 03:10:54 +00:00
|
|
|
|
2017-08-01 08:37:25 +00:00
|
|
|
contract ERC20 {
|
|
|
|
uint256 public totalSupply;
|
|
|
|
function balanceOf(address who) constant returns (uint256);
|
|
|
|
function allowance(address owner, address spender) constant returns (uint256);
|
|
|
|
function transfer(address to, uint256 value) returns (bool ok);
|
|
|
|
function transferFrom(address from, address to, uint256 value) returns (bool ok);
|
|
|
|
function approve(address spender, uint256 value) returns (bool ok);
|
|
|
|
event Transfer(address indexed from, address indexed to, uint256 value);
|
|
|
|
event Approval(address indexed owner, address indexed spender, uint256 value);
|
|
|
|
}
|
2017-08-02 03:10:54 +00:00
|
|
|
|
2017-08-03 07:50:22 +00:00
|
|
|
contract MultiSigTokenWallet {
|
2017-08-01 08:37:25 +00:00
|
|
|
|
2017-08-03 07:50:22 +00:00
|
|
|
address constant _walletLibrary = 0x0;
|
2017-08-01 08:37:25 +00:00
|
|
|
uint constant public MAX_OWNER_COUNT = 50;
|
2017-08-02 03:10:54 +00:00
|
|
|
|
2017-08-01 08:37:25 +00:00
|
|
|
event Confirmation(address indexed _sender, uint indexed _transactionId);
|
|
|
|
event Revocation(address indexed _sender, uint indexed _transactionId);
|
|
|
|
event Submission(uint indexed _transactionId);
|
|
|
|
event Execution(uint indexed _transactionId);
|
|
|
|
event ExecutionFailure(uint indexed _transactionId);
|
|
|
|
event Deposit(address indexed _sender, uint _value);
|
|
|
|
event TokenDeposit(address _token, address indexed _sender, uint _value);
|
|
|
|
event OwnerAddition(address indexed _owner);
|
|
|
|
event OwnerRemoval(address indexed _owner);
|
|
|
|
event RequirementChange(uint _required);
|
|
|
|
event IgnoredToken(address indexed _owner, address _token, bool ignored);
|
2017-08-02 03:10:54 +00:00
|
|
|
|
2017-08-01 08:37:25 +00:00
|
|
|
mapping (uint => Transaction) public transactions;
|
|
|
|
mapping (uint => mapping (address => bool)) public confirmations;
|
|
|
|
mapping (address => bool) public isOwner;
|
|
|
|
address[] public owners;
|
|
|
|
uint public required;
|
|
|
|
uint public transactionCount;
|
|
|
|
|
|
|
|
mapping (address => uint) public tokenBalances;
|
|
|
|
mapping (address => bool) public ignoredTokens;
|
|
|
|
address[] public tokens;
|
|
|
|
uint nonce;
|
2017-08-02 03:10:54 +00:00
|
|
|
|
2017-08-01 08:37:25 +00:00
|
|
|
struct Transaction {
|
|
|
|
address destination;
|
|
|
|
uint value;
|
|
|
|
bytes data;
|
|
|
|
bool executed;
|
|
|
|
}
|
|
|
|
|
|
|
|
modifier onlyWallet() {
|
|
|
|
require (msg.sender == address(this));
|
|
|
|
_;
|
|
|
|
}
|
|
|
|
|
|
|
|
modifier ownerDoesNotExist(address owner) {
|
|
|
|
require (!isOwner[owner]);
|
|
|
|
_;
|
|
|
|
}
|
|
|
|
|
|
|
|
modifier ownerExists(address owner) {
|
|
|
|
require (isOwner[owner]);
|
|
|
|
_;
|
|
|
|
}
|
|
|
|
|
|
|
|
modifier transactionExists(uint transactionId) {
|
|
|
|
require (transactions[transactionId].destination != 0);
|
|
|
|
_;
|
|
|
|
}
|
|
|
|
|
|
|
|
modifier confirmed(uint transactionId, address owner) {
|
|
|
|
require (confirmations[transactionId][owner]);
|
|
|
|
_;
|
|
|
|
}
|
|
|
|
|
|
|
|
modifier notConfirmed(uint transactionId, address owner) {
|
|
|
|
require(!confirmations[transactionId][owner]);
|
|
|
|
_;
|
|
|
|
}
|
|
|
|
|
|
|
|
modifier notExecuted(uint transactionId) {
|
|
|
|
require (!transactions[transactionId].executed);
|
|
|
|
_;
|
|
|
|
}
|
|
|
|
|
|
|
|
modifier notNull(address _address) {
|
|
|
|
require (_address != 0);
|
|
|
|
_;
|
|
|
|
}
|
|
|
|
|
|
|
|
modifier validRequirement(uint ownerCount, uint _required) {
|
|
|
|
require ( ownerCount <= MAX_OWNER_COUNT
|
|
|
|
&& _required <= ownerCount
|
|
|
|
&& _required != 0
|
|
|
|
&& ownerCount != 0);
|
|
|
|
_;
|
|
|
|
}
|
|
|
|
|
|
|
|
/// @dev Fallback function allows to deposit ether.
|
|
|
|
function()
|
|
|
|
payable
|
|
|
|
{
|
|
|
|
if (msg.value > 0)
|
|
|
|
Deposit(msg.sender, msg.value);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2017-08-02 03:10:54 +00:00
|
|
|
* Public functions
|
|
|
|
*/
|
2017-08-01 08:37:25 +00:00
|
|
|
/// @dev Contract constructor sets initial owners and required number of confirmations.
|
|
|
|
/// @param _owners List of initial owners.
|
|
|
|
/// @param _required Number of required confirmations.
|
2017-08-03 07:50:22 +00:00
|
|
|
function MultiSigTokenWallet(address[] _owners, uint _required)
|
2017-08-01 08:37:25 +00:00
|
|
|
public
|
|
|
|
validRequirement(_owners.length, _required)
|
|
|
|
{
|
|
|
|
for (uint i=0; i<_owners.length; i++) {
|
|
|
|
require (!isOwner[_owners[i]] && _owners[i] != 0);
|
|
|
|
isOwner[_owners[i]] = true;
|
|
|
|
}
|
|
|
|
owners = _owners;
|
|
|
|
required = _required;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @notice deposit a ERC20 token. The amount of deposit is the allowance set to this contract.
|
|
|
|
* @param _token the token contract address
|
|
|
|
* @param _data might be used by child implementations
|
|
|
|
**/
|
2017-08-02 03:10:54 +00:00
|
|
|
function depositToken(address _token, bytes _data)
|
|
|
|
public
|
|
|
|
{
|
2017-08-01 08:37:25 +00:00
|
|
|
address sender = msg.sender;
|
|
|
|
uint amount = ERC20(_token).allowance(sender, this);
|
|
|
|
deposit(sender, amount, _token, _data);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @notice deposit a ERC20 token. The amount of deposit is the allowance set to this contract.
|
|
|
|
* @param _token the token contract address
|
|
|
|
* @param _data might be used by child implementations
|
|
|
|
**/
|
2017-08-02 03:10:54 +00:00
|
|
|
function deposit(address _from, uint256 _amount, address _token, bytes _data)
|
|
|
|
public
|
|
|
|
{
|
2017-08-01 08:37:25 +00:00
|
|
|
if(_from == address(this)) return;
|
|
|
|
uint _nonce = nonce;
|
|
|
|
assert(ERC20(_token).transferFrom(_from, this, _amount));
|
|
|
|
if(nonce == _nonce){ //ERC23 not executed _deposited tokenFallback by
|
|
|
|
_deposited(_from, _amount, _token, _data);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @notice ERC23 Token fallback
|
|
|
|
* @param _from address incoming token
|
|
|
|
* @param _amount incoming amount
|
|
|
|
**/
|
2017-08-02 03:10:54 +00:00
|
|
|
function tokenFallback(address _from, uint _amount, bytes _data)
|
|
|
|
public
|
|
|
|
{
|
2017-08-01 08:37:25 +00:00
|
|
|
_deposited(_from, _amount, msg.sender, _data);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @notice Called MiniMeToken approvesAndCall to this contract, calls deposit.
|
|
|
|
* @param _from address incoming token
|
|
|
|
* @param _amount incoming amount
|
|
|
|
* @param _token the token contract address
|
|
|
|
* @param _data (might be used by child classes)
|
|
|
|
*/
|
2017-08-02 03:10:54 +00:00
|
|
|
function receiveApproval(address _from, uint256 _amount, address _token, bytes _data)
|
|
|
|
{
|
2017-08-01 08:37:25 +00:00
|
|
|
deposit(_from, _amount, _token, _data);
|
|
|
|
}
|
2017-08-02 03:10:54 +00:00
|
|
|
|
2017-08-01 08:37:25 +00:00
|
|
|
|
|
|
|
/// @dev Allows to add a new owner. Transaction has to be sent by wallet.
|
|
|
|
/// @param owner Address of new owner.
|
|
|
|
function addOwner(address owner)
|
|
|
|
public
|
|
|
|
onlyWallet
|
|
|
|
ownerDoesNotExist(owner)
|
|
|
|
notNull(owner)
|
|
|
|
validRequirement(owners.length + 1, required)
|
|
|
|
{
|
|
|
|
isOwner[owner] = true;
|
|
|
|
owners.push(owner);
|
|
|
|
OwnerAddition(owner);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @notice watches for balance in a token contract
|
|
|
|
* @param _tokenAddr the token contract address
|
|
|
|
* @param _data any data
|
|
|
|
**/
|
2017-08-02 03:10:54 +00:00
|
|
|
function watch(address _tokenAddr, bytes _data)
|
|
|
|
ownerExists(msg.sender)
|
|
|
|
{
|
2017-08-01 08:37:25 +00:00
|
|
|
uint oldBal = tokenBalances[_tokenAddr];
|
|
|
|
uint newBal = ERC20(_tokenAddr).balanceOf(this);
|
|
|
|
if(newBal > oldBal){
|
|
|
|
_deposited(0x0, newBal-oldBal, _tokenAddr, _data);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @notice ignores a token for sendAll
|
|
|
|
* @param _tokenAddr the token contract address
|
|
|
|
* @param _ignore true if is to ignore, false if not ignore (default)
|
|
|
|
**/
|
2017-08-02 03:10:54 +00:00
|
|
|
function ignoreToken(address _tokenAddr, bool _ignore)
|
|
|
|
ownerExists(msg.sender)
|
|
|
|
{
|
2017-08-01 08:37:25 +00:00
|
|
|
IgnoredToken(msg.sender, _tokenAddr, _ignore);
|
|
|
|
ignoredTokens[_tokenAddr] = _ignore;
|
|
|
|
}
|
|
|
|
|
|
|
|
/// @dev Allows to remove an owner. Transaction has to be sent by wallet.
|
|
|
|
/// @param owner Address of owner.
|
|
|
|
function removeOwner(address owner)
|
|
|
|
public
|
|
|
|
onlyWallet
|
|
|
|
ownerExists(owner)
|
|
|
|
{
|
|
|
|
isOwner[owner] = false;
|
|
|
|
for (uint i=0; i<owners.length - 1; i++)
|
|
|
|
if (owners[i] == owner) {
|
|
|
|
owners[i] = owners[owners.length - 1];
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
owners.length -= 1;
|
|
|
|
if (required > owners.length)
|
|
|
|
changeRequirement(owners.length);
|
|
|
|
OwnerRemoval(owner);
|
|
|
|
}
|
|
|
|
|
|
|
|
/// @dev Allows to replace an owner with a new owner. Transaction has to be sent by wallet.
|
|
|
|
/// @param owner Address of owner to be replaced.
|
|
|
|
/// @param owner Address of new owner.
|
|
|
|
function replaceOwner(address owner, address newOwner)
|
|
|
|
public
|
|
|
|
onlyWallet
|
|
|
|
ownerExists(owner)
|
|
|
|
ownerDoesNotExist(newOwner)
|
|
|
|
{
|
|
|
|
for (uint i=0; i<owners.length; i++)
|
|
|
|
if (owners[i] == owner) {
|
|
|
|
owners[i] = newOwner;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
isOwner[owner] = false;
|
|
|
|
isOwner[newOwner] = true;
|
|
|
|
OwnerRemoval(owner);
|
|
|
|
OwnerAddition(newOwner);
|
|
|
|
}
|
|
|
|
|
|
|
|
/// @dev Allows to change the number of required confirmations. Transaction has to be sent by wallet.
|
|
|
|
/// @param _required Number of required confirmations.
|
|
|
|
function changeRequirement(uint _required)
|
|
|
|
public
|
|
|
|
onlyWallet
|
|
|
|
validRequirement(owners.length, _required)
|
|
|
|
{
|
|
|
|
required = _required;
|
|
|
|
RequirementChange(_required);
|
|
|
|
}
|
|
|
|
|
|
|
|
/// @dev Allows an owner to submit and confirm a transaction.
|
|
|
|
/// @param destination Transaction target address.
|
|
|
|
/// @param value Transaction ether value.
|
|
|
|
/// @param data Transaction data payload.
|
|
|
|
/// @return Returns transaction ID.
|
|
|
|
function submitTransaction(address destination, uint value, bytes data)
|
|
|
|
public
|
|
|
|
returns (uint transactionId)
|
|
|
|
{
|
|
|
|
transactionId = addTransaction(destination, value, data);
|
|
|
|
confirmTransaction(transactionId);
|
|
|
|
}
|
|
|
|
|
|
|
|
/// @dev Allows an owner to confirm a transaction.
|
|
|
|
/// @param transactionId Transaction ID.
|
|
|
|
function confirmTransaction(uint transactionId)
|
|
|
|
public
|
|
|
|
ownerExists(msg.sender)
|
|
|
|
transactionExists(transactionId)
|
|
|
|
notConfirmed(transactionId, msg.sender)
|
|
|
|
{
|
|
|
|
confirmations[transactionId][msg.sender] = true;
|
|
|
|
Confirmation(msg.sender, transactionId);
|
|
|
|
executeTransaction(transactionId);
|
|
|
|
}
|
|
|
|
|
|
|
|
/// @dev Allows an owner to revoke a confirmation for a transaction.
|
|
|
|
/// @param transactionId Transaction ID.
|
|
|
|
function revokeConfirmation(uint transactionId)
|
|
|
|
public
|
|
|
|
ownerExists(msg.sender)
|
|
|
|
confirmed(transactionId, msg.sender)
|
|
|
|
notExecuted(transactionId)
|
|
|
|
{
|
|
|
|
confirmations[transactionId][msg.sender] = false;
|
|
|
|
Revocation(msg.sender, transactionId);
|
|
|
|
}
|
|
|
|
|
|
|
|
/// @dev Allows anyone to execute a confirmed transaction.
|
|
|
|
/// @param transactionId Transaction ID.
|
|
|
|
function executeTransaction(uint transactionId)
|
|
|
|
public
|
|
|
|
notExecuted(transactionId)
|
|
|
|
{
|
|
|
|
if (isConfirmed(transactionId)) {
|
|
|
|
Transaction storage tx = transactions[transactionId];
|
|
|
|
tx.executed = true;
|
|
|
|
if (tx.destination.call.value(tx.value)(tx.data))
|
|
|
|
Execution(transactionId);
|
|
|
|
else {
|
|
|
|
ExecutionFailure(transactionId);
|
|
|
|
tx.executed = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-08-02 03:10:54 +00:00
|
|
|
/**
|
|
|
|
* @dev gives full ownership of this wallet to `_dest` removing older owners from wallet
|
|
|
|
* @param _dest the address of new controller
|
|
|
|
**/
|
|
|
|
function releaseWallet(address _dest)
|
|
|
|
public
|
|
|
|
notNull(_dest)
|
|
|
|
ownerDoesNotExist(_dest)
|
|
|
|
onlyWallet
|
|
|
|
{
|
|
|
|
address[] memory _owners = owners;
|
|
|
|
uint numOwners = _owners.length;
|
|
|
|
addOwner(_dest);
|
|
|
|
for(uint i = 0; i < numOwners; i++){
|
|
|
|
removeOwner(_owners[i]);
|
|
|
|
}
|
2017-08-01 08:37:25 +00:00
|
|
|
}
|
2017-08-02 03:10:54 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @dev withdraw all recognized tokens balances and ether to `_dest`
|
|
|
|
* @param _dest the address of receiver
|
|
|
|
**/
|
|
|
|
function withdrawEverything(address _dest)
|
|
|
|
public
|
|
|
|
notNull(_dest)
|
|
|
|
onlyWallet
|
|
|
|
{
|
|
|
|
withdrawAllTokens(_dest);
|
|
|
|
_dest.transfer(this.balance);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @dev withdraw all recognized tokens balances to `_dest`
|
|
|
|
* @param _dest the address of receiver
|
|
|
|
**/
|
|
|
|
function withdrawAllTokens(address _dest)
|
|
|
|
public
|
|
|
|
notNull(_dest)
|
|
|
|
onlyWallet
|
|
|
|
{
|
2017-08-01 08:37:25 +00:00
|
|
|
uint len = tokens.length;
|
|
|
|
for(uint i = 0;i< len; i++){
|
|
|
|
address _tokenAddr = tokens[i];
|
|
|
|
uint _amount = tokenBalances[_tokenAddr];
|
|
|
|
if(_amount > 0 && !ignoredTokens[_tokenAddr]) {
|
|
|
|
delete tokenBalances[_tokenAddr];
|
2017-08-02 03:10:54 +00:00
|
|
|
ERC20(_tokenAddr).transfer(_dest, _amount);
|
2017-08-01 08:37:25 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2017-08-02 03:10:54 +00:00
|
|
|
|
2017-08-01 08:37:25 +00:00
|
|
|
/**
|
2017-08-02 03:10:54 +00:00
|
|
|
* @dev withdraw `_tokenAddr` `_amount` to `_dest`
|
|
|
|
* @param _tokenAddr the address of the token
|
|
|
|
* @param _dest the address of receiver
|
|
|
|
* @param _amount the number of tokens to send
|
2017-08-01 08:37:25 +00:00
|
|
|
**/
|
2017-08-02 03:10:54 +00:00
|
|
|
function withdrawToken(address _tokenAddr, address _dest, uint _amount)
|
|
|
|
public
|
|
|
|
notNull(_dest)
|
|
|
|
onlyWallet
|
|
|
|
{
|
|
|
|
require(_amount > 0);
|
|
|
|
uint _balance = tokenBalances[_tokenAddr];
|
|
|
|
require(_amount <= _balance);
|
|
|
|
tokenBalances[_tokenAddr] = _balance - _amount;
|
|
|
|
assert(ERC20(_tokenAddr).transfer(_dest, _amount));
|
2017-08-01 08:37:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/// @dev Returns the confirmation status of a transaction.
|
|
|
|
/// @param transactionId Transaction ID.
|
|
|
|
/// @return Confirmation status.
|
|
|
|
function isConfirmed(uint transactionId)
|
|
|
|
public
|
|
|
|
constant
|
|
|
|
returns (bool)
|
|
|
|
{
|
|
|
|
uint count = 0;
|
|
|
|
for (uint i=0; i<owners.length; i++) {
|
|
|
|
if (confirmations[transactionId][owners[i]])
|
|
|
|
count += 1;
|
|
|
|
if (count == required)
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2017-08-02 03:10:54 +00:00
|
|
|
* Internal functions
|
|
|
|
*/
|
2017-08-01 08:37:25 +00:00
|
|
|
/// @dev Adds a new transaction to the transaction mapping, if transaction does not exist yet.
|
|
|
|
/// @param destination Transaction target address.
|
|
|
|
/// @param value Transaction ether value.
|
|
|
|
/// @param data Transaction data payload.
|
|
|
|
/// @return Returns transaction ID.
|
|
|
|
function addTransaction(address destination, uint value, bytes data)
|
|
|
|
internal
|
|
|
|
notNull(destination)
|
|
|
|
returns (uint transactionId)
|
|
|
|
{
|
|
|
|
transactionId = transactionCount;
|
|
|
|
transactions[transactionId] = Transaction({
|
|
|
|
destination: destination,
|
|
|
|
value: value,
|
|
|
|
data: data,
|
|
|
|
executed: false
|
|
|
|
});
|
|
|
|
transactionCount += 1;
|
|
|
|
Submission(transactionId);
|
|
|
|
}
|
2017-08-02 03:10:54 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @dev register the deposit
|
|
|
|
**/
|
|
|
|
function _deposited(address _from, uint _amount, address _tokenAddr, bytes _data)
|
|
|
|
internal
|
|
|
|
{
|
|
|
|
TokenDeposit(_tokenAddr,_from,_amount);
|
|
|
|
nonce++;
|
|
|
|
if(tokenBalances[_tokenAddr] == 0){
|
|
|
|
tokens.push(_tokenAddr);
|
|
|
|
tokenBalances[_tokenAddr] = ERC20(_tokenAddr).balanceOf(this);
|
|
|
|
}else{
|
|
|
|
tokenBalances[_tokenAddr] += _amount;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-08-01 08:37:25 +00:00
|
|
|
/*
|
2017-08-02 03:10:54 +00:00
|
|
|
* Web3 call functions
|
|
|
|
*/
|
2017-08-01 08:37:25 +00:00
|
|
|
/// @dev Returns number of confirmations of a transaction.
|
|
|
|
/// @param transactionId Transaction ID.
|
|
|
|
/// @return Number of confirmations.
|
|
|
|
function getConfirmationCount(uint transactionId)
|
|
|
|
public
|
|
|
|
constant
|
|
|
|
returns (uint count)
|
|
|
|
{
|
|
|
|
for (uint i=0; i<owners.length; i++)
|
|
|
|
if (confirmations[transactionId][owners[i]])
|
|
|
|
count += 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/// @dev Returns total number of transactions after filters are applied.
|
|
|
|
/// @param pending Include pending transactions.
|
|
|
|
/// @param executed Include executed transactions.
|
|
|
|
/// @return Total number of transactions after filters are applied.
|
|
|
|
function getTransactionCount(bool pending, bool executed)
|
|
|
|
public
|
|
|
|
constant
|
|
|
|
returns (uint count)
|
|
|
|
{
|
|
|
|
for (uint i=0; i<transactionCount; i++)
|
|
|
|
if ( pending && !transactions[i].executed
|
|
|
|
|| executed && transactions[i].executed)
|
|
|
|
count += 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/// @dev Returns list of owners.
|
|
|
|
/// @return List of owner addresses.
|
|
|
|
function getOwners()
|
|
|
|
public
|
|
|
|
constant
|
|
|
|
returns (address[])
|
|
|
|
{
|
|
|
|
return owners;
|
|
|
|
}
|
|
|
|
|
|
|
|
/// @dev Returns array with owner addresses, which confirmed transaction.
|
|
|
|
/// @param transactionId Transaction ID.
|
|
|
|
/// @return Returns array of owner addresses.
|
|
|
|
function getConfirmations(uint transactionId)
|
|
|
|
public
|
|
|
|
constant
|
|
|
|
returns (address[] _confirmations)
|
|
|
|
{
|
|
|
|
address[] memory confirmationsTemp = new address[](owners.length);
|
|
|
|
uint count = 0;
|
|
|
|
uint i;
|
|
|
|
for (i=0; i<owners.length; i++)
|
|
|
|
if (confirmations[transactionId][owners[i]]) {
|
|
|
|
confirmationsTemp[count] = owners[i];
|
|
|
|
count += 1;
|
|
|
|
}
|
|
|
|
_confirmations = new address[](count);
|
|
|
|
for (i=0; i<count; i++)
|
|
|
|
_confirmations[i] = confirmationsTemp[i];
|
|
|
|
}
|
|
|
|
|
|
|
|
/// @dev Returns list of transaction IDs in defined range.
|
|
|
|
/// @param from Index start position of transaction array.
|
|
|
|
/// @param to Index end position of transaction array.
|
|
|
|
/// @param pending Include pending transactions.
|
|
|
|
/// @param executed Include executed transactions.
|
|
|
|
/// @return Returns array of transaction IDs.
|
|
|
|
function getTransactionIds(uint from, uint to, bool pending, bool executed)
|
|
|
|
public
|
|
|
|
constant
|
|
|
|
returns (uint[] _transactionIds)
|
|
|
|
{
|
|
|
|
uint[] memory transactionIdsTemp = new uint[](transactionCount);
|
|
|
|
uint count = 0;
|
|
|
|
uint i;
|
|
|
|
for (i=0; i<transactionCount; i++)
|
|
|
|
if ( pending && !transactions[i].executed
|
|
|
|
|| executed && transactions[i].executed)
|
|
|
|
{
|
|
|
|
transactionIdsTemp[count] = i;
|
|
|
|
count += 1;
|
|
|
|
}
|
|
|
|
_transactionIds = new uint[](to - from);
|
|
|
|
for (i=from; i<to; i++)
|
|
|
|
_transactionIds[i - from] = transactionIdsTemp[i];
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
contract EnhancedMultiSig {
|
|
|
|
|
2017-08-03 07:50:22 +00:00
|
|
|
address constant _walletLibrary = 0xf5f6853e0ebA27074A804358eEdF4E89eFaebc98;
|
2017-08-01 08:37:25 +00:00
|
|
|
uint constant public MAX_OWNER_COUNT = 50;
|
2017-08-02 03:10:54 +00:00
|
|
|
|
2017-08-01 08:37:25 +00:00
|
|
|
event Confirmation(address indexed _sender, uint indexed _transactionId);
|
|
|
|
event Revocation(address indexed _sender, uint indexed _transactionId);
|
|
|
|
event Submission(uint indexed _transactionId);
|
|
|
|
event Execution(uint indexed _transactionId);
|
|
|
|
event ExecutionFailure(uint indexed _transactionId);
|
|
|
|
event Deposit(address indexed _sender, uint _value);
|
|
|
|
event TokenDeposit(address _token, address indexed _sender, uint _value);
|
|
|
|
event OwnerAddition(address indexed _owner);
|
|
|
|
event OwnerRemoval(address indexed _owner);
|
|
|
|
event RequirementChange(uint _required);
|
|
|
|
event IgnoredToken(address indexed _owner, address _token, bool ignored);
|
2017-08-02 03:10:54 +00:00
|
|
|
|
2017-08-01 08:37:25 +00:00
|
|
|
mapping (uint => Transaction) public transactions;
|
|
|
|
mapping (uint => mapping (address => bool)) public confirmations;
|
|
|
|
mapping (address => bool) public isOwner;
|
|
|
|
address[] public owners;
|
|
|
|
uint public required;
|
|
|
|
uint public transactionCount;
|
|
|
|
|
|
|
|
mapping (address => uint) public tokenBalances;
|
|
|
|
mapping (address => bool) public ignoredTokens;
|
|
|
|
address[] public tokens;
|
|
|
|
uint nonce;
|
2017-08-02 03:10:54 +00:00
|
|
|
|
2017-08-01 08:37:25 +00:00
|
|
|
struct Transaction {
|
|
|
|
address destination;
|
|
|
|
uint value;
|
|
|
|
bytes data;
|
|
|
|
bool executed;
|
|
|
|
}
|
|
|
|
|
2017-08-02 03:10:54 +00:00
|
|
|
|
2017-08-01 08:37:25 +00:00
|
|
|
// WALLET CONSTRUCTOR
|
|
|
|
function EnhancedMultiSig(address[] _owners, uint _required) {
|
|
|
|
require(_required > 0);
|
|
|
|
uint len = _owners.length;
|
|
|
|
require(len <= MAX_OWNER_COUNT);
|
|
|
|
require(len >= _required);
|
|
|
|
for (uint i=0; i < len; i++) {
|
|
|
|
require (!isOwner[_owners[i]] && _owners[i] != 0);
|
|
|
|
isOwner[_owners[i]] = true;
|
|
|
|
}
|
|
|
|
owners = _owners;
|
|
|
|
required = _required;
|
|
|
|
}
|
|
|
|
|
|
|
|
/// @dev Fallback function allows to deposit ether or other functions in library.
|
|
|
|
function()
|
|
|
|
payable
|
|
|
|
{
|
|
|
|
_walletLibrary.delegatecall(msg.data);
|
|
|
|
}
|
|
|
|
|
|
|
|
/// @dev Returns the confirmation status of a transaction.
|
|
|
|
/// @param transactionId Transaction ID.
|
|
|
|
/// @return Confirmation status.
|
|
|
|
function isConfirmed(uint transactionId)
|
|
|
|
public
|
|
|
|
constant
|
|
|
|
returns (bool)
|
|
|
|
{
|
|
|
|
uint count = 0;
|
|
|
|
for (uint i=0; i<owners.length; i++) {
|
|
|
|
if (confirmations[transactionId][owners[i]])
|
|
|
|
count += 1;
|
|
|
|
if (count == required)
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/*
|
2017-08-02 03:10:54 +00:00
|
|
|
* Web3 call functions
|
|
|
|
*/
|
2017-08-01 08:37:25 +00:00
|
|
|
/// @dev Returns number of confirmations of a transaction.
|
|
|
|
/// @param transactionId Transaction ID.
|
|
|
|
/// @return Number of confirmations.
|
|
|
|
function getConfirmationCount(uint transactionId)
|
|
|
|
public
|
|
|
|
constant
|
|
|
|
returns (uint count)
|
|
|
|
{
|
|
|
|
for (uint i=0; i<owners.length; i++)
|
|
|
|
if (confirmations[transactionId][owners[i]])
|
|
|
|
count += 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/// @dev Returns total number of transactions after filters are applied.
|
|
|
|
/// @param pending Include pending transactions.
|
|
|
|
/// @param executed Include executed transactions.
|
|
|
|
/// @return Total number of transactions after filters are applied.
|
|
|
|
function getTransactionCount(bool pending, bool executed)
|
|
|
|
public
|
|
|
|
constant
|
|
|
|
returns (uint count)
|
|
|
|
{
|
|
|
|
for (uint i=0; i<transactionCount; i++)
|
|
|
|
if ( pending && !transactions[i].executed
|
|
|
|
|| executed && transactions[i].executed)
|
|
|
|
count += 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/// @dev Returns list of owners.
|
|
|
|
/// @return List of owner addresses.
|
|
|
|
function getOwners()
|
|
|
|
public
|
|
|
|
constant
|
|
|
|
returns (address[])
|
|
|
|
{
|
|
|
|
return owners;
|
|
|
|
}
|
|
|
|
|
|
|
|
/// @dev Returns array with owner addresses, which confirmed transaction.
|
|
|
|
/// @param transactionId Transaction ID.
|
|
|
|
/// @return Returns array of owner addresses.
|
|
|
|
function getConfirmations(uint transactionId)
|
|
|
|
public
|
|
|
|
constant
|
|
|
|
returns (address[] _confirmations)
|
|
|
|
{
|
|
|
|
address[] memory confirmationsTemp = new address[](owners.length);
|
|
|
|
uint count = 0;
|
|
|
|
uint i;
|
|
|
|
for (i=0; i<owners.length; i++)
|
|
|
|
if (confirmations[transactionId][owners[i]]) {
|
|
|
|
confirmationsTemp[count] = owners[i];
|
|
|
|
count += 1;
|
|
|
|
}
|
|
|
|
_confirmations = new address[](count);
|
|
|
|
for (i=0; i<count; i++)
|
|
|
|
_confirmations[i] = confirmationsTemp[i];
|
|
|
|
}
|
|
|
|
|
|
|
|
/// @dev Returns list of transaction IDs in defined range.
|
|
|
|
/// @param from Index start position of transaction array.
|
|
|
|
/// @param to Index end position of transaction array.
|
|
|
|
/// @param pending Include pending transactions.
|
|
|
|
/// @param executed Include executed transactions.
|
|
|
|
/// @return Returns array of transaction IDs.
|
|
|
|
function getTransactionIds(uint from, uint to, bool pending, bool executed)
|
|
|
|
public
|
|
|
|
constant
|
|
|
|
returns (uint[] _transactionIds)
|
|
|
|
{
|
|
|
|
uint[] memory transactionIdsTemp = new uint[](transactionCount);
|
|
|
|
uint count = 0;
|
|
|
|
uint i;
|
|
|
|
for (i=0; i<transactionCount; i++)
|
|
|
|
if ( pending && !transactions[i].executed
|
|
|
|
|| executed && transactions[i].executed)
|
|
|
|
{
|
|
|
|
transactionIdsTemp[count] = i;
|
|
|
|
count += 1;
|
|
|
|
}
|
|
|
|
_transactionIds = new uint[](to - from);
|
|
|
|
for (i=from; i<to; i++)
|
|
|
|
_transactionIds[i - from] = transactionIdsTemp[i];
|
|
|
|
}
|
|
|
|
|
2017-08-02 03:10:54 +00:00
|
|
|
}
|