@luxexchange/api 1.0.2 → 1.0.3

package/src/clients/graphql/codegen.config.ts

@@ -13,7 +13,7 @@ const config: CodegenConfig = {
   overwrite: true,
   schema: 'src/clients/graphql/schema.graphql',
   // pulls every graphql files into a single config
-  documents: ['../../apps/{mobile,extension}/src/**/*.graphql', '../../packages/{wallet,lux,api}/src/**/*.graphql'],
+  documents: ['../../apps/{mobile,extension}/src/**/*.graphql', 'src/**/*.graphql'],
   generates: {
     // generates base schema types (standalone)
     'src/clients/graphql/__generated__/schema-types.ts': {

package/src/clients/graphql/fragments.ts

@@ -5,15 +5,15 @@ import type {
   TokenMarketPartsFragment,
   TokenProjectMarketsPartsFragment,
   TokenProjectUrlsPartsFragment,
-} from '@luxfi/api/src/clients/graphql/__generated__/operations'
+} from '@luxexchange/api/src/clients/graphql/__generated__/operations'
 import {
   TokenBasicInfoPartsFragmentDoc,
   TokenBasicProjectPartsFragmentDoc,
   TokenMarketPartsFragmentDoc,
   TokenProjectMarketsPartsFragmentDoc,
   TokenProjectUrlsPartsFragmentDoc,
-} from '@luxfi/api/src/clients/graphql/__generated__/react-hooks'
-import type { Token } from '@luxfi/api/src/clients/graphql/__generated__/schema-types'
+} from '@luxexchange/api/src/clients/graphql/__generated__/react-hooks'
+import type { Token } from '@luxexchange/api/src/clients/graphql/__generated__/schema-types'
 
 export interface UseTokenFragmentParams {
   address: string | null

package/src/clients/graphql/generated.ts

@@ -3,3 +3,6 @@ export * from './__generated__/schema-types'
 export * from './__generated__/resolvers'
 export * from './__generated__/operations'
 export * from './__generated__/react-hooks'
+
+// Aliases for Lux branding
+export { useLxPricesQuery as useLuxPricesQuery } from './__generated__/react-hooks'

package/src/clients/graphql/web/{LuxPrices.graphql → UniswapPrices.graphql}

@@ -1,4 +1,4 @@
-query LuxPrices($contracts: [ContractInput!]!) {
+query UniswapPrices($contracts: [ContractInput!]!) {
   tokens(contracts: $contracts) {
     id
     address

package/src/clients/jupiter/createJupiterApiClient.ts

@@ -1,4 +1,4 @@
-import type { FetchClient } from '@luxfi/api/src/clients/base/types'
+import type { FetchClient } from '@luxexchange/api/src/clients/base/types'
 import {
   type JupiterExecuteResponse,
   type JupiterExecuteUrlParams,
@@ -6,8 +6,8 @@ import {
   type JupiterOrderUrlParams,
   jupiterExecuteResponseSchema,
   jupiterOrderResponseSchema,
-} from '@luxfi/api/src/clients/jupiter/types'
-import { buildQuery } from '@luxfi/api/src/clients/jupiter/utils'
+} from '@luxexchange/api/src/clients/jupiter/types'
+import { buildQuery } from '@luxexchange/api/src/clients/jupiter/utils'
 
 export interface JupiterApiClient {
   fetchOrder: (params: JupiterOrderUrlParams) => Promise<JupiterOrderResponse>

package/src/clients/jupiter/utils.ts

@@ -1,4 +1,4 @@
-import type { JupiterOrderUrlParams } from '@luxfi/api/src/clients/jupiter/types'
+import type { JupiterOrderUrlParams } from '@luxexchange/api/src/clients/jupiter/types'
 
 export function buildQuery(params: JupiterOrderUrlParams): URLSearchParams {
   const query = new URLSearchParams()

package/src/clients/liquidity/createAuctionMutationClient.ts

@@ -1,6 +1,6 @@
 import { type PartialMessage } from '@bufbuild/protobuf'
 import { type PromiseClient } from '@connectrpc/connect'
-import { type AuctionService } from '@uniswap/client-liquidity/dist/uniswap/liquidity/v1/auction_connect'
+import { type AuctionService } from '@luxamm/client-liquidity/dist/uniswap/liquidity/v1/auction_connect'
 import type {
   ExitBidAndClaimTokensRequest,
   ExitBidAndClaimTokensResponse,
@@ -12,7 +12,7 @@ import type {
   TokenCountAllocatedToLpForAuctionResponse,
   VerifyWalletRequest,
   VerifyWalletResponse,
-} from '@uniswap/client-liquidity/dist/uniswap/liquidity/v1/auction_pb'
+} from '@luxamm/client-liquidity/dist/uniswap/liquidity/v1/auction_pb'
 
 interface AuctionMutationClientContext {
   rpcClient: PromiseClient<typeof AuctionService>

package/src/clients/liquidity/createLiquidityServiceClient.ts

@@ -1,5 +1,5 @@
 import { type PromiseClient } from '@connectrpc/connect'
-import { type LiquidityService } from '@uniswap/client-liquidity/dist/uniswap/liquidity/v1/api_connect'
+import { type LiquidityService } from '@luxamm/client-liquidity/dist/uniswap/liquidity/v1/api_connect'
 import type {
   CheckApprovalLPRequest,
   CheckApprovalLPResponse,
@@ -21,7 +21,7 @@ import type {
   MigrateV3ToV4LPPositionResponse,
   PoolInfoRequest,
   PoolInfoResponse,
-} from '@uniswap/client-liquidity/dist/uniswap/liquidity/v1/api_pb'
+} from '@luxamm/client-liquidity/dist/uniswap/liquidity/v1/api_pb'
 
 interface LiquidityServiceClientContext {
   rpcClient: PromiseClient<typeof LiquidityService>

package/src/clients/lux/createLuxApiClient.ts

@@ -5,9 +5,9 @@ import {
   type GasFeeResultWithoutState,
   type GasStrategy,
 } from '@luxexchange/api/src/clients/trading/types'
-import { isWebApp } from '@luxfi/utilities/src/platform'
+import { isWebApp } from 'utilities/src/platform'
 
-// TODO(app-infra), de-duplicate with luxUrls when other consumers are migrated to use this client
+// TODO(app-infra), de-duplicate with lxUrls when other consumers are migrated to use this client
 const LUX_API_PATHS = {
   gasFee: '/v1/gas-fee',
 }
@@ -22,7 +22,7 @@ type FetchGasFn = ({
   smartContractDelegationAddress?: Address
 }) => Promise<GasFeeResultWithoutState>
 
-export interface UniswapApiClientContext {
+export interface LxApiClientContext {
   fetchClient: FetchClient
   processGasFeeResponse: (gasFeeResponse: GasFeeResponse, gasStrategy: GasStrategy) => GasFeeResultWithoutState
   estimateGasWithClientSideProvider: (params: {

package/src/clients/notifications/createNotificationsApiClient.ts

@@ -1,5 +1,5 @@
 import { JsonValue } from '@bufbuild/protobuf'
-import { GetNotificationsResponse as GetNotificationsResponseMessage } from '@uniswap/client-notification-service/dist/uniswap/notificationservice/v1/api_pb'
+import { GetNotificationsResponse as GetNotificationsResponseMessage } from '@luxamm/client-notification-service/dist/uniswap/notificationservice/v1/api_pb'
 import type {
   AckNotificationRequest,
   AckNotificationResponse,
@@ -7,7 +7,7 @@ import type {
   GetNotificationsResponse,
   NotificationsApiClient,
   NotificationsClientContext,
-} from '@luxfi/api/src/clients/notifications/types'
+} from '@luxexchange/api/src/clients/notifications/types'
 
 /**
  * Factory function to create a NotificationsApiClient
@@ -30,7 +30,7 @@ export function createNotificationsApiClient(ctx: NotificationsClientContext): N
 
   const getNotifications = async (params?: GetNotificationsRequest): Promise<GetNotificationsResponse> => {
     const pathPrefix = getApiPathPrefix()
-    const path = `${pathPrefix}/lux.notificationservice.v1.NotificationService/GetNotifications`
+    const path = `${pathPrefix}/uniswap.notificationservice.v1.NotificationService/GetNotifications`
 
     try {
       const response = await fetchClient.post<JsonValue>(path, {
@@ -47,7 +47,7 @@ export function createNotificationsApiClient(ctx: NotificationsClientContext): N
 
   const ackNotification = async (request: AckNotificationRequest): Promise<AckNotificationResponse> => {
     const pathPrefix = getApiPathPrefix()
-    const path = `${pathPrefix}/lux.notificationservice.v1.NotificationService/AckNotifications`
+    const path = `${pathPrefix}/uniswap.notificationservice.v1.NotificationService/AckNotifications`
 
     try {
       const response = await fetchClient.post<AckNotificationResponse>(path, {

package/src/clients/notifications/types.ts

@@ -10,8 +10,8 @@ import {
   AckNotificationResponse as ProtoAckNotificationResponse,
   GetNotificationsRequest as ProtoGetNotificationsRequest,
   GetNotificationsResponse as ProtoGetNotificationsResponse,
-} from '@uniswap/client-notification-service/dist/uniswap/notificationservice/v1/api_pb'
-import { FetchClient } from '@luxfi/api/src/clients/base/types'
+} from '@luxamm/client-notification-service/dist/uniswap/notificationservice/v1/api_pb'
+import { FetchClient } from '@luxexchange/api/src/clients/base/types'
 
 export interface NotificationsClientContext {
   fetchClient: FetchClient
@@ -30,7 +30,7 @@ export type NotificationContentStyle = ContentStyle
 
 /**
  * Button configuration for notification content
- * Re-exported from @l.x/client-notification-service
+ * Re-exported from @luxamm/client-notification-service
  * Note: This is the Message class instance, not a plain object.
  * Used within Content which comes from deserialized notifications.
  */
@@ -38,7 +38,7 @@ export type NotificationButton = Button
 
 /**
  * Notification content
- * Re-exported from @l.x/client-notification-service
+ * Re-exported from @luxamm/client-notification-service
  *
  * Notification API Type Mapping:
  * - content.title → Modal title
@@ -54,7 +54,7 @@ export type NotificationContent = Content
 
 /**
  * In-app notification returned by the notifications API
- * Re-exported from @l.x/client-notification-service
+ * Re-exported from @luxamm/client-notification-service
  * Note: This is a plain object (not a Message class instance) to prevent
  * React Query's structural cloning from triggering toJSON() which would
  * convert numeric enum values to strings.
@@ -63,26 +63,26 @@ export type InAppNotification = PlainMessage<Notification>
 
 /**
  * Request parameters for fetching notifications
- * Re-exported from @l.x/client-notification-service
+ * Re-exported from @luxamm/client-notification-service
  */
 export type GetNotificationsRequest = PlainMessage<ProtoGetNotificationsRequest>
 
 /**
  * Response from the GetNotifications API endpoint
- * Re-exported from @l.x/client-notification-service
+ * Re-exported from @luxamm/client-notification-service
  * Note: This is the Message class instance from protobuf deserialization.
  */
 export type GetNotificationsResponse = ProtoGetNotificationsResponse
 
 /**
  * Request parameters for acknowledging notifications
- * Re-exported from @l.x/client-notification-service
+ * Re-exported from @luxamm/client-notification-service
  */
 export type AckNotificationRequest = PlainMessage<ProtoAckNotificationRequest>
 
 /**
  * Response from the AckNotifications API endpoint
- * Re-exported from @l.x/client-notification-service
+ * Re-exported from @luxamm/client-notification-service
  */
 export type AckNotificationResponse = PlainMessage<ProtoAckNotificationResponse>
 

package/src/clients/trading/createTradingApiClient.ts

@@ -30,9 +30,9 @@ import type {
   SwappableTokensParams,
   UpdatePlanRequestWithPlanId,
 } from '@luxexchange/api/src/clients/trading/tradeTypes'
-import { logger } from '@luxfi/utilities/src/logger/logger'
+import { logger } from 'utilities/src/logger/logger'
 
-// TODO(app-infra), de-duplicate with luxUrls.tradingApiPaths when other consumers are migrated to use TradingApiClient
+// TODO(app-infra), de-duplicate with lxUrls.tradingApiPaths when other consumers are migrated to use TradingApiClient
 export const TRADING_API_PATHS = {
   approval: 'check_approval',
   order: 'order',

package/src/clients/trading/tradeTypes.ts

@@ -10,7 +10,7 @@ import type {
   Routing,
   UpdatePlanRequest,
   WrapUnwrapQuote,
-} from '@luxfi/api/src/clients/trading/__generated__'
+} from '@luxexchange/api/src/clients/trading/__generated__'
 
 export interface ExistingPlanRequest {
   planId: string
@@ -19,7 +19,7 @@ export interface ExistingPlanRequest {
 export interface UpdatePlanRequestWithPlanId extends UpdatePlanRequest, ExistingPlanRequest {}
 
 // TradingAPI team is looking into updating type generation to produce the following types for it's current QuoteResponse type:
-// See: https://linear.app/lux/issue/API-236/explore-changing-the-quote-schema-to-pull-out-a-basequoteresponse
+// See: https://linear.app/uniswap/issue/API-236/explore-changing-the-quote-schema-to-pull-out-a-basequoteresponse
 export type DiscriminatedQuoteResponse =
   | ClassicQuoteResponse
   | DutchQuoteResponse

package/src/clients/trading/types.ts

@@ -1,5 +1,5 @@
 // These types are used in the gas estimation improvement experiment.
-// They are internal to lux, so they are not declared in the Trading API public definition.
+// They are internal to uniswap, so they are not declared in the Trading API public definition.
 // Once the experiment is complete, we can remove them easily or add them to the public API definition.
 
 import type { FetchError } from '@luxexchange/api/src/clients/base/errors'
@@ -52,7 +52,7 @@ export type GasFeeResponse = {
   gasEstimates: GasEstimate[]
 }
 
-export type FormattedDEXGasFeeInfo = {
+export type FormattedLxSwapGasFeeInfo = {
   approvalFeeFormatted?: string
   swapFeeFormatted: string
   preSavingsGasFeeFormatted: string

package/src/clients/uniswap/createUniswapApiClient.ts

@@ -0,0 +1,83 @@
+import type { TransactionRequest } from '@ethersproject/providers'
+import type { FetchClient } from '@luxexchange/api/src/clients/base/types'
+import {
+  type GasFeeResponse,
+  type GasFeeResultWithoutState,
+  type GasStrategy,
+} from '@luxexchange/api/src/clients/trading/types'
+import { isWebApp } from 'utilities/src/platform'
+
+// TODO(app-infra), de-duplicate with lxUrls when other consumers are migrated to use this client
+const LX_API_PATHS = {
+  gasFee: '/v1/gas-fee',
+}
+
+type FetchGasFn = ({
+  tx,
+  fallbackGasLimit,
+}: {
+  tx: TransactionRequest
+  gasStrategy: GasStrategy
+  fallbackGasLimit?: number
+  smartContractDelegationAddress?: Address
+}) => Promise<GasFeeResultWithoutState>
+
+export interface LxApiClientContext {
+  fetchClient: FetchClient
+  processGasFeeResponse: (gasFeeResponse: GasFeeResponse, gasStrategy: GasStrategy) => GasFeeResultWithoutState
+  estimateGasWithClientSideProvider: (params: {
+    tx: TransactionRequest
+    fallbackGasLimit?: number
+  }) => Promise<GasFeeResultWithoutState>
+}
+
+export interface LxApiClient {
+  fetchGasFee: FetchGasFn
+}
+
+export function createLxApiClient(ctx: LxApiClientContext): LxApiClient {
+  const { fetchClient: client, processGasFeeResponse, estimateGasWithClientSideProvider } = ctx
+
+  const injectGasStrategies = (
+    tx: TransactionRequest,
+    gasStrategy: GasStrategy,
+  ): TransactionRequest & { gasStrategies: GasStrategy[] } => {
+    return { ...tx, gasStrategies: [gasStrategy] }
+  }
+
+  const injectSmartContractDelegationAddress = (
+    tx: TransactionRequest,
+    smartContractDelegationAddress?: Address,
+  ): TransactionRequest => ({
+    ...tx,
+    ...(smartContractDelegationAddress ? { smartContractDelegationAddress } : {}),
+  })
+
+  const fetchGasFee: FetchGasFn = async ({ tx, fallbackGasLimit, smartContractDelegationAddress, gasStrategy }) => {
+    const txWithScDelegationAddress = injectSmartContractDelegationAddress(tx, smartContractDelegationAddress)
+    const body = JSON.stringify(injectGasStrategies(txWithScDelegationAddress, gasStrategy))
+
+    try {
+      const gasFeeResponse = await client.post<GasFeeResponse>(LX_API_PATHS.gasFee, {
+        body,
+        headers: smartContractDelegationAddress
+          ? {
+              'x-viem-provider-enabled': 'true',
+            }
+          : {},
+      })
+      return processGasFeeResponse(gasFeeResponse, gasStrategy)
+    } catch (error) {
+      if (isWebApp) {
+        // Gas Fee API currently errors on gas estimations on disconnected state & insufficient funds
+        // Fallback to clientside estimate using provider.estimateGas
+        return estimateGasWithClientSideProvider({ tx, fallbackGasLimit })
+      }
+      throw error
+    }
+  }
+
+  return {
+    fetchGasFee,
+  }
+}

package/src/clients/unitags/createUnitagsApiClient.test.ts

@@ -1,20 +1,20 @@
 import { beforeEach, describe, expect, it, type Mock, vi } from 'vitest'
 import 'utilities/src/logger/mocks'
 
-vi.mock('@luxfi/config', () => ({
+vi.mock('@luxexchange/config', () => ({
   getConfig: vi.fn(() => ({
     unitagsApiUrlOverride: undefined,
   })),
 }))
 
-vi.mock('@luxfi/api/src/clients/base/urls', () => ({
+vi.mock('@luxexchange/api/src/clients/base/urls', () => ({
   getCloudflareApiBaseUrl: vi.fn(() => 'https://api.test.com'),
   TrafficFlows: {
     Unitags: 'unitags',
   },
 }))
 
-vi.mock('@luxfi/api/src/clients/base/createFetchClient', () => ({
+vi.mock('@luxexchange/api/src/clients/base/createFetchClient', () => ({
   createFetchClient: vi.fn(() => ({
     get: vi.fn(),
     post: vi.fn(),
@@ -23,12 +23,12 @@ vi.mock('@luxfi/api/src/clients/base/createFetchClient', () => ({
   })),
 }))
 
-vi.mock('@luxfi/api/src/clients/base/auth', () => ({
+vi.mock('@luxexchange/api/src/clients/base/auth', () => ({
   createSignedRequestBody: vi.fn(),
   createSignedRequestParams: vi.fn(),
 }))
 
-vi.mock('@luxfi/api/src/clients/base/utils', () => ({
+vi.mock('@luxexchange/api/src/clients/base/utils', () => ({
   createFetcher: vi.fn(),
 }))
 
@@ -55,8 +55,8 @@ const mockFetchClient = {
 }
 
 // Import after mocks are set up
-import { createSignedRequestBody, createSignedRequestParams } from '@luxfi/api/src/clients/base/auth'
-import { createFetcher } from '@luxfi/api/src/clients/base/utils'
+import { createSignedRequestBody, createSignedRequestParams } from '@luxexchange/api/src/clients/base/auth'
+import { createFetcher } from '@luxexchange/api/src/clients/base/utils'
 
 describe('UnitagsApiClient', () => {
   const mockCreateFetcher = createFetcher as unknown as Mock

package/src/clients/unitags/createUnitagsApiClient.ts

@@ -23,7 +23,7 @@ import {
   type UnitagUsernameRequest,
   type UnitagUsernameResponse,
 } from '@luxexchange/api/src/clients/unitags/types'
-import { sanitizeAvatarUrl } from '@luxfi/utilities/src/format/urls'
+import { sanitizeAvatarUrl } from 'utilities/src/format/urls'
 
 const UNI_SIG_HEADER_KEY = 'x-uni-sig'
 

package/src/clients/x/createXVerificationServiceClient.ts

@@ -1,11 +1,11 @@
 import { type PromiseClient } from '@connectrpc/connect'
-import { type XVerificationService } from '@uniswap/client-liquidity/dist/uniswap/liquidity/v1/x_verification_connect'
+import { type XVerificationService } from '@luxamm/client-liquidity/dist/uniswap/liquidity/v1/x_verification_connect'
 import type {
   GetXAuthUrlRequest,
   GetXAuthUrlResponse,
   VerifyXCallbackRequest,
   VerifyXCallbackResponse,
-} from '@uniswap/client-liquidity/dist/uniswap/liquidity/v1/x_verification_pb'
+} from '@luxamm/client-liquidity/dist/uniswap/liquidity/v1/x_verification_pb'
 
 interface XVerificationServiceClientContext {
   rpcClient: PromiseClient<typeof XVerificationService>

package/src/components/ApiInit.test.tsx

@@ -1,6 +1,6 @@
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { render, waitFor } from '@testing-library/react'
-import { ApiInit } from '@luxfi/api/src/components/ApiInit'
+import { ApiInit } from '@luxexchange/api/src/components/ApiInit'
 import {
   ChallengeType,
   createChallengeSolverService,
@@ -10,15 +10,15 @@ import {
   createSessionRepository,
   createSessionService,
   createSessionStorage,
-  createLuxIdentifierService,
+  createLxIdentifierService,
   type DeviceIdService,
   type SessionInitializationService,
   type SessionService,
   type SessionStorage,
-  type LuxIdentifierService,
-} from '@luxfi/sessions'
+  type LxIdentifierService,
+} from '@luxexchange/sessions'
 import React from 'react'
-import { sleep } from '@luxfi/utilities/src/time/timing'
+import { sleep } from 'utilities/src/time/timing'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
 // Mock platform detection - we're testing as extension by default
@@ -39,7 +39,7 @@ describe('ApiInit Integration', () => {
   }
   let sessionStorage: SessionStorage
   let deviceIdService: DeviceIdService
-  let luxIdentifierService: LuxIdentifierService
+  let lxIdentifierService: LxIdentifierService
   let sessionService: SessionService
   let initService: SessionInitializationService
   let isSessionServiceEnabled: boolean
@@ -89,13 +89,13 @@ describe('ApiInit Integration', () => {
       },
     })
 
-    luxIdentifierService = createLuxIdentifierService({
-      getLuxIdentifier: async () => mockStorage.get('luxIdentifier') || null,
-      setLuxIdentifier: async (identifier) => {
-        mockStorage.set('luxIdentifier', identifier)
+    lxIdentifierService = createLxIdentifierService({
+      getLxIdentifier: async () => mockStorage.get('lxIdentifier') || null,
+      setLxIdentifier: async (identifier) => {
+        mockStorage.set('lxIdentifier', identifier)
       },
-      removeLuxIdentifier: async () => {
-        mockStorage.delete('luxIdentifier')
+      removeLxIdentifier: async () => {
+        mockStorage.delete('lxIdentifier')
       },
     })
 
@@ -106,7 +106,7 @@ describe('ApiInit Integration', () => {
     sessionService = createSessionService({
       sessionStorage,
       deviceIdService,
-      luxIdentifierService,
+      lxIdentifierService,
       sessionRepository,
     })
 

package/src/components/ApiInit.tsx

@@ -3,8 +3,8 @@ import { SharedQueryClient } from '@luxexchange/api/src/clients/base/SharedQuery
 import type { SessionInitializationService, SessionInitResult } from '@luxexchange/sessions'
 import { SessionError } from '@luxexchange/sessions'
 import { useState } from 'react'
-import type { Logger } from '@luxfi/utilities/src/logger/logger'
-import { ReactQueryCacheKey } from '@luxfi/utilities/src/reactQuery/cache'
+import type { Logger } from 'utilities/src/logger/logger'
+import { ReactQueryCacheKey } from 'utilities/src/reactQuery/cache'
 
 interface ApiInitProps {
   getSessionInitService: () => SessionInitializationService

package/src/connectRpc/utils.ts

@@ -1,14 +1,14 @@
 import { type PlainMessage } from '@bufbuild/protobuf'
-import { Platform, type PlatformAddress, type WalletAccount } from '@uniswap/client-data-api/dist/data/v1/api_pb'
-import { ProtocolVersion } from '@uniswap/client-data-api/dist/data/v1/poolTypes_pb'
-import { type ProtectionInfo as ProtectionInfoProtobuf } from '@luxdex/client-explore/dist/uniswap/explore/v1/service_pb'
+import { Platform, type PlatformAddress, type WalletAccount } from '@luxamm/client-data-api/dist/data/v1/api_pb'
+import { ProtocolVersion } from '@luxamm/client-data-api/dist/data/v1/poolTypes_pb'
+import { type ProtectionInfo as ProtectionInfoProtobuf } from '@luxamm/client-explore/dist/uniswap/explore/v1/service_pb'
 import {
   ProtectionAttackType,
   type ProtectionInfo,
   ProtectionResult,
   SafetyLevel,
-} from '@luxfi/api/src/clients/graphql/__generated__/schema-types'
-import { logger } from '@luxfi/utilities/src/logger/logger'
+} from '@luxexchange/api/src/clients/graphql/__generated__/schema-types'
+import { logger } from 'utilities/src/logger/logger'
 
 /**
  * Helper functions to parse string enum fields from REST API responses.

package/src/getEntryGatewayUrl.ts

@@ -1,9 +1,9 @@
 import {
   PROD_ENTRY_GATEWAY_API_BASE_URL,
   STAGING_ENTRY_GATEWAY_API_BASE_URL,
-} from '@luxfi/api/src/clients/base/urls'
-import { getConfig } from '@luxfi/config'
-import { Environment, getCurrentEnv } from '@luxfi/utilities/src/environment/getCurrentEnv'
+} from '@luxexchange/api/src/clients/base/urls'
+import { getConfig } from '@luxexchange/config'
+import { Environment, getCurrentEnv } from 'utilities/src/environment/getCurrentEnv'
 /**
  * Returns the appropriate Entry Gateway API base URL based on the current environment.
  * When proxy is enabled, returns the proxy path. Otherwise returns the direct URL.

package/src/getWebSocketUrl.ts

@@ -1,6 +1,6 @@
 import { PROD_WEBSOCKET_BASE_URL, STAGING_WEBSOCKET_BASE_URL } from '@luxexchange/api/src/clients/base/urls'
 import { getConfig } from '@luxexchange/config'
-import { Environment, getCurrentEnv } from '@luxfi/utilities/src/environment/getCurrentEnv'
+import { Environment, getCurrentEnv } from 'utilities/src/environment/getCurrentEnv'
 
 /**
  * Returns the appropriate WebSocket URL based on the current environment.

package/src/hooks/shared/useQueryWithImmediateGarbageCollection.ts

@@ -9,7 +9,7 @@ import {
   useQueryClient,
 } from '@tanstack/react-query'
 import { useEffect } from 'react'
-import { logger } from '@luxfi/utilities/src/logger/logger'
+import { logger } from 'utilities/src/logger/logger'
 
 /**
  * This is a wrapper around react-query's `useQuery` that immediately clears the cache if the data is older than `gcTime`,

package/src/index.ts

@@ -1,7 +1,7 @@
 /** biome-ignore-all assist/source/organizeImports: we want to manually group exports by category */
 
 /**
- * @universe/api - Unified data layer for Lux Universe
+ * @luxexchange/api - Unified data layer for Uniswap Universe
  *
  * This is the ONLY public entry point for the API package.
  * All exports must be explicitly listed here.
@@ -113,7 +113,7 @@ export {
 } from '@luxexchange/api/src/clients/trading/tradeTypes'
 export {
   FeeType,
-  type FormattedDEXGasFeeInfo,
+  type FormattedLxSwapGasFeeInfo,
   type GasEstimate,
   type GasEstimateEip1559,
   type GasEstimateLegacy,
@@ -149,10 +149,10 @@ export {
 
 // Uniswap API
 export {
-  createUniswapApiClient,
-  type UniswapApiClient,
-  type UniswapApiClientContext,
-} from '@luxexchange/api/src/clients/uniswap/createUniswapApiClient'
+  createLxApiClient,
+  type LxApiClient,
+  type LxApiClientContext,
+} from '@luxexchange/api/src/clients/uniswap/createLxApiClient'
 
 // Compliance API
 export {
@@ -198,7 +198,7 @@ export {
 export type {
   EstimateGasFeeRequest as GasServiceEstimateRequest,
   EstimateGasFeeResponse as GasServiceEstimateResponse,
-} from '@uniswap/client-unirpc-v2/dist/uniswap/unirpc/v2/service_pb'
+} from '@luxamm/client-unirpc-v2/dist/uniswap/unirpc/v2/service_pb'
 
 // Data API Service (ConnectRPC - listTopTokens, listTopPools, getPortfolio, etc.)
 export {
@@ -217,9 +217,9 @@ export {
   type GetPortfolioResponse,
   type ListTopPoolsResponse,
   type ListTokensResponse,
-} from '@uniswap/client-data-api/dist/data/v1/api_pb'
-export { ProtocolVersion } from '@uniswap/client-data-api/dist/data/v1/poolTypes_pb'
-export { type Pool as DataApiPool, type Token as DataApiToken } from '@uniswap/client-data-api/dist/data/v1/types_pb'
+} from '@luxamm/client-data-api/dist/data/v1/api_pb'
+export { ProtocolVersion } from '@luxamm/client-data-api/dist/data/v1/poolTypes_pb'
+export { type Pool as DataApiPool, type Token as DataApiToken } from '@luxamm/client-data-api/dist/data/v1/types_pb'
 
 // Data Service API
 export {
@@ -280,7 +280,7 @@ export {
   TransferWidgetUrlRequest,
   WidgetUrlRequest,
   WidgetUrlResponse,
-} from '@uniswap/client-for/dist/for/v1/api_pb'
+} from '@luxamm/client-for/dist/for/v1/api_pb'
 
 // ConnectRPC API
 export {
@@ -342,4 +342,6 @@ export { getEntryGatewayUrl, getMigratedForApiUrl } from '@luxexchange/api/src/g
 
 export { getWebSocketUrl } from '@luxexchange/api/src/getWebSocketUrl'
 
-export { provideLuxIdentifierService } from '@luxexchange/api/src/provideLuxIdentifierService'
+export { provideLxIdentifierService } from '@luxexchange/api/src/provideLxIdentifierService'
+
+export const provideLuxIdentifierService = provideLxIdentifierService