diff --git a/packages/asset-swapper/CHANGELOG.json b/packages/asset-swapper/CHANGELOG.json index b0faccce3e..f832f0cbdc 100644 --- a/packages/asset-swapper/CHANGELOG.json +++ b/packages/asset-swapper/CHANGELOG.json @@ -21,6 +21,10 @@ { "note": "KnightSwap/Mdex cosmetic change", "pr": 502 + }, + { + "note": "Offboard JetSwap, CafeSwap, JulSwap, and PolyDex", + "pr": 503 } ] }, diff --git a/packages/asset-swapper/src/quote_consumers/exchange_proxy_swap_quote_consumer.ts b/packages/asset-swapper/src/quote_consumers/exchange_proxy_swap_quote_consumer.ts index b6ab861cef..9c1d474f99 100644 --- a/packages/asset-swapper/src/quote_consumers/exchange_proxy_swap_quote_consumer.ts +++ b/packages/asset-swapper/src/quote_consumers/exchange_proxy_swap_quote_consumer.ts @@ -75,9 +75,7 @@ const PANCAKE_SWAP_FORKS = [ ERC20BridgeSource.BakerySwap, ERC20BridgeSource.SushiSwap, ERC20BridgeSource.ApeSwap, - ERC20BridgeSource.CafeSwap, ERC20BridgeSource.CheeseSwap, - ERC20BridgeSource.JulSwap, ]; const FAKE_PROVIDER: any = { sendAsync(): void { @@ -222,9 +220,7 @@ export class ExchangeProxySwapQuoteConsumer implements SwapQuoteConsumerBase { ERC20BridgeSource.BakerySwap, ERC20BridgeSource.SushiSwap, ERC20BridgeSource.ApeSwap, - ERC20BridgeSource.CafeSwap, ERC20BridgeSource.CheeseSwap, - ERC20BridgeSource.JulSwap, ]) ) { const source = slippedOrders[0].source; diff --git a/packages/asset-swapper/src/utils/market_operation_utils/bridge_source_utils.ts b/packages/asset-swapper/src/utils/market_operation_utils/bridge_source_utils.ts index b43721401b..29676ffa67 100644 --- a/packages/asset-swapper/src/utils/market_operation_utils/bridge_source_utils.ts +++ b/packages/asset-swapper/src/utils/market_operation_utils/bridge_source_utils.ts @@ -7,7 +7,6 @@ import { BAKERYSWAP_ROUTER_BY_CHAIN_ID, BELT_BSC_INFOS, BISWAP_ROUTER_BY_CHAIN_ID, - CAFESWAP_ROUTER_BY_CHAIN_ID, CHEESESWAP_ROUTER_BY_CHAIN_ID, COMETHSWAP_ROUTER_BY_CHAIN_ID, COMPONENT_POOLS_BY_CHAIN_ID, @@ -26,8 +25,6 @@ import { FIREBIRDONESWAP_BSC_INFOS, FIREBIRDONESWAP_POLYGON_INFOS, IRONSWAP_POLYGON_INFOS, - JETSWAP_ROUTER_BY_CHAIN_ID, - JULSWAP_ROUTER_BY_CHAIN_ID, KNIGHTSWAP_ROUTER_BY_CHAIN_ID, MAX_DODOV2_POOLS_QUERIED, MDEX_ROUTER_BY_CHAIN_ID, @@ -41,7 +38,6 @@ import { PANCAKESWAPV2_ROUTER_BY_CHAIN_ID, PANGOLIN_ROUTER_BY_CHAIN_ID, PLATYPUS_AVALANCHE_INFOS, - POLYDEX_ROUTER_BY_CHAIN_ID, QUICKSWAP_ROUTER_BY_CHAIN_ID, SADDLE_MAINNET_INFOS, SHELL_POOLS_BY_CHAIN_ID, @@ -529,16 +525,12 @@ export function uniswapV2LikeRouterAddress( | ERC20BridgeSource.PancakeSwapV2 | ERC20BridgeSource.BakerySwap | ERC20BridgeSource.ApeSwap - | ERC20BridgeSource.CafeSwap | ERC20BridgeSource.CheeseSwap - | ERC20BridgeSource.JulSwap | ERC20BridgeSource.QuickSwap | ERC20BridgeSource.ComethSwap | ERC20BridgeSource.Dfyn | ERC20BridgeSource.WaultSwap - | ERC20BridgeSource.Polydex | ERC20BridgeSource.ShibaSwap - | ERC20BridgeSource.JetSwap | ERC20BridgeSource.TraderJoe | ERC20BridgeSource.Pangolin | ERC20BridgeSource.UbeSwap @@ -566,12 +558,8 @@ export function uniswapV2LikeRouterAddress( return BAKERYSWAP_ROUTER_BY_CHAIN_ID[chainId]; case ERC20BridgeSource.ApeSwap: return APESWAP_ROUTER_BY_CHAIN_ID[chainId]; - case ERC20BridgeSource.CafeSwap: - return CAFESWAP_ROUTER_BY_CHAIN_ID[chainId]; case ERC20BridgeSource.CheeseSwap: return CHEESESWAP_ROUTER_BY_CHAIN_ID[chainId]; - case ERC20BridgeSource.JulSwap: - return JULSWAP_ROUTER_BY_CHAIN_ID[chainId]; case ERC20BridgeSource.QuickSwap: return QUICKSWAP_ROUTER_BY_CHAIN_ID[chainId]; case ERC20BridgeSource.ComethSwap: @@ -580,12 +568,8 @@ export function uniswapV2LikeRouterAddress( return DFYN_ROUTER_BY_CHAIN_ID[chainId]; case ERC20BridgeSource.WaultSwap: return WAULTSWAP_ROUTER_BY_CHAIN_ID[chainId]; - case ERC20BridgeSource.Polydex: - return POLYDEX_ROUTER_BY_CHAIN_ID[chainId]; case ERC20BridgeSource.ShibaSwap: return SHIBASWAP_ROUTER_BY_CHAIN_ID[chainId]; - case ERC20BridgeSource.JetSwap: - return JETSWAP_ROUTER_BY_CHAIN_ID[chainId]; case ERC20BridgeSource.Pangolin: return PANGOLIN_ROUTER_BY_CHAIN_ID[chainId]; case ERC20BridgeSource.TraderJoe: diff --git a/packages/asset-swapper/src/utils/market_operation_utils/constants.ts b/packages/asset-swapper/src/utils/market_operation_utils/constants.ts index dbc7ae6d74..6210f87df3 100644 --- a/packages/asset-swapper/src/utils/market_operation_utils/constants.ts +++ b/packages/asset-swapper/src/utils/market_operation_utils/constants.ts @@ -137,13 +137,10 @@ export const SELL_SOURCE_FILTER_BY_CHAIN_ID = valueByChainId( ERC20BridgeSource.SushiSwap, ERC20BridgeSource.Smoothy, ERC20BridgeSource.ApeSwap, - ERC20BridgeSource.CafeSwap, ERC20BridgeSource.CheeseSwap, - ERC20BridgeSource.JulSwap, ERC20BridgeSource.LiquidityProvider, ERC20BridgeSource.WaultSwap, ERC20BridgeSource.FirebirdOneSwap, - ERC20BridgeSource.JetSwap, ERC20BridgeSource.ACryptos, ERC20BridgeSource.KyberDmm, ERC20BridgeSource.BiSwap, @@ -161,14 +158,12 @@ export const SELL_SOURCE_FILTER_BY_CHAIN_ID = valueByChainId( ERC20BridgeSource.Dodo, ERC20BridgeSource.CurveV2, ERC20BridgeSource.WaultSwap, - ERC20BridgeSource.Polydex, ERC20BridgeSource.ApeSwap, ERC20BridgeSource.FirebirdOneSwap, ERC20BridgeSource.BalancerV2, ERC20BridgeSource.KyberDmm, ERC20BridgeSource.LiquidityProvider, ERC20BridgeSource.MultiHop, - ERC20BridgeSource.JetSwap, ERC20BridgeSource.IronSwap, ERC20BridgeSource.AaveV2, ERC20BridgeSource.UniswapV3, @@ -194,7 +189,6 @@ export const SELL_SOURCE_FILTER_BY_CHAIN_ID = valueByChainId( ERC20BridgeSource.Curve, ERC20BridgeSource.CurveV2, ERC20BridgeSource.Geist, - ERC20BridgeSource.JetSwap, ERC20BridgeSource.MorpheusSwap, ERC20BridgeSource.SpiritSwap, ERC20BridgeSource.SpookySwap, @@ -286,13 +280,10 @@ export const BUY_SOURCE_FILTER_BY_CHAIN_ID = valueByChainId( ERC20BridgeSource.SushiSwap, ERC20BridgeSource.Smoothy, ERC20BridgeSource.ApeSwap, - ERC20BridgeSource.CafeSwap, ERC20BridgeSource.CheeseSwap, - ERC20BridgeSource.JulSwap, ERC20BridgeSource.LiquidityProvider, ERC20BridgeSource.WaultSwap, ERC20BridgeSource.FirebirdOneSwap, - ERC20BridgeSource.JetSwap, ERC20BridgeSource.ACryptos, ERC20BridgeSource.KyberDmm, ERC20BridgeSource.BiSwap, @@ -310,14 +301,12 @@ export const BUY_SOURCE_FILTER_BY_CHAIN_ID = valueByChainId( ERC20BridgeSource.Dodo, ERC20BridgeSource.CurveV2, ERC20BridgeSource.WaultSwap, - ERC20BridgeSource.Polydex, ERC20BridgeSource.ApeSwap, ERC20BridgeSource.FirebirdOneSwap, ERC20BridgeSource.BalancerV2, ERC20BridgeSource.KyberDmm, ERC20BridgeSource.LiquidityProvider, ERC20BridgeSource.MultiHop, - ERC20BridgeSource.JetSwap, ERC20BridgeSource.IronSwap, ERC20BridgeSource.AaveV2, ERC20BridgeSource.UniswapV3, @@ -343,7 +332,6 @@ export const BUY_SOURCE_FILTER_BY_CHAIN_ID = valueByChainId( ERC20BridgeSource.Curve, ERC20BridgeSource.CurveV2, ERC20BridgeSource.Geist, - ERC20BridgeSource.JetSwap, ERC20BridgeSource.MorpheusSwap, ERC20BridgeSource.SpiritSwap, ERC20BridgeSource.SpookySwap, @@ -2272,13 +2260,6 @@ export const APESWAP_ROUTER_BY_CHAIN_ID = valueByChainId( NULL_ADDRESS, ); -export const CAFESWAP_ROUTER_BY_CHAIN_ID = valueByChainId( - { - [ChainId.BSC]: '0x933daea3a5995fb94b14a7696a5f3ffd7b1e385a', - }, - NULL_ADDRESS, -); - export const CHEESESWAP_ROUTER_BY_CHAIN_ID = valueByChainId( { [ChainId.BSC]: '0x3047799262d8d2ef41ed2a222205968bc9b0d895', @@ -2286,13 +2267,6 @@ export const CHEESESWAP_ROUTER_BY_CHAIN_ID = valueByChainId( NULL_ADDRESS, ); -export const JULSWAP_ROUTER_BY_CHAIN_ID = valueByChainId( - { - [ChainId.BSC]: '0xbd67d157502a23309db761c41965600c2ec788b2', - }, - NULL_ADDRESS, -); - // // Polygon // @@ -2325,13 +2299,6 @@ export const WAULTSWAP_ROUTER_BY_CHAIN_ID = valueByChainId( NULL_ADDRESS, ); -export const POLYDEX_ROUTER_BY_CHAIN_ID = valueByChainId( - { - [ChainId.Polygon]: '0xe5c67ba380fb2f70a47b489e94bced486bb8fb74', - }, - NULL_ADDRESS, -); - export const MESHSWAP_ROUTER_BY_CHAIN_ID = valueByChainId( { [ChainId.Polygon]: '0x10f4a785f458bc144e3706575924889954946639', @@ -2339,15 +2306,6 @@ export const MESHSWAP_ROUTER_BY_CHAIN_ID = valueByChainId( NULL_ADDRESS, ); -export const JETSWAP_ROUTER_BY_CHAIN_ID = valueByChainId( - { - [ChainId.BSC]: '0xbe65b8f75b9f20f4c522e0067a3887fada714800', - [ChainId.Polygon]: '0x5c6ec38fb0e2609672bdf628b1fd605a523e5923', - [ChainId.Fantom]: '0x845e76a8691423fbc4ecb8dd77556cb61c09ee25', - }, - NULL_ADDRESS, -); - export const PANGOLIN_ROUTER_BY_CHAIN_ID = valueByChainId( { [ChainId.Avalanche]: '0xe54ca86531e17ef3616d22ca28b0d458b6c89106', @@ -2448,9 +2406,7 @@ export const VIP_ERC20_BRIDGE_SOURCES_BY_CHAIN_ID = valueByChainId = { [ERC20BridgeSource.PancakeSwapV2]: uniswapV2CloneGasSchedule, [ERC20BridgeSource.BakerySwap]: uniswapV2CloneGasSchedule, [ERC20BridgeSource.ApeSwap]: uniswapV2CloneGasSchedule, - [ERC20BridgeSource.CafeSwap]: uniswapV2CloneGasSchedule, [ERC20BridgeSource.CheeseSwap]: uniswapV2CloneGasSchedule, - [ERC20BridgeSource.JulSwap]: uniswapV2CloneGasSchedule, [ERC20BridgeSource.WaultSwap]: uniswapV2CloneGasSchedule, [ERC20BridgeSource.ACryptos]: fillData => (fillData as CurveFillData).pool.gasSchedule, @@ -2638,8 +2592,6 @@ export const DEFAULT_GAS_SCHEDULE: Required = { [ERC20BridgeSource.QuickSwap]: uniswapV2CloneGasSchedule, [ERC20BridgeSource.ComethSwap]: uniswapV2CloneGasSchedule, [ERC20BridgeSource.Dfyn]: uniswapV2CloneGasSchedule, - [ERC20BridgeSource.Polydex]: uniswapV2CloneGasSchedule, - [ERC20BridgeSource.JetSwap]: uniswapV2CloneGasSchedule, [ERC20BridgeSource.MeshSwap]: uniswapV2CloneGasSchedule, // diff --git a/packages/asset-swapper/src/utils/market_operation_utils/orders.ts b/packages/asset-swapper/src/utils/market_operation_utils/orders.ts index a5d4e22782..15832bfc0a 100644 --- a/packages/asset-swapper/src/utils/market_operation_utils/orders.ts +++ b/packages/asset-swapper/src/utils/market_operation_utils/orders.ts @@ -143,12 +143,8 @@ export function getErc20BridgeSourceToBridgeSource(source: ERC20BridgeSource): s return encodeBridgeSourceId(BridgeProtocol.Curve, 'xSigma'); case ERC20BridgeSource.ApeSwap: return encodeBridgeSourceId(BridgeProtocol.UniswapV2, 'ApeSwap'); - case ERC20BridgeSource.CafeSwap: - return encodeBridgeSourceId(BridgeProtocol.UniswapV2, 'CafeSwap'); case ERC20BridgeSource.CheeseSwap: return encodeBridgeSourceId(BridgeProtocol.UniswapV2, 'CheeseSwap'); - case ERC20BridgeSource.JulSwap: - return encodeBridgeSourceId(BridgeProtocol.UniswapV2, 'JulSwap'); case ERC20BridgeSource.UniswapV3: return encodeBridgeSourceId(BridgeProtocol.UniswapV3, 'UniswapV3'); case ERC20BridgeSource.KyberDmm: @@ -163,16 +159,12 @@ export function getErc20BridgeSourceToBridgeSource(source: ERC20BridgeSource): s return encodeBridgeSourceId(BridgeProtocol.CurveV2, 'CurveV2'); case ERC20BridgeSource.WaultSwap: return encodeBridgeSourceId(BridgeProtocol.UniswapV2, 'WaultSwap'); - case ERC20BridgeSource.Polydex: - return encodeBridgeSourceId(BridgeProtocol.UniswapV2, 'Polydex'); case ERC20BridgeSource.FirebirdOneSwap: return encodeBridgeSourceId(BridgeProtocol.Nerve, 'FirebirdOneSwap'); case ERC20BridgeSource.Lido: return encodeBridgeSourceId(BridgeProtocol.Lido, 'Lido'); case ERC20BridgeSource.ShibaSwap: return encodeBridgeSourceId(BridgeProtocol.UniswapV2, 'ShibaSwap'); - case ERC20BridgeSource.JetSwap: - return encodeBridgeSourceId(BridgeProtocol.UniswapV2, 'JetSwap'); case ERC20BridgeSource.IronSwap: return encodeBridgeSourceId(BridgeProtocol.Nerve, 'IronSwap'); case ERC20BridgeSource.ACryptos: @@ -290,16 +282,12 @@ export function createBridgeDataForBridgeOrder(order: OptimizedMarketBridgeOrder case ERC20BridgeSource.PancakeSwapV2: case ERC20BridgeSource.BakerySwap: case ERC20BridgeSource.ApeSwap: - case ERC20BridgeSource.CafeSwap: case ERC20BridgeSource.CheeseSwap: - case ERC20BridgeSource.JulSwap: case ERC20BridgeSource.QuickSwap: case ERC20BridgeSource.ComethSwap: case ERC20BridgeSource.Dfyn: case ERC20BridgeSource.WaultSwap: - case ERC20BridgeSource.Polydex: case ERC20BridgeSource.ShibaSwap: - case ERC20BridgeSource.JetSwap: case ERC20BridgeSource.Pangolin: case ERC20BridgeSource.TraderJoe: case ERC20BridgeSource.UbeSwap: @@ -552,16 +540,12 @@ export const BRIDGE_ENCODERS: { [ERC20BridgeSource.PancakeSwapV2]: routerAddressPathEncoder, [ERC20BridgeSource.BakerySwap]: routerAddressPathEncoder, [ERC20BridgeSource.ApeSwap]: routerAddressPathEncoder, - [ERC20BridgeSource.CafeSwap]: routerAddressPathEncoder, [ERC20BridgeSource.CheeseSwap]: routerAddressPathEncoder, - [ERC20BridgeSource.JulSwap]: routerAddressPathEncoder, [ERC20BridgeSource.WaultSwap]: routerAddressPathEncoder, // Polygon [ERC20BridgeSource.QuickSwap]: routerAddressPathEncoder, [ERC20BridgeSource.ComethSwap]: routerAddressPathEncoder, [ERC20BridgeSource.Dfyn]: routerAddressPathEncoder, - [ERC20BridgeSource.Polydex]: routerAddressPathEncoder, - [ERC20BridgeSource.JetSwap]: routerAddressPathEncoder, // Generic pools [ERC20BridgeSource.Shell]: poolEncoder, [ERC20BridgeSource.Component]: poolEncoder, diff --git a/packages/asset-swapper/src/utils/market_operation_utils/sampler_operations.ts b/packages/asset-swapper/src/utils/market_operation_utils/sampler_operations.ts index c02cd411da..8fab5a9dd4 100644 --- a/packages/asset-swapper/src/utils/market_operation_utils/sampler_operations.ts +++ b/packages/asset-swapper/src/utils/market_operation_utils/sampler_operations.ts @@ -1479,16 +1479,12 @@ export class SamplerOperations { case ERC20BridgeSource.PancakeSwapV2: case ERC20BridgeSource.BakerySwap: case ERC20BridgeSource.ApeSwap: - case ERC20BridgeSource.CafeSwap: case ERC20BridgeSource.CheeseSwap: - case ERC20BridgeSource.JulSwap: case ERC20BridgeSource.QuickSwap: case ERC20BridgeSource.ComethSwap: case ERC20BridgeSource.Dfyn: case ERC20BridgeSource.WaultSwap: - case ERC20BridgeSource.Polydex: case ERC20BridgeSource.ShibaSwap: - case ERC20BridgeSource.JetSwap: case ERC20BridgeSource.Pangolin: case ERC20BridgeSource.TraderJoe: case ERC20BridgeSource.UbeSwap: @@ -1831,16 +1827,12 @@ export class SamplerOperations { case ERC20BridgeSource.PancakeSwapV2: case ERC20BridgeSource.BakerySwap: case ERC20BridgeSource.ApeSwap: - case ERC20BridgeSource.CafeSwap: case ERC20BridgeSource.CheeseSwap: - case ERC20BridgeSource.JulSwap: case ERC20BridgeSource.QuickSwap: case ERC20BridgeSource.ComethSwap: case ERC20BridgeSource.Dfyn: case ERC20BridgeSource.WaultSwap: - case ERC20BridgeSource.Polydex: case ERC20BridgeSource.ShibaSwap: - case ERC20BridgeSource.JetSwap: case ERC20BridgeSource.Pangolin: case ERC20BridgeSource.TraderJoe: case ERC20BridgeSource.UbeSwap: diff --git a/packages/asset-swapper/src/utils/market_operation_utils/types.ts b/packages/asset-swapper/src/utils/market_operation_utils/types.ts index edc2882c12..d54cd4ea8a 100644 --- a/packages/asset-swapper/src/utils/market_operation_utils/types.ts +++ b/packages/asset-swapper/src/utils/market_operation_utils/types.ts @@ -78,18 +78,14 @@ export enum ERC20BridgeSource { Belt = 'Belt', Ellipsis = 'Ellipsis', ApeSwap = 'ApeSwap', - CafeSwap = 'CafeSwap', CheeseSwap = 'CheeseSwap', - JulSwap = 'JulSwap', ACryptos = 'ACryptoS', // Polygon only QuickSwap = 'QuickSwap', ComethSwap = 'ComethSwap', Dfyn = 'Dfyn', WaultSwap = 'WaultSwap', - Polydex = 'Polydex', FirebirdOneSwap = 'FirebirdOneSwap', - JetSwap = 'JetSwap', IronSwap = 'IronSwap', MeshSwap = 'MeshSwap', // Avalanche