Commit 7cf768b8 authored by Tina's avatar Tina Committed by GitHub

chore: feature flag cleanup for routing_api_price (#7159)

feature flag cleanup
parent 59b5e81d
...@@ -2,7 +2,6 @@ import { BaseVariant, FeatureFlag, featureFlagSettings, useUpdateFlag } from 'fe ...@@ -2,7 +2,6 @@ import { BaseVariant, FeatureFlag, featureFlagSettings, useUpdateFlag } from 'fe
import { useCurrencyConversionFlag } from 'featureFlags/flags/currencyConversion' import { useCurrencyConversionFlag } from 'featureFlags/flags/currencyConversion'
import { useForceUniswapXOnFlag } from 'featureFlags/flags/forceUniswapXOn' import { useForceUniswapXOnFlag } from 'featureFlags/flags/forceUniswapXOn'
import { useMultichainUXFlag } from 'featureFlags/flags/multichainUx' import { useMultichainUXFlag } from 'featureFlags/flags/multichainUx'
import { useRoutingAPIForPriceFlag } from 'featureFlags/flags/priceRoutingApi'
import { TraceJsonRpcVariant, useTraceJsonRpcFlag } from 'featureFlags/flags/traceJsonRpc' import { TraceJsonRpcVariant, useTraceJsonRpcFlag } from 'featureFlags/flags/traceJsonRpc'
import { UniswapXVariant, useUniswapXFlag } from 'featureFlags/flags/uniswapx' import { UniswapXVariant, useUniswapXFlag } from 'featureFlags/flags/uniswapx'
import { useUniswapXEthOutputFlag } from 'featureFlags/flags/uniswapXEthOutput' import { useUniswapXEthOutputFlag } from 'featureFlags/flags/uniswapXEthOutput'
...@@ -231,12 +230,6 @@ export default function FeatureFlagModal() { ...@@ -231,12 +230,6 @@ export default function FeatureFlagModal() {
featureFlag={FeatureFlag.uniswapXEthOutputEnabled} featureFlag={FeatureFlag.uniswapXEthOutputEnabled}
label="Enable eth output for UniswapX orders" label="Enable eth output for UniswapX orders"
/> />
<FeatureFlagOption
variant={BaseVariant}
value={useRoutingAPIForPriceFlag()}
featureFlag={FeatureFlag.routingAPIPrice}
label="Use the routing-api v2 for price fetches"
/>
<FeatureFlagOption <FeatureFlagOption
variant={BaseVariant} variant={BaseVariant}
value={useCurrencyConversionFlag()} value={useCurrencyConversionFlag()}
......
import { BaseVariant, FeatureFlag, useBaseFlag } from '../index'
export function useRoutingAPIForPriceFlag(): BaseVariant {
return useBaseFlag(FeatureFlag.routingAPIPrice)
}
export function useRoutingAPIForPrice(): boolean {
return useRoutingAPIForPriceFlag() === BaseVariant.Enabled
}
...@@ -12,7 +12,6 @@ export enum FeatureFlag { ...@@ -12,7 +12,6 @@ export enum FeatureFlag {
debounceSwapQuote = 'debounce_swap_quote', debounceSwapQuote = 'debounce_swap_quote',
uniswapXEnabled = 'uniswapx_enabled', // enables sending dutch_limit config to routing-api uniswapXEnabled = 'uniswapx_enabled', // enables sending dutch_limit config to routing-api
uniswapXSyntheticQuote = 'uniswapx_synthetic_quote', uniswapXSyntheticQuote = 'uniswapx_synthetic_quote',
routingAPIPrice = 'routing_api_price',
forceUniswapXOn = 'uniswapx_force_on', // forces routing-api's feature flag for uniswapx to turn on as well forceUniswapXOn = 'uniswapx_force_on', // forces routing-api's feature flag for uniswapx to turn on as well
uniswapXEthOutputEnabled = 'uniswapx_eth_output_enabled', uniswapXEthOutputEnabled = 'uniswapx_eth_output_enabled',
multichainUX = 'multichain_ux', multichainUX = 'multichain_ux',
......
import { Currency, CurrencyAmount, TradeType } from '@uniswap/sdk-core' import { Currency, CurrencyAmount, TradeType } from '@uniswap/sdk-core'
import { useForceUniswapXOn } from 'featureFlags/flags/forceUniswapXOn' import { useForceUniswapXOn } from 'featureFlags/flags/forceUniswapXOn'
import { useRoutingAPIForPrice } from 'featureFlags/flags/priceRoutingApi'
import { useUniswapXEnabled } from 'featureFlags/flags/uniswapx' import { useUniswapXEnabled } from 'featureFlags/flags/uniswapx'
import { useUniswapXEthOutputEnabled } from 'featureFlags/flags/uniswapXEthOutput' import { useUniswapXEthOutputEnabled } from 'featureFlags/flags/uniswapXEthOutput'
import { useUniswapXSyntheticQuoteEnabled } from 'featureFlags/flags/uniswapXUseSyntheticQuote' import { useUniswapXSyntheticQuoteEnabled } from 'featureFlags/flags/uniswapXUseSyntheticQuote'
...@@ -33,7 +32,6 @@ export function useRoutingAPIArguments({ ...@@ -33,7 +32,6 @@ export function useRoutingAPIArguments({
const uniswapXForceSyntheticQuotes = useUniswapXSyntheticQuoteEnabled() const uniswapXForceSyntheticQuotes = useUniswapXSyntheticQuoteEnabled()
const forceUniswapXOn = useForceUniswapXOn() const forceUniswapXOn = useForceUniswapXOn()
const userDisabledUniswapX = useUserDisabledUniswapX() const userDisabledUniswapX = useUserDisabledUniswapX()
const isRoutingAPIPrice = useRoutingAPIForPrice()
const uniswapXEthOutputEnabled = useUniswapXEthOutputEnabled() const uniswapXEthOutputEnabled = useUniswapXEthOutputEnabled()
return useMemo( return useMemo(
...@@ -53,7 +51,6 @@ export function useRoutingAPIArguments({ ...@@ -53,7 +51,6 @@ export function useRoutingAPIArguments({
tokenOutSymbol: tokenOut.wrapped.symbol, tokenOutSymbol: tokenOut.wrapped.symbol,
routerPreference, routerPreference,
tradeType, tradeType,
isRoutingAPIPrice,
needsWrapIfUniswapX: tokenIn.isNative, needsWrapIfUniswapX: tokenIn.isNative,
uniswapXEnabled, uniswapXEnabled,
uniswapXForceSyntheticQuotes, uniswapXForceSyntheticQuotes,
...@@ -68,7 +65,6 @@ export function useRoutingAPIArguments({ ...@@ -68,7 +65,6 @@ export function useRoutingAPIArguments({
tokenIn, tokenIn,
tokenOut, tokenOut,
tradeType, tradeType,
isRoutingAPIPrice,
uniswapXEnabled, uniswapXEnabled,
uniswapXForceSyntheticQuotes, uniswapXForceSyntheticQuotes,
forceUniswapXOn, forceUniswapXOn,
......
...@@ -47,7 +47,6 @@ export interface GetQuoteArgs { ...@@ -47,7 +47,6 @@ export interface GetQuoteArgs {
uniswapXEthOutputEnabled: boolean uniswapXEthOutputEnabled: boolean
forceUniswapXOn: boolean forceUniswapXOn: boolean
userDisabledUniswapX: boolean userDisabledUniswapX: boolean
isRoutingAPIPrice?: boolean
} }
// from https://github.com/Uniswap/routing-api/blob/main/lib/handlers/schema.ts // from https://github.com/Uniswap/routing-api/blob/main/lib/handlers/schema.ts
......
...@@ -17,7 +17,6 @@ import { ...@@ -17,7 +17,6 @@ import {
DutchOrderTrade, DutchOrderTrade,
GetQuoteArgs, GetQuoteArgs,
InterfaceTrade, InterfaceTrade,
INTERNAL_ROUTER_PREFERENCE_PRICE,
isClassicQuoteResponse, isClassicQuoteResponse,
PoolType, PoolType,
QuoteMethod, QuoteMethod,
...@@ -326,12 +325,7 @@ export function isUniswapXTrade(trade?: InterfaceTrade): trade is DutchOrderTrad ...@@ -326,12 +325,7 @@ export function isUniswapXTrade(trade?: InterfaceTrade): trade is DutchOrderTrad
} }
export function shouldUseAPIRouter(args: GetQuoteArgs): boolean { export function shouldUseAPIRouter(args: GetQuoteArgs): boolean {
const { routerPreference, isRoutingAPIPrice } = args return args.routerPreference !== RouterPreference.CLIENT
if (routerPreference === INTERNAL_ROUTER_PREFERENCE_PRICE && isRoutingAPIPrice) {
return true
}
return routerPreference === RouterPreference.API || routerPreference === RouterPreference.X
} }
export function getTransactionCount(trade: InterfaceTrade): number { export function getTransactionCount(trade: InterfaceTrade): number {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment