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

Apply suggestions from code review #1764 

Co-Authored-By: David Núñez <david@nucypher.com>
pull/1764/head
vzotova 2020-03-14 20:06:21 +03:00
parent 6b97e4e330
commit 2bac44e6b2
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nucypher/blockchain/eth/deployers.py
View File

@ -693,8 +693,8 @@ class StakingEscrowDeployer(BaseContractDeployer, UpgradeableContractMixin, Owna
# TODO: Consider looking for absence of Initialized event - see #1193
# This mimics initialization pre-condition in Issuer (StakingEscrow's base contract)
current_supply_1 = deployed_contract.functions.currentSupply1().call()
return current_supply_1 == 0
current_minting_period = deployed_contract.functions.currentMintingPeriod().call()
return current_minting_period == 0
@property
def is_active(self) -> bool:
@ -705,8 +705,8 @@ class StakingEscrowDeployer(BaseContractDeployer, UpgradeableContractMixin, Owna
# TODO: Consider looking for Initialized event - see #1193
# This mimics isInitialized() modifier in Issuer (StakingEscrow's base contract)
current_supply_1 = deployed_contract.functions.currentSupply1().call()
return current_supply_1 != 0
current_minting_period = deployed_contract.functions.currentMintingPeriod().call()
return current_minting_period != 0
class PolicyManagerDeployer(BaseContractDeployer, UpgradeableContractMixin, OwnableContractMixin):

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

@ -545,6 +545,7 @@ contract StakingEscrow is Issuer {
/**
* @notice Batch deposit. Allowed only initial deposit for each staker
* @param _stakers Stakers
* @param _numberOfSubStakes Number of sub-stakes which belong to staker in _values and _periods arrays
* @param _values Amount of tokens to deposit for each staker
* @param _periods Amount of periods during which tokens will be locked for each staker
*/
@ -569,15 +570,14 @@ contract StakingEscrow is Issuer {
for (uint256 i = 0; i < _stakers.length; i++) {
address staker = _stakers[i];
uint256 numberOfSubStakes = _numberOfSubStakes[i];
require(numberOfSubStakes > 0 && subStakesLength >= i + numberOfSubStakes);
uint256 endIndex = j + numberOfSubStakes;
require(numberOfSubStakes > 0 && subStakesLength >= endIndex);
StakerInfo storage info = stakerInfo[staker];
require(info.subStakes.length == 0);
require(workerToStaker[staker] == address(0) || workerToStaker[staker] == info.worker,
"A staker can't be a worker for another staker");
require(workerToStaker[staker] == address(0), "A staker can't be a worker for another staker");
stakers.push(staker);
policyManager.register(staker, previousPeriod);
uint256 endIndex = j + numberOfSubStakes;
for (; j < endIndex; j++) {
uint256 value = _values[j];
uint16 periods = _periods[j];