Skip to content

Miner -> staker in contracts#1020

Merged
KPrasch merged 3 commits intonucypher:alhambra-verdefrom
vzotova:miner-staker
May 30, 2019
Merged

Miner -> staker in contracts#1020
KPrasch merged 3 commits intonucypher:alhambra-verdefrom
vzotova:miner-staker

Conversation

@vzotova
Copy link
Member

@vzotova vzotova commented May 28, 2019

Based on #949

Renames miner to staker in solidity contracts and in tests for them.

Refs #800

@vzotova vzotova added ETH Contracts documentation Effects the official documentation Naming stuff The hardest part about code authorship labels May 28, 2019
@cygnusv cygnusv changed the base branch from alhambra-verde to master May 30, 2019 07:46
@cygnusv cygnusv changed the base branch from master to alhambra-verde May 30, 2019 07:46
In order to become a participant of the network, a miner stakes tokens in the `MinersEscrow` contract.
The miner allows the (mining) contract to perform a transaction using the `NuCypherToken.approve(address, uint256)` method
In order to become a participant of the network, a staker stakes tokens in the `StakingEscrow` contract.
The staker allows the (mining) contract to perform a transaction using the `NuCypherToken.approve(address, uint256)` method
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do you mean here by the "(mining) contract"?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, missed this

Stakers can claim their rewards by using the `StakingEscrow.withdraw(uint256)` method. Only non-locked tokens can be withdrawn.


### Ursula Generates Policy Rewards
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't better to call this "fees" instead of "rewards"? What do you think @michwill ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, I thought fee for policy and reward for staking

@codecov
Copy link

codecov bot commented May 30, 2019

Codecov Report

Merging #1020 into alhambra-verde will decrease coverage by 17.51%.
The diff coverage is n/a.

Impacted file tree graph

@@                 Coverage Diff                 @@
##           alhambra-verde    #1020       +/-   ##
===================================================
- Coverage           85.05%   67.54%   -17.52%     
===================================================
  Files                  65       65               
  Lines                7925     7925               
===================================================
- Hits                 6741     5353     -1388     
- Misses               1184     2572     +1388
Impacted Files Coverage Δ
nucypher/characters/unlawful.py 0% <0%> (-96.56%) ⬇️
nucypher/blockchain/eth/utils.py 22.22% <0%> (-72.23%) ⬇️
nucypher/blockchain/eth/policies.py 0% <0%> (-59.2%) ⬇️
nucypher/cli/deploy.py 28.42% <0%> (-52.64%) ⬇️
nucypher/blockchain/eth/token.py 38.7% <0%> (-51.08%) ⬇️
nucypher/characters/chaotic.py 25.44% <0%> (-49.47%) ⬇️
nucypher/blockchain/eth/actors.py 27.06% <0%> (-49.01%) ⬇️
nucypher/blockchain/eth/deployers.py 43.1% <0%> (-48.77%) ⬇️
nucypher/blockchain/eth/agents.py 43.72% <0%> (-47.32%) ⬇️
nucypher/utilities/sandbox/ursula.py 55.17% <0%> (-43.11%) ⬇️
... and 31 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0549edb...b9a1e0e. Read the comment docs.

@KPrasch KPrasch merged commit 27f2f6e into nucypher:alhambra-verde May 30, 2019
cygnusv pushed a commit to cygnusv/nucypher that referenced this pull request Jun 4, 2019
@vzotova vzotova deleted the miner-staker branch November 25, 2019 15:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Effects the official documentation Naming stuff The hardest part about code authorship

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants