Skip to content
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 @@ -53,7 +53,7 @@ allprojects {
}

group = "exchange.dydx.abacus"
version = "1.14.4"
version = "1.14.5"

repositories {
google()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package exchange.dydx.abacus

import exchange.dydx.abacus.output.ComplianceAction
import exchange.dydx.abacus.output.Documentation
import exchange.dydx.abacus.output.PerpetualState
import exchange.dydx.abacus.output.Restriction
Expand Down Expand Up @@ -116,20 +115,19 @@ interface AsyncAbacusStateManagerProtocol {
// Screen for restrictions
fun screen(address: String, callback: (restriction: Restriction) -> Unit)

// Trigger update for compliance
fun triggerCompliance(action: ComplianceAction, callback: TransactionCallback)

// Get chain data from id. Necessary to know chain name based on chain id
fun getChainById(chainId: String): TransferChainInfo?

fun registerPushNotification(token: String, languageCode: String?)
fun refreshVaultAccount()

fun setAddresses(source: String?, account: String?, isNew: Boolean)
}

@JsExport
interface AsyncAbacusStateManagerSingletonProtocol {
var accountAddress: String?
var sourceAddress: String?
val accountAddress: String?
val sourceAddress: String?
var subaccountNumber: Int
var market: String?
var walletConnectionType: WalletConnectionType?
Expand All @@ -139,12 +137,3 @@ interface AsyncAbacusStateManagerSingletonProtocol {
interface SingletonAsyncAbacusStateManagerProtocol :
AsyncAbacusStateManagerProtocol,
AsyncAbacusStateManagerSingletonProtocol

@JsExport
fun AsyncAbacusStateManagerSingletonProtocol.setAddresses(
source: String?,
account: String?
) {
accountAddress = account
sourceAddress = source
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package exchange.dydx.abacus
import exchange.dydx.abacus.di.AbacusScope
import exchange.dydx.abacus.di.Deployment
import exchange.dydx.abacus.di.DeploymentUri
import exchange.dydx.abacus.output.ComplianceAction
import exchange.dydx.abacus.output.Documentation
import exchange.dydx.abacus.output.PerpetualState
import exchange.dydx.abacus.output.Restriction
Expand Down Expand Up @@ -134,8 +133,7 @@ class AsyncAbacusStateManagerV2(
field?.dispose()

value?.market = market
value?.accountAddress = accountAddress
value?.sourceAddress = sourceAddress
value?.setAddresses(source = sourceAddress, account = accountAddress, isNew = true)
value?.subaccountNumber = subaccountNumber
value?.orderbookGrouping = orderbookGrouping
value?.historicalTradingRewardPeriod = historicalTradingRewardPeriod
Expand Down Expand Up @@ -182,12 +180,6 @@ class AsyncAbacusStateManagerV2(
}

override var accountAddress: String? = null
set(value) {
field = value
ioImplementations.threading?.async(ThreadingType.abacus) {
adaptor?.accountAddress = field
}
}

override var walletConnectionType: WalletConnectionType? = WalletConnectionType.Ethereum
set(value) {
Expand All @@ -198,12 +190,6 @@ class AsyncAbacusStateManagerV2(
}

override var sourceAddress: String? = null
set(value) {
field = value
ioImplementations.threading?.async(ThreadingType.abacus) {
adaptor?.sourceAddress = field
}
}

override var subaccountNumber: Int = 0
set(value) {
Expand All @@ -213,6 +199,12 @@ class AsyncAbacusStateManagerV2(
}
}

override fun setAddresses(source: String?, account: String?, isNew: Boolean) {
ioImplementations.threading?.async(ThreadingType.abacus) {
adaptor?.setAddresses(source, account, isNew)
}
}

override var historicalPnlPeriod: HistoricalPnlPeriod = HistoricalPnlPeriod.Period7d
set(value) {
field = value
Expand Down Expand Up @@ -262,6 +254,7 @@ class AsyncAbacusStateManagerV2(
)
}
}

private var started: Boolean = false
set(value) {
if (field != value) {
Expand Down Expand Up @@ -746,16 +739,6 @@ class AsyncAbacusStateManagerV2(
}
}

override fun triggerCompliance(action: ComplianceAction, callback: TransactionCallback) {
try {
adaptor?.triggerCompliance(action, callback)
} catch (e: Exception) {
val error = V4TransactionErrors.Companion.error(null, e.toString())
trackTransactionError("triggerCompliance", error)
callback(false, error, null)
}
}

private fun trackTransactionError(functionName: String, error: ParsingError?) {
if (error == null) {
return
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package exchange.dydx.abacus.state

import exchange.dydx.abacus.output.Compliance
import exchange.dydx.abacus.output.ComplianceAction
import exchange.dydx.abacus.output.ComplianceStatus
import exchange.dydx.abacus.output.Notification
import exchange.dydx.abacus.output.PerpetualState
Expand Down Expand Up @@ -54,7 +53,6 @@ import exchange.dydx.abacus.state.supervisor.NetworkHelper
import exchange.dydx.abacus.state.supervisor.OnboardingSupervisor
import exchange.dydx.abacus.state.supervisor.SystemSupervisor
import exchange.dydx.abacus.state.supervisor.VaultSupervisor
import exchange.dydx.abacus.state.supervisor.accountAddress
import exchange.dydx.abacus.state.supervisor.addressRestriction
import exchange.dydx.abacus.state.supervisor.adjustIsolatedMargin
import exchange.dydx.abacus.state.supervisor.adjustIsolatedMarginPayload
Expand All @@ -79,12 +77,11 @@ import exchange.dydx.abacus.state.supervisor.orderCanceled
import exchange.dydx.abacus.state.supervisor.placeOrderPayload
import exchange.dydx.abacus.state.supervisor.refresh
import exchange.dydx.abacus.state.supervisor.screen
import exchange.dydx.abacus.state.supervisor.sourceAddress
import exchange.dydx.abacus.state.supervisor.setAddresses
import exchange.dydx.abacus.state.supervisor.stopWatchingLastOrder
import exchange.dydx.abacus.state.supervisor.subaccountNumber
import exchange.dydx.abacus.state.supervisor.subaccountTransferPayload
import exchange.dydx.abacus.state.supervisor.trade
import exchange.dydx.abacus.state.supervisor.triggerCompliance
import exchange.dydx.abacus.state.supervisor.triggerOrders
import exchange.dydx.abacus.state.supervisor.triggerOrdersPayload
import exchange.dydx.abacus.state.supervisor.walletConnectionType
Expand Down Expand Up @@ -285,14 +282,10 @@ internal class StateManagerAdaptorV2(
markets.orderbookGrouping = value
}

internal var accountAddress: String?
internal val accountAddress: String?
get() {
return accounts.accountAddress
}
set(value) {
accounts.accountAddress = value
vault.accountAddress = value
}

internal var walletConnectionType: WalletConnectionType?
get() {
Expand All @@ -303,13 +296,10 @@ internal class StateManagerAdaptorV2(
onboarding.walletConnectionType = value
}

internal var sourceAddress: String?
internal val sourceAddress: String?
get() {
return accounts.sourceAddress
}
set(value) {
accounts.sourceAddress = value
}

internal var historicalPnlPeriod: HistoricalPnlPeriod
get() {
Expand Down Expand Up @@ -353,6 +343,11 @@ internal class StateManagerAdaptorV2(
return connections.validatorState
}

internal fun setAddresses(source: String?, account: String?, isNew: Boolean) {
accounts.setAddresses(sourceAddress = source, accountAddress = account, isNew = isNew)
vault.accountAddress = account
}

private fun didSetReadyToConnect(readyToConnect: Boolean) {
connections.readyToConnect = readyToConnect
system.readyToConnect = readyToConnect
Expand Down Expand Up @@ -680,10 +675,6 @@ internal class StateManagerAdaptorV2(
accounts.screen(address, callback)
}

internal fun triggerCompliance(action: ComplianceAction, callback: TransactionCallback?) {
accounts.triggerCompliance(action, callback)
}

internal fun registerPushNotification(token: String, languageCode: String?) {
accounts.registerPushNotification(token, languageCode)
}
Expand Down
Loading