chore(sltp): update sltp/sltplimit to be flagged behind env.json inst…

…ead of url params + enable sltp in all environments (#467) * update flags * fix bump * why is my translation non existent * sometimes all you have to do is restart your computer * fix circular dep * ungate on mainnet * switch pessimistic check to optimistic in mainnet * remove non v1 env.json changes
dydxprotocol · Apr 29, 2024 · 0ee3afe · 0ee3afe
1 parent ad56a5b
commit 0ee3afe
Show file tree

Hide file tree

Showing 13 changed files with 134 additions and 91 deletions.
diff --git a/package.json b/package.json
@@ -45,9 +45,9 @@
     "@cosmjs/proto-signing": "^0.32.1",
     "@cosmjs/stargate": "^0.32.1",
     "@cosmjs/tendermint-rpc": "^0.32.1",
-    "@dydxprotocol/v4-abacus": "^1.6.48",
+    "@dydxprotocol/v4-abacus": "^1.6.50",
     "@dydxprotocol/v4-client-js": "^1.1.7",
-    "@dydxprotocol/v4-localization": "^1.1.71",
+    "@dydxprotocol/v4-localization": "^1.1.74",
     "@ethersproject/providers": "^5.7.2",
     "@js-joda/core": "^5.5.3",
     "@privy-io/react-auth": "^1.59.7",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/public/configs/v1/env.json b/public/configs/v1/env.json
@@ -271,7 +271,9 @@
             "usePessimisticCollateralCheck": false,
             "useOptimisticCollateralCheck": true,
             "withdrawalSafetyEnabled": true,
-            "CCTPWithdrawalOnly": true
+            "CCTPWithdrawalOnly": true,
+            "isSlTpEnabled": true,
+            "isSlTpLimitOrdersEnabled": false
          }
       },
       "dydxprotocol-dev-2": {
@@ -300,7 +302,9 @@
             "usePessimisticCollateralCheck": false,
             "useOptimisticCollateralCheck": true,
             "withdrawalSafetyEnabled": true,
-            "CCTPWithdrawalOnly": true
+            "CCTPWithdrawalOnly": true,
+            "isSlTpEnabled": true,
+            "isSlTpLimitOrdersEnabled": false
          }
       },
       "dydxprotocol-dev-4": {
@@ -330,7 +334,9 @@
             "usePessimisticCollateralCheck": false,
             "useOptimisticCollateralCheck": true,
             "withdrawalSafetyEnabled": true,
-            "CCTPWithdrawalOnly": true
+            "CCTPWithdrawalOnly": true,
+            "isSlTpEnabled": true,
+            "isSlTpLimitOrdersEnabled": false
          }
       },
       "dydxprotocol-dev-5": {
@@ -359,7 +365,9 @@
             "usePessimisticCollateralCheck": false,
             "useOptimisticCollateralCheck": true,
             "withdrawalSafetyEnabled": true,
-            "CCTPWithdrawalOnly": true
+            "CCTPWithdrawalOnly": true,
+            "isSlTpEnabled": true,
+            "isSlTpLimitOrdersEnabled": false
          }
       },
       "dydxprotocol-staging": {
@@ -389,7 +397,9 @@
             "usePessimisticCollateralCheck": false,
             "useOptimisticCollateralCheck": true,
             "withdrawalSafetyEnabled": true,
-            "CCTPWithdrawalOnly": true
+            "CCTPWithdrawalOnly": true,
+            "isSlTpEnabled": true,
+            "isSlTpLimitOrdersEnabled": false
          }
       },
       "dydxprotocol-staging-forced-update": {
@@ -426,7 +436,9 @@
             "usePessimisticCollateralCheck": false,
             "useOptimisticCollateralCheck": true,
             "withdrawalSafetyEnabled": true,
-            "CCTPWithdrawalOnly": true
+            "CCTPWithdrawalOnly": true,
+            "isSlTpEnabled": true,
+            "isSlTpLimitOrdersEnabled": false
          }
       },
       "dydxprotocol-staging-west": {
@@ -456,7 +468,9 @@
             "usePessimisticCollateralCheck": false,
             "useOptimisticCollateralCheck": true,
             "withdrawalSafetyEnabled": true,
-            "CCTPWithdrawalOnly": true
+            "CCTPWithdrawalOnly": true,
+            "isSlTpEnabled": true,
+            "isSlTpLimitOrdersEnabled": false
          }
       },
       "dydxprotocol-testnet": {
@@ -490,7 +504,9 @@
             "usePessimisticCollateralCheck": false,
             "useOptimisticCollateralCheck": true,
             "withdrawalSafetyEnabled": true,
-            "CCTPWithdrawalOnly": true
+            "CCTPWithdrawalOnly": true,
+            "isSlTpEnabled": true,
+            "isSlTpLimitOrdersEnabled": false
          }
       },
       "dydxprotocol-testnet-dydx": {
@@ -519,7 +535,9 @@
             "reduceOnlySupported": true,
             "usePessimisticCollateralCheck": true,
             "withdrawalSafetyEnabled": true,
-            "CCTPWithdrawalOnly": true
+            "CCTPWithdrawalOnly": true,
+            "isSlTpEnabled": true,
+            "isSlTpLimitOrdersEnabled": false
          }
       },
       "dydxprotocol-testnet-nodefleet": {
@@ -549,7 +567,9 @@
             "usePessimisticCollateralCheck": false,
             "useOptimisticCollateralCheck": true,
             "withdrawalSafetyEnabled": true,
-            "CCTPWithdrawalOnly": true
+            "CCTPWithdrawalOnly": true,
+            "isSlTpEnabled": true,
+            "isSlTpLimitOrdersEnabled": false
          }
       },
       "dydxprotocol-testnet-kingnodes": {
@@ -578,7 +598,9 @@
             "reduceOnlySupported": true,
             "usePessimisticCollateralCheck": true,
             "withdrawalSafetyEnabled": true,
-            "CCTPWithdrawalOnly": true
+            "CCTPWithdrawalOnly": true,
+            "isSlTpEnabled": true,
+            "isSlTpLimitOrdersEnabled": false
          }
       },
       "dydxprotocol-testnet-liquify": {
@@ -608,7 +630,9 @@
             "usePessimisticCollateralCheck": false,
             "useOptimisticCollateralCheck": true,
             "withdrawalSafetyEnabled": true,
-            "CCTPWithdrawalOnly": true
+            "CCTPWithdrawalOnly": true,
+            "isSlTpEnabled": true,
+            "isSlTpLimitOrdersEnabled": false
          }
       },
       "dydxprotocol-testnet-polkachu": {
@@ -638,7 +662,9 @@
             "usePessimisticCollateralCheck": false,
             "useOptimisticCollateralCheck": true,
             "withdrawalSafetyEnabled": true,
-            "CCTPWithdrawalOnly": true
+            "CCTPWithdrawalOnly": true,
+            "isSlTpEnabled": true,
+            "isSlTpLimitOrdersEnabled": false
          }
       },
       "dydxprotocol-testnet-bware": {
@@ -668,7 +694,9 @@
             "usePessimisticCollateralCheck": false,
             "useOptimisticCollateralCheck": true,
             "withdrawalSafetyEnabled": true,
-            "CCTPWithdrawalOnly": true
+            "CCTPWithdrawalOnly": true,
+            "isSlTpEnabled": true,
+            "isSlTpLimitOrdersEnabled": false
          }
       },
       "dydxprotocol-mainnet": {
@@ -695,10 +723,12 @@
          },
          "featureFlags": {
             "reduceOnlySupported": true,
-            "usePessimisticCollateralCheck": true,
-            "useOptimisticCollateralCheck": false,
+            "usePessimisticCollateralCheck": false,
+            "useOptimisticCollateralCheck": true,
             "withdrawalSafetyEnabled": true,
-            "CCTPWithdrawalOnly": true
+            "CCTPWithdrawalOnly": true,
+            "isSlTpEnabled": true,
+            "isSlTpLimitOrdersEnabled": false
          }
       }
    }

