mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Remove block number from internal changes.
This commit is contained in:
parent
d4cb489c8f
commit
1dc55061f4
@ -116,7 +116,7 @@ contract multiowned {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Replaces an owner `_from` with another `_to`.
|
// Replaces an owner `_from` with another `_to`.
|
||||||
function changeOwner(address _from, address _to) onlymanyowners(sha3(msg.data, block.number)) external {
|
function changeOwner(address _from, address _to) onlymanyowners(sha3(msg.data)) external {
|
||||||
if (isOwner(_to)) return;
|
if (isOwner(_to)) return;
|
||||||
uint ownerIndex = m_ownerIndex[uint(_from)];
|
uint ownerIndex = m_ownerIndex[uint(_from)];
|
||||||
if (ownerIndex == 0) return;
|
if (ownerIndex == 0) return;
|
||||||
@ -128,7 +128,7 @@ contract multiowned {
|
|||||||
OwnerChanged(_from, _to);
|
OwnerChanged(_from, _to);
|
||||||
}
|
}
|
||||||
|
|
||||||
function addOwner(address _owner) onlymanyowners(sha3(msg.data, block.number)) external {
|
function addOwner(address _owner) onlymanyowners(sha3(msg.data)) external {
|
||||||
if (isOwner(_owner)) return;
|
if (isOwner(_owner)) return;
|
||||||
|
|
||||||
clearPending();
|
clearPending();
|
||||||
@ -142,7 +142,7 @@ contract multiowned {
|
|||||||
OwnerAdded(_owner);
|
OwnerAdded(_owner);
|
||||||
}
|
}
|
||||||
|
|
||||||
function removeOwner(address _owner) onlymanyowners(sha3(msg.data, block.number)) external {
|
function removeOwner(address _owner) onlymanyowners(sha3(msg.data)) external {
|
||||||
uint ownerIndex = m_ownerIndex[uint(_owner)];
|
uint ownerIndex = m_ownerIndex[uint(_owner)];
|
||||||
if (ownerIndex == 0) return;
|
if (ownerIndex == 0) return;
|
||||||
if (m_required > m_numOwners - 1) return;
|
if (m_required > m_numOwners - 1) return;
|
||||||
@ -154,7 +154,7 @@ contract multiowned {
|
|||||||
OwnerRemoved(_owner);
|
OwnerRemoved(_owner);
|
||||||
}
|
}
|
||||||
|
|
||||||
function changeRequirement(uint _newRequired) onlymanyowners(sha3(msg.data, block.number)) external {
|
function changeRequirement(uint _newRequired) onlymanyowners(sha3(msg.data)) external {
|
||||||
if (_newRequired > m_numOwners) return;
|
if (_newRequired > m_numOwners) return;
|
||||||
m_required = _newRequired;
|
m_required = _newRequired;
|
||||||
clearPending();
|
clearPending();
|
||||||
@ -281,11 +281,11 @@ contract daylimit is multiowned {
|
|||||||
m_lastDay = today();
|
m_lastDay = today();
|
||||||
}
|
}
|
||||||
// (re)sets the daily limit. needs many of the owners to confirm. doesn't alter the amount already spent today.
|
// (re)sets the daily limit. needs many of the owners to confirm. doesn't alter the amount already spent today.
|
||||||
function setDailyLimit(uint _newLimit) onlymanyowners(sha3(msg.data, block.number)) external {
|
function setDailyLimit(uint _newLimit) onlymanyowners(sha3(msg.data)) external {
|
||||||
m_dailyLimit = _newLimit;
|
m_dailyLimit = _newLimit;
|
||||||
}
|
}
|
||||||
// (re)sets the daily limit. needs many of the owners to confirm. doesn't alter the amount already spent today.
|
// (re)sets the daily limit. needs many of the owners to confirm. doesn't alter the amount already spent today.
|
||||||
function resetSpentToday() onlymanyowners(sha3(msg.data, block.number)) external {
|
function resetSpentToday() onlymanyowners(sha3(msg.data)) external {
|
||||||
m_spentToday = 0;
|
m_spentToday = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -362,7 +362,7 @@ contract Wallet is multisig, multiowned, daylimit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// kills the contract sending everything to `_to`.
|
// kills the contract sending everything to `_to`.
|
||||||
function kill(address _to) onlymanyowners(sha3(msg.data, block.number)) external {
|
function kill(address _to) onlymanyowners(sha3(msg.data)) external {
|
||||||
suicide(_to);
|
suicide(_to);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user