feat: integrate relay (#4320)

* setup relay compiler
* refactored to use polling interval, fixed PR comments
* fixes, readded uninitialized state for liquidity chart
* updated cypress test
* reorganized graphql files into src/graphql

.eslintrc.json

@@ -18,7 +18,6 @@
     "src/abis/types",
     "src/locales/**/*.js",
     "src/locales/**/en-US.po",
-    "src/state/data/generated.ts",
     "node_modules",
     "coverage",
     "build",

.gitignore

 # See https://help.github.com/ignore-files/ for more about ignoring files.
 
+
 # generated contract types
 /src/types/v3
 /src/abis/types
 /src/locales/**/*.js
 /src/locales/**/en-US.po
 /src/locales/**/pseudo.po
-/src/state/data/generated.ts
+
+# generated graphql types
+/src/graphql/schema/
+__generated__/
 
 # dependencies
 /node_modules

.prettierignore

-/src/state/data/generated.ts
\ No newline at end of file
+/src/schema/schema.graphql
\ No newline at end of file

codegen.yml

@@ -2,10 +2,6 @@ overrideExisting: true
 schema: 'https://api.thegraph.com/subgraphs/name/uniswap/uniswap-v3'
 documents: 'src/**/!(*.d).{ts,tsx}'
 generates:
-  ./src/state/data/generated.ts:
+  ./src/graphql/schema/schema.graphql:
     plugins:
-      - typescript
-      - typescript-operations
-      - typescript-rtk-query:
-          importBaseApiFrom: './slice'
-          exportHooks: true
+      - schema-ast

cypress/e2e/add-liquidity.test.ts

@@ -37,8 +37,8 @@ describe('Add Liquidity', () => {
   it('loads fee tier distribution', () => {
     cy.fixture('feeTierDistribution.json').then((feeTierDistribution) => {
       cy.intercept('POST', '/subgraphs/name/uniswap/uniswap-v3', (req: CyHttpMessages.IncomingHttpRequest) => {
-        if (hasQuery(req, 'feeTierDistribution')) {
-          req.alias = 'feeTierDistributionQuery'
+        if (hasQuery(req, 'FeeTierDistributionQuery')) {
+          req.alias = 'FeeTierDistributionQuery'
 
           req.reply({
             body: {
@@ -55,7 +55,7 @@ describe('Add Liquidity', () => {
 
       cy.visit('/add/0xF9bA5210F91D0474bd1e1DcDAeC4C58E359AaD85/0xc778417E063141139Fce010982780140Aa0cD5Ab')
 
-      cy.wait('@feeTierDistributionQuery')
+      cy.wait('@FeeTierDistributionQuery')
 
       cy.get('#add-liquidity-selected-fee .selected-fee-label').should('contain.text', '0.3% fee tier')
       cy.get('#add-liquidity-selected-fee .selected-fee-percentage').should('contain.text', '40%')

package.json

@@ -8,7 +8,8 @@
     "contracts:compile:abi": "typechain --target ethers-v5 --out-dir src/abis/types \"./src/abis/**/*.json\"",
     "contracts:compile:v3": "typechain --target ethers-v5 --out-dir src/types/v3 \"./node_modules/@uniswap/**/artifacts/contracts/**/*[!dbg].json\"",
     "contracts:compile": "yarn contracts:compile:abi && yarn contracts:compile:v3",
-    "graphql:generate": "graphql-codegen --config codegen.yml",
+    "relay": "relay-compiler",
+    "graphql:generate": "graphql-codegen --config codegen.yml && yarn relay",
     "prei18n:extract": "node prei18n-extract.js",
     "i18n:extract": "lingui extract --locale en-US",
     "i18n:compile": "yarn i18n:extract && lingui compile",
@@ -22,6 +23,11 @@
     "cypress:open": "cypress open --browser chrome --e2e",
     "cypress:run": "cypress run --browser chrome --e2e"
   },
+  "relay": {
+    "src": "./src",
+    "language": "typescript",
+    "schema": "./src/graphql/schema/schema.graphql"
+  },
   "jest": {
     "collectCoverageFrom": [
       "src/components/**/*.ts*",
@@ -58,8 +64,7 @@
     "@craco/craco": "6.4.3",
     "@ethersproject/experimental": "^5.4.0",
     "@graphql-codegen/cli": "1.21.5",
-    "@graphql-codegen/typescript": "1.22.3",
-    "@graphql-codegen/typescript-operations": "^1.18.2",
+    "@graphql-codegen/schema-ast": "^2.5.1",
     "@graphql-codegen/typescript-rtk-query": "^1.1.1",
     "@lingui/cli": "^3.9.0",
     "@testing-library/jest-dom": "^5.16.4",
@@ -90,6 +95,7 @@
     "@types/wcag-contrast": "^3.0.0",
     "@typescript-eslint/eslint-plugin": "^4",
     "@typescript-eslint/parser": "^4",
+    "babel-plugin-relay": "^14.1.0",
     "@vanilla-extract/babel-plugin": "^1.1.7",
     "@vanilla-extract/webpack-plugin": "^2.1.11",
     "cypress": "^10.3.1",
@@ -106,6 +112,7 @@
     "ms.macro": "^2.0.0",
     "prettier": "^2.7.1",
     "react-scripts": "^4.0.3",
+    "relay-compiler": "^14.1.0",
     "serve": "^11.3.2",
     "typechain": "^5.0.0",
     "typescript": "^4.4.3"
@@ -126,6 +133,7 @@
     "@reach/portal": "^0.10.3",
     "@react-hook/window-scroll": "^1.3.0",
     "@reduxjs/toolkit": "^1.6.1",
+    "@types/react-relay": "^13.0.2",
     "@uniswap/governance": "^1.0.2",
     "@uniswap/liquidity-staker": "^1.0.2",
     "@uniswap/merkle-distributor": "1.0.1",
@@ -174,7 +182,7 @@
     "firebase": "^9.1.3",
     "focus-visible": "^5.2.0",
     "fortmatic": "^2.4.0",
-    "graphql": "^15.5.0",
+    "graphql": "^16.5.0",
     "graphql-request": "^3.4.0",
     "immer": "^9.0.6",
     "inter-ui": "^3.13.1",
@@ -199,6 +207,7 @@
     "react-popper": "^2.2.3",
     "react-query": "^3.39.1",
     "react-redux": "^8.0.2",
+    "react-relay": "^14.1.0",
     "react-router-dom": "^6.3.0",
     "react-spring": "^8.0.27",
     "react-table": "^7.8.0",
@@ -208,6 +217,7 @@
     "rebass": "^4.0.7",
     "redux": "^4.1.2",
     "redux-localstorage-simple": "^2.3.1",
+    "relay-hooks": "^7.1.0",
     "setimmediate": "^1.0.5",
     "styled-components": "^5.3.5",
     "tiny-invariant": "^1.2.0",

src/components/LiquidityChartRangeInput/hooks.ts

@@ -14,7 +14,7 @@ export function useDensityChartData({
   currencyB: Currency | undefined
   feeAmount: FeeAmount | undefined
 }) {
-  const { isLoading, isUninitialized, isError, error, data } = usePoolActiveLiquidity(currencyA, currencyB, feeAmount)
+  const { isLoading, error, data } = usePoolActiveLiquidity(currencyA, currencyB, feeAmount)
 
   const formatData = useCallback(() => {
     if (!data?.length) {
@@ -42,10 +42,8 @@ export function useDensityChartData({
   return useMemo(() => {
     return {
       isLoading,
-      isUninitialized,
-      isError,
       error,
-      formattedData: !isLoading && !isUninitialized ? formatData() : undefined,
+      formattedData: !isLoading ? formatData() : undefined,
     }
-  }, [isLoading, isUninitialized, isError, error, formatData])
+  }, [isLoading, error, formatData])
 }

src/components/LiquidityChartRangeInput/index.tsx

@@ -96,7 +96,7 @@ export default function LiquidityChartRangeInput({
 
   const isSorted = currencyA && currencyB && currencyA?.wrapped.sortsBefore(currencyB?.wrapped)
 
-  const { isLoading, isUninitialized, isError, error, formattedData } = useDensityChartData({
+  const { isLoading, error, formattedData } = useDensityChartData({
     currencyA,
     currencyB,
     feeAmount,
@@ -157,10 +157,12 @@ export default function LiquidityChartRangeInput({
     [isSorted, price, ticksAtLimit]
   )
 
-  if (isError) {
+  if (error) {
     sendEvent('exception', { description: error.toString(), fatal: false })
   }
 
+  const isUninitialized = !currencyA || !currencyB || (formattedData === undefined && !isLoading)
+
   return (
     <AutoColumn gap="md" style={{ minHeight: '200px' }}>
       {isUninitialized ? (
@@ -170,7 +172,7 @@ export default function LiquidityChartRangeInput({
         />
       ) : isLoading ? (
         <InfoBox icon={<Loader size="40px" stroke={theme.deprecated_text4} />} />
-      ) : isError ? (
+      ) : error ? (
         <InfoBox
           message={<Trans>Liquidity data not available.</Trans>}
           icon={<CloudOff size={56} stroke={theme.deprecated_text4} />}

src/constants/chains.ts

@@ -44,7 +44,7 @@ export const ALL_SUPPORTED_CHAIN_IDS: SupportedChainId[] = Object.values(Support
   (id) => typeof id === 'number'
 ) as SupportedChainId[]
 
-export function isSupportedChain(chainId: number | undefined): chainId is SupportedChainId {
+export function isSupportedChain(chainId: number | null | undefined): chainId is SupportedChainId {
   return !!chainId && !!SupportedChainId[chainId]
 }
 

src/graphql/AllV3TicksQuery.ts

+import graphql from 'babel-plugin-relay/macro'
+import useInterval from 'lib/hooks/useInterval'
+import { useCallback, useEffect, useState } from 'react'
+import { fetchQuery, useRelayEnvironment } from 'relay-hooks'
+import { useAppSelector } from 'state/hooks'
+
+import type {
+  AllV3TicksQuery as AllV3TicksQueryType,
+  AllV3TicksQuery$data,
+} from './__generated__/AllV3TicksQuery.graphql'
+
+const query = graphql`
+  query AllV3TicksQuery($poolAddress: String!, $skip: Int!) {
+    ticks(first: 1000, skip: $skip, where: { poolAddress: $poolAddress }, orderBy: tickIdx) {
+      tick: tickIdx
+      liquidityNet
+      price0
+      price1
+    }
+  }
+`
+
+export type Ticks = AllV3TicksQuery$data['ticks']
+export type TickData = Ticks[number]
+
+export default function useAllV3TicksQuery(poolAddress: string | undefined, skip: number, interval: number) {
+  const [data, setData] = useState<AllV3TicksQuery$data | null>(null)
+  const [error, setError] = useState<any>(null)
+  const [isLoading, setIsLoading] = useState(true)
+  const chainId = useAppSelector((state) => state.application.chainId)
+  const environment = useRelayEnvironment()
+
+  const refreshData = useCallback(() => {
+    if (poolAddress && chainId) {
+      fetchQuery<AllV3TicksQueryType>(environment, query, {
+        poolAddress: poolAddress.toLowerCase(),
+        skip,
+      }).subscribe({
+        next: setData,
+        error: setError,
+        complete: () => setIsLoading(false),
+      })
+    } else {
+      setIsLoading(false)
+    }
+  }, [poolAddress, skip, chainId, environment])
+
+  // Trigger fetch on first load
+  useEffect(refreshData, [refreshData, poolAddress, skip])
+
+  useInterval(refreshData, interval, true)
+  return { error, isLoading, data }
+}

src/graphql/FeeTierDistributionQuery.ts

+import graphql from 'babel-plugin-relay/macro'
+import useInterval from 'lib/hooks/useInterval'
+import { useCallback, useEffect, useState } from 'react'
+import { fetchQuery, useRelayEnvironment } from 'relay-hooks'
+import { useAppSelector } from 'state/hooks'
+
+import type {
+  FeeTierDistributionQuery as FeeTierDistributionQueryType,
+  FeeTierDistributionQuery$data,
+} from './__generated__/FeeTierDistributionQuery.graphql'
+
+const query = graphql`
+  query FeeTierDistributionQuery($token0: String!, $token1: String!) {
+    _meta {
+      block {
+        number
+      }
+    }
+    asToken0: pools(
+      orderBy: totalValueLockedToken0
+      orderDirection: desc
+      where: { token0: $token0, token1: $token1 }
+    ) {
+      feeTier
+      totalValueLockedToken0
+      totalValueLockedToken1
+    }
+    asToken1: pools(
+      orderBy: totalValueLockedToken0
+      orderDirection: desc
+      where: { token0: $token1, token1: $token0 }
+    ) {
+      feeTier
+      totalValueLockedToken0
+      totalValueLockedToken1
+    }
+  }
+`
+
+export default function useFeeTierDistributionQuery(
+  token0: string | undefined,
+  token1: string | undefined,
+  interval: number
+) {
+  const [data, setData] = useState<FeeTierDistributionQuery$data | null>(null)
+  const [error, setError] = useState<any>(null)
+  const [isLoading, setIsLoading] = useState(true)
+  const environment = useRelayEnvironment()
+  const chainId = useAppSelector((state) => state.application.chainId)
+
+  const refreshData = useCallback(() => {
+    if (token0 && token1 && chainId) {
+      fetchQuery<FeeTierDistributionQueryType>(environment, query, {
+        token0: token0.toLowerCase(),
+        token1: token1.toLowerCase(),
+      }).subscribe({
+        next: setData,
+        error: setError,
+        complete: () => setIsLoading(false),
+      })
+    }
+  }, [token0, token1, chainId, environment])
+
+  // Trigger fetch on first load
+  useEffect(refreshData, [refreshData, token0, token1])
+
+  useInterval(refreshData, interval, true)
+  return { error, isLoading, data }
+}

src/graphql/RelayEnvironment.ts

+import { Environment, Network, RecordSource, Store } from 'relay-runtime'
+
+import fetchGraphQL from './fetchGraphQL'
+
+// Export a singleton instance of Relay Environment configured with our network function:
+export default new Environment({
+  network: Network.create(fetchGraphQL),
+  store: new Store(new RecordSource()),
+})

src/graphql/fetchGraphQL.ts

+/**
+ * Helpful Resources
+ * https://github.com/sibelius/create-react-app-relay-modern/blob/master/src/relay/fetchQuery.js
+ * https://github.com/relay-tools/relay-compiler-language-typescript/blob/master/example/ts/app.tsx
+ */
+
+import { SupportedChainId } from 'constants/chains'
+import { Variables } from 'react-relay'
+import { GraphQLResponse, ObservableFromValue, RequestParameters } from 'relay-runtime'
+
+import store, { AppState } from '../state/index'
+
+const CHAIN_SUBGRAPH_URL: Record<number, string> = {
+  [SupportedChainId.MAINNET]: 'https://api.thegraph.com/subgraphs/name/uniswap/uniswap-v3',
+  [SupportedChainId.RINKEBY]: 'https://api.thegraph.com/subgraphs/name/uniswap/uniswap-v3',
+
+  [SupportedChainId.ARBITRUM_ONE]: 'https://api.thegraph.com/subgraphs/name/ianlapham/arbitrum-minimal',
+
+  [SupportedChainId.OPTIMISM]: 'https://api.thegraph.com/subgraphs/name/ianlapham/optimism-post-regenesis',
+
+  [SupportedChainId.POLYGON]: 'https://api.thegraph.com/subgraphs/name/ianlapham/uniswap-v3-polygon',
+
+  [SupportedChainId.CELO]: 'https://api.thegraph.com/subgraphs/name/jesse-sawa/uniswap-celo',
+}
+
+const headers = {
+  Accept: 'application/json',
+  'Content-type': 'application/json',
+}
+
+// Define a function that fetches the results of a request (query/mutation/etc)
+// and returns its results as a Promise:
+const fetchQuery = (params: RequestParameters, variables: Variables): ObservableFromValue<GraphQLResponse> => {
+  const chainId = (store.getState() as AppState).application.chainId
+
+  const subgraphUrl =
+    chainId && CHAIN_SUBGRAPH_URL[chainId] ? CHAIN_SUBGRAPH_URL[chainId] : CHAIN_SUBGRAPH_URL[SupportedChainId.MAINNET]
+
+  const body = JSON.stringify({
+    query: params.text, // GraphQL text from input
+    variables,
+  })
+
+  const response = fetch(subgraphUrl, {
+    method: 'POST',
+    headers,
+    body,
+  }).then((res) => res.json())
+
+  return response
+}
+
+export default fetchQuery

src/hooks/useFeeTierDistribution.ts

-import { skipToken } from '@reduxjs/toolkit/query/react'
 import { Currency, Token } from '@uniswap/sdk-core'
 import { FeeAmount } from '@uniswap/v3-sdk'
 import { sendEvent } from 'components/analytics'
 import useBlockNumber from 'lib/hooks/useBlockNumber'
 import ms from 'ms.macro'
 import { useMemo } from 'react'
-import { useFeeTierDistributionQuery } from 'state/data/enhanced'
-import { FeeTierDistributionQuery } from 'state/data/generated'
 
+import useFeeTierDistributionQuery from '../graphql/FeeTierDistributionQuery'
 import { PoolState, usePool } from './usePools'
 
 // maximum number of blocks past which we consider the data stale
@@ -26,10 +24,7 @@ export function useFeeTierDistribution(
   currencyA: Currency | undefined,
   currencyB: Currency | undefined
 ): FeeTierDistribution {
-  const { isFetching, isLoading, isUninitialized, isError, distributions } = usePoolTVL(
-    currencyA?.wrapped,
-    currencyB?.wrapped
-  )
+  const { isLoading, error, distributions } = usePoolTVL(currencyA?.wrapped, currencyB?.wrapped)
 
   // fetch all pool states to determine pool state
   const [poolStateVeryLow] = usePool(currencyA, currencyB, FeeAmount.LOWEST)
@@ -38,10 +33,10 @@ export function useFeeTierDistribution(
   const [poolStateHigh] = usePool(currencyA, currencyB, FeeAmount.HIGH)
 
   return useMemo(() => {
-    if (isLoading || isFetching || isUninitialized || isError || !distributions) {
+    if (isLoading || error || !distributions) {
       return {
-        isLoading: isLoading || isFetching || !isUninitialized,
-        isError,
+        isLoading,
+        isError: !!error,
         distributions,
       }
     }
@@ -53,7 +48,7 @@ export function useFeeTierDistribution(
 
     const percentages =
       !isLoading &&
-      !isError &&
+      !error &&
       distributions &&
       poolStateVeryLow !== PoolState.LOADING &&
       poolStateLow !== PoolState.LOADING &&
@@ -72,42 +67,24 @@ export function useFeeTierDistribution(
 
     return {
       isLoading,
-      isError,
+      isError: !!error,
       distributions: percentages,
       largestUsageFeeTier: largestUsageFeeTier === -1 ? undefined : largestUsageFeeTier,
     }
-  }, [
-    isLoading,
-    isFetching,
-    isUninitialized,
-    isError,
-    distributions,
-    poolStateVeryLow,
-    poolStateLow,
-    poolStateMedium,
-    poolStateHigh,
-  ])
+  }, [isLoading, error, distributions, poolStateVeryLow, poolStateLow, poolStateMedium, poolStateHigh])
 }
 
 function usePoolTVL(token0: Token | undefined, token1: Token | undefined) {
   const latestBlock = useBlockNumber()
+  const { isLoading, error, data } = useFeeTierDistributionQuery(token0?.address, token1?.address, ms`30s`)
 
-  const { isLoading, isFetching, isUninitialized, isError, data } = useFeeTierDistributionQuery(
-    token0 && token1 ? { token0: token0.address.toLowerCase(), token1: token1.address.toLowerCase() } : skipToken,
-    {
-      pollingInterval: ms`30s`,
-    }
-  )
-
-  const { asToken0, asToken1, _meta } = (data as FeeTierDistributionQuery) ?? {}
+  const { asToken0, asToken1, _meta } = data ?? {}
 
   return useMemo(() => {
     if (!latestBlock || !_meta || !asToken0 || !asToken1) {
       return {
         isLoading,
-        isFetching,
-        isUninitialized,
-        isError,
+        error,
       }
     }
 
@@ -116,9 +93,7 @@ function usePoolTVL(token0: Token | undefined, token1: Token | undefined) {
 
       return {
         isLoading,
-        isFetching,
-        isUninitialized,
-        isError,
+        error,
       }
     }
 
@@ -177,10 +152,8 @@ function usePoolTVL(token0: Token | undefined, token1: Token | undefined) {
 
     return {
       isLoading,
-      isFetching,
-      isUninitialized,
-      isError,
+      error,
       distributions,
     }
-  }, [_meta, asToken0, asToken1, isLoading, isError, isFetching, isUninitialized, latestBlock])
+  }, [_meta, asToken0, asToken1, isLoading, error, latestBlock])
 }

src/hooks/usePoolTickData.ts

-import { skipToken } from '@reduxjs/toolkit/query/react'
 import { Currency } from '@uniswap/sdk-core'
 import { FeeAmount, nearestUsableTick, Pool, TICK_SPACINGS, tickToPrice } from '@uniswap/v3-sdk'
 import { useWeb3React } from '@web3-react/core'
 import { SupportedChainId } from 'constants/chains'
 import { ZERO_ADDRESS } from 'constants/misc'
+import useAllV3TicksQuery, { TickData } from 'graphql/AllV3TicksQuery'
 import JSBI from 'jsbi'
 import { useSingleContractMultipleData } from 'lib/hooks/multicall'
 import ms from 'ms.macro'
 import { useEffect, useMemo, useState } from 'react'
-import { useAllV3TicksQuery } from 'state/data/enhanced'
 import computeSurroundingTicks from 'utils/computeSurroundingTicks'
 
 import { V3_CORE_FACTORY_ADDRESSES } from '../constants/addresses'
@@ -18,12 +17,6 @@ import { PoolState, usePool } from './usePools'
 const PRICE_FIXED_DIGITS = 8
 const CHAIN_IDS_MISSING_SUBGRAPH_DATA = [SupportedChainId.ARBITRUM_ONE, SupportedChainId.ARBITRUM_RINKEBY]
 
-export interface TickData {
-  tick: number
-  liquidityNet: JSBI
-  liquidityGross: JSBI
-}
-
 // Tick with fields parsed to JSBIs, and active liquidity computed.
 export interface TickProcessed {
   tick: number
@@ -118,7 +111,6 @@ function useTicksFromTickLens(
               return {
                 tick: tickData.tick,
                 liquidityNet: JSBI.BigInt(tickData.liquidityNet),
-                liquidityGross: JSBI.BigInt(tickData.liquidityGross),
               }
             }) ?? []),
           ],
@@ -162,9 +154,7 @@ function useTicksFromSubgraph(
         )
       : undefined
 
-  return useAllV3TicksQuery(poolAddress ? { poolAddress: poolAddress?.toLowerCase(), skip: 0 } : skipToken, {
-    pollingInterval: ms`30s`,
-  })
+  return useAllV3TicksQuery(poolAddress, 0, ms`30s`)
 }
 
 // Fetches all ticks for a given pool
@@ -174,10 +164,8 @@ function useAllV3Ticks(
   feeAmount: FeeAmount | undefined
 ): {
   isLoading: boolean
-  isUninitialized: boolean
-  isError: boolean
   error: unknown
-  ticks: TickData[] | undefined
+  ticks: readonly TickData[] | undefined
 } {
   const useSubgraph = currencyA ? !CHAIN_IDS_MISSING_SUBGRAPH_DATA.includes(currencyA.chainId) : true
 
@@ -186,8 +174,6 @@ function useAllV3Ticks(
 
   return {
     isLoading: useSubgraph ? subgraphTickData.isLoading : tickLensTickData.isLoading,
-    isUninitialized: useSubgraph ? subgraphTickData.isUninitialized : false,
-    isError: useSubgraph ? subgraphTickData.isError : tickLensTickData.isError,
     error: useSubgraph ? subgraphTickData.error : tickLensTickData.isError,
     ticks: useSubgraph ? subgraphTickData.data?.ticks : tickLensTickData.tickData,
   }
@@ -199,8 +185,6 @@ export function usePoolActiveLiquidity(
   feeAmount: FeeAmount | undefined
 ): {
   isLoading: boolean
-  isUninitialized: boolean
-  isError: boolean
   error: any
   activeTick: number | undefined
   data: TickProcessed[] | undefined
@@ -210,7 +194,7 @@ export function usePoolActiveLiquidity(
   // Find nearest valid tick for pool in case tick is not initialized.
   const activeTick = useMemo(() => getActiveTick(pool[1]?.tickCurrent, feeAmount), [pool, feeAmount])
 
-  const { isLoading, isUninitialized, isError, error, ticks } = useAllV3Ticks(currencyA, currencyB, feeAmount)
+  const { isLoading, error, ticks } = useAllV3Ticks(currencyA, currencyB, feeAmount)
 
   return useMemo(() => {
     if (
@@ -220,13 +204,10 @@ export function usePoolActiveLiquidity(
       pool[0] !== PoolState.EXISTS ||
       !ticks ||
       ticks.length === 0 ||
-      isLoading ||
-      isUninitialized
+      isLoading
     ) {
       return {
         isLoading: isLoading || pool[0] === PoolState.LOADING,
-        isUninitialized,
-        isError,
         error,
         activeTick,
         data: undefined,
@@ -246,8 +227,6 @@ export function usePoolActiveLiquidity(
       console.error('TickData pivot not found')
       return {
         isLoading,
-        isUninitialized,
-        isError,
         error,
         activeTick,
         data: undefined,
@@ -269,11 +248,9 @@ export function usePoolActiveLiquidity(
 
     return {
       isLoading,
-      isUninitialized,
-      isError,
       error,
       activeTick,
       data: ticksProcessed,
     }
-  }, [currencyA, currencyB, activeTick, pool, ticks, isLoading, isUninitialized, isError, error])
+  }, [currencyA, currencyB, activeTick, pool, ticks, isLoading, error])
 }

src/index.tsx

@@ -4,6 +4,7 @@ import 'polyfills'
 import 'components/analytics'
 
 import { FeatureFlagsProvider } from 'featureFlags'
+import RelayEnvironment from 'graphql/RelayEnvironment'
 import { BlockNumberProvider } from 'lib/hooks/useBlockNumber'
 import { MulticallUpdater } from 'lib/state/multicall'
 import { StrictMode } from 'react'
@@ -11,6 +12,7 @@ import { createRoot } from 'react-dom/client'
 import { QueryClient, QueryClientProvider } from 'react-query'
 import { Provider } from 'react-redux'
 import { HashRouter } from 'react-router-dom'
+import { RelayEnvironmentProvider } from 'relay-hooks'
 
 import Blocklist from './components/Blocklist'
 import Web3Provider from './components/Web3Provider'
@@ -56,6 +58,7 @@ createRoot(container).render(
           <HashRouter>
             <LanguageProvider>
               <Web3Provider>
+                <RelayEnvironmentProvider environment={RelayEnvironment}>
                   <Blocklist>
                     <BlockNumberProvider>
                       <Updaters />
@@ -65,6 +68,7 @@ createRoot(container).render(
                       </ThemeProvider>
                     </BlockNumberProvider>
                   </Blocklist>
+                </RelayEnvironmentProvider>
               </Web3Provider>
             </LanguageProvider>
           </HashRouter>

src/react-app-env.d.ts

@@ -31,3 +31,7 @@ declare module 'multihashes' {
 declare module 'd3-curve-circlecorners' {
   declare function radius(r: number): d3.CurveFactory
 }
+
+declare module 'babel-plugin-relay/macro' {
+  export { graphql as default } from 'react-relay'
+}

src/state/application/updater.ts

@@ -2,25 +2,11 @@ import { useWeb3React } from '@web3-react/core'
 import useDebounce from 'hooks/useDebounce'
 import useIsWindowVisible from 'hooks/useIsWindowVisible'
 import { useEffect, useState } from 'react'
-import { api, CHAIN_TAG } from 'state/data/enhanced'
-import { useAppDispatch, useAppSelector } from 'state/hooks'
+import { useAppDispatch } from 'state/hooks'
 import { supportedChainId } from 'utils/supportedChainId'
 
 import { updateChainId } from './reducer'
 
-function useQueryCacheInvalidator() {
-  const dispatch = useAppDispatch()
-
-  // subscribe to `chainId` changes in the redux store rather than Web3
-  // this will ensure that when `invalidateTags` is called, the latest
-  // `chainId` is available in redux to build the subgraph url
-  const chainId = useAppSelector((state) => state.application.chainId)
-
-  useEffect(() => {
-    dispatch(api.util.invalidateTags([CHAIN_TAG]))
-  }, [chainId, dispatch])
-}
-
 export default function Updater(): null {
   const { chainId, provider } = useWeb3React()
   const dispatch = useAppDispatch()
@@ -28,8 +14,6 @@ export default function Updater(): null {
 
   const [activeChainId, setActiveChainId] = useState(chainId)
 
-  useQueryCacheInvalidator()
-
   useEffect(() => {
     if (provider && chainId && windowVisible) {
       setActiveChainId(chainId)

src/state/data/enhanced.ts

-import { api as generatedApi } from './generated'
-
-// tag that should be applied to queries that need to be invalidated when the chain changes
-export const CHAIN_TAG = 'Chain'
-
-// enhanced api to provide/invalidate tags
-export const api = generatedApi.enhanceEndpoints({
-  addTagTypes: [CHAIN_TAG],
-  endpoints: {
-    allV3Ticks: {
-      providesTags: [CHAIN_TAG],
-    },
-    feeTierDistribution: {
-      providesTags: [CHAIN_TAG],
-    },
-  },
-})
-
-export const { useAllV3TicksQuery, useFeeTierDistributionQuery } = api

src/state/data/slice.ts

-import { BaseQueryFn } from '@reduxjs/toolkit/query'
-import { createApi } from '@reduxjs/toolkit/query/react'
-import { SupportedChainId } from 'constants/chains'
-import { DocumentNode } from 'graphql'
-import { ClientError, gql, GraphQLClient } from 'graphql-request'
-import { AppState } from 'state'
-
-// List of supported subgraphs. Note that the app currently only support one active subgraph at a time
-const CHAIN_SUBGRAPH_URL: Record<number, string> = {
-  [SupportedChainId.MAINNET]: 'https://api.thegraph.com/subgraphs/name/uniswap/uniswap-v3',
-  [SupportedChainId.RINKEBY]: 'https://api.thegraph.com/subgraphs/name/uniswap/uniswap-v3',
-
-  [SupportedChainId.ARBITRUM_ONE]: 'https://api.thegraph.com/subgraphs/name/ianlapham/arbitrum-minimal',
-
-  [SupportedChainId.OPTIMISM]: 'https://api.thegraph.com/subgraphs/name/ianlapham/optimism-post-regenesis',
-
-  [SupportedChainId.POLYGON]: 'https://api.thegraph.com/subgraphs/name/ianlapham/uniswap-v3-polygon',
-
-  [SupportedChainId.CELO]: 'https://api.thegraph.com/subgraphs/name/jesse-sawa/uniswap-celo',
-}
-
-export const api = createApi({
-  reducerPath: 'dataApi',
-  baseQuery: graphqlRequestBaseQuery(),
-  endpoints: (builder) => ({
-    allV3Ticks: builder.query({
-      query: ({ poolAddress, skip = 0 }) => ({
-        document: gql`
-          query allV3Ticks($poolAddress: String!, $skip: Int!) {
-            ticks(first: 1000, skip: $skip, where: { poolAddress: $poolAddress }, orderBy: tickIdx) {
-              tick: tickIdx
-              liquidityNet
-              price0
-              price1
-            }
-          }
-        `,
-        variables: {
-          poolAddress,
-          skip,
-        },
-      }),
-    }),
-    feeTierDistribution: builder.query({
-      query: ({ token0, token1 }) => ({
-        document: gql`
-          query feeTierDistribution($token0: String!, $token1: String!) {
-            _meta {
-              block {
-                number
-              }
-            }
-            asToken0: pools(
-              orderBy: totalValueLockedToken0
-              orderDirection: desc
-              where: { token0: $token0, token1: $token1 }
-            ) {
-              feeTier
-              totalValueLockedToken0
-              totalValueLockedToken1
-            }
-            asToken1: pools(
-              orderBy: totalValueLockedToken0
-              orderDirection: desc
-              where: { token0: $token1, token1: $token0 }
-            ) {
-              feeTier
-              totalValueLockedToken0
-              totalValueLockedToken1
-            }
-          }
-        `,
-        variables: {
-          token0,
-          token1,
-        },
-      }),
-    }),
-  }),
-})
-
-// Graphql query client wrapper that builds a dynamic url based on chain id
-function graphqlRequestBaseQuery(): BaseQueryFn<
-  { document: string | DocumentNode; variables?: any },
-  unknown,
-  Pick<ClientError, 'name' | 'message' | 'stack'>,
-  Partial<Pick<ClientError, 'request' | 'response'>>
-> {
-  return async ({ document, variables }, { getState }) => {
-    try {
-      const chainId = (getState() as AppState).application.chainId
-
-      const subgraphUrl = chainId ? CHAIN_SUBGRAPH_URL[chainId] : undefined
-
-      if (!subgraphUrl) {
-        return {
-          error: {
-            name: 'UnsupportedChainId',
-            message: `Subgraph queries against ChainId ${chainId} are not supported.`,
-            stack: '',
-          },
-        }
-      }
-
-      return { data: await new GraphQLClient(subgraphUrl).request(document, variables), meta: {} }
-    } catch (error) {
-      if (error instanceof ClientError) {
-        const { name, message, stack, request, response } = error
-        return { error: { name, message, stack }, meta: { request, response } }
-      }
-      throw error
-    }
-  }
-}

src/state/index.ts

@@ -8,7 +8,6 @@ import application from './application/reducer'
 import burn from './burn/reducer'
 import burnV3 from './burn/v3/reducer'
 import connection from './connection/reducer'
-import { api as dataApi } from './data/slice'
 import { updateVersion } from './global/actions'
 import lists from './lists/reducer'
 import logs from './logs/slice'
@@ -37,12 +36,10 @@ const store = configureStore({
     multicall: multicall.reducer,
     lists,
     logs,
-    [dataApi.reducerPath]: dataApi.reducer,
     [routingApi.reducerPath]: routingApi.reducer,
   },
   middleware: (getDefaultMiddleware) =>
     getDefaultMiddleware({ thunk: true })
-      .concat(dataApi.middleware)
       .concat(routingApi.middleware)
       .concat(save({ states: PERSISTED_KEYS, debounce: 1000 })),
   preloadedState: load({ states: PERSISTED_KEYS, disableWarnings: isTestEnv() }),

src/utils/computeSurroundingTicks.ts

 import { Token } from '@uniswap/sdk-core'
 import { tickToPrice } from '@uniswap/v3-sdk'
-import { TickData, TickProcessed } from 'hooks/usePoolTickData'
+import { TickProcessed } from 'hooks/usePoolTickData'
 import JSBI from 'jsbi'
 
+import { Ticks } from '../graphql/AllV3TicksQuery'
+
 const PRICE_FIXED_DIGITS = 8
 
 // Computes the numSurroundingTicks above or below the active tick.
@@ -10,7 +12,7 @@ export default function computeSurroundingTicks(
   token0: Token,
   token1: Token,
   activeTickProcessed: TickProcessed,
-  sortedTickData: TickData[],
+  sortedTickData: Ticks,
   pivot: number,
   ascending: boolean
 ): TickProcessed[] {