From ab47a3cd8d4cf5437fab2427d3452c9d2f147882 Mon Sep 17 00:00:00 2001
From: Hamdi Allam <hamdi.allam97@gmail.com>
Date: Wed, 13 Mar 2024 08:34:57 -0700
Subject: [PATCH] fix (#689)

---
 optimism.tokenlist.json |  2 +-
 src/generate.ts         | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/optimism.tokenlist.json b/optimism.tokenlist.json
index 8e17d12a5..60e367ff5 100644
--- a/optimism.tokenlist.json
+++ b/optimism.tokenlist.json
@@ -7174,4 +7174,4 @@
     "minor": 0,
     "patch": 49
   }
-}
\ No newline at end of file
+}
diff --git a/src/generate.ts b/src/generate.ts
index 01868d73e..8fea6afd4 100644
--- a/src/generate.ts
+++ b/src/generate.ts
@@ -86,16 +86,18 @@ const getBridges = (tokenData: TokenData, chain: string, token: Token) => {
     if (tokenBridgeOverride && typeof tokenBridgeOverride !== 'string') {
       throw new Error('L2 Bridge override should be a string')
     }
+    const networkSep = chain.indexOf('-')
+    const chainName = networkSep === -1 ? chain : chain.slice(0, networkSep)
+    const bridgeKey = `${chainName}BridgeAddress`
     return [
       {
-        [chain === 'optimism' || chain === 'optimism-goerli' || chain === 'optimism-sepolia'
-          ? 'optimismBridgeAddress'
-          : 'baseBridgeAddress']:
+        [bridgeKey]:
           tokenBridgeOverride ??
           L2_STANDARD_BRIDGE_INFORMATION[chain].l2StandardBridgeAddress,
       },
     ]
   }
+
   if (isL1Chain(chain)) {
     const l2ChainsForL1 = L1_STANDARD_BRIDGE_INFORMATION[chain].map(
       (l1Bridge) => l1Bridge.l2Chain
@@ -116,10 +118,11 @@ const getBridges = (tokenData: TokenData, chain: string, token: Token) => {
           'L1 Bridge override should be a map from l2 chain to bridge address'
         )
       }
+      const networkSep = l2Chain.indexOf('-')
+      const chainName = networkSep === -1 ? l2Chain : l2Chain.slice(0, networkSep)
+      const bridgeKey = `${chainName}BridgeAddress`
       return {
-        [l2Chain === 'optimism' || l2Chain === 'optimism-goerli' || l2Chain === 'optimism-sepolia'
-          ? 'optimismBridgeAddress'
-          : 'baseBridgeAddress']:
+        [bridgeKey]:
           tokenBridgeOverride?.[l2Chain] ??
           l1StandardBridgeInfoForL2.l1StandardBridgeAddress,
       }