add test flag

package.json

@@ -40,9 +40,9 @@
     "@cosmjs/proto-signing": "^0.32.1",
     "@cosmjs/stargate": "^0.32.1",
     "@cosmjs/tendermint-rpc": "^0.32.1",
-    "@dydxprotocol/v4-abacus": "^1.4.9",
+    "@dydxprotocol/v4-abacus": "^1.4.6",
     "@dydxprotocol/v4-client-js": "^1.0.20",
-    "@dydxprotocol/v4-localization": "^1.1.34",
+    "@dydxprotocol/v4-localization": "^1.1.31",
     "@ethersproject/providers": "^5.7.2",
     "@js-joda/core": "^5.5.3",
     "@radix-ui/react-accordion": "^1.1.2",

pnpm-lock.yaml

@@ -1,9 +1,5 @@
 lockfileVersion: '6.0'
 
-settings:
-  autoInstallPeers: true
-  excludeLinksFromLockfile: false
-
 overrides:
   follow-redirects: 1.15.3
 
@@ -30,14 +26,14 @@ dependencies:
     specifier: ^0.32.1
     version: 0.32.2
   '@dydxprotocol/v4-abacus':
-    specifier: ^1.4.9
-    version: 1.4.9
+    specifier: ^1.4.6
+    version: 1.4.6
   '@dydxprotocol/v4-client-js':
     specifier: ^1.0.20
     version: 1.0.20
   '@dydxprotocol/v4-localization':
-    specifier: ^1.1.34
-    version: 1.1.34
+    specifier: ^1.1.31
+    version: 1.1.31
   '@ethersproject/providers':
     specifier: ^5.7.2
     version: 5.7.2
@@ -1290,8 +1286,8 @@ packages:
     resolution: {integrity: sha512-Gg5t+eR7vPJMAmhkFt6CZrzPd0EKpAslWwk5rFVYZpJsM8JG5KT9XQ99hgNM3Ov6ScNoIWbXkpX27F6A9cXR4Q==}
     dev: false
 
-  /@dydxprotocol/v4-abacus@1.4.9:
-    resolution: {integrity: sha512-OnrD5Db7AGSxyQE+gWRmkBuXbkZMfSEDB+v2s+ft0zgd4D5j/WTZkk1RG0fn8ISV4AffoN5T24jBWxLfqVlmZw==}
+  /@dydxprotocol/v4-abacus@1.4.6:
+    resolution: {integrity: sha512-qYq+4TizcMMxYVXckn0LCucWBe5N9ZNtD1XnowCAuBUUifHSgMGvao5OeZIKMgNM/udSKOXLss4zLy6dH/G2SA==}
     dev: false
 
   /@dydxprotocol/v4-client-js@1.0.20:
@@ -1323,8 +1319,8 @@ packages:
       - utf-8-validate
     dev: false
 
-  /@dydxprotocol/v4-localization@1.1.34:
-    resolution: {integrity: sha512-I7zivjv8gS+6b9n7/wh7PY9QEUDIIyLx9ugZ5K6ybar0xT/06yupOVdVE6iLivQ/IAsVi/RFHkD8bQd0DWCetg==}
+  /@dydxprotocol/v4-localization@1.1.31:
+    resolution: {integrity: sha512-plJVIgFAKq9/hA/gk5GgKgCQFsH3pNtDWfG/yHLDXyiGX0M0mMEi1bTNVs4podFVoHJu1nSL9YPFlpJ00FteGw==}
     dev: false
 
   /@dydxprotocol/v4-proto@4.0.0-dev.0:
@@ -16053,3 +16049,7 @@ packages:
   /zwitch@2.0.4:
     resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
     dev: true
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false

public/configs/cctp.json

@@ -1,22 +1,12 @@
 [
-  {
-    "chainId": "1",
-    "tokenAddress": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-    "name": "Ethereum"
-  },
-  {
-    "chainId": "5",
-    "tokenAddress": "0x07865c6E87B9F70255377e024ace6630C1Eaa37F",
-    "name": "Ethereum Goerli"
-  },
-  {
-    "chainId": "43114",
-    "tokenAddress": "0xB97EF9Ef8734C71904D8002F8b6Bc66Dd9c48a6E",
-    "name": "Avalanche"
-  },
-  {
-    "chainId": "10",
-    "tokenAddress": "0x0b2C639c533813f4Aa9D7837CAf62653d097Ff85",
-    "name": "optimism"
-  }
-]
+    {
+        "chainId": "1",
+        "tokenAddress": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
+        "name": "Ethereum"
+    },
+    {
+        "chainId": "5",
+        "tokenAddress": "0x07865c6E87B9F70255377e024ace6630C1Eaa37F",
+        "name": "Ethereum Goerli"
+    }
+]

