Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Core(Queue): Update to use Aragon Protocol #195

Merged
merged 13 commits into from
Dec 8, 2020
Merged

Conversation

izqui
Copy link
Contributor

@izqui izqui commented Nov 5, 2020

No description provided.

@izqui izqui self-assigned this Nov 5, 2020
@izqui izqui added this to the v1.0: Mainnet launch milestone Nov 5, 2020
@izqui izqui added P0 🚒 'Drop everything and work on this' issues S1: Feature 👨‍🎨 Adding new stuff T0: Core 🌞 Core issues labels Nov 5, 2020
Copy link
Contributor

@sohkai sohkai left a comment

Choose a reason for hiding this comment

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

Couple of notes for now, I think the logic looks good but will review again with the rest of the contracts.

* veto extended to handle the challenged state as well
@CLAassistant
Copy link

CLAassistant commented Nov 9, 2020

CLA assistant check
All committers have signed the CLA.

@codecov-io
Copy link

codecov-io commented Dec 8, 2020

Codecov Report

Merging #195 (a0ba123) into master (53f174f) will decrease coverage by 0.49%.
The diff coverage is 2.38%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #195      +/-   ##
==========================================
- Coverage   51.56%   51.07%   -0.50%     
==========================================
  Files          31       31              
  Lines         510      513       +3     
  Branches       58       59       +1     
==========================================
- Hits          263      262       -1     
- Misses        247      251       +4     
Impacted Files Coverage Δ
packages/erc3k/contracts/test/ERC3000Mock.sol 0.00% <0.00%> (ø)
...ackages/govern-core/contracts/test/ERC3000Mock.sol 0.00% <0.00%> (ø)
...es/govern-core/contracts/pipelines/GovernQueue.sol 9.27% <2.63%> (-1.60%) ⬇️

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 53f174f...a0ba123. Read the comment docs.

@sohkai
Copy link
Contributor

sohkai commented Dec 8, 2020

@izqui @nivida I've added a few commits to polish a few rough edges.

The only logical change was with a0ba123, which fixes the submitter's collateral being stuck in the case of a veto on a challenged action. Like rejection, I felt it most appropriate to return this collateral to the challenger.

@sohkai sohkai merged commit f8fb1a4 into master Dec 8, 2020
@sohkai sohkai deleted the core-protocol-changes branch December 8, 2020 21:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
P0 🚒 'Drop everything and work on this' issues S1: Feature 👨‍🎨 Adding new stuff T0: Core 🌞 Core issues
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants