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 subaccount data issue with websocket reconnect #753

Merged
merged 3 commits into from
Nov 14, 2024
Merged

Fix subaccount data issue with websocket reconnect #753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15ba7a5
Fix subaccount data issue with websocket reconnect
ruixhuang Nov 14, 2024
0a7a5b8
Fix the orderbook crossing
ruixhuang Nov 14, 2024
e181126
Merge branch 'main' into feature/bug_fixes1
ruixhuang Nov 14, 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.13.28"
version = "1.13.29"

repositories {
google()
Expand Down
4 changes: 2 additions & 2 deletions src/commonMain/kotlin/exchange.dydx.abacus/processor/markets/OrderbookProcessor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ internal class OrderbookProcessor(
): InternalMarketState {
this.groupingMultiplier = groupingMultiplier
existing.groupedOrderbook = calculator.calculate(
rawOrderbook = existing.rawOrderbook,
rawOrderbook = existing.consolidatedOrderbook,
tickSize = tickSize ?: defaultTickSize,
groupingMultiplier = groupingMultiplier,
)
Expand Down Expand Up @@ -105,7 +105,7 @@ internal class OrderbookProcessor(
rawOrderbook = existing.rawOrderbook,
)
existing.groupedOrderbook = calculator.calculate(
rawOrderbook = existing.rawOrderbook,
rawOrderbook = existing.consolidatedOrderbook,
tickSize = tickSize ?: defaultTickSize,
groupingMultiplier = groupingMultiplier,
)
Expand Down
9 changes: 8 additions & 1 deletion ...commonMain/kotlin/exchange.dydx.abacus/processor/wallet/account/V4SubaccountsProcessor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ internal class V4SubaccountsProcessor(
payload: List<Any>?,
): MutableMap<Int, InternalSubaccountState> {
return if (payload != null) {
internalState.clear()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ooooo

val modifiedSubaccountNumbers = mutableListOf<Int>()
for (item in payload) {
val data = parser.asNativeMap(item)
if (data != null) {
Expand All @@ -62,9 +62,16 @@ internal class V4SubaccountsProcessor(
firstTime = true,
)
internalState[subaccountNumber] = subaccount
modifiedSubaccountNumbers.add(subaccountNumber)
}
}
}
val keys = internalState.keys.toSet()
for (key in keys) {
if (!modifiedSubaccountNumbers.contains(key)) {
internalState.remove(key)
}
}
internalState
} else {
internalState
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.13.28'
spec.version = '1.13.29'
spec.homepage = 'https://github.com/dydxprotocol/v4-abacus'
spec.source = { :http=> ''}
spec.authors = ''
Expand Down