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

empty vault account is allowed, expected on first deposit #679

Merged
merged 2 commits into from
Sep 25, 2024
Merged

empty vault account is allowed, expected on first deposit #679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4209f3
valid
tyleroooo Sep 25, 2024
60b2d1f
fix
tyleroooo Sep 25, 2024
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.11.21"
version = "1.11.22"

repositories {
google()
Expand Down
10 changes: 3 additions & 7 deletions 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 @@ -232,13 +232,9 @@ object VaultDepositWithdrawFormValidator {
}

val withdrawnAmountIncludingSlippage = slippageResponse?.expectedAmount
val postOpVaultBalance = if (vaultAccount?.balanceUsdc != null) {
when (formData.action) {
VaultFormAction.DEPOSIT -> vaultAccount.balanceUsdc + amount
VaultFormAction.WITHDRAW -> vaultAccount.balanceUsdc - amount
}
} else {
null
val postOpVaultBalance = when (formData.action) {
VaultFormAction.DEPOSIT -> (vaultAccount?.balanceUsdc ?: 0.0) + amount
VaultFormAction.WITHDRAW -> (vaultAccount?.balanceUsdc ?: 0.0) - amount
}

val (postOpFreeCollateral, postOpMarginUsage) = if (accountData?.freeCollateral != null && accountData.marginUsage != null) {
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.11.21'
spec.version = '1.11.22'
spec.homepage = 'https://github.com/dydxprotocol/v4-abacus'
spec.source = { :http=> ''}
spec.authors = ''
Expand Down