From 9536df2ff1f330413749376de5387ea801ac5fbc Mon Sep 17 00:00:00 2001
From: Kristie Huang <kristiehuang01@gmail.com>
Date: Tue, 31 Oct 2023 16:26:44 -0400
Subject: [PATCH] fix: remove bridged USDC from quickselect (#7529)

* fix: remove bridged usdc from quickselect

* oops remove migrations logic

* update routing test
---
 src/constants/routing.test.ts |  2 +-
 src/constants/routing.ts      | 17 +++--------------
 src/constants/tokens.ts       | 21 ---------------------
 3 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/src/constants/routing.test.ts b/src/constants/routing.test.ts
index 0222fb3140..b712328ab8 100644
--- a/src/constants/routing.test.ts
+++ b/src/constants/routing.test.ts
@@ -14,7 +14,7 @@ describe('Routing', () => {
     })
     it('contains all coins for optimism', () => {
       const symbols = COMMON_BASES[ChainId.OPTIMISM].map((coin) => coin.symbol)
-      expect(symbols).toEqual(['ETH', 'OP', 'DAI', 'USDC', 'USDC.e', 'USDT', 'WBTC'])
+      expect(symbols).toEqual(['ETH', 'OP', 'DAI', 'USDC', 'USDT', 'WBTC'])
     })
     it('contains all coins for polygon', () => {
       const symbols = COMMON_BASES[ChainId.POLYGON].map((coin) => coin.symbol)
diff --git a/src/constants/routing.ts b/src/constants/routing.ts
index e830a63361..57944cc299 100644
--- a/src/constants/routing.ts
+++ b/src/constants/routing.ts
@@ -20,7 +20,6 @@ import {
   OP,
   PORTAL_ETH_CELO,
   PORTAL_USDC_CELO,
-  USDbC_BASE,
   USDC_ARBITRUM,
   USDC_ARBITRUM_GOERLI,
   USDC_AVALANCHE,
@@ -31,8 +30,6 @@ import {
   USDC_OPTIMISM_GOERLI,
   USDC_POLYGON,
   USDC_POLYGON_MUMBAI,
-  USDCe_OPTIMISM,
-  USDCe_OPTIMISM_GOERLI,
   USDT,
   USDT_ARBITRUM_ONE,
   USDT_AVALANCHE,
@@ -94,18 +91,10 @@ export const COMMON_BASES: ChainCurrencyList = {
     USDC_ARBITRUM_GOERLI,
   ],
 
-  [ChainId.OPTIMISM]: [
-    nativeOnChain(ChainId.OPTIMISM),
-    OP,
-    DAI_OPTIMISM,
-    USDC_OPTIMISM,
-    USDCe_OPTIMISM,
-    USDT_OPTIMISM,
-    WBTC_OPTIMISM,
-  ],
-  [ChainId.OPTIMISM_GOERLI]: [nativeOnChain(ChainId.OPTIMISM_GOERLI), USDC_OPTIMISM_GOERLI, USDCe_OPTIMISM_GOERLI],
+  [ChainId.OPTIMISM]: [nativeOnChain(ChainId.OPTIMISM), OP, DAI_OPTIMISM, USDC_OPTIMISM, USDT_OPTIMISM, WBTC_OPTIMISM],
+  [ChainId.OPTIMISM_GOERLI]: [nativeOnChain(ChainId.OPTIMISM_GOERLI), USDC_OPTIMISM_GOERLI],
 
-  [ChainId.BASE]: [nativeOnChain(ChainId.BASE), WRAPPED_NATIVE_CURRENCY[ChainId.BASE] as Token, USDC_BASE, USDbC_BASE],
+  [ChainId.BASE]: [nativeOnChain(ChainId.BASE), WRAPPED_NATIVE_CURRENCY[ChainId.BASE] as Token, USDC_BASE],
 
   [ChainId.POLYGON]: [
     nativeOnChain(ChainId.POLYGON),
diff --git a/src/constants/tokens.ts b/src/constants/tokens.ts
index 919153f900..31ded79413 100644
--- a/src/constants/tokens.ts
+++ b/src/constants/tokens.ts
@@ -24,13 +24,6 @@ export const USDC_OPTIMISM = new Token(
   'USDC',
   'USD//C'
 )
-export const USDCe_OPTIMISM = new Token(
-  ChainId.OPTIMISM,
-  '0x7F5c764cBc14f9669B88837ca1490cCa17c31607',
-  6,
-  'USDC.e',
-  'Bridged USDC'
-)
 export const USDC_OPTIMISM_GOERLI = new Token(
   ChainId.OPTIMISM_GOERLI,
   '0xe05606174bac4A6364B31bd0eCA4bf4dD368f8C6',
@@ -38,13 +31,6 @@ export const USDC_OPTIMISM_GOERLI = new Token(
   'USDC',
   'USD//C'
 )
-export const USDCe_OPTIMISM_GOERLI = new Token(
-  ChainId.OPTIMISM_GOERLI,
-  '0x7E07E15D2a87A24492740D16f5bdF58c16db0c4E',
-  6,
-  'USDC.e',
-  'Bridged USDC'
-)
 export const USDC_ARBITRUM = new Token(
   ChainId.ARBITRUM_ONE,
   '0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
@@ -80,13 +66,6 @@ export const PORTAL_USDC_CELO = new Token(
   'USDCet',
   'USDC (Portal from Ethereum)'
 )
-export const USDbC_BASE = new Token(
-  ChainId.BASE,
-  '0xd9aAEc86B65D86f6A7B5B1b0c42FFA531710b6CA',
-  6,
-  'USDbC',
-  'USD Base Coin'
-)
 export const USDC_BASE = new Token(ChainId.BASE, '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913', 6, 'USDC', 'USD Coin')
 
 export const DAI = new Token(ChainId.MAINNET, '0x6B175474E89094C44Da98b954EedeAC495271d0F', 18, 'DAI', 'Dai Stablecoin')