Skip to content

[EPIC] Alhambra Verde - Introduce Staker and Worker Roles#1029

Merged
cygnusv merged 138 commits intomasterfrom
alhambra-verde
Jul 6, 2019
Merged

[EPIC] Alhambra Verde - Introduce Staker and Worker Roles#1029
cygnusv merged 138 commits intomasterfrom
alhambra-verde

Conversation

@KPrasch
Copy link
Member

@KPrasch KPrasch commented May 29, 2019 •
edited by cygnusv
Loading

Chaperones: @cygnusv, @KPrasch

This PR addresses the problems of having a sole entity for staking and working. The solution is to separate both roles, as sketched in #1003.

Issues to fix?

Pull requests:

A word cloud of the new lines added by this PR (thanks @jMyles for the idea):
image

@KPrasch KPrasch added Enhancement New or improved features Security Security concern ETH Contracts Ursula 👩‍🚀 Effects the "Ursula" development area labels May 29, 2019
@codecov
Copy link

codecov bot commented May 30, 2019 •
edited
Loading

Codecov Report

Merging #1029 into master will decrease coverage by 0.14%.
The diff coverage is 85.41%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1029      +/-   ##
==========================================
- Coverage   83.25%   83.11%   -0.15%     
==========================================
  Files          68       69       +1     
  Lines        9103     9201      +98     
==========================================
+ Hits         7579     7647      +68     
- Misses       1524     1554      +30
Impacted Files Coverage Δ
nucypher/network/server.py 85.2% <ø> (-1.8%) ⬇️
nucypher/blockchain/eth/sol/compile.py 80% <0%> (ø) ⬆️
nucypher/characters/unlawful.py 46.42% <0%> (-50.13%) ⬇️
nucypher/utilities/sandbox/middleware.py 90.58% <100%> (-2.36%) ⬇️
nucypher/characters/base.py 87.37% <100%> (-0.13%) ⬇️
nucypher/blockchain/eth/decorators.py 77.14% <100%> (+19.24%) ⬆️
nucypher/utilities/sandbox/constants.py 98.14% <100%> (+0.03%) ⬆️
nucypher/config/characters.py 99.1% <100%> (+0.12%) ⬆️
nucypher/blockchain/economics.py 100% <100%> (ø) ⬆️
nucypher/cli/characters/bob.py 68.83% <100%> (ø) ⬆️
... and 50 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 a2cdafd...2da1c45. Read the comment docs.

@KPrasch KPrasch mentioned this pull request Jun 4, 2019
Merged
@KPrasch KPrasch force-pushed the alhambra-verde branch 2 times, most recently from e4267f3 to 5f0972f Compare June 5, 2019 16:35
@KPrasch KPrasch requested a review from vzotova June 5, 2019 16:36
@tuxxy tuxxy mentioned this pull request Jun 5, 2019
Merged
vzotova
vzotova reviewed Jun 6, 2019
View reviewed changes
tests/blockchain/eth/contracts/main/staking_escrow/conftest.py
def make_escrow(max_allowed_locked_tokens):
# Creator deploys the escrow
_mining_coefficient = 2 * 10 ** 7
_staking_coefficient = 2 * 10 ** 7
Copy link
Member

@vzotova vzotova Jun 6, 2019

Choose a reason for hiding this comment

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

in contract this is still mining coefficient because related to mining reward

