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

fix: min vault withdraw #701

Merged
merged 1 commit into from
Oct 3, 2024
+114 −4
Merged

fix: min vault withdraw #701

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 build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ allprojects {
}

group = "exchange.dydx.abacus"
version = "1.12.17"
version = "1.12.18"

repositories {
google()
Expand Down
17 changes: 16 additions & 1 deletion src/commonMain/kotlin/exchange.dydx.abacus/functional/vault/VaultDepositWithdrawForm.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,14 @@ internal class VaultFormValidationErrors(
textKey = "APP.VAULTS.WITHDRAW_TOO_HIGH",
)

fun withdrawTooLow() = createError(
code = "WITHDRAW_TOO_LOW",
type = ErrorType.error,
fields = listOf("amount"),
titleKey = "APP.TRADE.MODIFY_SIZE_FIELD",
textKey = "APP.VAULTS.WITHDRAW_TOO_LOW",
)

fun withdrawingLockedBalance() = createError(
code = "WITHDRAWING_LOCKED_BALANCE",
type = ErrorType.error,
Expand Down Expand Up @@ -341,7 +349,14 @@ object VaultDepositWithdrawFormValidator {
if (postOpVaultBalance != null && postOpVaultBalance < 0) {
errors.add(vaultFormValidationErrors.withdrawTooHigh())
}
if (postOpVaultBalance != null && postOpVaultBalance >= 0 && amount > 0 && vaultAccount?.withdrawableUsdc != null && amount > vaultAccount.withdrawableUsdc) {
if (amount > 0 && amount < MIN_DEPOSIT_FE_THRESHOLD &&
vaultAccount?.withdrawableUsdc != null && vaultAccount.withdrawableUsdc >= MIN_DEPOSIT_FE_THRESHOLD
) {
errors.add(vaultFormValidationErrors.withdrawTooLow())
}
if (postOpVaultBalance != null && postOpVaultBalance >= 0 && amount > 0 &&
vaultAccount?.withdrawableUsdc != null && amount > vaultAccount.withdrawableUsdc
) {
errors.add(vaultFormValidationErrors.withdrawingLockedBalance())
}
if (sharesToAttemptWithdraw != null && slippageResponse != null && sharesToAttemptWithdraw != slippageResponse.sharesToWithdraw.numShares) {
Expand Down
97 changes: 96 additions & 1 deletion src/commonTest/kotlin/exchange.dydx.abacus/functional/vault/VaultFormTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ class VaultFormTests {
}

@Test
fun testLowWithdraw() {
fun testLowDeposit() {
val result = VaultDepositWithdrawFormValidator.validateVaultForm(
formData = VaultFormData(
action = VaultFormAction.DEPOSIT,
Expand Down Expand Up @@ -272,6 +272,101 @@ class VaultFormTests {
)
}

@Test
fun testLowWithdraw() {
val result = VaultDepositWithdrawFormValidator.validateVaultForm(
formData = VaultFormData(
action = VaultFormAction.WITHDRAW,
amount = 10.0,
acknowledgedSlippage = false,
inConfirmationStep = false,
),
accountData = VaultFormAccountData(
marginUsage = 0.5,
freeCollateral = 1000.0,
canViewAccount = true,
),
vaultAccount = makeVaultAccount(
balanceUsdc = 1000.0,
withdrawableUsdc = 500.0,
balanceShares = 500.0,
),
slippageResponse = OnChainVaultDepositWithdrawSlippageResponse(
sharesToWithdraw = OnChainNumShares(numShares = 5.0),
expectedQuoteQuantums = 10.0 * 1_000_000,
),
)

assertEquals(
VaultFormValidationResult(
errors = iListOf(
VaultFormValidationErrors().withdrawTooLow(),
),
submissionData = null,
summaryData = VaultFormSummaryData(
needSlippageAck = false,
marginUsage = 0.49751243781094523,
freeCollateral = 1010.0,
vaultBalance = 990.0,
withdrawableVaultBalance = 490.0,
estimatedSlippage = 0.0,
estimatedAmountReceived = 10.0,
),
),
result,
)
}

@Test
fun testLowWithdrawFull() {
val result = VaultDepositWithdrawFormValidator.validateVaultForm(
formData = VaultFormData(
action = VaultFormAction.WITHDRAW,
amount = 10.0,
acknowledgedSlippage = false,
inConfirmationStep = false,
),
accountData = VaultFormAccountData(
marginUsage = 0.5,
freeCollateral = 1000.0,
canViewAccount = true,
),
vaultAccount = makeVaultAccount(
balanceUsdc = 1000.0,
withdrawableUsdc = 10.0,
balanceShares = 500.0,
),
slippageResponse = OnChainVaultDepositWithdrawSlippageResponse(
sharesToWithdraw = OnChainNumShares(numShares = 5.0),
expectedQuoteQuantums = 10.0 * 1_000_000,
),
)

assertEquals(
VaultFormValidationResult(
errors = listOf<ValidationError>().toIList(),
submissionData = VaultDepositWithdrawSubmissionData(
withdraw = VaultWithdrawData(
subaccountTo = "0",
shares = 5.0,
minAmount = 9.90,
),
deposit = null,
),
summaryData = VaultFormSummaryData(
needSlippageAck = false,
marginUsage = 0.49751243781094523,
freeCollateral = 1010.0,
vaultBalance = 990.0,
withdrawableVaultBalance = 0.0,
estimatedSlippage = 0.0,
estimatedAmountReceived = 10.0,
),
),
result,
)
}

@Test
fun testValidHighSlippageWithdrawWithAck() {
val result = VaultDepositWithdrawFormValidator.validateVaultForm(
Expand Down
2 changes: 1 addition & 1 deletion v4_abacus.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |spec|
spec.name = 'v4_abacus'
spec.version = '1.12.17'
spec.version = '1.12.18'
spec.homepage = 'https://github.com/dydxprotocol/v4-abacus'
spec.source = { :http=> ''}
spec.authors = ''
Expand Down