public/configs/markets.json

@@ -428,13 +428,6 @@
     "whitepaperLink": "https://solana.com/solana-whitepaper.pdf",
     "coinMarketCapsLink": "https://coinmarketcap.com/currencies/solana/"
   },
-  "STRK-USD": {
-    "name": "Starknet",
-    "tags": ["Layer 2"],
-    "websiteLink": "https://www.starknet.io/en",
-    "whitepaperLink": "https://docs.starknet.io/documentation/",
-    "coinMarketCapsLink": "https://coinmarketcap.com/currencies/starknet-token/"
-  },
   "STX-USD": {
     "name": "Stacks",
     "tags": ["Layer 2"],

public/configs/otherMarketExchangeConfig.json

@@ -513,14 +513,6 @@
     { "exchangeName": "Okx", "ticker": "SOL-USDT", "adjustByMarket": "USDT-USD" },
     { "exchangeName": "Mexc", "ticker": "SOL_USDT", "adjustByMarket": "USDT-USD" }
   ],
-  "STRK": [
-    { "exchangeName": "Binance", "ticker": "STRKUSDT", "adjustByMarket": "USDT-USD" },
-    { "exchangeName": "Bybit", "ticker": "STRKUSDT", "adjustByMarket": "USDT-USD" },
-    { "exchangeName": "Kraken", "ticker": "STRKUSD" },
-    { "exchangeName": "Kucoin", "ticker": "STRK-USDT", "adjustByMarket": "USDT-USD" },
-    { "exchangeName": "Okx", "ticker": "STRK-USDT", "adjustByMarket": "USDT-USD" },
-    { "exchangeName": "Gate", "ticker": "STRK_USDT", "adjustByMarket": "USDT-USD" }
-  ],
   "STX": [
     { "exchangeName": "Binance", "ticker": "STXUSDT", "adjustByMarket": "USDT-USD" },
     { "exchangeName": "Bybit", "ticker": "STXUSDT", "adjustByMarket": "USDT-USD" },

public/configs/otherMarketParameters.json

@@ -968,23 +968,6 @@
     "minOrderSize": 1000000,
     "quantumConversionExponent": -9
   },
