feat(bonsai-ui): migrate position action cell and triggers dialog, delete some old stuff

src/abacus-ts/calculators/helpers.ts

@@ -0,0 +1,5 @@
+import { PositionUniqueId } from '../types/summaryTypes';
+
+export function getPositionUniqueId(marketId: string, subaccountNumber: number): PositionUniqueId {
+  return `${marketId}-${subaccountNumber}` as PositionUniqueId;
+}

src/abacus-ts/calculators/orders.ts

@@ -2,7 +2,11 @@ import { HeightResponse } from '@dydxprotocol/v4-client-js';
 import { mapValues, maxBy, orderBy } from 'lodash';
 
 import { NUM_PARENT_SUBACCOUNTS } from '@/constants/account';
-import { IndexerBestEffortOpenedStatus, IndexerOrderStatus } from '@/types/indexer/indexerApiGen';
+import {
+  IndexerBestEffortOpenedStatus,
+  IndexerOrderStatus,
+  IndexerOrderType,
+} from '@/types/indexer/indexerApiGen';
 import { IndexerCompositeOrderObject } from '@/types/indexer/indexerManual';
 
 import { assertNever } from '@/lib/assertNever';
@@ -13,6 +17,7 @@ import { MaybeBigNumber, MustBigNumber } from '@/lib/numbers';
 import { mergeObjects } from '../lib/mergeObjects';
 import { OrdersData } from '../types/rawTypes';
 import { OrderStatus, SubaccountOrder } from '../types/summaryTypes';
