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

feat(perpetual-liquidatable) Implement Liquidatable and replace expiry logic with emergency-shutdown logic #2076

Merged
merged 17 commits into from
Oct 13, 2020
Merged

feat(perpetual-liquidatable) Implement Liquidatable and replace expiry logic with emergency-shutdown logic #2076

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
516ae5a
Added initial implementation
chrismaree Oct 7, 2020
566817f
Updated nits
chrismaree Oct 7, 2020
72c004e
Update packages/core/contracts/financial-templates/perpetual-multipar…
chrismaree Oct 7, 2020
a8ca434
Update packages/core/contracts/financial-templates/perpetual-multipar…
chrismaree Oct 7, 2020
8906c48
Update packages/core/test/financial-templates/perpetual-multiparty/Po…
chrismaree Oct 7, 2020
c49dd9b
Update packages/core/test/financial-templates/perpetual-multiparty/Po…
chrismaree Oct 7, 2020
7c34c82
Update packages/core/test/financial-templates/perpetual-multiparty/Po…
chrismaree Oct 7, 2020
2f09a48
Update packages/core/test/financial-templates/perpetual-multiparty/Po…
chrismaree Oct 7, 2020
2e52d5e
clean
chrismaree Oct 8, 2020
c40e7ea
Merge branch 'chrismaree/initial-position-manager' of github.com:UMAp…
chrismaree Oct 8, 2020
188b7ef
Merge branch 'master' into chrismaree/initial-position-manager
nicholaspai Oct 8, 2020
424a931
remove expiry logic
nicholaspai Oct 8, 2020
f9154a6
merge master
nicholaspai Oct 8, 2020
f3c1963
remove position manager tests
nicholaspai Oct 8, 2020
da50396
change name
nicholaspai Oct 8, 2020
d2d58f9
fix
nicholaspai Oct 8, 2020
dbcff0f
try increasing heap size
nicholaspai Oct 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update packages/core/contracts/financial-templates/perpetual-multipar… 
…ty/PositionManager.sol

Co-authored-by: nicholaspai <9457025+nicholaspai@users.noreply.github.com>
  • Loading branch information
@chrismaree @nicholaspai
chrismaree and nicholaspai authored Oct 7, 2020
commit a8ca434d937200600e13ccdebd2ea7405c1bd670
2 changes: 1 addition & 1 deletion packages/core/contracts/financial-templates/perpetual-multiparty/PositionManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ contract PositionManager is FeePayer, AdministrateeInterface {
nonReentrant()
returns (FixedPoint.Unsigned memory amountWithdrawn)
{
// Set the emergency shutdown price as resolved from the DVM. If DVM has not resolve will revert.
// Set the emergency shutdown price as resolved from the DVM. If DVM has not resolved will revert.
if (emergencyShutdownPrice.isEqual(FixedPoint.fromUnscaledUint(0))) {
emergencyShutdownPrice = _getOracleEmergencyShutdownPrice();
}
Expand Down