-  {
-    "baseAsset": "STRK",
-    "referencePrice": 2.05,
-    "numOracles": 6,
-    "liquidityTier": 2,
-    "assetName": "Starknet",
-    "p": 0.0,
-    "atomicResolution": -6.0,
-    "minExchanges": 3,
-    "minPriceChangePpm": 4000,
-    "priceExponent": -9.0,
-    "stepBaseQuantum": 1000000,
-    "ticksizeExponent": -3,
-    "subticksPerTick": 1000000,
-    "minOrderSize": 1000000,
-    "quantumConversionExponent": -9
-  },
   {
     "baseAsset": "STX",
     "referencePrice": 1.5144048703611412,

src/hooks/tradingView/useChartLines.ts

@@ -9,16 +9,14 @@ import type { ChartLine, TvWidget } from '@/constants/tvchart';
 
 import { useStringGetter } from '@/hooks';
 
-import {
-  getCurrentMarketOrders,
-  getCurrentMarketPositionData,
-  getIsAccountConnected,
-} from '@/state/accountSelectors';
+import { getCurrentMarketOrders, getCurrentMarketPositionData } from '@/state/accountSelectors';
 import { getAppTheme, getAppColorMode } from '@/state/configsSelectors';
 
 import { MustBigNumber } from '@/lib/numbers';
 import { getChartLineColors } from '@/lib/tradingView/utils';
 
+let chartLines: Record<string, ChartLine> = {};
+
 /**
  * @description Hook to handle drawing chart lines
  */
@@ -27,47 +25,43 @@ export const useChartLines = ({
   tvWidget,
   displayButton,
   isChartReady,
-  chartLinesRef,
 }: {
   tvWidget: TvWidget | null;
   displayButton: HTMLElement | null;
-  isChartReady: boolean;
-  chartLinesRef: React.MutableRefObject<Record<string, ChartLine>>;
+  isChartReady?: boolean;
 }) => {
-  const [showOrderLines, setShowOrderLines] = useState(true);
+  const [showOrderLines, setShowOrderLines] = useState(false);
 
   const stringGetter = useStringGetter();
 
   const appTheme = useSelector(getAppTheme);
   const appColorMode = useSelector(getAppColorMode);
 
-  const isAccountConnected = useSelector(getIsAccountConnected);
-
   const currentMarketPositionData = useSelector(getCurrentMarketPositionData, shallowEqual);
   const currentMarketOrders: SubaccountOrder[] = useSelector(getCurrentMarketOrders, shallowEqual);
 
   useEffect(() => {
     if (isChartReady && displayButton) {
-      displayButton.onclick = () => setShowOrderLines(!showOrderLines);
+      displayButton.onclick = () => {
+        const newShowOrderLinesState = !showOrderLines;
+        if (newShowOrderLinesState) {
+          displayButton?.classList?.add('order-lines-active');
+        } else {
+          displayButton?.classList?.remove('order-lines-active');
+        }
+        setShowOrderLines(newShowOrderLinesState);
+      };
     }
   }, [isChartReady, showOrderLines]);
 
   useEffect(() => {
-    if (!isAccountConnected) {
-      deleteChartLines();
-    }
-  }, [isAccountConnected]);
-
-  useEffect(() => {
-    if (isChartReady && tvWidget) {
+    if (tvWidget && isChartReady) {
       tvWidget.onChartReady(() => {
         tvWidget.chart().dataReady(() => {
           if (showOrderLines) {
-            displayButton?.classList?.add('order-lines-active');
             drawOrderLines();
             drawPositionLine();
           } else {
-            displayButton?.classList?.remove('order-lines-active');
             deleteChartLines();
           }
         });
@@ -84,13 +78,13 @@ export const useChartLines = ({
     const key = currentMarketPositionData.id;
     const price = MustBigNumber(entryPrice).toNumber();
 
-    const maybePositionLine = chartLinesRef.current[key]?.line;
+    const maybePositionLine = chartLines[key]?.line;
     const shouldShow = size && size !== 0;
 
     if (!shouldShow) {
       if (maybePositionLine) {
         maybePositionLine.remove();
-        delete chartLinesRef.current[key];
+        delete chartLines[key];
         return;
       }
     } else {
@@ -112,9 +106,9 @@ export const useChartLines = ({
           .setQuantity(quantity);
 
         if (positionLine) {
-          const chartLine: ChartLine = { line: positionLine, chartLineType: 'position' };
+          const chartLine = { line: positionLine, chartLineType: 'position' };
           setLineColors({ chartLine: chartLine });
-          chartLinesRef.current[key] = chartLine;
+          chartLines[key] = chartLine;
         }
       }
     }
@@ -149,12 +143,12 @@ export const useChartLines = ({
           !cancelReason &&
           (status === AbacusOrderStatus.open || status === AbacusOrderStatus.untriggered);
 
-        const maybeOrderLine = chartLinesRef.current[key]?.line;
+        const maybeOrderLine = chartLines[key]?.line;
 
         if (!shouldShow) {
           if (maybeOrderLine) {
             maybeOrderLine.remove();
-            delete chartLinesRef.current[key];
+            delete chartLines[key];
             return;
           }
         } else {
@@ -176,7 +170,7 @@ export const useChartLines = ({
                 chartLineType: ORDER_SIDES[side.name],
               };
               setLineColors({ chartLine: chartLine });
-              chartLinesRef.current[key] = chartLine;
+              chartLines[key] = chartLine;
             }
           }
         }
@@ -185,10 +179,10 @@ export const useChartLines = ({
   };
 
   const deleteChartLines = () => {
-    Object.values(chartLinesRef.current).forEach(({ line }) => {
+    Object.values(chartLines).forEach(({ line }) => {
       line.remove();
     });
-    chartLinesRef.current = {};
+    chartLines = {};
   };
 
   const setLineColors = ({ chartLine }: { chartLine: ChartLine }) => {
@@ -210,4 +204,6 @@ export const useChartLines = ({
     maybeQuantityColor &&
       line.setLineColor(maybeQuantityColor).setQuantityBackgroundColor(maybeQuantityColor);
   };
+
+  return { chartLines };
 };

src/hooks/tradingView/useChartMarketAndResolution.ts

@@ -38,7 +38,7 @@ export const useChartMarketAndResolution = ({
    * @description Hook to handle changing markets - intentionally should avoid triggering on change of resolutions.
    */
   useEffect(() => {
-    if (isWidgetReady && currentMarketId !== tvWidget?.activeChart().symbol()) {
+    if (currentMarketId && isWidgetReady) {
       const resolution = savedResolution || selectedResolution;
       tvWidget?.setSymbol(currentMarketId, resolution as ResolutionString, () => {});
     }

src/lib/abacus/dydxChainTransactions.ts

@@ -34,7 +34,7 @@ import {
 import { DEFAULT_TRANSACTION_MEMO } from '@/constants/analytics';
 import { DialogTypes } from '@/constants/dialogs';
 import { UNCOMMITTED_ORDER_TIMEOUT_MS } from '@/constants/trade';
-import { DydxChainId, isTestnet } from '@/constants/networks';
+import { DydxNetwork, isTestnet } from '@/constants/networks';
 
 import { RootStore } from '@/state/_store';
 import { addUncommittedOrderClientId, removeUncommittedOrderClientId } from '@/state/account';
@@ -44,10 +44,7 @@ import { StatefulOrderError } from '../errors';
 import { bytesToBigInt } from '../numbers';
 import { log } from '../telemetry';
 import { hashFromTx, getMintscanTxLink } from '../txUtils';
-
-(BigInt.prototype as any).toJSON = function () {
-  return this.toString();
-};
+import { getDydxChainIdFromNetwork } from '../network';
 
 class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
   private compositeClient: CompositeClient | undefined;
@@ -242,7 +239,10 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
 
       if (isTestnet) {
         console.log(
-          getMintscanTxLink(this.compositeClient.network.getString() as DydxChainId, hash)
+          getMintscanTxLink(
+            getDydxChainIdFromNetwork(this.compositeClient.network.getString() as DydxNetwork),
+            hash
+          )
         );
       } else console.log(`txHash: ${hash}`);
 
@@ -538,6 +538,7 @@ class DydxChainTransactions implements AbacusDYDXChainTransactionsProtocol {
           const result = await this.cctpWithdraw(params);
           callback(result);
           break;
+          break;
         }
         default: {
           break;

src/lib/network.ts

@@ -1,4 +1,8 @@
 import { type DydxNetwork, ENVIRONMENT_CONFIG_MAP, type DydxChainId } from '@/constants/networks';
 
 export const validateAgainstAvailableEnvironments = (value: DydxNetwork) =>
-  Object.keys(ENVIRONMENT_CONFIG_MAP).includes(value);
+  Object.keys(ENVIRONMENT_CONFIG_MAP).includes(value);
+
+export const getDydxChainIdFromNetwork = (network: DydxNetwork) => {
+  return ENVIRONMENT_CONFIG_MAP[network].dydxChainId as DydxChainId;
+};

src/lib/squid.ts

@@ -31,13 +31,13 @@ export const fetchSquidStatus = async (
 
   const response = await fetch(url, {
     headers: {
-      'x-integrator-id': integratorId || 'dYdX-api',
+      "x-integrator-id": integratorId || 'dYdX-api'
     },
   });
 
   if (!response.ok) {
     const error = await response.json();
-    throw error;
+    throw new Error(error);
   }
 
   return response.json();
@@ -45,4 +45,4 @@ export const fetchSquidStatus = async (
 
 export const getNobleChainId = () => {
   return isMainnet ? 'noble-1' : 'grand-1';
-};
+}

src/views/charts/TvChart.tsx

@@ -4,7 +4,7 @@ import styled, { type AnyStyledComponent, css } from 'styled-components';
 
 import type { ResolutionString } from 'public/tradingview/charting_library';
 
-import type { ChartLine, TvWidget } from '@/constants/tvchart';
+import type { TvWidget } from '@/constants/tvchart';
 
 import {
   useChartLines,
@@ -27,16 +27,13 @@ export const TvChart = () => {
   const displayButtonRef = useRef<HTMLElement | null>(null);
   const displayButton = displayButtonRef.current;
 
-  const chartLinesRef = useRef<Record<string, ChartLine>>({});
-  const chartLines = chartLinesRef.current;
-
   const { savedResolution } = useTradingView({ tvWidgetRef, displayButtonRef, setIsChartReady });
   useChartMarketAndResolution({
     tvWidget,
     isWidgetReady,
     savedResolution: savedResolution as ResolutionString | undefined,
   });
-  useChartLines({ tvWidget, displayButton, isChartReady, chartLinesRef });
+  const { chartLines } = useChartLines({ tvWidget, displayButton, isChartReady });
   useTradingViewTheme({ tvWidget, isWidgetReady, chartLines });
 
   return (