Coordinator Alpha 13 Support by derekpierre · Pull Request #3227 · nucypher/nucypher

derekpierre · 2023-09-12T18:39:17Z

Type of PR:

Feature
Contract Compatibility

Required reviews:
3

What this does:

Feature

provider public key (ferveo public key) is set on Ursula startup in block_until_ready.
use OZ proxy contracts for upgradeable contract deployments (taco application and child, etc.)

Refactor

merges Ritualist into Operator
converts ape YML deployment customization into fixtures
converts web3 contract interactions in tests to use local ape deployments
adapts Agents to use ProxyAdmin and TransparentUpgradeableProxy from nucypher registries
bumps ursula configuration v6 -> v7
Operator.block_until_ready handles MATIC instead of ETH

Rename

renames payment_method -> pre_payment_method
renames payment_network -> pre_payment_network
renames payment_strategy -> pre_payment_strategy
relocates OperatorBondedTracker to nucypher.blockchain.eth.trackers.bonding

Removal

removes Ritualist
removes AvailabiltyTracker
removes WorkTracker

Notes for reviewers:

Based over Coordinator Alpha 12 Support #3213
Related to nucypher-contracts changes:
- Operator confirmation from Coordinator to TACo application nucypher-contracts#114
- TACo commitment nucypher-contracts#115

derekpierre · 2023-09-14T12:39:05Z

Temporarily changing the PR base to get some CI builds.

codecov · 2023-09-14T19:25:05Z

Codecov Report

Merging #3227 (dcbb7bf) into contracts-alpha-13 (84d8344) will increase coverage by 0.80%.
The diff coverage is 90.20%.

❗ Current head dcbb7bf differs from pull request most recent head 83348ec. Consider uploading reports for the commit 83348ec to get more accurate results

@@                  Coverage Diff                   @@
##           contracts-alpha-13    #3227      +/-   ##
======================================================
+ Coverage               79.03%   79.83%   +0.80%     
======================================================
  Files                     112      112              
  Lines                   11762    11264     -498     
======================================================
- Hits                     9296     8993     -303     
+ Misses                   2466     2271     -195

Flag	Coverage Δ
acceptance	`90.96% <95.67%> (-0.36%)`	⬇️
integration	`72.61% <77.27%> (+1.22%)`	⬆️
unit	`57.67% <61.97%> (+0.36%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Changed	Coverage Δ
nucypher/network/middleware.py	`86.53% <ø> (+1.00%)`	⬆️
tests/acceptance/characters/test_operator.py	`100.00% <ø> (ø)`
tests/acceptance/cli/test_ursula_init.py	`29.23% <0.00%> (+0.87%)`	⬆️
...cypher/config/migrations/configuration_v6_to_v7.py	`30.76% <30.76%> (ø)`
tests/acceptance/cli/test_ursula_run.py	`55.42% <56.25%> (ø)`
nucypher/blockchain/eth/actors.py	`79.09% <69.23%> (-2.95%)`	⬇️
nucypher/config/base.py	`92.57% <85.71%> (ø)`
...ts/acceptance/agents/test_sampling_distribution.py	`95.45% <90.00%> (-0.44%)`	⬇️
nucypher/config/characters.py	`94.59% <93.75%> (-0.51%)`	⬇️
nucypher/blockchain/eth/trackers/bonding.py	`100.00% <100.00%> (ø)`
... and 19 more

…no longer a contract.

…to point to alpha-13 EPIC.

…d use ape pytest fixtures for contract deployment/management.

TACoApplicationChild should reference root application via proxy contract.

…ddress.

…al contracts) as part of acceptance tests contract deployments

… needed for integration tests.

…ovider_public_key() from confirm_operator_address().

…acceptance tests.

…of confirmOperatorAddress().

…ment.

KPrasch

There is one outstanding issue related to configuration migration but this PR is RFR!

I am a co-author so my approval is implicit :-) 🤠

cygnusv

First pass, nothing important!

nucypher/blockchain/eth/actors.py

…o ensure proper changes are enacted. Migration from v4->v5 missed deprecation of "db_filepath" configuration parameter. Add tests for configuration migration.

…ID in ferveo key publication logs

…ic key needs on-chain setting.

…ic_key`

