Skip to content

Gate manualLiquidation by EParticipant entitlement #316

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

Open
jordanschalm wants to merge 1 commit into
base: v0
Choose a base branch
from
Open

Gate manualLiquidation by EParticipant entitlement #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion cadence/contracts/FlowALPv0.cdc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1977,7 +1977,7 @@ access(all) contract FlowALPv0 {
/// - C means collateral: Ce is effective collateral, Ct is true collateral, measured in $
/// - D means debt: De is effective debt, Dt is true debt, measured in $
/// - Fc, Fd are collateral and debt factors
access(all) fun manualLiquidation(
access(EParticipant) fun manualLiquidation(
pid: UInt64,
debtType: Type,
seizeType: Type,
Expand Down
18 changes: 18 additions & 0 deletions cadence/tests/liquidation_phase1_test.cdc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ fun testManualLiquidation_healthyPosition() {
// Repay MOET to seize FLOW
let repayAmount = 2.0
let seizeAmount = 1.0
grantBetaPoolParticipantAccess(PROTOCOL_ACCOUNT, liquidator)
let liqRes = _executeTransaction(
"../transactions/flow-alp/pool-management/manual_liquidation.cdc",
[pid, Type<@MOET.Vault>().identifier, FLOW_TOKEN_IDENTIFIER, seizeAmount, repayAmount],
Expand Down Expand Up @@ -126,6 +127,7 @@ fun testManualLiquidation_liquidationExceedsTargetHealth() {
// TODO(jord): add helper to compute health boundaries given best acceptable price, then test boundaries
let repayAmount = 500.0
let seizeAmount = 500.0
grantBetaPoolParticipantAccess(PROTOCOL_ACCOUNT, liquidator)
let liqRes = _executeTransaction(
"../transactions/flow-alp/pool-management/manual_liquidation.cdc",
[pid, Type<@MOET.Vault>().identifier, FLOW_TOKEN_IDENTIFIER, seizeAmount, repayAmount],
Expand Down Expand Up @@ -186,6 +188,7 @@ fun testManualLiquidation_repayExceedsDebt() {
// Repay MOET to seize FLOW. Choose repay amount above debt balance
let repayAmount = debtBalance + 0.001
let seizeAmount = (repayAmount / newPrice) * 0.99
grantBetaPoolParticipantAccess(PROTOCOL_ACCOUNT, liquidator)
let liqRes = _executeTransaction(
"../transactions/flow-alp/pool-management/manual_liquidation.cdc",
[pid, Type<@MOET.Vault>().identifier, FLOW_TOKEN_IDENTIFIER, seizeAmount, repayAmount],
Expand Down Expand Up @@ -244,6 +247,7 @@ fun testManualLiquidation_seizeExceedsCollateral() {
// Repay MOET to seize FLOW. Choose seize amount above collateral balance
let seizeAmount = collateralBalance + 0.001
let repayAmount = seizeAmount * newPrice * 1.01
grantBetaPoolParticipantAccess(PROTOCOL_ACCOUNT, liquidator)
let liqRes = _executeTransaction(
"../transactions/flow-alp/pool-management/manual_liquidation.cdc",
[pid, Type<@MOET.Vault>().identifier, FLOW_TOKEN_IDENTIFIER, seizeAmount, repayAmount],
Expand Down Expand Up @@ -303,6 +307,7 @@ fun testManualLiquidation_reduceHealth() {
// Repay MOET to seize FLOW. Choose seize amount above collateral balance
let seizeAmount = collateralBalancePreLiq - 0.01
let repayAmount = seizeAmount * newPrice * 1.01
grantBetaPoolParticipantAccess(PROTOCOL_ACCOUNT, liquidator)
let liqRes = _executeTransaction(
"../transactions/flow-alp/pool-management/manual_liquidation.cdc",
[pid, Type<@MOET.Vault>().identifier, FLOW_TOKEN_IDENTIFIER, seizeAmount, repayAmount],
Expand Down Expand Up @@ -366,6 +371,7 @@ fun testManualLiquidation_increaseHealthBelowTarget() {
// Liquidator offers 150 FLOW < 200 FLOW (better price)
let repayAmount = 100.0
let seizeAmount = 150.0
grantBetaPoolParticipantAccess(PROTOCOL_ACCOUNT, liquidator)
let liqRes = _executeTransaction(
"../transactions/flow-alp/pool-management/manual_liquidation.cdc",
[pid, Type<@MOET.Vault>().identifier, FLOW_TOKEN_IDENTIFIER, seizeAmount, repayAmount],
Expand Down Expand Up @@ -431,6 +437,7 @@ fun testManualLiquidation_liquidateToTarget() {
// Liquidator offers 33.66 FLOW < 142.86 FLOW (better price)
let repayAmount = 100.0
let seizeAmount = 33.66
grantBetaPoolParticipantAccess(PROTOCOL_ACCOUNT, liquidator)
let liqRes = _executeTransaction(
"../transactions/flow-alp/pool-management/manual_liquidation.cdc",
[pid, Type<@MOET.Vault>().identifier, FLOW_TOKEN_IDENTIFIER, seizeAmount, repayAmount],
Expand Down Expand Up @@ -488,6 +495,7 @@ fun testManualLiquidation_repaymentVaultCollateralType() {
// Purport to repay MOET to seize FLOW, but we will actually pass in a FLOW vault for repayment
let repayAmount = debtBalance + 0.001
let seizeAmount = (repayAmount / newPrice) * 0.99
grantBetaPoolParticipantAccess(PROTOCOL_ACCOUNT, liquidator)
let liqRes = _executeTransaction(
"../tests/transactions/flow-alp/pool-management/manual_liquidation_chosen_vault.cdc",
[pid, Type<@MOET.Vault>().identifier, FLOW_TOKEN_IDENTIFIER, FLOW_TOKEN_IDENTIFIER, seizeAmount, repayAmount],
Expand Down Expand Up @@ -544,6 +552,7 @@ fun testManualLiquidation_repaymentVaultTypeMismatch() {
// Purport to repay MOET to seize FLOW, but we will actually pass in a MockYieldToken vault for repayment
let repayAmount = debtBalance + 0.001
let seizeAmount = (repayAmount / newPrice) * 0.99
grantBetaPoolParticipantAccess(PROTOCOL_ACCOUNT, liquidator)
let liqRes = _executeTransaction(
"../tests/transactions/flow-alp/pool-management/manual_liquidation_chosen_vault.cdc",
[pid, Type<@MOET.Vault>().identifier, MOCK_YIELD_TOKEN_IDENTIFIER, FLOW_TOKEN_IDENTIFIER, seizeAmount, repayAmount],
Expand Down Expand Up @@ -599,6 +608,7 @@ fun testManualLiquidation_unsupportedDebtType() {
// Pass in MockYieldToken as repayment, an unsupported debt type
let repayAmount = debtBalance + 0.001
let seizeAmount = (repayAmount / newPrice) * 0.99
grantBetaPoolParticipantAccess(PROTOCOL_ACCOUNT, liquidator)
let liqRes = _executeTransaction(
"../tests/transactions/flow-alp/pool-management/manual_liquidation_chosen_vault.cdc",
[pid, MOCK_YIELD_TOKEN_IDENTIFIER, MOCK_YIELD_TOKEN_IDENTIFIER, FLOW_TOKEN_IDENTIFIER, seizeAmount, repayAmount],
Expand Down Expand Up @@ -654,6 +664,7 @@ fun testManualLiquidation_unsupportedCollateralType() {
// Repay MOET to seize FLOW. Choose seize amount above collateral balance
let seizeAmount = collateralBalancePreLiq - 0.01
let repayAmount = seizeAmount * newPrice * 1.01
grantBetaPoolParticipantAccess(PROTOCOL_ACCOUNT, liquidator)
let liqRes = _executeTransaction(
"../transactions/flow-alp/pool-management/manual_liquidation.cdc",
[pid, Type<@MOET.Vault>().identifier, MOCK_YIELD_TOKEN_IDENTIFIER, seizeAmount, repayAmount],
Expand Down Expand Up @@ -738,6 +749,7 @@ fun testManualLiquidation_supportedDebtTypeNotInPosition() {
// user1 has no MockYieldToken debt balance
let seizeAmount = 0.01
let repayAmount = 100.0
grantBetaPoolParticipantAccess(PROTOCOL_ACCOUNT, liquidator)
let liqRes = _executeTransaction(
"../transactions/flow-alp/pool-management/manual_liquidation.cdc",
[pid1, MOCK_YIELD_TOKEN_IDENTIFIER, FLOW_TOKEN_IDENTIFIER, seizeAmount, repayAmount],
Expand Down Expand Up @@ -822,6 +834,7 @@ fun testManualLiquidation_supportedCollateralTypeNotInPosition() {
// User1 only has MOET debt, not MockYieldToken debt
let seizeAmount = 0.01
let repayAmount = 100.0
grantBetaPoolParticipantAccess(PROTOCOL_ACCOUNT, liquidator)
let liqRes = _executeTransaction(
"../transactions/flow-alp/pool-management/manual_liquidation.cdc",
[pid1, Type<@MOET.Vault>().identifier, MOCK_YIELD_TOKEN_IDENTIFIER, seizeAmount, repayAmount],
Expand Down Expand Up @@ -881,6 +894,7 @@ fun testManualLiquidation_dexOraclePriceDivergence_withinThreshold() {
// Liquidator offers 72 FLOW < 73.53 FLOW (better price)
let repayAmount = 50.0
let seizeAmount = 72.0
grantBetaPoolParticipantAccess(PROTOCOL_ACCOUNT, liquidator)
let liqRes = _executeTransaction(
"../transactions/flow-alp/pool-management/manual_liquidation.cdc",
[pid, Type<@MOET.Vault>().identifier, FLOW_TOKEN_IDENTIFIER, seizeAmount, repayAmount],
Expand Down Expand Up @@ -917,6 +931,7 @@ fun testManualLiquidation_dexOraclePriceDivergence_dexBelowOracle() {
setupMoetVault(liquidator, beFailed: false)
mintMoet(signer: Test.getAccount(0x0000000000000007), to: liquidator.address, amount: 1000.0, beFailed: false)

grantBetaPoolParticipantAccess(PROTOCOL_ACCOUNT, liquidator)
let liqRes = _executeTransaction(
"../transactions/flow-alp/pool-management/manual_liquidation.cdc",
[pid, Type<@MOET.Vault>().identifier, FLOW_TOKEN_IDENTIFIER, 70.0, 50.0],
Expand Down Expand Up @@ -954,6 +969,7 @@ fun testManualLiquidation_dexOraclePriceDivergence_dexAboveOracle() {
setupMoetVault(liquidator, beFailed: false)
mintMoet(signer: Test.getAccount(0x0000000000000007), to: liquidator.address, amount: 1000.0, beFailed: false)

grantBetaPoolParticipantAccess(PROTOCOL_ACCOUNT, liquidator)
let liqRes = _executeTransaction(
"../transactions/flow-alp/pool-management/manual_liquidation.cdc",
[pid, Type<@MOET.Vault>().identifier, FLOW_TOKEN_IDENTIFIER, 66.0, 50.0],
Expand Down Expand Up @@ -1005,6 +1021,7 @@ fun testManualLiquidation_liquidatorOfferWorseThanDex() {
// Liquidator offers 75 FLOW > 71.43 FLOW (worse price)
let repayAmount = 50.0
let seizeAmount = 75.0
grantBetaPoolParticipantAccess(PROTOCOL_ACCOUNT, liquidator)
let liqRes = _executeTransaction(
"../transactions/flow-alp/pool-management/manual_liquidation.cdc",
[pid, Type<@MOET.Vault>().identifier, FLOW_TOKEN_IDENTIFIER, seizeAmount, repayAmount],
Expand Down Expand Up @@ -1058,6 +1075,7 @@ fun testManualLiquidation_combinedEdgeCase() {
// But divergence is 9.375% which exceeds 3% threshold
let repayAmount = 50.0
let seizeAmount = 75.0
grantBetaPoolParticipantAccess(PROTOCOL_ACCOUNT, liquidator)
let liqRes = _executeTransaction(
"../transactions/flow-alp/pool-management/manual_liquidation.cdc",
[pid, Type<@MOET.Vault>().identifier, FLOW_TOKEN_IDENTIFIER, seizeAmount, repayAmount],
Expand Down
9 changes: 5 additions & 4 deletions cadence/tests/transactions/flow-alp/pool-management/manual_liquidation_chosen_vault.cdc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,18 @@ import "FlowALPv0"
/// debtVaultIdentifier: e.g., Type<@MOET.Vault>().identifier
/// seizeVaultIdentifier: e.g., Type<@FlowToken.Vault>().identifier
transaction(pid: UInt64, purportedDebtVaultIdentifier: String, actualDebtVaultIdentifier: String, seizeVaultIdentifier: String, seizeAmount: UFix64, repayAmount: UFix64) {
let pool: &FlowALPv0.Pool
let pool: auth(FlowALPv0.EParticipant) &FlowALPv0.Pool
let receiver: &{FungibleToken.Receiver}
let actualDebtType: Type
let purportedDebtType: Type
let seizeType: Type
let repay: @{FungibleToken.Vault}

prepare(signer: auth(BorrowValue, SaveValue, IssueStorageCapabilityController, PublishCapability, UnpublishCapability) &Account) {
let protocolAddress = Type<@FlowALPv0.Pool>().address!
self.pool = getAccount(protocolAddress).capabilities.borrow<&FlowALPv0.Pool>(FlowALPv0.PoolPublicPath)
?? panic("Could not borrow Pool at \(FlowALPv0.PoolPublicPath)")
let cap = signer.storage.borrow<&Capability<auth(FlowALPv0.EParticipant, FlowALPv0.EPosition) &FlowALPv0.Pool>>(
from: FlowALPv0.PoolCapStoragePath
) ?? panic("Could not borrow Pool capability from storage - ensure the signer has been granted Pool access with EParticipant entitlement")
self.pool = cap.borrow() ?? panic("Could not borrow Pool from capability")

// Resolve types
self.actualDebtType = CompositeType(actualDebtVaultIdentifier) ?? panic("Invalid actualDebtVaultIdentifier: \(actualDebtVaultIdentifier)")
Expand Down
9 changes: 5 additions & 4 deletions cadence/transactions/flow-alp/pool-management/manual_liquidation.cdc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,17 @@ import "FlowALPv0"
/// debtVaultIdentifier: e.g., Type<@MOET.Vault>().identifier
/// seizeVaultIdentifier: e.g., Type<@FlowToken.Vault>().identifier
transaction(pid: UInt64, debtVaultIdentifier: String, seizeVaultIdentifier: String, seizeAmount: UFix64, repayAmount: UFix64) {
let pool: &FlowALPv0.Pool
let pool: auth(FlowALPv0.EParticipant) &FlowALPv0.Pool
let receiver: &{FungibleToken.Receiver}
let debtType: Type
let seizeType: Type
let repay: @{FungibleToken.Vault}

prepare(signer: auth(BorrowValue, SaveValue, IssueStorageCapabilityController, PublishCapability, UnpublishCapability) &Account) {
let protocolAddress = Type<@FlowALPv0.Pool>().address!
self.pool = getAccount(protocolAddress).capabilities.borrow<&FlowALPv0.Pool>(FlowALPv0.PoolPublicPath)
?? panic("Could not borrow Pool at \(FlowALPv0.PoolPublicPath)")
let cap = signer.storage.borrow<&Capability<auth(FlowALPv0.EParticipant, FlowALPv0.EPosition) &FlowALPv0.Pool>>(
from: FlowALPv0.PoolCapStoragePath
) ?? panic("Could not borrow Pool capability from storage - ensure the signer has been granted Pool access with EParticipant entitlement")
self.pool = cap.borrow() ?? panic("Could not borrow Pool from capability")

// Resolve types
self.debtType = CompositeType(debtVaultIdentifier) ?? panic("Invalid debtVaultIdentifier: \(debtVaultIdentifier)")
Expand Down
Loading