@uniswap/token-list-bridge-utils 2.1.0 → 2.3.0

package/src/arbitrum/instantiate_bridge.ts

@@ -3,6 +3,14 @@ import { providers } from 'ethers'
 
 const networkID = 42161
 
+const l2Rpc = (chainId: number) => {
+  if (chainId === 42161) return 'https://arb1.arbitrum.io/rpc'
+  else if (chainId === 421611) return 'https://rinkeby.arbitrum.io/rpc'
+  else if (chainId === 42170) return 'https://nova.arbitrum.io/rpc'
+  else if (chainId === 421613) return 'https://goerli-rollup.arbitrum.io/rpc'
+  throw new Error('No L2 RPC detected')
+}
+
 // ref: https://github.com/OffchainLabs/arb-token-lists/blob/master/src/lib/instantiate_bridge.ts
 export const getNetworkConfig = async () => {
   const { getL1Network, getL2Network, MultiCaller } = await import(
@@ -11,8 +19,8 @@ export const getNetworkConfig = async () => {
   const l2Network = await getL2Network(networkID)
   const l1Network = await getL1Network(l2Network.partnerChainID)
 
-  const arbProvider = new providers.JsonRpcProvider(l2Network.rpcURL)
-  const ethProvider = new providers.JsonRpcProvider(l1Network.rpcURL)
+  const arbProvider = new providers.JsonRpcProvider(l2Rpc(l2Network.chainID))
+  const ethProvider = new providers.JsonRpcProvider(process.env.MAINNET_RPC)
 
   const l1MultiCaller = await MultiCaller.fromProvider(ethProvider)
   const l2MultiCaller = await MultiCaller.fromProvider(arbProvider)

package/src/constants/chainId.ts

@@ -12,9 +12,12 @@ export enum ChainId {
   POLYGON_MUMBAI = 80001,
 
   CELO = 42220,
+  CELO_ALFAJORES = 44787,
+
   BNB = 56,
 
   AVALANCHE = 43114,
 
+  BASE = 8453,
   BASE_GOERLI = 84531,
 }

package/src/constants/tokens.ts

@@ -11,7 +11,15 @@ export const COINBASE_WRAPPED_STAKED_ETH = new Token(
 
 export const COINBASE_WRAPPED_STAKED_ETH_BASE_GOERLI = new Token(
   ChainId.BASE_GOERLI,
-  '0x7c6b91D9Be155A6Db01f749217d76fF02A7227F2',
+  '0x4fC531f8Ae7A7808E0dccCA08F1e3c7694582950',
+  18,
+  'cbETH',
+  'Coinbase Wrapped Staked ETH'
+)
+
+export const COINBASE_WRAPPED_STAKED_ETH_BASE = new Token(
+  ChainId.BASE,
+  '0x2Ae3F1Ec7F1F5012CFEab0185bfc7aa3cf0DEc22',
   18,
   'cbETH',
   'Coinbase Wrapped Staked ETH'
@@ -25,6 +33,14 @@ export const COINBASE_WRAPPED_STAKED_ETH_ARBITRUM_ONE = new Token(
   'Coinbase Wrapped Staked ETH'
 )
 
+export const COINBASE_WRAPPED_STAKED_ETH_OPTIMISM = new Token(
+  ChainId.OPTIMISM,
+  '0xadDb6A0412DE1BA0F936DCaeb8Aaa24578dcF3B2',
+  18,
+  'cbETH',
+  'Coinbase Wrapped Staked ETH'
+)
+
 export const DAI = new Token(
   ChainId.MAINNET,
   '0x6B175474E89094C44Da98b954EedeAC495271d0F',
@@ -70,6 +86,22 @@ export const DAI_AVALANCHE = new Token(
   'DAI.e'
 )
 
+export const DAI_BASE = new Token(
+  ChainId.BASE,
+  '0x50c5725949A6F0c72E6C4a641F24049A917DB0Cb',
+  18,
+  'DAI',
+  'Dai Stablecoin'
+)
+
+export const DAI_BASE_GOERLI = new Token(
+  ChainId.BASE_GOERLI,
+  '0x174956bDfbCEb6e53089297cce4fE2825E58d92C',
+  18,
+  'DAI',
+  'Dai Stablecoin'
+)
+
 export const USDT = new Token(
   ChainId.MAINNET,
   '0xdAC17F958D2ee523a2206206994597C13D831ec7',
@@ -85,3 +117,11 @@ export const USDT_BNB = new Token(
   'USDT',
   'Tether USD'
 )
+
+export const USDT_CELO = new Token(
+  ChainId.CELO,
+  '0x617f3112bf5397D0467D315cC709EF968D9ba546',
+  6,
+  'USDT',
+  'Tether USD'
+)

package/src/fixtures/index.ts

@@ -13,6 +13,11 @@ import {
   COINBASE_WRAPPED_STAKED_ETH,
   COINBASE_WRAPPED_STAKED_ETH_BASE_GOERLI,
   COINBASE_WRAPPED_STAKED_ETH_ARBITRUM_ONE,
+  COINBASE_WRAPPED_STAKED_ETH_BASE,
+  DAI_BASE_GOERLI,
+  COINBASE_WRAPPED_STAKED_ETH_OPTIMISM,
+  DAI_BASE,
+  USDT_CELO,
 } from '../constants/tokens'
 import { compareTokenInfos } from '../utils'
 
@@ -33,6 +38,9 @@ export const Tokens: Partial<Record<ChainId, Record<string, TokenInfo>>> = {
   },
   [ChainId.OPTIMISM]: {
     DAI: tokenToTokenInfo(DAI_OPTIMISM),
+    COINBASE_WRAPPED_STAKED_ETH: tokenToTokenInfo(
+      COINBASE_WRAPPED_STAKED_ETH_OPTIMISM
+    ),
   },
   [ChainId.BNB]: {
     DAI: tokenToTokenInfo(DAI_BNB),
@@ -41,11 +49,21 @@ export const Tokens: Partial<Record<ChainId, Record<string, TokenInfo>>> = {
   [ChainId.AVALANCHE]: {
     DAI: tokenToTokenInfo(DAI_AVALANCHE),
   },
+  [ChainId.BASE]: {
+    DAI: tokenToTokenInfo(DAI_BASE),
+    COINBASE_WRAPPED_STAKED_ETH: tokenToTokenInfo(
+      COINBASE_WRAPPED_STAKED_ETH_BASE
+    ),
+  },
   [ChainId.BASE_GOERLI]: {
+    DAI: tokenToTokenInfo(DAI_BASE_GOERLI),
     COINBASE_WRAPPED_STAKED_ETH: tokenToTokenInfo(
       COINBASE_WRAPPED_STAKED_ETH_BASE_GOERLI
     ),
   },
+  [ChainId.CELO]: {
+    USDT: tokenToTokenInfo(USDT_CELO),
+  },
 }
 
 export const sampleL1TokenList: TokenList = {
@@ -222,6 +240,33 @@ export const bnbedSampleTokenList_2 = {
   ].sort(compareTokenInfos),
 }
 
+export const celoedSampleTokenList = {
+  ...sampleL1TokenList_2,
+  name: 'Celo Sample',
+  tokens: [
+    {
+      ...Tokens[ChainId.CELO]!.USDT,
+      extensions: {
+        bridgeInfo: {
+          [ChainId.MAINNET]: {
+            tokenAddress: USDT.address,
+          },
+        },
+      },
+    } as unknown as TokenInfo,
+    {
+      ...(Tokens[ChainId.MAINNET]!.USDT as unknown as TokenInfo),
+      extensions: {
+        bridgeInfo: {
+          [ChainId.CELO]: {
+            tokenAddress: USDT_CELO.address,
+          },
+        },
+      },
+    } as unknown as TokenInfo,
+  ].sort(compareTokenInfos),
+}
+
 export const baseGoerliSampleTokenList_3 = {
   ...sampleL1TokenList_3,
   name: 'Base Goerli Sample_3',
@@ -250,6 +295,34 @@ export const baseGoerliSampleTokenList_3 = {
   ].sort(compareTokenInfos),
 }
 
+export const baseSampleTokenList_3 = {
+  ...sampleL1TokenList_3,
+  name: 'Base Sample_3',
+  tokens: [
+    {
+      ...Tokens[ChainId.BASE]!.COINBASE_WRAPPED_STAKED_ETH,
+      extensions: {
+        bridgeInfo: {
+          [ChainId.MAINNET]: {
+            tokenAddress: COINBASE_WRAPPED_STAKED_ETH.address,
+          },
+        },
+      },
+    } as unknown as TokenInfo,
+    {
+      ...(Tokens[ChainId.MAINNET]!
+        .COINBASE_WRAPPED_STAKED_ETH as unknown as TokenInfo),
+      extensions: {
+        bridgeInfo: {
+          [ChainId.BASE]: {
+            tokenAddress: COINBASE_WRAPPED_STAKED_ETH_BASE.address,
+          },
+        },
+      },
+    } as unknown as TokenInfo,
+  ].sort(compareTokenInfos),
+}
+
 export const optimizedSampleTokenList = {
   ...sampleL1TokenList,
   name: 'Optimized Sample',

package/src/index.test.ts

@@ -4,10 +4,14 @@ import { ChainId } from './constants/chainId'
 import {
   COINBASE_WRAPPED_STAKED_ETH,
   COINBASE_WRAPPED_STAKED_ETH_ARBITRUM_ONE,
+  COINBASE_WRAPPED_STAKED_ETH_BASE,
   COINBASE_WRAPPED_STAKED_ETH_BASE_GOERLI,
+  COINBASE_WRAPPED_STAKED_ETH_OPTIMISM,
   DAI,
   DAI_ARBITRUM_ONE,
   DAI_AVALANCHE,
+  DAI_BASE,
+  DAI_BASE_GOERLI,
   DAI_BNB,
   DAI_OPTIMISM,
   DAI_POLYGON,
@@ -24,6 +28,8 @@ import {
   avalanchedSampleTokenList,
   sampleL1TokenList_3,
   baseGoerliSampleTokenList_3,
+  baseSampleTokenList_3,
+  celoedSampleTokenList,
 } from './fixtures'
 
 jest.setTimeout(15000)
@@ -125,6 +131,22 @@ it('outputs bnb list correctly', async () => {
   )
 })
 
+it('outputs celo list correctly', async () => {
+  const tokenList = await chainifyTokenList([ChainId.CELO], sampleL1TokenList_2)
+  expect(tokenList).toBeDefined()
+  expect(tokenList?.version).toEqual(celoedSampleTokenList.version)
+  expect(
+    tokenList?.tokens.map((t) => [t.address, t.chainId, t.extensions])
+  ).toEqual(
+    // ignores other metadata
+    celoedSampleTokenList.tokens.map((t) => [
+      t.address,
+      t.chainId,
+      t.extensions,
+    ])
+  )
+})
+
 it('outputs bnb list correctly with different decimals', async () => {
   const tokenList = await chainifyTokenList([ChainId.BNB], sampleL1TokenList_2)
   expect(tokenList).toBeDefined()
@@ -160,6 +182,22 @@ it('outputs base goerli list correctly', async () => {
   )
 })
 
+it('outputs base list correctly', async () => {
+  const tokenList = await chainifyTokenList([ChainId.BASE], sampleL1TokenList_3)
+  expect(tokenList).toBeDefined()
+  expect(tokenList?.version).toEqual(baseSampleTokenList_3.version)
+  expect(
+    tokenList?.tokens.map((t) => [t.address, t.chainId, t.extensions])
+  ).toEqual(
+    // ignores other metadata
+    baseSampleTokenList_3.tokens.map((t) => [
+      t.address,
+      t.chainId,
+      t.extensions,
+    ])
+  )
+})
+
 describe(mergeTokenLists, () => {
   it('correctly deduplicates', () => {
     const merged = mergeTokenLists(sampleL1TokenList, sampleL1TokenList)
@@ -255,32 +293,11 @@ describe(mergeTokenLists, () => {
   })
 })
 describe(chainify, () => {
-  it('creates tokenMap correctly in chainify', async () => {
+  it('provides bridge extensions', async () => {
     const chainified = await chainify(sampleL1TokenList)
 
-    expect(chainified.tokenMap).toEqual({
-      '10_0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1': {
-        ...Tokens[ChainId.OPTIMISM]!.DAI,
-        name: 'Dai Stablecoin',
-        extensions: {
-          bridgeInfo: {
-            [ChainId.MAINNET]: {
-              tokenAddress: DAI.address,
-            },
-          },
-        },
-      },
-      '137_0x8f3Cf7ad23Cd3CaDbD9735AFf958023239c6A063': {
-        ...Tokens[ChainId.POLYGON]!.DAI,
-        extensions: {
-          bridgeInfo: {
-            [ChainId.MAINNET]: {
-              tokenAddress: DAI.address,
-            },
-          },
-        },
-      },
-      '1_0x6B175474E89094C44Da98b954EedeAC495271d0F': {
+    expect(chainified.tokens).toEqual([
+      {
         ...Tokens[ChainId.MAINNET]!.DAI,
         extensions: {
           bridgeInfo: {
@@ -301,26 +318,18 @@ describe(chainify, () => {
               // destBridgeAddress: arbBridgeL2Address,
               // originBridgeAddress: arbBridgeL1Address,
             },
-          },
-        },
-      },
-      '42161_0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1': {
-        ...Tokens[ChainId.ARBITRUM_ONE]!.DAI,
-        extensions: {
-          bridgeInfo: {
-            [ChainId.MAINNET]: {
-              tokenAddress: DAI.address,
-              // originBridgeAddress: arbBridgeL2Address,
-              // destBridgeAddress: arbBridgeL1Address,
+            [ChainId.BASE]: {
+              tokenAddress: DAI_BASE.address,
+            },
+            [ChainId.BASE_GOERLI]: {
+              tokenAddress: DAI_BASE_GOERLI.address,
             },
           },
         },
-        name: 'Dai Stablecoin',
       },
-      '43114_0xd586E7F844cEa2F87f50152665BCbc2C279D8d70': {
-        ...Tokens[ChainId.AVALANCHE]!.DAI,
+      {
+        ...Tokens[ChainId.OPTIMISM]!.DAI,
         name: 'Dai Stablecoin',
-        symbol: 'DAI',
         extensions: {
           bridgeInfo: {
             [ChainId.MAINNET]: {
@@ -329,7 +338,7 @@ describe(chainify, () => {
           },
         },
       },
-      '56_0x1AF3F329e8BE154074D8769D1FFa4eE058B1DBc3': {
+      {
         ...Tokens[ChainId.BNB]!.DAI,
         extensions: {
           bridgeInfo: {
@@ -339,40 +348,8 @@ describe(chainify, () => {
           },
         },
       },
-    })
-  })
-
-  it('provides bridge extensions', async () => {
-    const chainified = await chainify(sampleL1TokenList)
-
-    expect(chainified.tokens).toEqual([
-      {
-        ...Tokens[ChainId.MAINNET]!.DAI,
-        extensions: {
-          bridgeInfo: {
-            [ChainId.BNB]: {
-              tokenAddress: DAI_BNB.address,
-            },
-            [ChainId.AVALANCHE]: {
-              tokenAddress: DAI_AVALANCHE.address,
-            },
-            [ChainId.OPTIMISM]: {
-              tokenAddress: DAI_OPTIMISM.address,
-            },
-            [ChainId.POLYGON]: {
-              tokenAddress: DAI_POLYGON.address,
-            },
-            [ChainId.ARBITRUM_ONE]: {
-              tokenAddress: DAI_ARBITRUM_ONE.address,
-              // destBridgeAddress: arbBridgeL2Address,
-              // originBridgeAddress: arbBridgeL1Address,
-            },
-          },
-        },
-      },
       {
-        ...Tokens[ChainId.OPTIMISM]!.DAI,
-        name: 'Dai Stablecoin',
+        ...Tokens[ChainId.POLYGON]!.DAI,
         extensions: {
           bridgeInfo: {
             [ChainId.MAINNET]: {
@@ -382,7 +359,7 @@ describe(chainify, () => {
         },
       },
       {
-        ...Tokens[ChainId.BNB]!.DAI,
+        ...Tokens[ChainId.BASE]!.DAI,
         extensions: {
           bridgeInfo: {
             [ChainId.MAINNET]: {
@@ -392,32 +369,32 @@ describe(chainify, () => {
         },
       },
       {
-        ...Tokens[ChainId.POLYGON]!.DAI,
+        ...Tokens[ChainId.ARBITRUM_ONE]!.DAI,
         extensions: {
           bridgeInfo: {
             [ChainId.MAINNET]: {
               tokenAddress: DAI.address,
+              // originBridgeAddress: arbBridgeL2Address,
+              // destBridgeAddress: arbBridgeL1Address,
             },
           },
         },
+        name: 'Dai Stablecoin',
       },
       {
-        ...Tokens[ChainId.ARBITRUM_ONE]!.DAI,
+        ...Tokens[ChainId.AVALANCHE]!.DAI,
+        name: 'Dai Stablecoin',
+        symbol: 'DAI',
         extensions: {
           bridgeInfo: {
             [ChainId.MAINNET]: {
               tokenAddress: DAI.address,
-              // originBridgeAddress: arbBridgeL2Address,
-              // destBridgeAddress: arbBridgeL1Address,
             },
           },
         },
-        name: 'Dai Stablecoin',
       },
       {
-        ...Tokens[ChainId.AVALANCHE]!.DAI,
-        name: 'Dai Stablecoin',
-        symbol: 'DAI',
+        ...Tokens[ChainId.BASE_GOERLI]!.DAI,
         extensions: {
           bridgeInfo: {
             [ChainId.MAINNET]: {
@@ -429,7 +406,7 @@ describe(chainify, () => {
     ])
   })
 
-  it('provides bridge extensions for base goerli list', async () => {
+  it('provides bridge extensions for base list', async () => {
     const chainified = await chainify(sampleL1TokenList_3)
 
     expect(chainified.tokens).toEqual([
@@ -437,12 +414,40 @@ describe(chainify, () => {
         ...Tokens[ChainId.MAINNET]!.COINBASE_WRAPPED_STAKED_ETH,
         extensions: {
           bridgeInfo: {
-            [ChainId.ARBITRUM_ONE]: {
-              tokenAddress: COINBASE_WRAPPED_STAKED_ETH_ARBITRUM_ONE.address,
+            [ChainId.OPTIMISM]: {
+              tokenAddress: COINBASE_WRAPPED_STAKED_ETH_OPTIMISM.address,
+            },
+            [ChainId.BASE]: {
+              tokenAddress: COINBASE_WRAPPED_STAKED_ETH_BASE.address,
             },
             [ChainId.BASE_GOERLI]: {
               tokenAddress: COINBASE_WRAPPED_STAKED_ETH_BASE_GOERLI.address,
             },
+            [ChainId.ARBITRUM_ONE]: {
+              tokenAddress: COINBASE_WRAPPED_STAKED_ETH_ARBITRUM_ONE.address,
+            },
+          },
+        },
+      },
+      {
+        ...Tokens[ChainId.OPTIMISM]!.COINBASE_WRAPPED_STAKED_ETH,
+        name: 'Coinbase Wrapped Staked ETH',
+        extensions: {
+          bridgeInfo: {
+            [ChainId.MAINNET]: {
+              tokenAddress: COINBASE_WRAPPED_STAKED_ETH.address,
+            },
+          },
+        },
+      },
+      {
+        ...Tokens[ChainId.BASE]!.COINBASE_WRAPPED_STAKED_ETH,
+        name: 'Coinbase Wrapped Staked ETH',
+        extensions: {
+          bridgeInfo: {
+            [ChainId.MAINNET]: {
+              tokenAddress: COINBASE_WRAPPED_STAKED_ETH.address,
+            },
           },
         },
       },

package/src/index.ts

@@ -25,6 +25,7 @@ export async function chainify(
     ChainId.CELO,
     ChainId.BNB,
     ChainId.AVALANCHE,
+    ChainId.BASE,
     ChainId.BASE_GOERLI,
   ]
 
@@ -34,13 +35,7 @@ export async function chainify(
     chainified
   )
 
-  const tokenMap = {}
-  if (merged.tokens && merged.tokens.length > 0) {
-    merged.tokens.forEach((token) => {
-      tokenMap[`${token.chainId}_${token.address}`] = token
-    })
-  }
-  return { ...merged, tokenMap }
+  return merged
 }
 
 /**
@@ -81,7 +76,10 @@ export function mergeTokenLists(
     }
 
     const merged = merge(group[0], group[1])
-    if (merged.extensions?.bridgeInfo) {
+    if (
+      merged.extensions?.bridgeInfo &&
+      typeof merged.extensions.bridgeInfo === 'object'
+    ) {
       // remove reference to self-chain from merge
       delete merged.extensions.bridgeInfo[merged.chainId]
     }

package/src/local_mappings/celo.json

@@ -0,0 +1,19 @@
+{
+  "0xdac17f958d2ee523a2206206994597c13d831ec7": {
+    "childToken": "0x617f3112bf5397D0467D315cC709EF968D9ba546",
+    "decimals": 18
+  },
+  "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599": {
+    "childToken": "0xd71Ffd0940c920786eC4DbB5A12306669b5b81EF",
+    "decimals": 18
+  },
+  "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2": {
+    "childToken": "0xb829b68f57CC546dA7E5806A929e53bE32a4625D",
+    "decimals": 18
+  },
+  "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48": {
+    "childToken": "0x37f750B7cC259A2f741AF45294f6a16572CF5cAd",
+    "decimals": 6
+  }
+}
+

package/src/providers/BaseGoerliMappingProvider.ts

@@ -17,7 +17,7 @@ export class BaseGoerliMappingProvider implements MappingProvider {
 
     let allTokens = await getTokenList(baseGoerliTokenListURL)
 
-    let opTokenId_baseGoerliAddressMap = {}
+    let opTokenId_baseGoerliAddressMap: Record<string, string> = {}
     allTokens.tokens.forEach((token) => {
       if (token.chainId === ChainId.BASE_GOERLI) {
         if (typeof token.extensions?.opTokenId === 'string') {

package/src/providers/BaseMappingProvider.ts

@@ -0,0 +1,42 @@
+import { MappingProvider } from './MappingProvider'
+import { ChainId } from '../constants/chainId'
+import { getTokenList } from '../utils'
+import { GenericMappedTokenData } from '../constants/types'
+
+const baseGoerliTokenListURL =
+  'https://raw.githubusercontent.com/' +
+  'ethereum-optimism/ethereum-optimism.github.io/master/optimism.tokenlist.json'
+
+/**
+ * The Base mapping (linked above) is manually maintained by the Coinbase team
+ * in this repository: https://github.com/ethereum-optimism/ethereum-optimism.github.io.
+ */
+export class BaseMappingProvider implements MappingProvider {
+  async provide(): Promise<GenericMappedTokenData> {
+    const tokens: { [key: string]: string | undefined } = {}
+
+    let allTokens = await getTokenList(baseGoerliTokenListURL)
+
+    let opTokenId_baseAddressMap: Record<string, string> = {}
+    allTokens.tokens.forEach((token) => {
+      if (token.chainId === ChainId.BASE) {
+        if (typeof token.extensions?.opTokenId === 'string') {
+          opTokenId_baseAddressMap[token.extensions.opTokenId] = token.address
+        }
+      }
+    })
+
+    allTokens.tokens.forEach((token) => {
+      if (
+        token.chainId === ChainId.MAINNET &&
+        typeof token.extensions?.opTokenId === 'string' &&
+        token.extensions!.opTokenId in opTokenId_baseAddressMap
+      ) {
+        tokens[token.address.toLowerCase()] =
+          opTokenId_baseAddressMap[token.extensions!.opTokenId]
+      }
+    })
+
+    return tokens
+  }
+}

package/src/providers/CeloMappingProvider.ts

@@ -0,0 +1,10 @@
+import { MappingProvider } from './MappingProvider'
+import { MappedTokenData } from '../constants/types'
+import celoMappings from '../local_mappings/celo.json'
+
+// barring a better external source, we use a local source of mappings for celo
+export class CeloMappingProvider implements MappingProvider {
+  async provide(): Promise<MappedTokenData> {
+    return celoMappings as MappedTokenData
+  }
+}

package/src/providers/OptimismMappingProvider.ts

@@ -5,7 +5,7 @@ import { GenericMappedTokenData } from '../constants/types'
 
 const optimismTokenListURL =
   'https://raw.githubusercontent.com/' +
-  'ethereum-optimism/ethereum-optimism.github.io/2138386277e4156d159615d1840882cecc398437/optimism.tokenlist.json'
+  'ethereum-optimism/ethereum-optimism.github.io/master/optimism.tokenlist.json'
 
 /**
  * The Optimism L2 mapping (linked above) is manually maintained by the Optimism team.
@@ -16,14 +16,27 @@ export class OptimismMappingProvider implements MappingProvider {
   async provide(): Promise<GenericMappedTokenData> {
     const tokens: { [key: string]: string | undefined } = {}
 
-    let optimismTokens = await getTokenList(optimismTokenListURL)
+    let allTokens = await getTokenList(optimismTokenListURL)
 
-    for (const token of optimismTokens.tokens) {
-      if (token.chainId === ChainId.MAINNET) {
+    let opTokenId_baseAddressMap: Record<string, string> = {}
+    allTokens.tokens.forEach((token) => {
+      if (token.chainId === ChainId.OPTIMISM) {
+        if (typeof token.extensions?.opTokenId === 'string') {
+          opTokenId_baseAddressMap[token.extensions.opTokenId] = token.address
+        }
+      }
+    })
+
+    allTokens.tokens.forEach((token) => {
+      if (
+        token.chainId === ChainId.MAINNET &&
+        typeof token.extensions?.opTokenId === 'string' &&
+        token.extensions!.opTokenId in opTokenId_baseAddressMap
+      ) {
         tokens[token.address.toLowerCase()] =
-          token?.extensions?.bridgeInfo![ChainId.OPTIMISM].tokenAddress
+          opTokenId_baseAddressMap[token.extensions!.opTokenId]
       }
-    }
+    })
 
     return tokens
   }

package/src/providers/PolygonMappingProvider.ts

@@ -3,7 +3,8 @@ import { MappingProvider } from './MappingProvider'
 import { PolygonMappedTokenData } from '../constants/types'
 
 // called from https://mapper.polygon.technology
-const url = 'https://open-api.polygon.technology/api/v1/info/all-mappings'
+const url =
+  'https://api-polygon-tokens.polygon.technology/api/v1/info/all-mappings'
 const access_token = '504afd90-3228-4df9-9d88-9b4d70646101'
 
 /**