cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2312 from chriseth/sol_updateWallet

Browse Source 
Updated wallet test to latest wallet source.
This commit is contained in:
chriseth 2015-06-29 16:46:50 +02:00
commit 9cb646697d
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libsolidity/SolidityWallet.cpp
View File

@ -200,17 +200,17 @@ contract multiowned {
} }
// the number of owners that must confirm the same operation before it is run. // the number of owners that must confirm the same operation before it is run.
uint m_required; uint public m_required;
// pointer used to find a free slot in m_owners // pointer used to find a free slot in m_owners
uint m_numOwners; uint public m_numOwners;
// list of owners // list of owners
uint[256] m_owners; uint[256] public m_owners;
uint constant c_maxOwners = 250; uint constant c_maxOwners = 250;
// index on the list of owners to allow reverse lookup // index on the list of owners to allow reverse lookup
mapping(uint => uint) m_ownerIndex; mapping(uint => uint) public m_ownerIndex;
// the ongoing operations. // the ongoing operations.
mapping(bytes32 => PendingState) m_pending; mapping(bytes32 => PendingState) public m_pending;
bytes32[] m_pendingIndex; bytes32[] public m_pendingIndex;
} }
// inheritable "property" contract that enables methods to be protected by placing a linear limit (specifiable) // inheritable "property" contract that enables methods to be protected by placing a linear limit (specifiable)
@ -251,9 +251,9 @@ contract daylimit is multiowned {
} }
// determines today's index. // determines today's index.
function today() private constant returns (uint) { return now / 1 days; } function today() private constant returns (uint) { return now / 1 days; }
uint m_spentToday; uint public m_spentToday;
uint m_dailyLimit; uint public m_dailyLimit;
uint m_lastDay; uint public m_lastDay;
} }
// interface contract for multisig proxy contracts; see below for docs. // interface contract for multisig proxy contracts; see below for docs.
contract multisig { contract multisig {
@ -275,11 +275,14 @@ contract Wallet is multisig, multiowned, daylimit {
uint value; uint value;
bytes data; bytes data;
} }
/*
// logged events: // logged events:
// Funds has arrived into the wallet (record how much). // Funds has arrived into the wallet (record how much).
event Deposit(address from, uint value); event Deposit(address from, uint value);
// Single transaction going out of the wallet (record who signed for it, how much, and to whom it's going). // Single transaction going out of the wallet (record who signed for it, how much, and to whom it's going).
event SingleTransact(address owner, uint value, address to, bytes data); event SingleTransact(address owner, uint value, address to, bytes data);
// 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).
event MultiTransact(address owner, bytes32 operation, uint value, address to, bytes data);*/
// constructor - just pass on the owner arra to the multiowned. // constructor - just pass on the owner arra to the multiowned.
event Created(); event Created();
function Wallet() { function Wallet() {
@ -299,7 +302,7 @@ contract Wallet is multisig, multiowned, daylimit {
// If not, goes into multisig process. We provide a hash on return to allow the sender to provide // 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 // 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. // and _data arguments). They still get the option of using them if they want, anyways.
function execute(address _to, uint _value, bytes _data) onlyowner external returns (bytes32 _r) { function execute(address _to, uint _value, bytes _data) external onlyowner returns (bytes32 _r) {
// first, take the opportunity to check that we're under the daily limit. // first, take the opportunity to check that we're under the daily limit.
if (underLimit(_value)) { if (underLimit(_value)) {
SingleTransact(msg.sender, _value, _to, _data); SingleTransact(msg.sender, _value, _to, _data);
@ -332,8 +335,14 @@ contract Wallet is multisig, multiowned, daylimit {
delete m_txs[m_pendingIndex[i]]; delete m_txs[m_pendingIndex[i]];
super.clearPending(); super.clearPending();
} }
// // internally confirm transaction with all of the info. returns true iff confirmed good and executed.
// function confirmVerbose(bytes32 _h, address _to, uint _value, bytes _data) private onlymanyowners(_h) returns (bool) {
// _to.call.value(_value)(_data);
// MultiTransact("out", msg.sender, _h, _value, _to);
// return true;
// }
// pending transactions we have at present. // pending transactions we have at present.
mapping (bytes32 => Transaction) m_txs; mapping (bytes32 => Transaction) public m_txs;
} }
)DELIMITER"; )DELIMITER";