Merge pull request #18 from dydxprotocol/sync/upstream-main-12-16-2025

chore: sync/upstream main 12 16 2025

Author: dwjanus

src/bonsai/forms/spot.ts

@@ -1,7 +1,11 @@
 import { LAMPORTS_PER_SOL } from '@solana/web3.js';
 
 import { SpotWalletStatus } from '@/constants/account';
-import { MIN_SOL_RESERVE } from '@/constants/spot';
+import {
+  DEFAULT_PRIORITY_FEE_LAMPORTS,
+  DEFAULT_SLIPPAGE_BPS,
+  MIN_SOL_RESERVE,
+} from '@/constants/spot';
 
 import { SpotApiCreateTransactionRequest, SpotApiSide, SpotApiTradeRoute } from '@/clients/spotApi';
 import { calc, mapIfPresent } from '@/lib/do';
@@ -151,6 +155,8 @@ function calculateSummary(state: SpotFormState, inputData: SpotFormInputData): S
             inAmount,
             pool: pairAddress,
             tradeRoute,
+            maxSlippageBps: DEFAULT_SLIPPAGE_BPS,
+            priorityFeeLamports: DEFAULT_PRIORITY_FEE_LAMPORTS,
           };
         }
       );
@@ -172,6 +178,8 @@ function calculateSummary(state: SpotFormState, inputData: SpotFormInputData): S
           inAmount,
           pool: pairAddress,
           tradeRoute,
+          maxSlippageBps: DEFAULT_SLIPPAGE_BPS,
+          priorityFeeLamports: DEFAULT_PRIORITY_FEE_LAMPORTS,
         };
       }
     );

src/bonsai/rest/spot.ts

