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

Implement BSIP 77: Initial collateral ratio (ICR) #2157

Merged
merged 8 commits into from May 5, 2020
Merged

Conversation

abitmore
Copy link
Member

@abitmore abitmore commented Apr 23, 2020

@abitmore abitmore added this to In development in Protocol Upgrade Release (4.0.0) via automation Apr 23, 2020
@abitmore abitmore marked this pull request as ready for review April 24, 2020 22:09
oxarbitrage
oxarbitrage previously approved these changes Apr 27, 2020
Copy link
Member

@oxarbitrage oxarbitrage left a comment

Choose a reason for hiding this comment

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

Code and logic looks perfect to me, the test coverage is pretty big. I feel confident with this PR in the current state to be merged.

Resolved conflicts:
- libraries/chain/asset_evaluator.cpp : applied changes from both branches
- libraries/chain/proposal_evaluator.cpp : applied changes from both branches
@abitmore abitmore merged commit 319fc3b into hardfork May 5, 2020
Protocol Upgrade Release (4.0.0) automation moved this from In development to Done May 5, 2020
@abitmore abitmore deleted the pr-bsip77-icr branch May 5, 2020 18:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

None yet

2 participants