manumonti

I have seen several times that test_registry is passed as argument to tests or functions that don't use it.

But a this point I'm not sure if this is unnecesary code or it is neccesary to have it (although this is not called) for some reason.

In any case, great work guys! 💪

tests/acceptance/conftest.py

manumonti · 2023-09-18T15:50:30Z

It's nice to see the CI tests passing again 🙌

…t/dependeny fixture parameters, comment cleanups.

Comments resolved via commits.

tests/acceptance/conftest.py

…t/dependeny fixture parameters, comment cleanups.

manumonti

LGTM! 🙌

Thanks for addressing all this nitpicky suggestions

derekpierre · 2023-09-18T16:18:29Z

Thanks for addressing all this nitpicky suggestions

Thanks for the great review! 🧐

Update newsfragment for nucypher#3213.

…eny fixture parameters, comment cleanups.

Update newsfragment for #3213.

derekpierre assigned KPrasch and derekpierre Sep 12, 2023

derekpierre changed the base branch from development to contracts-alpha-13 September 12, 2023 18:39

derekpierre mentioned this pull request Sep 12, 2023

[EPIC] Coordinator Alpha 13 Support #3226

Merged

derekpierre changed the title ~~[WIP] Coordinator - Alpha 13~~ [WIP] Coordinator Alpha 13 Support Sep 12, 2023

derekpierre changed the base branch from contracts-alpha-13 to development September 14, 2023 12:38

derekpierre mentioned this pull request Sep 14, 2023

Coordinator Alpha 12 Support #3213

Merged

derekpierre force-pushed the alpha-13 branch 2 times, most recently from a0bf22a to ff2ed01 Compare September 14, 2023 19:01

derekpierre added 19 commits September 14, 2023 16:26

Update acceptance tests contract deployment / fixtures; StakeInfo is …

75be004

…no longer a contract.

Remove over-aggressive rename of stake_info.

0d587f0

Modify nucypher-contracts dependency being used for alpha-13 support …

209fee3

…to point to alpha-13 EPIC.

Update version of openzeppelin contracts dependency.

cf00cdd

Remove special logic for using ape config for deployments, and instea…

b8b8fc0

…d use ape pytest fixtures for contract deployment/management.

Ensure that staking_providers fixture can be correctly configured.

9fae50b

TACoApplicationChild should reference root application via proxy contract.

Initialize taco_child_application fixture with coordinator contract a…

d86ad57

…ddress.

Only use proxy contracts for root/child applications (instead of actu…

f5ca66b

…al contracts) as part of acceptance tests contract deployments

Fix acceptance/agents tests based on latest fixtures and contracts.

7dc8aa3

Remove unused method from ape utils.

59da3df

Add get_ritual_initiation_cost to MockCoordinatorAgent - although not…

681e3b1

… needed for integration tests.

Update dkg ritual acceptance test to use updated fixtures and contracts.

acb89db

Update ursula operator acceptance tests to accomodate shift to set_pr…

8bb1faf

…ovider_public_key() from confirm_operator_address().

Ensure that SubscriptionManager is one of the deployed contracts for …

958c222

…acceptance tests.

Fix use of various fixtures and contracts for test.

3f1f40f

Modify transacting power tests to use setProviderPublicKey() instead …

6a09fdf

…of confirmOperatorAddress().

Fix failing test that invlolves Vladimir.

3092746

Properly manage ape dependencies for acceptance tests contract deploy…

ab0ab5c

…ment.

Fix usage of ape fixtures in acceptance cli tests.

f58d767

KPrasch approved these changes Sep 15, 2023

View reviewed changes

cygnusv reviewed Sep 15, 2023

View reviewed changes

nucypher/blockchain/eth/actors.py Show resolved Hide resolved

nucypher/blockchain/eth/actors.py Show resolved Hide resolved

nucypher/blockchain/eth/actors.py Outdated Show resolved Hide resolved

Acceptance tests target nucypher/nucypher-contracts@main

5d5261a

derekpierre mentioned this pull request Sep 15, 2023

condition_provider_uris is a dictionary in our Ursula Configuration; how is it updated via the CLI update command #3228

Closed

derekpierre and others added 4 commits September 15, 2023 10:53

