2015-06-10 15:37:17 +00:00
|
|
|
/*
|
|
|
|
This file is part of cpp-ethereum.
|
|
|
|
|
|
|
|
cpp-ethereum is free software: you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
cpp-ethereum is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with cpp-ethereum. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*/
|
|
|
|
/**
|
|
|
|
* @author Christian <c@ethdev.com>
|
|
|
|
* @date 2015
|
|
|
|
* Tests for a (comparatively) complex multisig wallet contract.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <string>
|
|
|
|
#include <tuple>
|
2016-03-18 08:22:15 +00:00
|
|
|
|
|
|
|
#if defined(_MSC_VER)
|
|
|
|
#pragma warning(push)
|
|
|
|
#pragma warning(disable:4535) // calling _set_se_translator requires /EHa
|
|
|
|
#endif
|
2015-06-10 15:37:17 +00:00
|
|
|
#include <boost/test/unit_test.hpp>
|
2016-03-18 08:22:15 +00:00
|
|
|
#if defined(_MSC_VER)
|
|
|
|
#pragma warning(pop)
|
|
|
|
#endif
|
|
|
|
|
2015-06-10 15:37:17 +00:00
|
|
|
#include <libdevcore/Hash.h>
|
2016-06-09 16:54:29 +00:00
|
|
|
#include <test/libsolidity/SolidityExecutionFramework.h>
|
2015-06-10 15:37:17 +00:00
|
|
|
|
|
|
|
using namespace std;
|
|
|
|
|
|
|
|
namespace dev
|
|
|
|
{
|
|
|
|
namespace solidity
|
|
|
|
{
|
|
|
|
namespace test
|
|
|
|
{
|
|
|
|
|
|
|
|
static char const* walletCode = R"DELIMITER(
|
|
|
|
//sol Wallet
|
|
|
|
// Multi-sig, daily-limited account proxy/wallet.
|
|
|
|
// @authors:
|
|
|
|
// Gav Wood <g@ethdev.com>
|
|
|
|
// 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, modifiable) before the
|
|
|
|
// interior is executed.
|
|
|
|
contract multiowned {
|
2015-07-06 16:04:26 +00:00
|
|
|
|
|
|
|
// TYPES
|
|
|
|
|
2015-06-10 15:37:17 +00:00
|
|
|
// struct for the status of a pending operation.
|
|
|
|
struct PendingState {
|
|
|
|
uint yetNeeded;
|
|
|
|
uint ownersDone;
|
|
|
|
uint index;
|
|
|
|
}
|
2015-07-06 16:04:26 +00:00
|
|
|
|
|
|
|
// EVENTS
|
|
|
|
|
2015-06-10 15:37:17 +00:00
|
|
|
// this contract only has five types of events: it can accept a confirmation, in which case
|
|
|
|
// we record owner and operation (hash) alongside it.
|
|
|
|
event Confirmation(address owner, bytes32 operation);
|
|
|
|
event Revoke(address owner, bytes32 operation);
|
|
|
|
// some others are in the case of an owner changing.
|
|
|
|
event OwnerChanged(address oldOwner, address newOwner);
|
|
|
|
event OwnerAdded(address newOwner);
|
|
|
|
event OwnerRemoved(address oldOwner);
|
|
|
|
// the last one is emitted if the required signatures change
|
|
|
|
event RequirementChanged(uint newRequirement);
|
2015-07-06 16:04:26 +00:00
|
|
|
|
|
|
|
// MODIFIERS
|
|
|
|
|
2015-06-10 15:37:17 +00:00
|
|
|
// simple single-sig function modifier.
|
|
|
|
modifier onlyowner {
|
|
|
|
if (isOwner(msg.sender))
|
|
|
|
_
|
|
|
|
}
|
|
|
|
// multi-sig function modifier: the operation must have an intrinsic hash in order
|
|
|
|
// that later attempts can be realised as the same underlying operation and
|
|
|
|
// thus count as confirmations.
|
|
|
|
modifier onlymanyowners(bytes32 _operation) {
|
2015-07-06 16:04:26 +00:00
|
|
|
if (confirmAndCheck(_operation))
|
2015-06-10 15:37:17 +00:00
|
|
|
_
|
|
|
|
}
|
2015-07-06 16:04:26 +00:00
|
|
|
|
|
|
|
// METHODS
|
|
|
|
|
|
|
|
// constructor is given number of sigs required to do protected "onlymanyowners" transactions
|
|
|
|
// as well as the selection of addresses capable of confirming them.
|
2015-07-16 14:25:23 +00:00
|
|
|
function multiowned(address[] _owners, uint _required) {
|
|
|
|
m_numOwners = _owners.length + 1;
|
|
|
|
m_owners[1] = uint(msg.sender);
|
|
|
|
m_ownerIndex[uint(msg.sender)] = 1;
|
|
|
|
for (uint i = 0; i < _owners.length; ++i)
|
|
|
|
{
|
|
|
|
m_owners[2 + i] = uint(_owners[i]);
|
|
|
|
m_ownerIndex[uint(_owners[i])] = 2 + i;
|
|
|
|
}
|
|
|
|
m_required = _required;
|
2015-07-06 16:04:26 +00:00
|
|
|
}
|
|
|
|
|
2015-06-10 15:37:17 +00:00
|
|
|
// Revokes a prior confirmation of the given operation
|
|
|
|
function revoke(bytes32 _operation) external {
|
|
|
|
uint ownerIndex = m_ownerIndex[uint(msg.sender)];
|
|
|
|
// make sure they're an owner
|
|
|
|
if (ownerIndex == 0) return;
|
|
|
|
uint ownerIndexBit = 2**ownerIndex;
|
|
|
|
var pending = m_pending[_operation];
|
|
|
|
if (pending.ownersDone & ownerIndexBit > 0) {
|
|
|
|
pending.yetNeeded++;
|
|
|
|
pending.ownersDone -= ownerIndexBit;
|
|
|
|
Revoke(msg.sender, _operation);
|
|
|
|
}
|
|
|
|
}
|
2015-07-06 16:04:26 +00:00
|
|
|
|
|
|
|
// Replaces an owner `_from` with another `_to`.
|
2015-07-22 22:05:09 +00:00
|
|
|
function changeOwner(address _from, address _to) onlymanyowners(sha3(msg.data)) external {
|
2015-07-06 16:04:26 +00:00
|
|
|
if (isOwner(_to)) return;
|
|
|
|
uint ownerIndex = m_ownerIndex[uint(_from)];
|
|
|
|
if (ownerIndex == 0) return;
|
|
|
|
|
|
|
|
clearPending();
|
|
|
|
m_owners[ownerIndex] = uint(_to);
|
|
|
|
m_ownerIndex[uint(_from)] = 0;
|
|
|
|
m_ownerIndex[uint(_to)] = ownerIndex;
|
|
|
|
OwnerChanged(_from, _to);
|
|
|
|
}
|
2015-07-16 14:25:23 +00:00
|
|
|
|
2015-07-22 22:05:09 +00:00
|
|
|
function addOwner(address _owner) onlymanyowners(sha3(msg.data)) external {
|
2015-07-06 16:04:26 +00:00
|
|
|
if (isOwner(_owner)) return;
|
|
|
|
|
|
|
|
clearPending();
|
|
|
|
if (m_numOwners >= c_maxOwners)
|
|
|
|
reorganizeOwners();
|
|
|
|
if (m_numOwners >= c_maxOwners)
|
|
|
|
return;
|
|
|
|
m_numOwners++;
|
|
|
|
m_owners[m_numOwners] = uint(_owner);
|
|
|
|
m_ownerIndex[uint(_owner)] = m_numOwners;
|
|
|
|
OwnerAdded(_owner);
|
|
|
|
}
|
|
|
|
|
2015-07-22 22:05:09 +00:00
|
|
|
function removeOwner(address _owner) onlymanyowners(sha3(msg.data)) external {
|
2015-07-06 16:04:26 +00:00
|
|
|
uint ownerIndex = m_ownerIndex[uint(_owner)];
|
|
|
|
if (ownerIndex == 0) return;
|
|
|
|
if (m_required > m_numOwners - 1) return;
|
|
|
|
|
|
|
|
m_owners[ownerIndex] = 0;
|
|
|
|
m_ownerIndex[uint(_owner)] = 0;
|
|
|
|
clearPending();
|
|
|
|
reorganizeOwners(); //make sure m_numOwner is equal to the number of owners and always points to the optimal free slot
|
|
|
|
OwnerRemoved(_owner);
|
|
|
|
}
|
|
|
|
|
2015-07-22 22:05:09 +00:00
|
|
|
function changeRequirement(uint _newRequired) onlymanyowners(sha3(msg.data)) external {
|
2015-07-06 16:04:26 +00:00
|
|
|
if (_newRequired > m_numOwners) return;
|
|
|
|
m_required = _newRequired;
|
|
|
|
clearPending();
|
|
|
|
RequirementChanged(_newRequired);
|
|
|
|
}
|
|
|
|
|
|
|
|
function isOwner(address _addr) returns (bool) {
|
|
|
|
return m_ownerIndex[uint(_addr)] > 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
function hasConfirmed(bytes32 _operation, address _owner) constant returns (bool) {
|
|
|
|
var pending = m_pending[_operation];
|
|
|
|
uint ownerIndex = m_ownerIndex[uint(_owner)];
|
|
|
|
|
|
|
|
// make sure they're an owner
|
|
|
|
if (ownerIndex == 0) return false;
|
|
|
|
|
|
|
|
// determine the bit to set for this owner.
|
|
|
|
uint ownerIndexBit = 2**ownerIndex;
|
|
|
|
if (pending.ownersDone & ownerIndexBit == 0) {
|
|
|
|
return false;
|
|
|
|
} else {
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// INTERNAL METHODS
|
|
|
|
|
|
|
|
function confirmAndCheck(bytes32 _operation) internal returns (bool) {
|
2015-06-10 15:37:17 +00:00
|
|
|
// determine what index the present sender is:
|
|
|
|
uint ownerIndex = m_ownerIndex[uint(msg.sender)];
|
|
|
|
// make sure they're an owner
|
|
|
|
if (ownerIndex == 0) return;
|
|
|
|
|
|
|
|
var pending = m_pending[_operation];
|
|
|
|
// if we're not yet working on this operation, switch over and reset the confirmation status.
|
|
|
|
if (pending.yetNeeded == 0) {
|
|
|
|
// reset count of confirmations needed.
|
|
|
|
pending.yetNeeded = m_required;
|
|
|
|
// reset which owners have confirmed (none) - set our bitmap to 0.
|
|
|
|
pending.ownersDone = 0;
|
|
|
|
pending.index = m_pendingIndex.length++;
|
|
|
|
m_pendingIndex[pending.index] = _operation;
|
|
|
|
}
|
|
|
|
// determine the bit to set for this owner.
|
|
|
|
uint ownerIndexBit = 2**ownerIndex;
|
|
|
|
// make sure we (the message sender) haven't confirmed this operation previously.
|
|
|
|
if (pending.ownersDone & ownerIndexBit == 0) {
|
|
|
|
Confirmation(msg.sender, _operation);
|
|
|
|
// ok - check if count is enough to go ahead.
|
|
|
|
if (pending.yetNeeded <= 1) {
|
|
|
|
// enough confirmations: reset and run interior.
|
|
|
|
delete m_pendingIndex[m_pending[_operation].index];
|
|
|
|
delete m_pending[_operation];
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// not enough: record that this owner in particular confirmed.
|
|
|
|
pending.yetNeeded--;
|
|
|
|
pending.ownersDone |= ownerIndexBit;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
function reorganizeOwners() private returns (bool) {
|
|
|
|
uint free = 1;
|
|
|
|
while (free < m_numOwners)
|
|
|
|
{
|
|
|
|
while (free < m_numOwners && m_owners[free] != 0) free++;
|
|
|
|
while (m_numOwners > 1 && m_owners[m_numOwners] == 0) m_numOwners--;
|
|
|
|
if (free < m_numOwners && m_owners[m_numOwners] != 0 && m_owners[free] == 0)
|
|
|
|
{
|
|
|
|
m_owners[free] = m_owners[m_numOwners];
|
|
|
|
m_ownerIndex[m_owners[free]] = free;
|
|
|
|
m_owners[m_numOwners] = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2015-07-06 16:04:26 +00:00
|
|
|
|
2015-06-10 15:37:17 +00:00
|
|
|
function clearPending() internal {
|
|
|
|
uint length = m_pendingIndex.length;
|
|
|
|
for (uint i = 0; i < length; ++i)
|
|
|
|
if (m_pendingIndex[i] != 0)
|
|
|
|
delete m_pending[m_pendingIndex[i]];
|
|
|
|
delete m_pendingIndex;
|
|
|
|
}
|
2015-07-06 16:04:26 +00:00
|
|
|
|
|
|
|
// FIELDS
|
2015-06-10 15:37:17 +00:00
|
|
|
|
|
|
|
// the number of owners that must confirm the same operation before it is run.
|
2015-06-29 10:46:31 +00:00
|
|
|
uint public m_required;
|
2015-06-10 15:37:17 +00:00
|
|
|
// pointer used to find a free slot in m_owners
|
2015-06-29 10:46:31 +00:00
|
|
|
uint public m_numOwners;
|
2015-07-06 16:04:26 +00:00
|
|
|
|
2015-06-10 15:37:17 +00:00
|
|
|
// list of owners
|
2015-07-06 16:04:26 +00:00
|
|
|
uint[256] m_owners;
|
2015-06-10 15:37:17 +00:00
|
|
|
uint constant c_maxOwners = 250;
|
|
|
|
// index on the list of owners to allow reverse lookup
|
2015-07-06 16:04:26 +00:00
|
|
|
mapping(uint => uint) m_ownerIndex;
|
2015-06-10 15:37:17 +00:00
|
|
|
// the ongoing operations.
|
2015-07-06 16:04:26 +00:00
|
|
|
mapping(bytes32 => PendingState) m_pending;
|
|
|
|
bytes32[] m_pendingIndex;
|
2015-06-10 15:37:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// inheritable "property" contract that enables methods to be protected by placing a linear limit (specifiable)
|
|
|
|
// on a particular resource per calendar day. is multiowned to allow the limit to be altered. resource that method
|
|
|
|
// uses is specified in the modifier.
|
|
|
|
contract daylimit is multiowned {
|
2015-07-06 16:04:26 +00:00
|
|
|
|
|
|
|
// MODIFIERS
|
|
|
|
|
|
|
|
// simple modifier for daily limit.
|
|
|
|
modifier limitedDaily(uint _value) {
|
|
|
|
if (underLimit(_value))
|
|
|
|
_
|
|
|
|
}
|
|
|
|
|
|
|
|
// METHODS
|
|
|
|
|
2015-07-22 14:58:24 +00:00
|
|
|
// constructor - stores initial daily limit and records the present day's index.
|
|
|
|
function daylimit(uint _limit) {
|
|
|
|
m_dailyLimit = _limit;
|
2015-06-10 15:37:17 +00:00
|
|
|
m_lastDay = today();
|
|
|
|
}
|
|
|
|
// (re)sets the daily limit. needs many of the owners to confirm. doesn't alter the amount already spent today.
|
2015-07-22 22:05:09 +00:00
|
|
|
function setDailyLimit(uint _newLimit) onlymanyowners(sha3(msg.data)) external {
|
2015-06-10 15:37:17 +00:00
|
|
|
m_dailyLimit = _newLimit;
|
|
|
|
}
|
|
|
|
// (re)sets the daily limit. needs many of the owners to confirm. doesn't alter the amount already spent today.
|
2015-07-22 22:05:09 +00:00
|
|
|
function resetSpentToday() onlymanyowners(sha3(msg.data)) external {
|
2015-06-10 15:37:17 +00:00
|
|
|
m_spentToday = 0;
|
|
|
|
}
|
2015-07-06 16:04:26 +00:00
|
|
|
|
|
|
|
// INTERNAL METHODS
|
|
|
|
|
2015-06-10 15:37:17 +00:00
|
|
|
// checks to see if there is at least `_value` left from the daily limit today. if there is, subtracts it and
|
|
|
|
// returns true. otherwise just returns false.
|
|
|
|
function underLimit(uint _value) internal onlyowner returns (bool) {
|
|
|
|
// reset the spend limit if we're on a different day to last time.
|
|
|
|
if (today() > m_lastDay) {
|
|
|
|
m_spentToday = 0;
|
|
|
|
m_lastDay = today();
|
|
|
|
}
|
|
|
|
// check to see if there's enough left - if so, subtract and return true.
|
|
|
|
if (m_spentToday + _value >= m_spentToday && m_spentToday + _value <= m_dailyLimit) {
|
|
|
|
m_spentToday += _value;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
// determines today's index.
|
|
|
|
function today() private constant returns (uint) { return now / 1 days; }
|
2015-07-06 16:04:26 +00:00
|
|
|
|
|
|
|
// FIELDS
|
|
|
|
|
2015-06-29 10:46:31 +00:00
|
|
|
uint public m_dailyLimit;
|
2015-07-06 16:04:26 +00:00
|
|
|
uint m_spentToday;
|
|
|
|
uint m_lastDay;
|
2015-06-10 15:37:17 +00:00
|
|
|
}
|
2015-07-06 16:04:26 +00:00
|
|
|
|
2015-06-10 15:37:17 +00:00
|
|
|
// interface contract for multisig proxy contracts; see below for docs.
|
|
|
|
contract multisig {
|
2015-07-06 16:04:26 +00:00
|
|
|
|
|
|
|
// EVENTS
|
|
|
|
|
|
|
|
// logged events:
|
|
|
|
// Funds has arrived into the wallet (record how much).
|
2015-06-10 15:37:17 +00:00
|
|
|
event Deposit(address from, uint value);
|
2015-07-06 16:04:26 +00:00
|
|
|
// Single transaction going out of the wallet (record who signed for it, how much, and to whom it's going).
|
2015-06-10 15:37:17 +00:00
|
|
|
event SingleTransact(address owner, uint value, address to, bytes data);
|
2015-07-06 16:04:26 +00:00
|
|
|
// Multi-sig transaction going out of the wallet (record who signed for it last, the operation hash, how much, and to whom it's going).
|
2015-06-10 15:37:17 +00:00
|
|
|
event MultiTransact(address owner, bytes32 operation, uint value, address to, bytes data);
|
2015-07-06 16:04:26 +00:00
|
|
|
// Confirmation still needed for a transaction.
|
2015-06-10 15:37:17 +00:00
|
|
|
event ConfirmationNeeded(bytes32 operation, address initiator, uint value, address to, bytes data);
|
2015-07-06 16:04:26 +00:00
|
|
|
|
|
|
|
// FUNCTIONS
|
|
|
|
|
|
|
|
// TODO: document
|
2015-06-10 15:37:17 +00:00
|
|
|
function changeOwner(address _from, address _to) external;
|
|
|
|
function execute(address _to, uint _value, bytes _data) external returns (bytes32);
|
|
|
|
function confirm(bytes32 _h) returns (bool);
|
|
|
|
}
|
2015-07-06 16:04:26 +00:00
|
|
|
|
2015-06-10 15:37:17 +00:00
|
|
|
// usage:
|
|
|
|
// bytes32 h = Wallet(w).from(oneOwner).transact(to, value, data);
|
|
|
|
// Wallet(w).from(anotherOwner).confirm(h);
|
|
|
|
contract Wallet is multisig, multiowned, daylimit {
|
2015-07-06 16:04:26 +00:00
|
|
|
|
|
|
|
// TYPES
|
|
|
|
|
2015-06-10 15:37:17 +00:00
|
|
|
// Transaction structure to remember details of transaction lest it need be saved for a later call.
|
|
|
|
struct Transaction {
|
|
|
|
address to;
|
|
|
|
uint value;
|
|
|
|
bytes data;
|
|
|
|
}
|
2015-07-06 16:04:26 +00:00
|
|
|
|
|
|
|
// METHODS
|
|
|
|
|
2015-07-22 14:58:24 +00:00
|
|
|
// constructor - just pass on the owner array to the multiowned and
|
|
|
|
// the limit to daylimit
|
|
|
|
function Wallet(address[] _owners, uint _required, uint _daylimit)
|
|
|
|
multiowned(_owners, _required) daylimit(_daylimit) {
|
2015-06-10 15:37:17 +00:00
|
|
|
}
|
2015-07-06 16:04:26 +00:00
|
|
|
|
2015-11-28 23:09:15 +00:00
|
|
|
// destroys the contract sending everything to `_to`.
|
2015-07-22 22:05:09 +00:00
|
|
|
function kill(address _to) onlymanyowners(sha3(msg.data)) external {
|
2015-11-28 23:09:15 +00:00
|
|
|
selfdestruct(_to);
|
2015-06-10 15:37:17 +00:00
|
|
|
}
|
2015-07-06 16:04:26 +00:00
|
|
|
|
2015-06-10 15:37:17 +00:00
|
|
|
// gets called when no other function matches
|
|
|
|
function() {
|
|
|
|
// just being sent some cash?
|
|
|
|
if (msg.value > 0)
|
|
|
|
Deposit(msg.sender, msg.value);
|
|
|
|
}
|
2015-07-06 16:04:26 +00:00
|
|
|
|
2015-06-10 15:37:17 +00:00
|
|
|
// Outside-visible transact entry point. Executes transacion immediately if below daily spend limit.
|
|
|
|
// If not, goes into multisig process. We provide a hash on return to allow the sender to provide
|
|
|
|
// shortcuts for the other confirmations (allowing them to avoid replicating the _to, _value
|
|
|
|
// and _data arguments). They still get the option of using them if they want, anyways.
|
2015-06-29 10:46:31 +00:00
|
|
|
function execute(address _to, uint _value, bytes _data) external onlyowner returns (bytes32 _r) {
|
2015-06-10 15:37:17 +00:00
|
|
|
// first, take the opportunity to check that we're under the daily limit.
|
|
|
|
if (underLimit(_value)) {
|
|
|
|
SingleTransact(msg.sender, _value, _to, _data);
|
|
|
|
// yes - just execute the call.
|
|
|
|
_to.call.value(_value)(_data);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
// determine our operation hash.
|
2015-07-06 16:04:26 +00:00
|
|
|
_r = sha3(msg.data, block.number);
|
2015-06-10 15:37:17 +00:00
|
|
|
if (!confirm(_r) && m_txs[_r].to == 0) {
|
|
|
|
m_txs[_r].to = _to;
|
|
|
|
m_txs[_r].value = _value;
|
|
|
|
m_txs[_r].data = _data;
|
|
|
|
ConfirmationNeeded(_r, msg.sender, _value, _to, _data);
|
|
|
|
}
|
|
|
|
}
|
2015-07-06 16:04:26 +00:00
|
|
|
|
2015-06-10 15:37:17 +00:00
|
|
|
// confirm a transaction through just the hash. we use the previous transactions map, m_txs, in order
|
|
|
|
// to determine the body of the transaction from the hash provided.
|
|
|
|
function confirm(bytes32 _h) onlymanyowners(_h) returns (bool) {
|
|
|
|
if (m_txs[_h].to != 0) {
|
|
|
|
m_txs[_h].to.call.value(m_txs[_h].value)(m_txs[_h].data);
|
|
|
|
MultiTransact(msg.sender, _h, m_txs[_h].value, m_txs[_h].to, m_txs[_h].data);
|
|
|
|
delete m_txs[_h];
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
2015-07-06 16:04:26 +00:00
|
|
|
|
|
|
|
// INTERNAL METHODS
|
|
|
|
|
2015-06-10 15:37:17 +00:00
|
|
|
function clearPending() internal {
|
|
|
|
uint length = m_pendingIndex.length;
|
|
|
|
for (uint i = 0; i < length; ++i)
|
|
|
|
delete m_txs[m_pendingIndex[i]];
|
|
|
|
super.clearPending();
|
|
|
|
}
|
2015-07-06 16:04:26 +00:00
|
|
|
|
|
|
|
// FIELDS
|
|
|
|
|
2015-06-10 15:37:17 +00:00
|
|
|
// pending transactions we have at present.
|
2015-07-06 16:04:26 +00:00
|
|
|
mapping (bytes32 => Transaction) m_txs;
|
2015-06-10 15:37:17 +00:00
|
|
|
}
|
|
|
|
)DELIMITER";
|
|
|
|
|
|
|
|
static unique_ptr<bytes> s_compiledWallet;
|
|
|
|
|
|
|
|
class WalletTestFramework: public ExecutionFramework
|
|
|
|
{
|
|
|
|
protected:
|
2015-07-22 14:58:24 +00:00
|
|
|
void deployWallet(
|
|
|
|
u256 const& _value = 0,
|
|
|
|
vector<u256> const& _owners = vector<u256>{},
|
|
|
|
u256 _required = 1,
|
|
|
|
u256 _dailyLimit = 0
|
|
|
|
)
|
2015-06-10 15:37:17 +00:00
|
|
|
{
|
|
|
|
if (!s_compiledWallet)
|
|
|
|
{
|
|
|
|
m_optimize = true;
|
|
|
|
m_compiler.reset(false, m_addStandardSources);
|
|
|
|
m_compiler.addSource("", walletCode);
|
|
|
|
ETH_TEST_REQUIRE_NO_THROW(m_compiler.compile(m_optimize, m_optimizeRuns), "Compiling contract failed");
|
2015-09-10 10:01:05 +00:00
|
|
|
s_compiledWallet.reset(new bytes(m_compiler.object("Wallet").bytecode));
|
2015-06-10 15:37:17 +00:00
|
|
|
}
|
2015-07-22 14:58:24 +00:00
|
|
|
bytes args = encodeArgs(u256(0x60), _required, _dailyLimit, u256(_owners.size()), _owners);
|
2015-07-16 14:25:23 +00:00
|
|
|
sendMessage(*s_compiledWallet + args, true, _value);
|
2015-06-10 15:37:17 +00:00
|
|
|
BOOST_REQUIRE(!m_output.empty());
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
/// This is a test suite that tests optimised code!
|
|
|
|
BOOST_FIXTURE_TEST_SUITE(SolidityWallet, WalletTestFramework)
|
|
|
|
|
|
|
|
BOOST_AUTO_TEST_CASE(creation)
|
|
|
|
{
|
|
|
|
deployWallet(200);
|
|
|
|
BOOST_REQUIRE(callContractFunction("isOwner(address)", h256(m_sender, h256::AlignRight)) == encodeArgs(true));
|
|
|
|
BOOST_REQUIRE(callContractFunction("isOwner(address)", ~h256(m_sender, h256::AlignRight)) == encodeArgs(false));
|
|
|
|
}
|
|
|
|
|
|
|
|
BOOST_AUTO_TEST_CASE(add_owners)
|
|
|
|
{
|
|
|
|
deployWallet(200);
|
|
|
|
Address originalOwner = m_sender;
|
2016-06-18 00:08:20 +00:00
|
|
|
BOOST_REQUIRE(callContractFunction("addOwner(address)", h256(account(1), h256::AlignRight)) == encodeArgs());
|
|
|
|
BOOST_REQUIRE(callContractFunction("isOwner(address)", h256(account(1), h256::AlignRight)) == encodeArgs(true));
|
2015-06-10 15:37:17 +00:00
|
|
|
// now let the new owner add someone
|
2016-06-18 00:08:20 +00:00
|
|
|
sendEther(account(1), 10 * eth::ether);
|
|
|
|
m_sender = account(1);
|
2015-06-10 15:37:17 +00:00
|
|
|
BOOST_REQUIRE(callContractFunction("addOwner(address)", h256(0x13)) == encodeArgs());
|
|
|
|
BOOST_REQUIRE(callContractFunction("isOwner(address)", h256(0x13)) == encodeArgs(true));
|
|
|
|
// and check that a non-owner cannot add a new owner
|
2016-06-18 00:08:20 +00:00
|
|
|
m_sender = account(0);
|
|
|
|
sendEther(account(2), 10 * eth::ether);
|
|
|
|
m_sender = account(2);
|
2015-06-10 15:37:17 +00:00
|
|
|
BOOST_REQUIRE(callContractFunction("addOwner(address)", h256(0x20)) == encodeArgs());
|
|
|
|
BOOST_REQUIRE(callContractFunction("isOwner(address)", h256(0x20)) == encodeArgs(false));
|
|
|
|
// finally check that all the owners are there
|
|
|
|
BOOST_REQUIRE(callContractFunction("isOwner(address)", h256(originalOwner, h256::AlignRight)) == encodeArgs(true));
|
2016-06-18 00:08:20 +00:00
|
|
|
BOOST_REQUIRE(callContractFunction("isOwner(address)", h256(account(1), h256::AlignRight)) == encodeArgs(true));
|
2015-06-10 15:37:17 +00:00
|
|
|
BOOST_REQUIRE(callContractFunction("isOwner(address)", h256(0x13)) == encodeArgs(true));
|
|
|
|
}
|
|
|
|
|
|
|
|
BOOST_AUTO_TEST_CASE(change_owners)
|
|
|
|
{
|
|
|
|
deployWallet(200);
|
|
|
|
BOOST_REQUIRE(callContractFunction("addOwner(address)", h256(0x12)) == encodeArgs());
|
|
|
|
BOOST_REQUIRE(callContractFunction("isOwner(address)", h256(0x12)) == encodeArgs(true));
|
|
|
|
BOOST_REQUIRE(callContractFunction("changeOwner(address,address)", h256(0x12), h256(0x13)) == encodeArgs());
|
|
|
|
BOOST_REQUIRE(callContractFunction("isOwner(address)", h256(0x12)) == encodeArgs(false));
|
|
|
|
BOOST_REQUIRE(callContractFunction("isOwner(address)", h256(0x13)) == encodeArgs(true));
|
|
|
|
}
|
|
|
|
|
|
|
|
BOOST_AUTO_TEST_CASE(remove_owner)
|
|
|
|
{
|
|
|
|
deployWallet(200);
|
|
|
|
// add 10 owners
|
|
|
|
for (unsigned i = 0; i < 10; ++i)
|
|
|
|
{
|
|
|
|
BOOST_REQUIRE(callContractFunction("addOwner(address)", h256(0x12 + i)) == encodeArgs());
|
|
|
|
BOOST_REQUIRE(callContractFunction("isOwner(address)", h256(0x12 + i)) == encodeArgs(true));
|
|
|
|
}
|
|
|
|
// check they are there again
|
|
|
|
for (unsigned i = 0; i < 10; ++i)
|
|
|
|
BOOST_REQUIRE(callContractFunction("isOwner(address)", h256(0x12 + i)) == encodeArgs(true));
|
|
|
|
// remove the odd owners
|
|
|
|
for (unsigned i = 0; i < 10; ++i)
|
|
|
|
if (i % 2 == 1)
|
|
|
|
BOOST_REQUIRE(callContractFunction("removeOwner(address)", h256(0x12 + i)) == encodeArgs());
|
|
|
|
// check the result
|
|
|
|
for (unsigned i = 0; i < 10; ++i)
|
|
|
|
BOOST_REQUIRE(callContractFunction("isOwner(address)", h256(0x12 + i)) == encodeArgs(i % 2 == 0));
|
|
|
|
// add them again
|
|
|
|
for (unsigned i = 0; i < 10; ++i)
|
|
|
|
if (i % 2 == 1)
|
|
|
|
BOOST_REQUIRE(callContractFunction("addOwner(address)", h256(0x12 + i)) == encodeArgs());
|
|
|
|
// check everyone is there
|
|
|
|
for (unsigned i = 0; i < 10; ++i)
|
|
|
|
BOOST_REQUIRE(callContractFunction("isOwner(address)", h256(0x12 + i)) == encodeArgs(true));
|
|
|
|
}
|
|
|
|
|
2015-07-16 14:25:23 +00:00
|
|
|
BOOST_AUTO_TEST_CASE(initial_owners)
|
|
|
|
{
|
2015-07-20 15:51:28 +00:00
|
|
|
vector<u256> owners{
|
|
|
|
u256("0x00000000000000000000000042c56279432962a17176998a4747d1b4d6ed4367"),
|
|
|
|
u256("0x000000000000000000000000d4d4669f5ba9f4c27d38ef02a358c339b5560c47"),
|
|
|
|
u256("0x000000000000000000000000e6716f9544a56c530d868e4bfbacb172315bdead"),
|
|
|
|
u256("0x000000000000000000000000775e18be7a50a0abb8a4e82b1bd697d79f31fe04"),
|
|
|
|
u256("0x000000000000000000000000f4dd5c3794f1fd0cdc0327a83aa472609c806e99"),
|
|
|
|
u256("0x0000000000000000000000004c9113886af165b2de069d6e99430647e94a9fff"),
|
|
|
|
u256("0x0000000000000000000000003fb1cd2cd96c6d5c0b5eb3322d807b34482481d4")
|
|
|
|
};
|
2015-07-22 14:58:24 +00:00
|
|
|
deployWallet(0, owners, 4, 2);
|
2015-07-20 15:51:28 +00:00
|
|
|
BOOST_CHECK(callContractFunction("m_numOwners()") == encodeArgs(u256(8)));
|
2015-07-16 14:25:23 +00:00
|
|
|
BOOST_CHECK(callContractFunction("isOwner(address)", h256(m_sender, h256::AlignRight)) == encodeArgs(true));
|
2015-07-20 15:51:28 +00:00
|
|
|
for (u256 const& owner: owners)
|
2015-07-20 16:44:06 +00:00
|
|
|
{
|
2015-07-20 15:51:28 +00:00
|
|
|
BOOST_CHECK(callContractFunction("isOwner(address)", owner) == encodeArgs(true));
|
2015-07-20 16:44:06 +00:00
|
|
|
}
|
2015-07-16 14:25:23 +00:00
|
|
|
}
|
|
|
|
|
2015-06-10 15:37:17 +00:00
|
|
|
BOOST_AUTO_TEST_CASE(multisig_value_transfer)
|
|
|
|
{
|
|
|
|
deployWallet(200);
|
2016-06-18 00:08:20 +00:00
|
|
|
BOOST_REQUIRE(callContractFunction("addOwner(address)", h256(account(1), h256::AlignRight)) == encodeArgs());
|
|
|
|
BOOST_REQUIRE(callContractFunction("addOwner(address)", h256(account(2), h256::AlignRight)) == encodeArgs());
|
|
|
|
BOOST_REQUIRE(callContractFunction("addOwner(address)", h256(account(3), h256::AlignRight)) == encodeArgs());
|
2015-06-10 15:37:17 +00:00
|
|
|
// 4 owners, set required to 3
|
|
|
|
BOOST_REQUIRE(callContractFunction("changeRequirement(uint256)", u256(3)) == encodeArgs());
|
|
|
|
// check that balance is and stays zero at destination address
|
2016-06-14 15:01:57 +00:00
|
|
|
BOOST_CHECK_EQUAL(balanceAt(Address(0x05)), 0);
|
2016-06-18 00:08:20 +00:00
|
|
|
m_sender = account(0);
|
|
|
|
sendEther(account(1), 10 * eth::ether);
|
|
|
|
m_sender = account(1);
|
|
|
|
auto ophash = callContractFunction("execute(address,uint256,bytes)", h256(0x05), 100, 0x60, 0x00);
|
2016-06-14 15:01:57 +00:00
|
|
|
BOOST_CHECK_EQUAL(balanceAt(Address(0x05)), 0);
|
2016-06-18 00:08:20 +00:00
|
|
|
m_sender = account(0);
|
|
|
|
sendEther(account(2), 10 * eth::ether);
|
|
|
|
m_sender = account(2);
|
|
|
|
callContractFunction("confirm(bytes32)", ophash);
|
2016-06-14 15:01:57 +00:00
|
|
|
BOOST_CHECK_EQUAL(balanceAt(Address(0x05)), 0);
|
2016-06-18 00:08:20 +00:00
|
|
|
m_sender = account(0);
|
|
|
|
sendEther(account(3), 10 * eth::ether);
|
|
|
|
m_sender = account(3);
|
|
|
|
callContractFunction("confirm(bytes32)", ophash);
|
2015-07-23 21:44:35 +00:00
|
|
|
// now it should go through
|
2016-06-14 15:01:57 +00:00
|
|
|
BOOST_CHECK_EQUAL(balanceAt(Address(0x05)), 100);
|
2015-07-23 21:44:35 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
BOOST_AUTO_TEST_CASE(revoke_addOwner)
|
|
|
|
{
|
|
|
|
deployWallet();
|
2016-06-18 00:08:20 +00:00
|
|
|
BOOST_REQUIRE(callContractFunction("addOwner(address)", h256(account(1), h256::AlignRight)) == encodeArgs());
|
|
|
|
BOOST_REQUIRE(callContractFunction("addOwner(address)", h256(account(2), h256::AlignRight)) == encodeArgs());
|
|
|
|
BOOST_REQUIRE(callContractFunction("addOwner(address)", h256(account(3), h256::AlignRight)) == encodeArgs());
|
2015-07-23 21:44:35 +00:00
|
|
|
// 4 owners, set required to 3
|
|
|
|
BOOST_REQUIRE(callContractFunction("changeRequirement(uint256)", u256(3)) == encodeArgs());
|
|
|
|
// add a new owner
|
|
|
|
Address deployer = m_sender;
|
|
|
|
h256 opHash = sha3(FixedHash<4>(dev::sha3("addOwner(address)")).asBytes() + h256(0x33).asBytes());
|
|
|
|
BOOST_REQUIRE(callContractFunction("addOwner(address)", h256(0x33)) == encodeArgs());
|
|
|
|
BOOST_REQUIRE(callContractFunction("isOwner(address)", h256(0x33)) == encodeArgs(false));
|
2016-06-18 00:08:20 +00:00
|
|
|
m_sender = account(0);
|
|
|
|
sendEther(account(1), 10 * eth::ether);
|
|
|
|
m_sender = account(1);
|
2015-07-23 21:44:35 +00:00
|
|
|
BOOST_REQUIRE(callContractFunction("addOwner(address)", h256(0x33)) == encodeArgs());
|
|
|
|
BOOST_REQUIRE(callContractFunction("isOwner(address)", h256(0x33)) == encodeArgs(false));
|
|
|
|
// revoke one confirmation
|
|
|
|
m_sender = deployer;
|
|
|
|
BOOST_REQUIRE(callContractFunction("revoke(bytes32)", opHash) == encodeArgs());
|
2016-06-18 00:08:20 +00:00
|
|
|
m_sender = account(0);
|
|
|
|
sendEther(account(2), 10 * eth::ether);
|
|
|
|
m_sender = account(2);
|
2015-07-23 21:44:35 +00:00
|
|
|
BOOST_REQUIRE(callContractFunction("addOwner(address)", h256(0x33)) == encodeArgs());
|
|
|
|
BOOST_REQUIRE(callContractFunction("isOwner(address)", h256(0x33)) == encodeArgs(false));
|
2016-06-18 00:08:20 +00:00
|
|
|
m_sender = account(0);
|
|
|
|
sendEther(account(3), 10 * eth::ether);
|
|
|
|
m_sender = account(3);
|
2015-07-23 21:44:35 +00:00
|
|
|
BOOST_REQUIRE(callContractFunction("addOwner(address)", h256(0x33)) == encodeArgs());
|
|
|
|
BOOST_REQUIRE(callContractFunction("isOwner(address)", h256(0x33)) == encodeArgs(true));
|
|
|
|
}
|
|
|
|
|
|
|
|
BOOST_AUTO_TEST_CASE(revoke_transaction)
|
|
|
|
{
|
|
|
|
deployWallet(200);
|
2016-06-18 00:08:20 +00:00
|
|
|
BOOST_REQUIRE(callContractFunction("addOwner(address)", h256(account(1), h256::AlignRight)) == encodeArgs());
|
|
|
|
BOOST_REQUIRE(callContractFunction("addOwner(address)", h256(account(2), h256::AlignRight)) == encodeArgs());
|
|
|
|
BOOST_REQUIRE(callContractFunction("addOwner(address)", h256(account(3), h256::AlignRight)) == encodeArgs());
|
2015-07-23 21:44:35 +00:00
|
|
|
// 4 owners, set required to 3
|
|
|
|
BOOST_REQUIRE(callContractFunction("changeRequirement(uint256)", u256(3)) == encodeArgs());
|
|
|
|
// create a transaction
|
|
|
|
Address deployer = m_sender;
|
2016-06-14 15:01:57 +00:00
|
|
|
BOOST_CHECK_EQUAL(balanceAt(Address(0x05)), 0);
|
2016-06-18 00:08:20 +00:00
|
|
|
m_sender = account(0);
|
|
|
|
sendEther(account(1), 10 * eth::ether);
|
|
|
|
m_sender = account(1);
|
|
|
|
auto opHash = callContractFunction("execute(address,uint256,bytes)", h256(0x05), 100, 0x60, 0x00);
|
2016-06-14 15:01:57 +00:00
|
|
|
BOOST_CHECK_EQUAL(balanceAt(Address(0x05)), 0);
|
2016-06-18 00:08:20 +00:00
|
|
|
m_sender = account(0);
|
|
|
|
sendEther(account(2), 10 * eth::ether);
|
|
|
|
m_sender = account(2);
|
|
|
|
callContractFunction("confirm(bytes32)", opHash);
|
2016-06-14 15:01:57 +00:00
|
|
|
BOOST_CHECK_EQUAL(balanceAt(Address(0x05)), 0);
|
2016-06-18 00:08:20 +00:00
|
|
|
m_sender = account(0);
|
|
|
|
sendEther(account(1), 10 * eth::ether);
|
|
|
|
m_sender = account(1);
|
2015-07-23 21:44:35 +00:00
|
|
|
BOOST_REQUIRE(callContractFunction("revoke(bytes32)", opHash) == encodeArgs());
|
|
|
|
m_sender = deployer;
|
2016-06-18 00:08:20 +00:00
|
|
|
callContractFunction("confirm(bytes32)", opHash);
|
2016-06-14 15:01:57 +00:00
|
|
|
BOOST_CHECK_EQUAL(balanceAt(Address(0x05)), 0);
|
2016-06-18 00:08:20 +00:00
|
|
|
m_sender = account(0);
|
|
|
|
sendEther(account(3), 10 * eth::ether);
|
|
|
|
m_sender = account(3);
|
|
|
|
callContractFunction("confirm(bytes32)", opHash);
|
2015-06-10 15:37:17 +00:00
|
|
|
// now it should go through
|
2016-06-14 15:01:57 +00:00
|
|
|
BOOST_CHECK_EQUAL(balanceAt(Address(0x05)), 100);
|
2015-06-10 15:37:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
BOOST_AUTO_TEST_CASE(daylimit)
|
|
|
|
{
|
|
|
|
deployWallet(200);
|
2015-07-22 14:58:24 +00:00
|
|
|
BOOST_REQUIRE(callContractFunction("m_dailyLimit()") == encodeArgs(u256(0)));
|
2015-06-10 15:37:17 +00:00
|
|
|
BOOST_REQUIRE(callContractFunction("setDailyLimit(uint256)", h256(100)) == encodeArgs());
|
2015-07-22 14:58:24 +00:00
|
|
|
BOOST_REQUIRE(callContractFunction("m_dailyLimit()") == encodeArgs(u256(100)));
|
2016-06-18 00:08:20 +00:00
|
|
|
BOOST_REQUIRE(callContractFunction("addOwner(address)", h256(account(1), h256::AlignRight)) == encodeArgs());
|
|
|
|
BOOST_REQUIRE(callContractFunction("addOwner(address)", h256(account(2), h256::AlignRight)) == encodeArgs());
|
|
|
|
BOOST_REQUIRE(callContractFunction("addOwner(address)", h256(account(3), h256::AlignRight)) == encodeArgs());
|
2015-06-10 15:37:17 +00:00
|
|
|
// 4 owners, set required to 3
|
|
|
|
BOOST_REQUIRE(callContractFunction("changeRequirement(uint256)", u256(3)) == encodeArgs());
|
|
|
|
|
|
|
|
// try to send tx over daylimit
|
2016-06-14 15:01:57 +00:00
|
|
|
BOOST_CHECK_EQUAL(balanceAt(Address(0x05)), 0);
|
2016-06-18 00:08:20 +00:00
|
|
|
sendEther(account(1), 10 * eth::ether);
|
|
|
|
m_sender = account(1);
|
2015-06-10 15:37:17 +00:00
|
|
|
BOOST_REQUIRE(
|
|
|
|
callContractFunction("execute(address,uint256,bytes)", h256(0x05), 150, 0x60, 0x00) !=
|
|
|
|
encodeArgs(u256(0))
|
|
|
|
);
|
2016-06-14 15:01:57 +00:00
|
|
|
BOOST_CHECK_EQUAL(balanceAt(Address(0x05)), 0);
|
2015-06-10 15:37:17 +00:00
|
|
|
// try to send tx under daylimit by stranger
|
2016-06-18 00:08:20 +00:00
|
|
|
m_sender = account(0);
|
|
|
|
sendEther(account(4), 10 * eth::ether);
|
|
|
|
m_sender = account(4);
|
2015-06-10 15:37:17 +00:00
|
|
|
BOOST_REQUIRE(
|
|
|
|
callContractFunction("execute(address,uint256,bytes)", h256(0x05), 90, 0x60, 0x00) ==
|
|
|
|
encodeArgs(u256(0))
|
|
|
|
);
|
2016-06-14 15:01:57 +00:00
|
|
|
BOOST_CHECK_EQUAL(balanceAt(Address(0x05)), 0);
|
2015-06-10 15:37:17 +00:00
|
|
|
// now send below limit by owner
|
2016-06-18 00:08:20 +00:00
|
|
|
m_sender = account(0);
|
|
|
|
sendEther(account(1), 10 * eth::ether);
|
2015-06-10 15:37:17 +00:00
|
|
|
BOOST_REQUIRE(
|
|
|
|
callContractFunction("execute(address,uint256,bytes)", h256(0x05), 90, 0x60, 0x00) ==
|
|
|
|
encodeArgs(u256(0))
|
|
|
|
);
|
2016-06-14 15:01:57 +00:00
|
|
|
BOOST_CHECK_EQUAL(balanceAt(Address(0x05)), 90);
|
2015-06-10 15:37:17 +00:00
|
|
|
}
|
|
|
|
|
2015-07-22 14:58:24 +00:00
|
|
|
BOOST_AUTO_TEST_CASE(daylimit_constructor)
|
|
|
|
{
|
|
|
|
deployWallet(200, {}, 1, 20);
|
|
|
|
BOOST_REQUIRE(callContractFunction("m_dailyLimit()") == encodeArgs(u256(20)));
|
|
|
|
BOOST_REQUIRE(callContractFunction("setDailyLimit(uint256)", h256(30)) == encodeArgs());
|
|
|
|
BOOST_REQUIRE(callContractFunction("m_dailyLimit()") == encodeArgs(u256(30)));
|
|
|
|
}
|
|
|
|
|
2015-06-10 15:37:17 +00:00
|
|
|
//@todo test data calls
|
|
|
|
|
|
|
|
BOOST_AUTO_TEST_SUITE_END()
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} // end namespaces
|