Bump Abacus, V4-client and AGP (#206)

dydxprotocol · Jul 25, 2024 · 842e7f5 · 842e7f5
1 parent e747081
commit 842e7f5
Show file tree

Hide file tree

Showing 47 changed files with 159 additions and 88 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     ext.ktlintVersion = '0.48.0'
     ext.kotlinVersion = '1.9.20'
-    ext.androidApplicationVersion = '8.5.0'
+    ext.androidApplicationVersion = '8.5.1'
 
     repositories {
         google()

diff --git a/v4/app/build.gradle b/v4/app/build.gradle
@@ -59,7 +59,6 @@ android {
             applicationIdSuffix = ".debug"
             versionNameSuffix = "-debug"
             minifyEnabled false
-            testCoverageEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             testProguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguardTest-rules.pro'
             debuggable = true

diff --git a/v4/build.gradle b/v4/build.gradle
@@ -88,7 +88,7 @@ ext {
     compileSdkVersion = 34
 
     // App dependencies
-    abacusVersion = '1.8.35'
+    abacusVersion = '1.8.61'
     carteraVersion = '0.1.15'
     kollectionsVersion = '2.0.16'
 

diff --git a/...e/dydx/trading/feature/market/marketinfo/components/account/DydxMarketAccountViewModel.kt b/...e/dydx/trading/feature/market/marketinfo/components/account/DydxMarketAccountViewModel.kt
@@ -2,8 +2,8 @@ package exchange.dydx.trading.feature.market.marketinfo.components.account
 
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
-import exchange.dydx.abacus.output.Subaccount
 import exchange.dydx.abacus.output.TradeStatesWithDoubleValues
+import exchange.dydx.abacus.output.account.Subaccount
 import exchange.dydx.abacus.protocols.LocalizerProtocol
 import exchange.dydx.dydxstatemanager.AbacusStateManagerProtocol
 import exchange.dydx.trading.common.DydxViewModel

diff --git a/...ading/feature/market/marketinfo/components/position/DydxMarketPositionButtonsViewModel.kt b/...ading/feature/market/marketinfo/components/position/DydxMarketPositionButtonsViewModel.kt
@@ -2,8 +2,8 @@ package exchange.dydx.trading.feature.market.marketinfo.components.position
 
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
-import exchange.dydx.abacus.output.SubaccountOrder
-import exchange.dydx.abacus.output.SubaccountPosition
+import exchange.dydx.abacus.output.account.SubaccountOrder
+import exchange.dydx.abacus.output.account.SubaccountPosition
 import exchange.dydx.abacus.output.input.OrderType
 import exchange.dydx.abacus.protocols.LocalizerProtocol
 import exchange.dydx.dydxstatemanager.AbacusStateManagerProtocol

diff --git a/...dydx/trading/feature/market/marketinfo/components/position/DydxMarketPositionViewModel.kt b/...dydx/trading/feature/market/marketinfo/components/position/DydxMarketPositionViewModel.kt
@@ -2,8 +2,8 @@ package exchange.dydx.trading.feature.market.marketinfo.components.position
 
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
-import exchange.dydx.abacus.output.SubaccountPendingPosition
-import exchange.dydx.abacus.output.SubaccountPosition
+import exchange.dydx.abacus.output.account.SubaccountPendingPosition
+import exchange.dydx.abacus.output.account.SubaccountPosition
 import exchange.dydx.abacus.output.input.MarginMode
 import exchange.dydx.abacus.protocols.LocalizerProtocol
 import exchange.dydx.dydxstatemanager.AbacusStateManagerProtocol

diff --git a/...src/main/java/exchange/dydx/trading/feature/market/marketinfo/streams/MarketInfoStream.kt b/...src/main/java/exchange/dydx/trading/feature/market/marketinfo/streams/MarketInfoStream.kt
@@ -3,8 +3,8 @@ package exchange.dydx.trading.feature.market.marketinfo.streams
 import dagger.hilt.android.scopes.ActivityRetainedScoped
 import exchange.dydx.abacus.output.Asset
 import exchange.dydx.abacus.output.PerpetualMarket
-import exchange.dydx.abacus.output.PositionSide
-import exchange.dydx.abacus.output.SubaccountPosition
+import exchange.dydx.abacus.output.account.PositionSide
+import exchange.dydx.abacus.output.account.SubaccountPosition
 import exchange.dydx.abacus.protocols.LocalizerProtocol
 import exchange.dydx.dydxstatemanager.AbacusStateManagerProtocol
 import exchange.dydx.dydxstatemanager.clientState.favorite.DydxFavoriteStoreProtocol

diff --git a/...ydx/trading/feature/portfolio/cancelpendingposition/DydxCancelPendingPositionViewModel.kt b/...ydx/trading/feature/portfolio/cancelpendingposition/DydxCancelPendingPositionViewModel.kt
@@ -5,9 +5,9 @@ import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import exchange.dydx.abacus.output.Asset
 import exchange.dydx.abacus.output.PerpetualMarket
-import exchange.dydx.abacus.output.Subaccount
-import exchange.dydx.abacus.output.SubaccountOrder
-import exchange.dydx.abacus.output.SubaccountPendingPosition
+import exchange.dydx.abacus.output.account.Subaccount
+import exchange.dydx.abacus.output.account.SubaccountOrder
+import exchange.dydx.abacus.output.account.SubaccountPendingPosition
 import exchange.dydx.abacus.output.input.OrderStatus
 import exchange.dydx.abacus.protocols.LocalizerProtocol
 import exchange.dydx.abacus.utils.filterNotNull

diff --git a/...a/exchange/dydx/trading/feature/portfolio/components/fills/DydxPortfolioFillsViewModel.kt b/...a/exchange/dydx/trading/feature/portfolio/components/fills/DydxPortfolioFillsViewModel.kt
@@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import exchange.dydx.abacus.output.Asset
 import exchange.dydx.abacus.output.PerpetualMarket
-import exchange.dydx.abacus.output.SubaccountFill
+import exchange.dydx.abacus.output.account.SubaccountFill
 import exchange.dydx.abacus.protocols.LocalizerProtocol
 import exchange.dydx.dydxstatemanager.AbacusStateManagerProtocol
 import exchange.dydx.trading.common.DydxViewModel

diff --git a/...exchange/dydx/trading/feature/portfolio/components/orders/DydxPortfolioOrdersViewModel.kt b/...exchange/dydx/trading/feature/portfolio/components/orders/DydxPortfolioOrdersViewModel.kt
@@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import exchange.dydx.abacus.output.Asset
 import exchange.dydx.abacus.output.PerpetualMarket
-import exchange.dydx.abacus.output.SubaccountOrder
+import exchange.dydx.abacus.output.account.SubaccountOrder
 import exchange.dydx.abacus.protocols.LocalizerProtocol
 import exchange.dydx.dydxstatemanager.AbacusStateManagerProtocol
 import exchange.dydx.trading.common.DydxViewModel

diff --git a/...xchange/dydx/trading/feature/portfolio/components/overview/DydxPortfolioChartViewModel.kt b/...xchange/dydx/trading/feature/portfolio/components/overview/DydxPortfolioChartViewModel.kt
@@ -6,8 +6,8 @@ import com.github.mikephil.charting.data.Entry
 import com.github.mikephil.charting.highlight.Highlight
 import com.github.mikephil.charting.listener.OnChartValueSelectedListener
 import dagger.hilt.android.lifecycle.HiltViewModel
-import exchange.dydx.abacus.output.Subaccount
-import exchange.dydx.abacus.output.SubaccountHistoricalPNL
+import exchange.dydx.abacus.output.account.Subaccount
+import exchange.dydx.abacus.output.account.SubaccountHistoricalPNL
 import exchange.dydx.abacus.protocols.LocalizerProtocol
 import exchange.dydx.abacus.state.manager.HistoricalPnlPeriod
 import exchange.dydx.dydxstatemanager.AbacusStateManagerProtocol

diff --git a/...hange/dydx/trading/feature/portfolio/components/overview/DydxPortfolioDetailsViewModel.kt b/...hange/dydx/trading/feature/portfolio/components/overview/DydxPortfolioDetailsViewModel.kt
@@ -2,7 +2,7 @@ package exchange.dydx.trading.feature.portfolio.components.overview
 
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
-import exchange.dydx.abacus.output.Subaccount
+import exchange.dydx.abacus.output.account.Subaccount
 import exchange.dydx.abacus.protocols.LocalizerProtocol
 import exchange.dydx.dydxstatemanager.AbacusStateManagerProtocol
 import exchange.dydx.trading.common.DydxViewModel

diff --git a/...g/feature/portfolio/components/pendingpositions/DydxPortfolioPendingPositionsViewModel.kt b/...g/feature/portfolio/components/pendingpositions/DydxPortfolioPendingPositionsViewModel.kt
@@ -2,7 +2,7 @@ package exchange.dydx.trading.feature.portfolio.components.pendingpositions
 
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
-import exchange.dydx.abacus.output.SubaccountPendingPosition
+import exchange.dydx.abacus.output.account.SubaccountPendingPosition
 import exchange.dydx.abacus.protocols.LocalizerProtocol
 import exchange.dydx.dydxstatemanager.AbacusStateManagerProtocol
 import exchange.dydx.dydxstatemanager.MarketConfigsAndAsset

diff --git a/...ydx/trading/feature/portfolio/components/placeholder/DydxPortfolioPlaceholderViewModel.kt b/...ydx/trading/feature/portfolio/components/placeholder/DydxPortfolioPlaceholderViewModel.kt
@@ -2,7 +2,7 @@ package exchange.dydx.trading.feature.portfolio.components.placeholder
 
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
-import exchange.dydx.abacus.output.Subaccount
+import exchange.dydx.abacus.output.account.Subaccount
 import exchange.dydx.abacus.protocols.LocalizerProtocol
 import exchange.dydx.dydxstatemanager.AbacusStateManagerProtocol
 import exchange.dydx.trading.common.DydxViewModel

diff --git a/...ge/dydx/trading/feature/portfolio/components/positions/DydxPortfolioPositionsViewModel.kt b/...ge/dydx/trading/feature/portfolio/components/positions/DydxPortfolioPositionsViewModel.kt
@@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import exchange.dydx.abacus.output.Asset
 import exchange.dydx.abacus.output.PerpetualMarket
-import exchange.dydx.abacus.output.SubaccountPosition
+import exchange.dydx.abacus.output.account.SubaccountPosition
 import exchange.dydx.abacus.protocols.LocalizerProtocol
 import exchange.dydx.dydxstatemanager.AbacusStateManagerProtocol
 import exchange.dydx.trading.common.DydxViewModel

diff --git a/...ge/dydx/trading/feature/portfolio/components/transfers/DydxPortfolioTransfersViewModel.kt b/...ge/dydx/trading/feature/portfolio/components/transfers/DydxPortfolioTransfersViewModel.kt
@@ -2,8 +2,8 @@ package exchange.dydx.trading.feature.portfolio.components.transfers
 
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
-import exchange.dydx.abacus.output.SubaccountTransfer
-import exchange.dydx.abacus.output.TransferRecordType
+import exchange.dydx.abacus.output.account.SubaccountTransfer
+import exchange.dydx.abacus.output.account.TransferRecordType
 import exchange.dydx.abacus.protocols.LocalizerProtocol
 import exchange.dydx.dydxstatemanager.AbacusStateManagerProtocol
 import exchange.dydx.dydxstatemanager.localizeWithParams

diff --git a/...in/java/exchange/dydx/trading/feature/portfolio/orderdetails/DydxOrderDetailsViewModel.kt b/...in/java/exchange/dydx/trading/feature/portfolio/orderdetails/DydxOrderDetailsViewModel.kt
@@ -6,8 +6,8 @@ import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import exchange.dydx.abacus.output.Asset
 import exchange.dydx.abacus.output.PerpetualMarket
-import exchange.dydx.abacus.output.SubaccountFill
-import exchange.dydx.abacus.output.SubaccountOrder
+import exchange.dydx.abacus.output.account.SubaccountFill
+import exchange.dydx.abacus.output.account.SubaccountOrder
 import exchange.dydx.abacus.output.input.OrderSide
 import exchange.dydx.abacus.protocols.LocalizerProtocol
 import exchange.dydx.dydxstatemanager.AbacusStateManagerProtocol

diff --git a/...main/java/exchange/dydx/trading/feature/profile/components/DydxProfileHistoryViewModel.kt b/...main/java/exchange/dydx/trading/feature/profile/components/DydxProfileHistoryViewModel.kt
@@ -2,9 +2,9 @@ package exchange.dydx.trading.feature.profile.components
 
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
-import exchange.dydx.abacus.output.SubaccountFill
-import exchange.dydx.abacus.output.SubaccountFundingPayment
-import exchange.dydx.abacus.output.SubaccountTransfer
+import exchange.dydx.abacus.output.account.SubaccountFill
+import exchange.dydx.abacus.output.account.SubaccountFundingPayment
+import exchange.dydx.abacus.output.account.SubaccountTransfer
 import exchange.dydx.abacus.output.input.OrderSide
 import exchange.dydx.abacus.protocols.LocalizerProtocol
 import exchange.dydx.dydxstatemanager.AbacusStateManagerProtocol

diff --git a/...main/java/exchange/dydx/trading/feature/profile/components/DydxProfileRewardsViewModel.kt b/...main/java/exchange/dydx/trading/feature/profile/components/DydxProfileRewardsViewModel.kt
@@ -2,7 +2,7 @@ package exchange.dydx.trading.feature.profile.components
 
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
-import exchange.dydx.abacus.output.Account
+import exchange.dydx.abacus.output.account.Account
 import exchange.dydx.abacus.protocols.LocalizerProtocol
 import exchange.dydx.dydxstatemanager.AbacusStateManagerProtocol
 import exchange.dydx.dydxstatemanager.nativeTokenLogoUrl

diff --git a/...src/main/java/exchange/dydx/trading/feature/profile/rewards/DydxRewardsEventsViewModel.kt b/...src/main/java/exchange/dydx/trading/feature/profile/rewards/DydxRewardsEventsViewModel.kt
@@ -2,7 +2,7 @@ package exchange.dydx.trading.feature.profile.rewards
 
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
-import exchange.dydx.abacus.output.Account
+import exchange.dydx.abacus.output.account.Account
 import exchange.dydx.abacus.protocols.LocalizerProtocol
 import exchange.dydx.abacus.state.manager.HistoricalTradingRewardsPeriod
 import exchange.dydx.dydxstatemanager.AbacusStateManagerProtocol

diff --git a/...ge/dydx/trading/feature/receipt/components/buyingpower/DydxReceiptBuyingPowerViewModel.kt b/...ge/dydx/trading/feature/receipt/components/buyingpower/DydxReceiptBuyingPowerViewModel.kt
@@ -2,8 +2,8 @@ package exchange.dydx.trading.feature.receipt.components.buyingpower
 
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
-import exchange.dydx.abacus.output.Subaccount
-import exchange.dydx.abacus.output.SubaccountPosition
+import exchange.dydx.abacus.output.account.Subaccount
+import exchange.dydx.abacus.output.account.SubaccountPosition
 import exchange.dydx.abacus.output.input.TradeInput
 import exchange.dydx.abacus.output.input.TransferInput
 import exchange.dydx.abacus.protocols.LocalizerProtocol

diff --git a/...ava/exchange/dydx/trading/feature/receipt/components/equity/DydxReceiptEquityViewModel.kt b/...ava/exchange/dydx/trading/feature/receipt/components/equity/DydxReceiptEquityViewModel.kt
@@ -2,7 +2,7 @@ package exchange.dydx.trading.feature.receipt.components.equity
 
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
-import exchange.dydx.abacus.output.Subaccount
+import exchange.dydx.abacus.output.account.Subaccount
 import exchange.dydx.abacus.protocols.LocalizerProtocol
 import exchange.dydx.dydxstatemanager.AbacusStateManagerProtocol
 import exchange.dydx.trading.common.DydxViewModel

diff --git a/...x/trading/feature/receipt/components/freecollateral/DydxReceiptFreeCollateralViewModel.kt b/...x/trading/feature/receipt/components/freecollateral/DydxReceiptFreeCollateralViewModel.kt
@@ -2,8 +2,8 @@ package exchange.dydx.trading.feature.receipt.components.buyingpower
 
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
-import exchange.dydx.abacus.output.SubaccountPendingPosition
-import exchange.dydx.abacus.output.SubaccountPosition
+import exchange.dydx.abacus.output.account.SubaccountPendingPosition
+import exchange.dydx.abacus.output.account.SubaccountPosition
 import exchange.dydx.abacus.protocols.LocalizerProtocol
 import exchange.dydx.dydxstatemanager.AbacusStateManagerProtocol
 import exchange.dydx.trading.common.DydxViewModel

diff --git a/...ture/receipt/components/isolatedmargin/DydxReceiptIsolatedPositionMarginUsageViewModel.kt b/...ture/receipt/components/isolatedmargin/DydxReceiptIsolatedPositionMarginUsageViewModel.kt
@@ -2,8 +2,8 @@ package exchange.dydx.trading.feature.receipt.components.isolatedmargin
 
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
-import exchange.dydx.abacus.output.SubaccountPendingPosition
-import exchange.dydx.abacus.output.SubaccountPosition
+import exchange.dydx.abacus.output.account.SubaccountPendingPosition
+import exchange.dydx.abacus.output.account.SubaccountPosition
 import exchange.dydx.abacus.protocols.LocalizerProtocol
 import exchange.dydx.dydxstatemanager.AbacusStateManagerProtocol
 import exchange.dydx.trading.common.DydxViewModel

diff --git a/.../dydx/trading/feature/receipt/components/leverage/DydxReceiptPositionLeverageViewModel.kt b/.../dydx/trading/feature/receipt/components/leverage/DydxReceiptPositionLeverageViewModel.kt
@@ -2,8 +2,8 @@ package exchange.dydx.trading.feature.receipt.components.leverage
 
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
-import exchange.dydx.abacus.output.SubaccountPosition
 import exchange.dydx.abacus.output.TradeStatesWithDoubleValues
+import exchange.dydx.abacus.output.account.SubaccountPosition
 import exchange.dydx.abacus.protocols.LocalizerProtocol
 import exchange.dydx.dydxstatemanager.AbacusStateManagerProtocol
 import exchange.dydx.trading.common.DydxViewModel

diff --git a/...ading/feature/receipt/components/liquidationprice/DydxReceiptLiquidationPriceViewModel.kt b/...ading/feature/receipt/components/liquidationprice/DydxReceiptLiquidationPriceViewModel.kt
@@ -2,13 +2,12 @@ package exchange.dydx.trading.feature.receipt.components.liquidationprice
 
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
-import exchange.dydx.abacus.output.SubaccountPosition
+import exchange.dydx.abacus.output.account.SubaccountPosition
 import exchange.dydx.abacus.protocols.LocalizerProtocol
 import exchange.dydx.dydxstatemanager.AbacusStateManagerProtocol
 import exchange.dydx.dydxstatemanager.MarketConfigsAndAsset
 import exchange.dydx.trading.common.DydxViewModel
 import exchange.dydx.trading.common.formatter.DydxFormatter
-import exchange.dydx.trading.common.navigation.PortfolioRoutes.positions
 import exchange.dydx.trading.feature.shared.views.AmountText
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine

diff --git a/...ge/dydx/trading/feature/receipt/components/marginusage/DydxReceiptMarginUsageViewModel.kt b/...ge/dydx/trading/feature/receipt/components/marginusage/DydxReceiptMarginUsageViewModel.kt
@@ -2,7 +2,7 @@ package exchange.dydx.trading.feature.receipt.components.marginusage
 
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
-import exchange.dydx.abacus.output.Subaccount
+import exchange.dydx.abacus.output.account.Subaccount
 import exchange.dydx.abacus.protocols.LocalizerProtocol
 import exchange.dydx.dydxstatemanager.AbacusStateManagerProtocol
 import exchange.dydx.trading.common.DydxViewModel

diff --git a/...ed/src/main/java/exchange/dydx/trading/feature/shared/viewstate/SharedAccountViewState.kt b/...ed/src/main/java/exchange/dydx/trading/feature/shared/viewstate/SharedAccountViewState.kt
@@ -1,6 +1,6 @@
 package exchange.dydx.trading.feature.shared.viewstate
 
-import exchange.dydx.abacus.output.Subaccount
+import exchange.dydx.abacus.output.account.Subaccount
 import exchange.dydx.abacus.protocols.LocalizerProtocol
 import exchange.dydx.trading.common.formatter.DydxFormatter
 import exchange.dydx.trading.feature.shared.views.LeverageRiskView

diff --git a/...hared/src/main/java/exchange/dydx/trading/feature/shared/viewstate/SharedFillViewState.kt b/...hared/src/main/java/exchange/dydx/trading/feature/shared/viewstate/SharedFillViewState.kt
@@ -2,7 +2,7 @@ package exchange.dydx.trading.feature.shared.viewstate
 
 import exchange.dydx.abacus.output.Asset
 import exchange.dydx.abacus.output.PerpetualMarket
-import exchange.dydx.abacus.output.SubaccountFill
+import exchange.dydx.abacus.output.account.SubaccountFill
 import exchange.dydx.abacus.output.input.OrderSide
 import exchange.dydx.abacus.protocols.LocalizerProtocol
 import exchange.dydx.platformui.theme.MockLocalizer

diff --git a/...main/java/exchange/dydx/trading/feature/shared/viewstate/SharedMarketPositionViewState.kt b/...main/java/exchange/dydx/trading/feature/shared/viewstate/SharedMarketPositionViewState.kt
@@ -3,7 +3,7 @@ package exchange.dydx.trading.feature.shared.viewstate
 import androidx.compose.ui.unit.dp
 import exchange.dydx.abacus.output.Asset
 import exchange.dydx.abacus.output.PerpetualMarket
-import exchange.dydx.abacus.output.SubaccountPosition
+import exchange.dydx.abacus.output.account.SubaccountPosition
 import exchange.dydx.abacus.output.input.MarginMode
 import exchange.dydx.abacus.protocols.LocalizerProtocol
 import exchange.dydx.platformui.components.PlatformUISign

diff --git a/...ared/src/main/java/exchange/dydx/trading/feature/shared/viewstate/SharedOrderViewState.kt b/...ared/src/main/java/exchange/dydx/trading/feature/shared/viewstate/SharedOrderViewState.kt
@@ -2,7 +2,7 @@ package exchange.dydx.trading.feature.shared.viewstate
 
 import exchange.dydx.abacus.output.Asset
 import exchange.dydx.abacus.output.PerpetualMarket
-import exchange.dydx.abacus.output.SubaccountOrder
+import exchange.dydx.abacus.output.account.SubaccountOrder
 import exchange.dydx.abacus.output.input.OrderSide
 import exchange.dydx.abacus.output.input.OrderStatus
 import exchange.dydx.abacus.output.input.OrderType

diff --git a/...e/dydx/trading/feature/trade/closeposition/components/DydxClosePositionHeaderViewModel.kt b/...e/dydx/trading/feature/trade/closeposition/components/DydxClosePositionHeaderViewModel.kt
@@ -4,8 +4,8 @@ import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import exchange.dydx.abacus.output.Asset
 import exchange.dydx.abacus.output.PerpetualMarket
-import exchange.dydx.abacus.output.PositionSide
-import exchange.dydx.abacus.output.SubaccountPosition
+import exchange.dydx.abacus.output.account.PositionSide
+import exchange.dydx.abacus.output.account.SubaccountPosition
 import exchange.dydx.abacus.protocols.LocalizerProtocol
 import exchange.dydx.dydxstatemanager.AbacusStateManagerProtocol
 import exchange.dydx.dydxstatemanager.clientState.favorite.DydxFavoriteStoreProtocol

diff --git a/...rc/main/java/exchange/dydx/trading/feature/trade/margin/DydxAdjustMarginInputViewModel.kt b/...rc/main/java/exchange/dydx/trading/feature/trade/margin/DydxAdjustMarginInputViewModel.kt
@@ -3,7 +3,7 @@ package exchange.dydx.trading.feature.trade.margin
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
-import exchange.dydx.abacus.output.SubaccountPosition
+import exchange.dydx.abacus.output.account.SubaccountPosition
 import exchange.dydx.abacus.output.input.AdjustIsolatedMarginInput
 import exchange.dydx.abacus.output.input.IsolatedMarginAdjustmentType.Add
 import exchange.dydx.abacus.output.input.IsolatedMarginAdjustmentType.Remove

diff --git a/v4/feature/trade/src/main/java/exchange/dydx/trading/feature/trade/streams/TradeStream.kt b/v4/feature/trade/src/main/java/exchange/dydx/trading/feature/trade/streams/TradeStream.kt
@@ -1,7 +1,7 @@
 package exchange.dydx.trading.feature.trade.streams
 
 import dagger.hilt.android.scopes.ActivityRetainedScoped
-import exchange.dydx.abacus.output.SubaccountOrder
+import exchange.dydx.abacus.output.account.SubaccountOrder
 import exchange.dydx.abacus.state.model.TradeInputField
 import exchange.dydx.dydxstatemanager.AbacusStateManagerProtocol
 import kotlinx.coroutines.flow.Flow

diff --git a/...hange/dydx/trading/feature/trade/tradestatus/components/DydxTradeStatusHeaderViewModel.kt b/...hange/dydx/trading/feature/trade/tradestatus/components/DydxTradeStatusHeaderViewModel.kt
@@ -2,7 +2,7 @@ package exchange.dydx.trading.feature.trade.tradestatus.components
 
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
-import exchange.dydx.abacus.output.SubaccountOrder
+import exchange.dydx.abacus.output.account.SubaccountOrder
 import exchange.dydx.abacus.output.input.OrderStatus
 import exchange.dydx.abacus.protocols.LocalizerProtocol
 import exchange.dydx.dydxstatemanager.AbacusStateManagerProtocol

diff --git a/...nge/dydx/trading/feature/trade/tradestatus/components/DydxTradeStatusPositionViewModel.kt b/...nge/dydx/trading/feature/trade/tradestatus/components/DydxTradeStatusPositionViewModel.kt
@@ -2,9 +2,9 @@ package exchange.dydx.trading.feature.trade.tradestatus.components
 
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
-import exchange.dydx.abacus.output.PositionSide
-import exchange.dydx.abacus.output.SubaccountOrder
-import exchange.dydx.abacus.output.SubaccountPosition
+import exchange.dydx.abacus.output.account.PositionSide
+import exchange.dydx.abacus.output.account.SubaccountOrder
+import exchange.dydx.abacus.output.account.SubaccountPosition
 import exchange.dydx.abacus.protocols.LocalizerProtocol
 import exchange.dydx.dydxstatemanager.AbacusStateManagerProtocol
 import exchange.dydx.dydxstatemanager.MarketConfigsAndAsset

diff --git a/...c/main/java/exchange/dydx/trading/feature/trade/trigger/DydxTriggerOrderInputViewModel.kt b/...c/main/java/exchange/dydx/trading/feature/trade/trigger/DydxTriggerOrderInputViewModel.kt
@@ -2,10 +2,9 @@ package exchange.dydx.trading.feature.trade.trigger
 
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
-import exchange.dydx.abacus.output.SubaccountOrder
-import exchange.dydx.abacus.output.SubaccountPosition
+import exchange.dydx.abacus.output.account.SubaccountOrder
+import exchange.dydx.abacus.output.account.SubaccountPosition
 import exchange.dydx.abacus.output.input.ErrorType
 import exchange.dydx.abacus.output.input.OrderType
 import exchange.dydx.abacus.output.input.TriggerOrdersInput

diff --git a/...xchange/dydx/trading/feature/trade/trigger/components/DydxTriggerOrderReceiptViewModel.kt b/...xchange/dydx/trading/feature/trade/trigger/components/DydxTriggerOrderReceiptViewModel.kt
@@ -3,7 +3,7 @@ package exchange.dydx.trading.feature.trade.trigger.components
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import exchange.dydx.abacus.output.PerpetualMarket
-import exchange.dydx.abacus.output.SubaccountPosition
+import exchange.dydx.abacus.output.account.SubaccountPosition
 import exchange.dydx.abacus.protocols.LocalizerProtocol
 import exchange.dydx.dydxstatemanager.AbacusStateManagerProtocol
 import exchange.dydx.dydxstatemanager.MarketConfigsAndAsset

diff --git a/...rading/feature/trade/trigger/components/inputfields/size/DydxTriggerOrderSizeViewModel.kt b/...rading/feature/trade/trigger/components/inputfields/size/DydxTriggerOrderSizeViewModel.kt
@@ -2,7 +2,7 @@ package exchange.dydx.trading.feature.trade.trigger.components.inputfields.size
 
 import androidx.lifecycle.ViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
-import exchange.dydx.abacus.output.SubaccountPosition
+import exchange.dydx.abacus.output.account.SubaccountPosition
 import exchange.dydx.abacus.output.input.ErrorType
 import exchange.dydx.abacus.output.input.TriggerOrdersInput
 import exchange.dydx.abacus.output.input.ValidationError