Skip to content

Move Fields and Method #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: clean-docs
Choose a base branch
from
Open

Move Fields and Method #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 22 additions & 22 deletions Wallet.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,17 @@ contract multiowned {
uint ownersDone;
uint index;
}

// FIELDS

uint public m_required; // the number of owners needed to confirm.
uint public m_numOwners; // pointer used to find a free slot in m_owners

uint[256] m_owners; // owner array
uint constant c_maxOwners = 250; // maximum number of owners allowed to avoid overflow
mapping(uint => uint) m_ownerIndex; // index on the list of owners to allow reverse lookup
mapping(bytes32 => PendingState) m_pending; // pending authorization map
bytes32[] m_pendingIndex;

// EVENTS

Expand Down Expand Up @@ -231,24 +242,19 @@ contract multiowned {
delete m_pending[m_pendingIndex[i]];
delete m_pendingIndex;
}

// FIELDS

uint public m_required; // the number of owners needed to confirm.
uint public m_numOwners; // pointer used to find a free slot in m_owners

uint[256] m_owners; // owner array
uint constant c_maxOwners = 250; // maximum number of owners allowed to avoid overflow
mapping(uint => uint) m_ownerIndex; // index on the list of owners to allow reverse lookup
mapping(bytes32 => PendingState) m_pending; // pending authorization map
bytes32[] m_pendingIndex;
}

// 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 {

// FIELDS

uint public m_dailyLimit;
uint public m_spentToday;
uint public m_lastDay;

// METHODS

/// @dev Constructor - stores initial daily limit and records the present day's index.
Expand Down Expand Up @@ -291,12 +297,6 @@ contract daylimit is multiowned {

/// @dev Utility function, determines today's index.
function today() private constant returns (uint) { return now / 1 days; }

// FIELDS

uint public m_dailyLimit;
uint public m_spentToday;
uint public m_lastDay;
}

// interface contract for multisig proxy contracts; see below for docs.
Expand Down Expand Up @@ -340,6 +340,11 @@ contract creator {
// Wallet(w).from(anotherOwner).confirm(h);
contract Wallet is multisig, multiowned, daylimit, creator {

// FIELDS

// pending transactions we have at present.
mapping (bytes32 => Transaction) m_txs;

// TYPES

// Transaction structure to remember details of transaction lest it need be saved for a later call.
Expand Down Expand Up @@ -439,9 +444,4 @@ contract Wallet is multisig, multiowned, daylimit, creator {
delete m_txs[m_pendingIndex[i]];
super.clearPending();
}

// FIELDS

// pending transactions we have at present.
mapping (bytes32 => Transaction) m_txs;
}