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.

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

close all positions: return payload #668

Merged
merged 2 commits into from
Sep 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ allprojects {
}

group = "exchange.dydx.abacus"
version = "1.11.13"
version = "1.11.14"

repositories {
google()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ interface AsyncAbacusStateManagerProtocol {
fun faucet(amount: Double, callback: TransactionCallback)
fun cancelOrder(orderId: String, callback: TransactionCallback)
fun cancelAllOrders(marketId: String?, callback: TransactionCallback)
fun closeAllPositions(callback: TransactionCallback)
fun closeAllPositions(callback: TransactionCallback): HumanReadableCloseAllPositionsPayload?

// Bridge functions.
// If client is not using cancelOrder function, it should call orderCanceled function with
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -630,12 +630,13 @@ class AsyncAbacusStateManagerV2(
}
}

override fun closeAllPositions(callback: TransactionCallback) {
try {
override fun closeAllPositions(callback: TransactionCallback): HumanReadableCloseAllPositionsPayload? {
return try {
adaptor?.closeAllPositions(callback)
} catch (e: Exception) {
val error = V4TransactionErrors.error(null, e.toString())
callback(false, error, null)
null
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -615,8 +615,8 @@ internal class StateManagerAdaptorV2(
accounts.cancelAllOrders(marketId, callback)
}

internal fun closeAllPositions(callback: TransactionCallback) {
accounts.closeAllPositions(currentHeight, callback)
internal fun closeAllPositions(callback: TransactionCallback): HumanReadableCloseAllPositionsPayload? {
return accounts.closeAllPositions(currentHeight, callback)
}

internal fun orderCanceled(orderId: String) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1214,8 +1214,8 @@ internal fun AccountSupervisor.cancelAllOrders(marketId: String?, callback: Tran
subaccount?.cancelAllOrders(marketId, callback)
}

internal fun AccountSupervisor.closeAllPositions(currentHeight: Int?, callback: TransactionCallback) {
subaccount?.closeAllPositions(currentHeight, callback)
internal fun AccountSupervisor.closeAllPositions(currentHeight: Int?, callback: TransactionCallback): HumanReadableCloseAllPositionsPayload? {
return subaccount?.closeAllPositions(currentHeight, callback)
}

internal fun AccountSupervisor.orderCanceled(orderId: String) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -366,8 +366,8 @@ internal fun AccountsSupervisor.cancelAllOrders(marketId: String?, callback: Tra
account?.cancelAllOrders(marketId, callback)
}

internal fun AccountsSupervisor.closeAllPositions(currentHeight: Int?, callback: TransactionCallback) {
account?.closeAllPositions(currentHeight, callback)
internal fun AccountsSupervisor.closeAllPositions(currentHeight: Int?, callback: TransactionCallback): HumanReadableCloseAllPositionsPayload? {
return account?.closeAllPositions(currentHeight, callback)
}

internal fun AccountsSupervisor.orderCanceled(orderId: String) {
Expand Down
2 changes: 1 addition & 1 deletion v4_abacus.podspec
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.13'
spec.version = '1.11.14'
spec.homepage = 'https://github.com/dydxprotocol/v4-abacus'
spec.source = { :http=> ''}
spec.authors = ''
Expand Down
Loading