Nucypher
/
nucypher
mirror of https://github.com/nucypher/nucypher.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Simplify StakingEscrow.confirmActivity(): only direct calls from Worker

pull/1029/head
David Núñez 2019-06-08 12:11:52 +02:00
parent 1387683e35
commit dd23408ca7
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nucypher/blockchain/eth/sol/source/contracts/StakingEscrow.sol
View File

@ -639,16 +639,9 @@ contract StakingEscrow is Issuer {
* @notice Confirm activity for the next period and mine for the previous period * @notice Confirm activity for the next period and mine for the previous period
**/ **/
function confirmActivity() external { function confirmActivity() external {
address staker = msg.sender; address staker = getStakerByWorker(msg.sender);
// sender is staker -> staker is an intermediary contract require(stakerInfo[staker].value > 0, "Staker must have a stake to confirm activity");
if (stakerInfo[staker].value > 0) { require(msg.sender == tx.origin, "Only worker with real address can confirm activity");
require(getWorkerByStaker(staker) == tx.origin, "Only worker can confirm activity");
} else {
// staker is not a contract -> sender is worker
staker = getStakerByWorker(msg.sender);
require(stakerInfo[staker].value > 0, "Staker must have a stake to confirm activity");
require(msg.sender == tx.origin, "Only worker with real address can confirm activity");
}
uint16 lastActivePeriod = getLastActivePeriod(staker); uint16 lastActivePeriod = getLastActivePeriod(staker);
mint(staker); mint(staker);