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.

Sign up for GitHub

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

Jump to bottom

V1.1 Collected Branch #231

Merged
merged 7 commits into from
Mar 2, 2022
Merged

V1.1 Collected Branch #231

merged 7 commits into from
Mar 2, 2022

Conversation

aleph-v
Copy link
Contributor

@aleph-v aleph-v commented Nov 11, 2021

This PR collected and merges prs #216 #218 #217 #222 into one PR to enable a single commit into main and update to the latest main.

@aleph-v
Removes the gas reserve which is unused in our deployed versions (#218)
6017b2e 
* remove gas reserve

* remove warning

* pause and admin upgrade (#222)
@aleph-v
Changed CC Pool LP withdraw to use an input of Shares (#216)
74293f4 
* changed the withdraw function to use LP token inputs instead

* comment updates

* Changes the governance fee collection (#217)

* fee collection update

* explictly ban the governance address

* test merge fixes
@coveralls
Copy link

coveralls commented Nov 11, 2021 •
edited
Loading

Coverage Status

Coverage increased (+2.5%) to 96.595% when pulling 8a08f2c on paul/feature/v1.1 into 4bae413 on main.

@aleph-v aleph-v requested a review from satyamakgec December 9, 2021 15:11
satyamakgec
satyamakgec approved these changes Dec 15, 2021
View reviewed changes
Copy link
Contributor

@satyamakgec satyamakgec left a comment

Choose a reason for hiding this comment

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

LGTM, Just a minor stuff

contracts/ConvergentCurvePool.sol Show resolved Hide resolved
contracts/ConvergentCurvePool.sol Show resolved Hide resolved
maxsam4
maxsam4 approved these changes Dec 21, 2021
View reviewed changes
Copy link

@maxsam4 maxsam4 left a comment

Choose a reason for hiding this comment

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

LGTM, just some minor comments.

contracts/ConvergentCurvePool.sol Outdated Show resolved Hide resolved
contracts/ConvergentCurvePool.sol Show resolved Hide resolved
contracts/ConvergentCurvePool.sol Show resolved Hide resolved
contracts/YVaultAssetProxy.sol Show resolved Hide resolved
daejunpark
daejunpark reviewed Jan 18, 2022
View reviewed changes
Copy link
Contributor

@daejunpark daejunpark left a comment

Choose a reason for hiding this comment

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

Quick cleanup comment.

contracts/ConvergentCurvePool.sol Show resolved Hide resolved
contracts/ConvergentCurvePool.sol Show resolved Hide resolved
@aleph-v aleph-v merged commit ac88e49 into main Mar 2, 2022
@aleph-v aleph-v deleted the paul/feature/v1.1 branch March 2, 2022 21:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@daejunpark daejunpark daejunpark left review comments

@satyamakgec satyamakgec satyamakgec approved these changes

@maxsam4 maxsam4 maxsam4 approved these changes

@jrhea jrhea Awaiting requested review from jrhea

@NicholasDotSol NicholasDotSol Awaiting requested review from NicholasDotSol

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@aleph-v @coveralls @daejunpark @maxsam4 @satyamakgec