Don't migrate configurations from v4->v6, but instead do v4->v5->v6 t…

0081ee1

…o ensure proper changes are enacted. Migration from v4->v5 missed deprecation of "db_filepath" configuration parameter. Add tests for configuration migration.

Ursula's funding qualification logs are MATIC; Include chain name or …

d31ada7

…ID in ferveo key publication logs

Call the Coordinator contract directly when checking is provider publ…

1705b03

…ic key needs on-chain setting.

operator.set_provider_public_key comment/todo for nucypher#3176

2178524

derekpierre force-pushed the alpha-13 branch from fd7be5c to 2178524 Compare September 15, 2023 14:53

embed provider public key bool check into `Operator.set_provider_publ…

c92302d

…ic_key`

derekpierre mentioned this pull request Sep 15, 2023

[DO NOT MERGE] [WIP] PR created to see passing CI builds for #3227 #3230

Closed

KPrasch requested a review from vzotova September 15, 2023 15:36

derekpierre mentioned this pull request Sep 18, 2023

Remove Ape chain ID workarounds for acceptance tests #3233

Merged

7 tasks

manumonti previously requested changes Sep 18, 2023

View reviewed changes

derekpierre added a commit to derekpierre/nucypher that referenced this pull request Sep 18, 2023

Address RFCs in nucypher#3227. Utilize pytest usefixtures for implici…

2e7a505

…t/dependeny fixture parameters, comment cleanups.

derekpierre requested a review from manumonti September 18, 2023 16:07

manumonti suggested changes Sep 18, 2023

View reviewed changes

tests/acceptance/conftest.py Outdated Show resolved Hide resolved

derekpierre requested a review from manumonti September 18, 2023 16:13

Address RFCs in nucypher#3227. Utilize pytest usefixtures for implici…

f4e34f6

…t/dependeny fixture parameters, comment cleanups.

manumonti approved these changes Sep 18, 2023

View reviewed changes

derekpierre force-pushed the alpha-13 branch from 078ef8f to f4e34f6 Compare September 18, 2023 16:15

Add newsfragment for nucypher#3227.

83348ec

Update newsfragment for nucypher#3213.

derekpierre merged commit fa0082e into nucypher:contracts-alpha-13 Sep 20, 2023

derekpierre mentioned this pull request Sep 20, 2023

v7.0.0 Major feature freeze #3200

Closed

KPrasch mentioned this pull request Sep 28, 2023

PRE application contract (full) #2834

Closed

2 tasks

KPrasch pushed a commit that referenced this pull request Nov 30, 2023

Address RFCs in #3227. Utilize pytest usefixtures for implicit/depend…

fbd2226

…eny fixture parameters, comment cleanups.

KPrasch pushed a commit that referenced this pull request Nov 30, 2023

Add newsfragment for #3227.

fc7bb3d

Update newsfragment for #3213.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Coordinator Alpha 13 Support#3227

Coordinator Alpha 13 Support#3227
derekpierre merged 38 commits intonucypher:contracts-alpha-13from
derekpierre:alpha-13

derekpierre commented Sep 12, 2023 •

edited by KPrasch

Loading

Uh oh!

derekpierre commented Sep 14, 2023

Uh oh!

codecov bot commented Sep 14, 2023 •

edited

Loading

Uh oh!

KPrasch left a comment

Uh oh!

cygnusv left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

manumonti left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

manumonti commented Sep 18, 2023

Uh oh!

Uh oh!

manumonti left a comment

Uh oh!

derekpierre commented Sep 18, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

derekpierre commented Sep 12, 2023 • edited by KPrasch Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Feature

Refactor

Rename

Removal

Uh oh!

derekpierre commented Sep 14, 2023

Uh oh!

codecov bot commented Sep 14, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

KPrasch left a comment

Choose a reason for hiding this comment

Uh oh!

cygnusv left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

manumonti left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

manumonti commented Sep 18, 2023

Uh oh!

Uh oh!

manumonti left a comment

Choose a reason for hiding this comment

Uh oh!

derekpierre commented Sep 18, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

derekpierre commented Sep 12, 2023 •

edited by KPrasch

Loading

codecov bot commented Sep 14, 2023 •

edited

Loading