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

Fix issues related to global settlement introduced in PR #2721 #2727

Merged
merged 4 commits into from
Mar 13, 2023
Merged

Fix issues related to global settlement introduced in PR #2721 #2727

merged 4 commits into from
Mar 13, 2023
+130 −12

Conversation

abitmore
Copy link
Member

Follow-up of PR #2721 for issue #2591.

Fix issues:

  • When force-settling a Predict Market (after globally settled), skip calculating collateral fees.
  • When globally settling a Market Pegged Asset whose BSRM was individual_settlement_to_order, process collateral in the order correctly.

@sonarcloud
Copy link

sonarcloud bot commented Mar 12, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

66.7% 66.7% Coverage
0.0% 0.0% Duplication

@abitmore abitmore merged commit 0b2dd8e into hardfork Mar 13, 2023
@abitmore abitmore deleted the pr-2591-fix-gs branch March 13, 2023 10:27
@abitmore abitmore mentioned this pull request May 19, 2023
Closed
@abitmore abitmore mentioned this pull request Jun 24, 2023
Closed
17 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
hardfork
Projects
None yet
Milestone
7.0.0 - Protocol Upgrade Release
Development

Successfully merging this pull request may close these issues.
1 participant
@abitmore