+import { getPositionUniqueId } from './helpers';
 
 export function calculateOpenOrders(orders: SubaccountOrder[]) {
   return orders.filter(
@@ -50,8 +55,9 @@ function calculateSubaccountOrder(
     marginMode: base.subaccountNumber >= NUM_PARENT_SUBACCOUNTS ? 'ISOLATED' : 'CROSS',
     subaccountNumber: base.subaccountNumber,
     id: base.id,
+    positionUniqueId: getPositionUniqueId(base.ticker, base.subaccountNumber),
     clientId: base.clientId,
-    type: base.type,
+    type: getOrderType(base.type, base.clientMetadata),
     side: base.side,
     timeInForce: base.timeInForce,
     clobPairId: MaybeBigNumber(base.clobPairId)?.toNumber(),
@@ -72,6 +78,25 @@ function calculateSubaccountOrder(
   return order;
 }
 
+function getOrderType(
+  type: IndexerOrderType,
+  clientMetadata: string | undefined
+): IndexerOrderType {
+  if (clientMetadata === '1') {
+    switch (type) {
+      case IndexerOrderType.LIMIT:
+        return IndexerOrderType.MARKET;
+      case IndexerOrderType.STOPLIMIT:
+        return IndexerOrderType.STOPMARKET;
+      case IndexerOrderType.TAKEPROFIT:
+        return IndexerOrderType.TAKEPROFITMARKET;
+      default:
+        return type;
+    }
+  }
+  return type;
+}
+
 export function getSimpleOrderStatus(status: OrderStatus) {
   switch (status) {
     case OrderStatus.Open:

src/abacus-ts/calculators/subaccount.ts

@@ -33,6 +33,7 @@ import {
   SubaccountSummaryCore,
   SubaccountSummaryDerived,
 } from '../types/summaryTypes';
+import { getPositionUniqueId } from './helpers';
 import { getMarketEffectiveInitialMarginForMarket } from './markets';
 
 export function calculateParentSubaccountPositions(
@@ -216,7 +217,7 @@ function calculateDerivedPositionCore(
   const value = signedSize.times(oracle);
 
   return {
-    uniqueId: `${position.market}-${position.subaccountNumber}`,
+    uniqueId: getPositionUniqueId(position.market, position.subaccountNumber),
     assetId: getAssetFromMarketId(position.market),
     marginMode,
     unsignedSize,

src/abacus-ts/ontology.ts

@@ -36,6 +36,7 @@ import {
   selectRawValidatorHeightDataLoading,
 } from './selectors/base';
 import {
+  createSelectMarketSummaryById,
   selectAllMarketSummaries,
   selectAllMarketSummariesLoading,
   selectCurrentMarketInfo,
@@ -111,6 +112,9 @@ export const BonsaiHelpers = {
   assets: {
     createSelectAssetInfo,
   },
+  markets: {
+    createSelectMarketSummaryById,
+  },
   forms: {
     deposit: {
       createSelectParentSubaccountSummary: createSelectParentSubaccountSummaryDeposit,

src/abacus-ts/selectors/summary.ts

@@ -66,3 +66,14 @@ export const selectCurrentMarketAssetInfo = createAppSelector(
     return assets[currentMarketInfo.assetId];
   }
 );
+
+export const createSelectMarketSummaryById = () =>
+  createAppSelector(
+    [selectAllMarketSummaries, (_s, marketId: string | undefined) => marketId],
+    (allSummaries, marketId) => {
+      if (marketId == null) {
+        return undefined;
+      }
+      return allSummaries?.[marketId];
+    }
+  );

src/abacus-ts/types/summaryTypes.ts

@@ -75,8 +75,10 @@ export type SubaccountPositionBase = ConvertStringToBigNumber<
 
 export type MarginMode = 'ISOLATED' | 'CROSS';
 
+export type PositionUniqueId = string & { ___brand: 'POSITION_UNIQUE_ID' };
+
 export type SubaccountPositionDerivedCore = {
-  uniqueId: string;
+  uniqueId: PositionUniqueId;
   assetId: string;
   marginMode: MarginMode;
 
@@ -133,6 +135,7 @@ export type SubaccountOrder = {
   subaccountNumber: number;
   id: string;
   clientId: string | undefined;
+  positionUniqueId: PositionUniqueId; // market + subaccount, can map to a unique position if/when it exists
   type: IndexerOrderType;
   side: IndexerOrderSide;
   status: OrderStatus | undefined;

src/constants/dialogs.ts

@@ -1,12 +1,13 @@
 import { ReactNode } from 'react';
 
+import { PositionUniqueId } from '@/abacus-ts/types/summaryTypes';
 import { TagsOf, UnionOf, ofType, unionize } from 'unionize';
 
 import { IndexerPositionSide } from '@/types/indexer/indexerApiGen';
 
 import { BigNumberish } from '@/lib/numbers';
 
-import { Nullable, SubaccountOrder, SubaccountPosition } from './abacus';
+import { Nullable, SubaccountPosition } from './abacus';
 import { IAffiliateStats } from './affiliates';
 import { DydxChainAsset } from './wallets';
 
@@ -76,10 +77,9 @@ export type TradeDialogProps = {
   slotTrigger?: React.ReactNode;
 };
 export type TriggersDialogProps = {
+  positionUniqueId: PositionUniqueId;
   marketId: string;
   assetId: string;
-  stopLossOrders: SubaccountOrder[];
-  takeProfitOrders: SubaccountOrder[];
   navigateToMarketOrders: (market: string) => void;
 };
 export type TransferDialogProps = { selectedAsset?: DydxChainAsset };

src/constants/markets.ts

@@ -16,6 +16,9 @@ export type MarketData = {
   // Displayable Market id (e.g. 'ETH-USD' or 'BUFFI-USD')
   displayId: Nullable<string>;
 
+  // Displayable asset id so just 'ETH' or 'BUFFI
+  displayableAsset: Nullable<string>;
+
   clobPairId: string;
   effectiveInitialMarginFraction: Nullable<number>;
   logo: string;

src/hooks/useTriggerOrdersFormInputs.ts

@@ -1,8 +1,9 @@
 import { useEffect, useState } from 'react';
 
+import { SubaccountOrder } from '@/abacus-ts/types/summaryTypes';
 import { shallowEqual, useDispatch } from 'react-redux';
 
-import { AbacusOrderType, SubaccountOrder, TriggerOrdersInputField } from '@/constants/abacus';
+import { AbacusOrderType, TriggerOrdersInputField } from '@/constants/abacus';
 
 import { useAppSelector } from '@/state/appTypes';
 import { setTriggerFormInputs } from '@/state/inputs';
@@ -11,7 +12,7 @@ import { getTriggerOrdersInputErrors } from '@/state/inputsSelectors';
 import abacusStateManager from '@/lib/abacus';
 import { isTruthy } from '@/lib/isTruthy';
 import { MustBigNumber } from '@/lib/numbers';
-import { isLimitOrderType } from '@/lib/orders';
+import { isLimitOrderTypeNew } from '@/lib/orders';
 
 export const useTriggerOrdersFormInputs = ({
   marketId,
@@ -50,22 +51,23 @@ export const useTriggerOrdersFormInputs = ({
         },
         {
           field: TriggerOrdersInputField.stopLossOrderSize,
-          value: stopLossOrder.size,
+          value: stopLossOrder.size.toNumber(),
           hasFormInput: false,
         },
         {
           field: TriggerOrdersInputField.stopLossOrderType,
-          value: stopLossOrder.type.rawValue,
+          // DANGER - only safe because they happen to match, manually verified
+          value: stopLossOrder.type,
           hasFormInput: false,
         },
         {
           field: TriggerOrdersInputField.stopLossPrice,
-          value: stopLossOrder.triggerPrice,
+          value: stopLossOrder.triggerPrice?.toNumber(),
           hasFormInput: true,
         },
-        isLimitOrderType(stopLossOrder.type) && {
+        isLimitOrderTypeNew(stopLossOrder.type) && {
           field: TriggerOrdersInputField.stopLossLimitPrice,
-          value: stopLossOrder.price,
+          value: stopLossOrder.price.toNumber(),
           hasFormInput: true,
         },
       ]
@@ -97,22 +99,23 @@ export const useTriggerOrdersFormInputs = ({
         },
         {
           field: TriggerOrdersInputField.takeProfitOrderSize,
-          value: takeProfitOrder.size,
+          value: takeProfitOrder.size.toNumber(),
           hasFormInput: false,
         },
         {
           field: TriggerOrdersInputField.takeProfitOrderType,
-          value: takeProfitOrder.type.rawValue,
+          // DANGER - only safe because they happen to match, manually verified
+          value: takeProfitOrder.type,
           hasFormInput: false,
         },
         {
           field: TriggerOrdersInputField.takeProfitPrice,
-          value: takeProfitOrder.triggerPrice,
+          value: takeProfitOrder.triggerPrice?.toNumber(),
           hasFormInput: true,
         },
-        isLimitOrderType(takeProfitOrder.type) && {
+        isLimitOrderTypeNew(takeProfitOrder.type) && {
           field: TriggerOrdersInputField.takeProfitLimitPrice,
-          value: takeProfitOrder.price,
+          value: takeProfitOrder.price.toNumber(),
           hasFormInput: true,
         },
       ]
@@ -136,15 +139,15 @@ export const useTriggerOrdersFormInputs = ({
 
     if (stopLossOrder?.size && takeProfitOrder?.size) {
       if (stopLossOrder.size === takeProfitOrder.size) {
-        setSize(stopLossOrder.size);
+        setSize(stopLossOrder.size.toNumber());
       } else {
         setSize(null);
         setDifferingOrderSizes(true);
       }
     } else if (stopLossOrder?.size) {
-      setSize(stopLossOrder.size);
+      setSize(stopLossOrder.size.toNumber());
     } else if (takeProfitOrder?.size) {
-      setSize(takeProfitOrder.size);
+      setSize(takeProfitOrder.size.toNumber());
     } else {
       // Default to full position size for initial order creation
       setSize(positionSize);
@@ -172,7 +175,7 @@ export const useTriggerOrdersFormInputs = ({
     inputSize,
     // Boolean to signify whether the limit box should be checked on initial render of the triggers order form
     existsLimitOrder:
-      !!(stopLossOrder && isLimitOrderType(stopLossOrder.type)) ||
-      !!(takeProfitOrder && isLimitOrderType(takeProfitOrder.type)),
+      !!(stopLossOrder && isLimitOrderTypeNew(stopLossOrder.type)) ||
+      !!(takeProfitOrder && isLimitOrderTypeNew(takeProfitOrder.type)),
   };
 };

src/lib/abacus/stateNotification.ts

@@ -26,7 +26,6 @@ import {
   setChildSubaccount,
   setCompliance,
   setFills,
-  setFundingPayments,
   setHistoricalPnl,
   setRestrictionType,
   setStakingBalances,
@@ -188,20 +187,6 @@ class AbacusStateNotifier implements AbacusStateNotificationProtocol {
           }
         }
 
-        if (changes.has(Changes.fundingPayments)) {
-          const fundingPayments =
-            updatedState.subaccountFundingPayments(subaccountId)?.toArray() ?? [];
-
-          if (isChildSubaccount) {
-            childSubaccountUpdate[subaccountId] = {
-              ...childSubaccountUpdate[subaccountId],
-              fundingPayments,
-            };
-          } else {
-            dispatch(setFundingPayments(fundingPayments));
-          }
-        }
-
         if (changes.has(Changes.transfers)) {
           const transfers = updatedState.subaccountTransfers(subaccountId)?.toArray() ?? [];
 

src/lib/marketsHelpers.ts

@@ -2,7 +2,11 @@ import { AssetData, PerpetualMarketSummary } from '@/abacus-ts/types/summaryType
 
 import { ISOLATED_LIQUIDITY_TIER_INFO, MarketData } from '@/constants/markets';
 
-import { getDisplayableTickerFromMarket, getMarketIdFromAsset } from './assetUtils';
+import {
+  getDisplayableAssetFromTicker,
+  getDisplayableTickerFromMarket,
+  getMarketIdFromAsset,
+} from './assetUtils';
 import { BIG_NUMBERS, MustBigNumber } from './numbers';
 import { safeAssign } from './objectHelpers';
 
@@ -28,6 +32,7 @@ export function getMarketDataFromPerpetualMarketSummary(
     ticker: id,
     assetId,
     displayableTicker: displayId,
+    displayableAsset,
     clobPairId,
     effectiveInitialMarginFraction,
     logo,
@@ -54,6 +59,7 @@ export function getMarketDataFromPerpetualMarketSummary(
     id,
     assetId,
     displayId,
+    displayableAsset,
     clobPairId,
     effectiveInitialMarginFraction,
     logo,
@@ -94,11 +100,13 @@ export function getMarketDataFromAsset(asset: AssetData, favoritedMarkets: strin
 
   const ticker = getMarketIdFromAsset(assetId);
   const displayId = getDisplayableTickerFromMarket(ticker);
+  const displayableAsset = getDisplayableAssetFromTicker(ticker);
 
   return safeAssign({}, {
     id: ticker,
     assetId,
     displayId,
+    displayableAsset,
     clobPairId: '-1',
     effectiveInitialMarginFraction: ISOLATED_LIQUIDITY_TIER_INFO.initialMarginFraction,
     logo,