@@ -52,7 +52,7 @@ export function setUpTokenMetadataQuery(store: RootStore) {
       queryKey: ['spot', 'tokenMetadata', currentSpotToken],
       queryFn: wrapAndLogBonsaiError(
         () => getSpotTokenMetadata(endpoint, currentSpotToken),
-        'tokenMetadata'
+        'spot/tokenMetadata'
       ),
       refetchInterval: timeUnits.minute * 5,
       staleTime: timeUnits.minute * 5,
@@ -64,8 +64,8 @@ export function setUpTokenMetadataQuery(store: RootStore) {
         store.dispatch(setSpotTokenMetadata(queryResultToLoadable(result)));
       } catch (e) {
         logBonsaiError(
-          'setUpTokenMetadataQuery',
-          'Error handling result from react query',
+          'spot/setUpTokenMetadataQuery',
+          'Error handling result from react query store effect',
           e,
           result
         );
@@ -90,7 +90,7 @@ export function setUpSolPriceQuery(store: RootStore) {
       queryKey: ['spotTokenPrice', SOL_MINT_ADDRESS],
       queryFn: wrapAndLogBonsaiError(
         () => getSpotTokenUsdPrice(params.endpoint, SOL_MINT_ADDRESS),
-        'solPrice'
+        'spot/solPrice'
       ),
       refetchInterval: timeUnits.second * 10,
       staleTime: timeUnits.second * 10,
@@ -101,7 +101,12 @@ export function setUpSolPriceQuery(store: RootStore) {
       try {
         store.dispatch(setSpotSolPrice(queryResultToLoadable(result)));
       } catch (e) {
-        logBonsaiError('setUpSolPriceQuery', 'Error handling result from react query', e, result);
+        logBonsaiError(
+          'spot/setUpSolPriceQuery',
+          'Error handling result from react query store effect',
+          e,
+          result
+        );
       }
     });
 
@@ -123,7 +128,7 @@ export function setUpSpotTokenPriceQuery(store: RootStore) {
       queryKey: ['spotTokenPrice', params.currentSpotToken],
       queryFn: wrapAndLogBonsaiError(
         () => getSpotTokenUsdPrice(params.endpoint, params.currentSpotToken),
-        'tokenPrice'
+        'spot/tokenPrice'
       ),
       refetchInterval: timeUnits.second * 10,
       staleTime: timeUnits.second * 10,
@@ -135,8 +140,8 @@ export function setUpSpotTokenPriceQuery(store: RootStore) {
         store.dispatch(setSpotTokenPrice(queryResultToLoadable(result)));
       } catch (e) {
         logBonsaiError(
-          'setUpSpotTokenPriceQuery',
-          'Error handling result from react query',
+          'spot/setUpSpotTokenPriceQuery',
+          'Error handling result from react query store effect',
           e,
           result
         );
@@ -173,7 +178,7 @@ export function setUpPortfolioTradesQuery(store: RootStore) {
       queryKey: ['spot', 'portfolioTrades', walletAddress],
       queryFn: wrapAndLogBonsaiError(
         () => getSpotPortfolioTrades(endpoint, walletAddress),
-        'portfolioTrades'
+        'spot/portfolioTrades'
       ),
       refetchInterval: timeUnits.minute * 2,
       staleTime: timeUnits.minute * 2,
@@ -185,8 +190,8 @@ export function setUpPortfolioTradesQuery(store: RootStore) {
         store.dispatch(setSpotPortfolioTrades(queryResultToLoadable(result)));
       } catch (e) {
         logBonsaiError(
-          'setUpPortfolioTradesQuery',
-          'Error handling result from react query',
+          'spot/setUpPortfolioTradesQuery',
+          'Error handling result from react query store effect',
           e,
           result
         );

src/clients/spotApi.ts

@@ -1,8 +1,7 @@
 import { logBonsaiError } from '@/bonsai/logs';
 
-import { DEFAULT_PRIORITY_FEE_LAMPORTS, DEFAULT_SLIPPAGE_BPS } from '@/constants/spot';
-
 import { simpleFetch } from '@/lib/simpleFetch';
+import { isPresent } from '@/lib/typeUtils';
 
 export enum SpotApiLandingMethod {
   JITO = 'jito',
@@ -34,10 +33,10 @@ export type SpotApiCreateTransactionRequest = {
   tokenMint: string;
   side: SpotApiSide;
   inAmount: string;
-  maxSlippageBps?: number;
+  maxSlippageBps: number;
   pool: string;
   tradeRoute: SpotApiTradeRoute;
-  priorityFeeLamports?: number;
+  priorityFeeLamports: number;
 };
 
 export type SpotApiTransactionMetadataObject = {
@@ -191,13 +190,27 @@ export type SpotApiBarsResolution =
   | '1D'
   | '7D';
 
+export enum SpotApiTokenPairStatisticsType {
+  Filtered = 'FILTERED',
+  Unfiltered = 'UNFILTERED',
+}
+
 export type SpotApiGetBarsQuery = {
   from: number; // unix timestamp
   tokenMint: string;
   to?: number; // unix timestamp, defaults to current time
   resolution?: SpotApiBarsResolution;
+  statsType?: SpotApiTokenPairStatisticsType;
+  removeEmptyBars?: boolean;
+  removeLeadingNullValues?: boolean;
+  countback?: number;
 };
 
+export enum SpotApiHistoricalBarsStatus {
+  OK = 'ok',
+  NO_DATA = 'no_data',
+}
+
 export interface SpotApiGetBarsResponseData {
   buyVolume: string[];
   buyers: number[];
@@ -215,7 +228,7 @@ export interface SpotApiGetBarsResponseData {
   transactions: number[];
   volume: string[];
   volumeNativeToken: string[];
-  s: string;
+  s: SpotApiHistoricalBarsStatus;
   pair: Record<string, any>;
 }
 
@@ -291,20 +304,12 @@ export class SpotApiClient {
   }
 
   async getBars(query: SpotApiGetBarsQuery) {
-    const params = new URLSearchParams({
-      from: query.from.toString(),
-      tokenMint: query.tokenMint,
-    });
-
-    if (query.to) {
-      params.append('to', query.to.toString());
-    }
-
-    if (query.resolution) {
-      params.append('resolution', query.resolution);
-    }
-
-    return this._get<SpotApiGetBarsResponse>(`tokens/bars?${params.toString()}`);
+    const params = new URLSearchParams(
+      Object.entries(query)
+        .filter(([_, v]) => isPresent(v))
+        .map(([k, v]) => [k, String(v)])
+    );
+    return this._get<SpotApiGetBarsResponse>(`tokens/bars?${params}`);
   }
 
   async createTransaction(request: SpotApiCreateTransactionRequest) {
@@ -353,14 +358,7 @@ export const createSpotTransaction = async (
   request: SpotApiCreateTransactionRequest
 ) => {
   const client = getOrCreateSpotApiClient(apiUrl);
-
-  const requestWithDefaults: Required<SpotApiCreateTransactionRequest> = {
-    ...request,
-    maxSlippageBps: request.maxSlippageBps ?? DEFAULT_SLIPPAGE_BPS,
-    priorityFeeLamports: request.priorityFeeLamports ?? DEFAULT_PRIORITY_FEE_LAMPORTS,
-  };
-
-  return client.createTransaction(requestWithDefaults);
+  return client.createTransaction(request);
 };
 
 export const landSpotTransaction = async (
@@ -387,8 +385,7 @@ export const transformBarsResponseToBars = (
 
 export const getSpotBars = async (apiUrl: string, query: SpotApiGetBarsQuery) => {
   const client = getOrCreateSpotApiClient(apiUrl);
-  const response = await client.getBars(query);
-  return transformBarsResponseToBars(response);
+  return client.getBars(query);
 };
 
 export const getSpotPortfolioTrades = async (apiUrl: string, address: string) => {

src/constants/analytics.ts

@@ -1,3 +1,4 @@
+import { type SpotBuyInputType, type SpotSellInputType } from '@/bonsai/forms/spot';
 import { OrderSide, TradeFormType } from '@/bonsai/forms/trade/types';
 import { PlaceOrderPayload } from '@/bonsai/forms/triggers/types';
 import { ApiStatus, SubaccountFill } from '@/bonsai/types/summaryTypes';
@@ -11,6 +12,8 @@ import { type ConnectorType, type DydxAddress, type WalletType } from '@/constan
 
 import type { Deposit, Withdraw } from '@/state/transfers';
 
+import { type SpotApiSide, type SpotApiTradeRoute } from '@/clients/spotApi';
+
 import type { OnboardingState, OnboardingSteps } from './account';
 import { type DialogTypesTypes } from './dialogs';
 import type { SupportedLocales } from './localization';
@@ -80,6 +83,7 @@ export const AnalyticsUserProperties = unionize(
 
     // Account
     DydxAddress: ofType<DydxAddress | null>(),
+    SolanaAddress: ofType<string | null>(),
     SubaccountNumber: ofType<number | null>(),
 
     // Affiliate
@@ -109,6 +113,7 @@ export const AnalyticsUserPropertyLoggableTypes = {
   WalletAddress: 'walletAddress',
   IsRememberMe: 'isRememberMe',
   DydxAddress: 'dydxAddress',
+  SolanaAddress: 'solanaAddress',
   SubaccountNumber: 'subaccountNumber',
   AffiliateAddress: 'affiliateAddress',
   BonsaiValidatorUrl: 'bonsaiValidator',
@@ -596,6 +601,53 @@ export const AnalyticsEvents = unionize(
       campaign: string;
       timestamp: number;
     }>(),
+
+    // Spot Trading
+    SpotTransactionSubmitStarted: ofType<{
+      side: SpotApiSide;
+      tokenMint: string;
+      tokenSymbol?: string;
+      tradeRoute: SpotApiTradeRoute;
+      estimatedUsdAmount?: number;
+      inputType: SpotBuyInputType | SpotSellInputType;
+    }>(),
+    SpotTransactionSubmitSuccess: ofType<{
+      side: SpotApiSide;
+      tokenMint: string;
+      tokenSymbol?: string;
+      tradeRoute: SpotApiTradeRoute;
+      usdAmount: number;
+      solAmount: number;
+      timingMs: Record<string, number>;
+    }>(),
+    SpotTransactionSubmitError: ofType<{
+      side: SpotApiSide;
+      tokenMint: string;
+      tokenSymbol?: string;
+      tradeRoute: SpotApiTradeRoute;
+      estimatedUsdAmount?: number;
+      step: string;
+      errorName: string;
+      errorMessage: string;
+    }>(),
+
+    // Spot Withdrawal
+    SpotSolWithdrawalStarted: ofType<{
+      solAmount: number;
+    }>(),
+    SpotSolWithdrawalSuccess: ofType<{
+      solAmount: number;
+      timingMs: Record<string, number>;
+    }>(),
+    SpotSolWithdrawalError: ofType<{
+      solAmount: number;
+      step: string;
+      errorName: string;
+      errorMessage: string;
+    }>(),
+
+    // Spot Deposit
+    SpotDepositInitiated: ofType<{}>(),
   },
   { tag: 'type' as const, value: 'payload' as const }
 );

src/constants/spot.ts

@@ -7,3 +7,4 @@ export const SOLANA_BASE_TRANSACTION_FEE = 0.000005;
 export const SOL_WITHDRAWAL_POLL_INTERVAL_MS = 1000;
 export const SOL_WITHDRAWAL_TIMEOUT_MS = 30000;
 export const SPOT_DEFAULT_TOKEN_MINT = 'DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263';
+export const SPOT_TV_DEFAULT_VISIBLE_BAR_COUNT = 250;

src/hooks/tradingView/useSpotChartMarketAndResolution.ts

@@ -2,7 +2,8 @@ import { useEffect, useRef } from 'react';
 
 import type { ResolutionString } from 'public/tradingview/charting_library';
 
-import { DEFAULT_RESOLUTION, SPOT_RESOLUTION_CHART_CONFIGS } from '@/constants/candles';
+import { DEFAULT_RESOLUTION } from '@/constants/candles';
+import { SPOT_TV_DEFAULT_VISIBLE_BAR_COUNT } from '@/constants/spot';
 import type { TvWidget } from '@/constants/tvchart';
 
 import { useAppSelector } from '@/state/appTypes';
@@ -42,29 +43,43 @@ export const useSpotChartMarketAndResolution = ({
       tvWidget
         .activeChart()
         .onIntervalChanged()
-        .subscribe(null, (newResolution) => {
-          setVisibleRangeForResolution(tvWidget, newResolution);
+        .subscribe(null, () => {
+          setVisibleRange(tvWidget);
         });
 
-      // Set visible range on initial render
-      setVisibleRangeForResolution(tvWidget, resolution);
+      setVisibleRange(tvWidget);
     });
   }, [tokenMint, tvWidget]);
 };
 
-const setVisibleRangeForResolution = (tvWidget: TvWidget, resolution: ResolutionString) => {
-  const defaultRange: number | undefined = SPOT_RESOLUTION_CHART_CONFIGS[resolution]?.defaultRange;
-
-  if (defaultRange) {
-    const to = Date.now() / 1000;
-    const from = (Date.now() - defaultRange) / 1000;
-
-    tvWidget.activeChart().setVisibleRange(
-      {
-        from,
-        to,
-      },
-      { percentRightMargin: 10 }
-    );
-  }
+const setVisibleRange = (tvWidget: TvWidget) => {
+  const defaultBarCount = SPOT_TV_DEFAULT_VISIBLE_BAR_COUNT;
+  const chart = tvWidget.activeChart();
+
+  const handleDataLoaded = () => {
+    chart
+      .exportData({ includeTime: true, includeSeries: true, includedStudies: [] })
+      .then((exportedData) => {
+        const bars = exportedData.data;
+        if (bars.length === 0) return;
+
+        const startIndex = Math.max(0, bars.length - defaultBarCount);
+        const fromBar = bars[startIndex];
+        const toBar = bars[bars.length - 1];
+        const from = fromBar?.[0];
+        const to = toBar?.[0];
+
+        if (from && to) {
+          chart.setVisibleRange({ from, to }, { percentRightMargin: 10 });
+        }
+      })
+      .catch(() => {
+        // Fallback: do nothing, let TradingView use default zoom
+      });
+
+    // Unsubscribe after handling
+    chart.onDataLoaded().unsubscribe(null, handleDataLoaded);
+  };
+
+  chart.onDataLoaded().subscribe(null, handleDataLoaded);
 };