This was referenced Jun 6, 2019
Closed
Closed
Closed
Merged
@cygnusv cygnusv force-pushed the alhambra-verde branch 4 times, most recently from ffdb6f6 to e2a3ec9 Compare June 10, 2019 10:02
@KPrasch KPrasch mentioned this pull request Jun 11, 2019
Closed
@cygnusv cygnusv marked this pull request as ready for review June 11, 2019 07:50
@cygnusv cygnusv changed the title [EPIC] Alhambra Verde - Introduce Staker and Worker Roles [WIP][EPIC] Alhambra Verde - Introduce Staker and Worker Roles Jun 11, 2019
@cygnusv cygnusv force-pushed the alhambra-verde branch 2 times, most recently from b1572a7 to 9738aeb Compare June 13, 2019 18:33
mswilkison
mswilkison reviewed Jun 15, 2019
View reviewed changes
@cygnusv cygnusv force-pushed the alhambra-verde branch 2 times, most recently from 0dc5f37 to ddf1d08 Compare June 20, 2019 13:58
This was referenced Jul 6, 2019
Closed
Closed
Closed
KPrasch added a commit to KPrasch/nucypher that referenced this pull request Jul 6, 2019
@KPrasch
Restores staking CLI tests post nucypher#1029 via Stakeholder API.
3965ebf
KPrasch added a commit to KPrasch/nucypher that referenced this pull request Jul 6, 2019
@KPrasch
Restores staking CLI tests post nucypher#1029 via Stakeholder API.
43b22b5
KPrasch added a commit to KPrasch/nucypher that referenced this pull request Jul 6, 2019
@KPrasch
post nucypher#1029 rebase touch ups.
eaf20a9
KPrasch added a commit to KPrasch/nucypher that referenced this pull request Jul 6, 2019
@KPrasch
Restores staking CLI tests post nucypher#1029 via Stakeholder API.
6f356b8
KPrasch added a commit to KPrasch/nucypher that referenced this pull request Jul 6, 2019
@KPrasch
post nucypher#1029 rebase touch ups.
f24d2d7
KPrasch added a commit to KPrasch/nucypher that referenced this pull request Jul 10, 2019
@KPrasch
Restores staking CLI tests post nucypher#1029 via Stakeholder API.
7afebce
KPrasch added a commit to KPrasch/nucypher that referenced this pull request Jul 10, 2019
@KPrasch
post nucypher#1029 rebase touch ups.
c8b98ee
KPrasch added a commit to KPrasch/nucypher that referenced this pull request Jul 11, 2019
@KPrasch
Restores staking CLI tests post nucypher#1029 via Stakeholder API.
ee98e63
KPrasch added a commit to KPrasch/nucypher that referenced this pull request Jul 11, 2019
@KPrasch
post nucypher#1029 rebase touch ups.
1d39a72
KPrasch added a commit to KPrasch/nucypher that referenced this pull request Jul 15, 2019
@KPrasch
Restores staking CLI tests post nucypher#1029 via Stakeholder API.
009b883
KPrasch added a commit to KPrasch/nucypher that referenced this pull request Jul 15, 2019
@KPrasch
post nucypher#1029 rebase touch ups.
49f16e1
KPrasch added a commit to KPrasch/nucypher that referenced this pull request Jul 15, 2019
@KPrasch
Restores staking CLI tests post nucypher#1029 via Stakeholder API.
7d7f8d5
KPrasch added a commit to KPrasch/nucypher that referenced this pull request Jul 15, 2019
@KPrasch
post nucypher#1029 rebase touch ups.
e72ba68
KPrasch added a commit to KPrasch/nucypher that referenced this pull request Jul 15, 2019
@KPrasch
Restores staking CLI tests post nucypher#1029 via Stakeholder API.
25d58d0
KPrasch added a commit to KPrasch/nucypher that referenced this pull request Jul 15, 2019
@KPrasch
post nucypher#1029 rebase touch ups.
c34a914
KPrasch added a commit to KPrasch/nucypher that referenced this pull request Jul 15, 2019
@KPrasch
Restores staking CLI tests post nucypher#1029 via Stakeholder API.
b18b9d9
KPrasch added a commit to KPrasch/nucypher that referenced this pull request Jul 15, 2019
@KPrasch
post nucypher#1029 rebase touch ups.
d935f3b
KPrasch added a commit to KPrasch/nucypher that referenced this pull request Jul 15, 2019
@KPrasch
Restores staking CLI tests post nucypher#1029 via Stakeholder API.
7acc7f6
KPrasch added a commit to KPrasch/nucypher that referenced this pull request Jul 15, 2019
@KPrasch
post nucypher#1029 rebase touch ups.
6989295
KPrasch added a commit to KPrasch/nucypher that referenced this pull request Jul 16, 2019
@KPrasch
Restores staking CLI tests post nucypher#1029 via Stakeholder API.
fe7a655
KPrasch added a commit to KPrasch/nucypher that referenced this pull request Jul 16, 2019
@KPrasch
post nucypher#1029 rebase touch ups.
b592aee
@KPrasch KPrasch mentioned this pull request Jul 16, 2019
Merged
13 tasks
KPrasch added a commit to KPrasch/nucypher that referenced this pull request Jul 16, 2019
@KPrasch
Restores staking CLI tests post nucypher#1029 via Stakeholder API.
4020d66
KPrasch added a commit to KPrasch/nucypher that referenced this pull request Jul 16, 2019
@KPrasch
post nucypher#1029 rebase touch ups.
203cfef
KPrasch added a commit to KPrasch/nucypher that referenced this pull request Jul 25, 2019
@KPrasch
Restores staking CLI tests post nucypher#1029 via Stakeholder API.
73f606a
KPrasch added a commit to KPrasch/nucypher that referenced this pull request Jul 25, 2019
@KPrasch
post nucypher#1029 rebase touch ups.
28c1b39
@jMyles jMyles deleted the alhambra-verde branch February 24, 2020 19:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@derekpierre derekpierre derekpierre requested changes

@vzotova vzotova vzotova approved these changes

@cygnusv cygnusv Awaiting requested review from cygnusv

@jMyles jMyles Awaiting requested review from jMyles

@fjarri fjarri Awaiting requested review from fjarri

@michwill michwill Awaiting requested review from michwill

@mswilkison mswilkison Awaiting requested review from mswilkison

+2 more reviewers

@vepkenez vepkenez vepkenez approved these changes

@tuxxy tuxxy tuxxy approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

Enhancement New or improved features Security Security concern Ursula 👩‍🚀 Effects the "Ursula" development area

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@KPrasch @cygnusv @vepkenez @mswilkison @tuxxy @derekpierre @vzotova