diff --git a/src/hooks/useEnvFeatures.ts b/src/hooks/useEnvFeatures.ts
@@ -8,6 +8,8 @@ export interface EnvironmentFeatures {
   reduceOnlySupported: boolean;
   withdrawalSafetyEnabled: boolean;
   CCTPWithdrawalOnly: boolean;
+  isSlTpEnabled: boolean;
+  isSlTpLimitOrdersEnabled: boolean;
 }
 
 export const useEnvFeatures = (): EnvironmentFeatures => {

diff --git a/src/lib/orders.ts b/src/lib/orders.ts
@@ -19,8 +19,6 @@ import { IconName } from '@/components/Icon';
 import { convertAbacusOrderSide } from '@/lib/abacus/conversions';
 import { MustBigNumber } from '@/lib/numbers';
 
-import { testFlags } from './testFlags';
-
 export const getStatusIconInfo = ({
   status,
   totalFilled,
@@ -95,15 +93,15 @@ export const isLimitOrderType = (type?: AbacusOrderTypes) =>
     ({ ordinal }) => ordinal === type.ordinal
   );
 
-export const isStopLossOrder = (order: SubaccountOrder) => {
-  const validOrderTypes = testFlags.enableConditionalLimitOrders
+export const isStopLossOrder = (order: SubaccountOrder, isSlTpLimitOrdersEnabled: boolean) => {
+  const validOrderTypes = isSlTpLimitOrdersEnabled
     ? [AbacusOrderType.stopLimit, AbacusOrderType.stopMarket]
     : [AbacusOrderType.stopMarket];
   return validOrderTypes.some(({ ordinal }) => ordinal === order.type.ordinal) && order.reduceOnly;
 };
 
-export const isTakeProfitOrder = (order: SubaccountOrder) => {
-  const validOrderTypes = testFlags.enableConditionalLimitOrders
+export const isTakeProfitOrder = (order: SubaccountOrder, isSlTpLimitOrdersEnabled: boolean) => {
+  const validOrderTypes = isSlTpLimitOrdersEnabled
     ? [AbacusOrderType.takeProfitLimit, AbacusOrderType.takeProfitMarket]
     : [AbacusOrderType.takeProfitMarket];
   return validOrderTypes.some(({ ordinal }) => ordinal === order.type.ordinal) && order.reduceOnly;

diff --git a/src/lib/testFlags.ts b/src/lib/testFlags.ts
@@ -32,14 +32,6 @@ class TestFlags {
     return this.queryParams.address;
   }
 
-  get configureSlTpFromPositionsTable() {
-    return !!this.queryParams.sltp;
-  }
-
-  get enableConditionalLimitOrders() {
-    return !!this.queryParams.sltplimit;
-  }
-
   get isolatedMargin() {
     return !!this.queryParams.isolatedmargin;
   }

diff --git a/src/state/accountCalculators.ts b/src/state/accountCalculators.ts
@@ -1,15 +1,16 @@
 import { createSelector } from 'reselect';
 
 import { OnboardingState, OnboardingSteps } from '@/constants/account';
+import { type DydxNetwork } from '@/constants/networks';
+import { ENVIRONMENT_CONFIG_MAP } from '@/constants/networks';
 
 import {
   getOnboardingGuards,
   getOnboardingState,
   getSubaccountId,
   getUncommittedOrderClientIds,
 } from '@/state/accountSelectors';
-
-import { testFlags } from '@/lib/testFlags';
+import { getSelectedNetwork } from '@/state/appSelectors';
 
 export const calculateOnboardingStep = createSelector(
   [getOnboardingState, getOnboardingGuards],
@@ -91,8 +92,9 @@ export const calculateIsAccountLoading = createSelector(
  * @description calculate whether positions table should render triggers column
  */
 export const calculateShouldRenderTriggersInPositionsTable = createSelector(
-  [calculateIsAccountViewOnly],
-  (isAccountViewOnly: boolean) => !isAccountViewOnly && testFlags.configureSlTpFromPositionsTable
+  [calculateIsAccountViewOnly, getSelectedNetwork],
+  (isAccountViewOnly: boolean, selectedNetwork: DydxNetwork) =>
+    !isAccountViewOnly && ENVIRONMENT_CONFIG_MAP[selectedNetwork].featureFlags.isSlTpEnabled
 );
 
 /**

diff --git a/src/state/accountSelectors.ts b/src/state/accountSelectors.ts
@@ -179,32 +179,39 @@ export const getMarketSubaccountOpenOrders = (
  * @param state
  * @returns list of conditional orders that have not been filled or cancelled for all subaccount positions
  */
-export const getSubaccountConditionalOrders = createSelector(
-  [getMarketSubaccountOpenOrders, getOpenPositions],
-  (openOrdersByMarketId, positions) => {
-    const stopLossOrders: SubaccountOrder[] = [];
-    const takeProfitOrders: SubaccountOrder[] = [];
-
-    positions?.forEach((position) => {
-      const orderSideForConditionalOrder =
-        position?.side?.current === AbacusPositionSide.LONG
-          ? AbacusOrderSide.sell
-          : AbacusOrderSide.buy;
-
-      const conditionalOrders = openOrdersByMarketId[position.id];
-
-      conditionalOrders?.forEach((order: SubaccountOrder) => {
-        if (order.side === orderSideForConditionalOrder && isStopLossOrder(order)) {
-          stopLossOrders.push(order);
-        } else if (order.side === orderSideForConditionalOrder && isTakeProfitOrder(order)) {
-          takeProfitOrders.push(order);
-        }
+export const getSubaccountConditionalOrders = (isSlTpLimitOrdersEnabled: boolean) =>
+  createSelector(
+    [getMarketSubaccountOpenOrders, getOpenPositions],
+    (openOrdersByMarketId, positions) => {
+      const stopLossOrders: SubaccountOrder[] = [];
+      const takeProfitOrders: SubaccountOrder[] = [];
+
+      positions?.forEach((position) => {
+        const orderSideForConditionalOrder =
+          position?.side?.current === AbacusPositionSide.LONG
+            ? AbacusOrderSide.sell
+            : AbacusOrderSide.buy;
+
+        const conditionalOrders = openOrdersByMarketId[position.id];
+
+        conditionalOrders?.forEach((order: SubaccountOrder) => {
+          if (
+            order.side === orderSideForConditionalOrder &&
+            isStopLossOrder(order, isSlTpLimitOrdersEnabled)
+          ) {
+            stopLossOrders.push(order);
+          } else if (
+            order.side === orderSideForConditionalOrder &&
+            isTakeProfitOrder(order, isSlTpLimitOrdersEnabled)
+          ) {
+            takeProfitOrders.push(order);
+          }
+        });
       });
-    });
 
-    return { stopLossOrders, takeProfitOrders };
-  }
-);
+      return { stopLossOrders, takeProfitOrders };
+    }
+  );
 
 /**
  * @param state