fix: remove georli & drop emoji support for now (ethereum-optimism#694)

* tokenlist.fix,remove unicode entry * remove goerli from schema * remove goerli token addresses * update readme & regenerate tokenlist * fix apt/sol/mpETH validation * 10.0.0 * make apt/sol/mpeth names consistent
OriginProtocol · Mar 18, 2024 · a20d8ed · a20d8ed
1 parent 311141f
commit a20d8ed
Show file tree

Hide file tree

Showing 74 changed files with 116 additions and 2,801 deletions.
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ Please note that by adding a token to the list we aren’t making any claims abo
 
 ### Specifying chains
 For right now, each OP Chain has their own review process. So, if you are adding tokens across multiple chains, please separate your pull request so that you have one PR for each chain, in order to streamline the review process. 
-- If you are adding a token to a `Base` chain (e.g. `base` [mainnet] or `base-goerli` [testnet]) please add [@roberto-bayardo](https://github.com/roberto-bayardo) as a reviewer as they are the point of contact for `Base` tokens and must approve all `Base` tokens before they are merged.
+- If you are adding a token to a `Base` chain (e.g. `base` [mainnet] or `base-sepolia` [testnet]) please add [@roberto-bayardo](https://github.com/roberto-bayardo) as a reviewer as they are the point of contact for `Base` tokens and must approve all `Base` tokens before they are merged.
   - Instead of using the predeploy token factory on Base, we recommend you use the token factory [listed here](https://docs.base.org/base-contracts/#l2-contract-addresses) for the time being to avoid having a token address that may conflict with a different token on Optimism.
 - If you are adding a token to `Zora`: please use the [`zora` label](https://github.com/ethereum-optimism/ethereum-optimism.github.io/labels/zora) and add [@tbtstl](https://github.com/tbtstl) as a reviewer.
 - If you are adding a token to `Mode`: please use the [`mode` label](https://github.com/ethereum-optimism/ethereum-optimism.github.io/labels/mode).
@@ -89,16 +89,16 @@ Add a file to your folder called `data.json` with the following format:
     "optimism": {
       "address": "0x2345234523452345234523452345234523452345"
     },
-    "goerli": {
+    "sepolia": {
       "address": "0x5678567856785678567856785678567856785678"
     },
-    "optimism-goerli": {
+    "optimism-sepolia": {
       "address": "0x6789678967896789678967896789678967896789"
     },
     "base": {
       "address": "0x7890789078907890789078907890789078907890"
     },
-    "base-goerli": {
+    "base-sepolia": {
       "address": "0x1011121011121011121011121011121011121011"
     }
   }
@@ -110,13 +110,12 @@ We currently accept tokens on the following chains:
 
 - `ethereum`
 - `optimism`
-- `goerli`
 - `sepolia`
 - `base`
-- `base-goerli`
 - `base-sepolia`
-- `optimism-goerli`
 - `optimism-sepolia`
+- `mode`
+- `pgn`
 
 #### Non-bridgable tokens
 
@@ -210,15 +209,15 @@ Here is an example:
         "bridge": "0x136b1EC699c62b0606854056f02dC7Bb80482d63"
       }
     },
-    "goerli": {
+    "sepolia": {
       "address": "0x51f44ca59b867E005e48FA573Cb8df83FC7f7597",
       "overrides": {
         "bridge": {
-          "optimism-goerli": "0x1427Bc44755d9Aa317535B1feE38922760Aa4e65"
+          "optimism-sepolia": "0x1427Bc44755d9Aa317535B1feE38922760Aa4e65"
         }
       }
     },
-    "optimism-goerli": {
+    "optimism-sepolia": {
       "address": "0x2E5ED97596a8368EB9E44B1f3F25B2E813845303",
       "overrides": {
         "bridge": "0xD2b3F0Ea40dB68088415412b0043F37B3088836D"

diff --git a/data/ALI/data.json b/data/ALI/data.json
@@ -9,14 +9,8 @@
     "ethereum": {
       "address": "0x6B0b3a982b4634aC68dD83a4DBF02311cE324181"
     },
-    "goerli": {
-      "address": "0x3ACd26F0b5080C30c066a2055A4254A5BB05F22a"
-    },
     "base": {
       "address": "0x97c806e7665d3AFd84A8Fe1837921403D59F3Dcc"
-    },
-    "base-goerli": {
-      "address": "0xC6729C6cFc6B872acF641EB3EA628C9F038e5ABb"
     }
   }
 }
diff --git a/data/APT/data.json b/data/APT/data.json
@@ -1,5 +1,5 @@
 {
-  "name": "Aptos",
+  "name": "Aptos Coin",
   "symbol": "APT",
   "decimals": 8,
   "description": "APT from Aptos, bridged by Wormhole.",
@@ -8,13 +8,16 @@
   "nobridge": true,
   "tokens": {
     "ethereum": {
-      "address": "0x8CDf7AF57E4c8B930e1B23c477c22f076530585e"
+      "address": "0x8CDf7AF57E4c8B930e1B23c477c22f076530585e",
+      "overrides": {
+        "name": "Aptos"
+      }
     },
     "optimism": {
-      "address": "0xC5B3AC2DF8D8D7AC851F763a5b3Ff23B4A696d59"
-    },
-    "goerli": {
-      "address": "0xd7A89a8DD20Cb4F252c7FB96B6421b37d82cE506"
+      "address": "0xC5B3AC2DF8D8D7AC851F763a5b3Ff23B4A696d59",
+      "overrides": {
+        "name": "Aptos"
+      }
     }
   }
 }
diff --git a/data/BTRST/data.json b/data/BTRST/data.json
@@ -15,12 +15,6 @@
     "base": {
       "address": "0xA7d68d155d17cB30e311367c2Ef1E82aB6022b67"
     },
-    "goerli": {
-      "address": "0x39e09359F5a7396937504Eb2766722e2bf4650e8"
-    },
-    "base-goerli": {
-      "address": "0x99aC4484e8a1dbd6A185380B3A811913Ac884D87"
-    },
     "sepolia": {
       "address": "0xE490c7698F2b80789Fe312162d9D0a1Bd8C9beeE"
     },

diff --git a/data/BridgedUSDC/data.json b/data/BridgedUSDC/data.json
@@ -9,36 +9,19 @@
     "ethereum": {
       "address": "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"
     },
-    "goerli": {
-      "address": "0x07865c6E87B9F70255377e024ace6630C1Eaa37F"
-    },
     "base": {
       "address": "0xd9aAEc86B65D86f6A7B5B1b0c42FFA531710b6CA",
       "overrides": {
         "name": "USD Base Coin",
         "symbol": "USDbC"
       }
     },
-    "base-goerli": {
-      "address": "0x853154e2A5604E5C74a2546E2871Ad44932eB92C",
-      "overrides": {
-        "name": "USD Base Coin",
-        "symbol": "USDbC"
-      }
-    },
     "optimism": {
       "address": "0x7F5c764cBc14f9669B88837ca1490cCa17c31607",
       "overrides": {
         "name": "Bridged USDC",
         "symbol": "USDC.e"
       }
-    },
-    "optimism-goerli": {
-      "address": "0x7E07E15D2a87A24492740D16f5bdF58c16db0c4E",
-      "overrides": {
-        "name": "Bridged USDC",
-        "symbol": "USDC.e"
-      }
     }
   }
 }
diff --git a/data/CHAIN/data.json b/data/CHAIN/data.json
@@ -8,15 +8,6 @@
   "tokens": {
     "ethereum": {
       "address": "0xC4C2614E694cF534D407Ee49F8E44D125E4681c4"
-    },
-    "goerli": {
-      "address": "0x76EBA9F21d659Fc15D5f33a1a0C7f9088D0FBd28",
-      "overrides": {
-        "name": "Chain Games"
-      }
-    },
-    "base-goerli": {
-      "address": "0xeEFf5B1cd3DE16F347996725F5184fdAA54565A0"
     }
   }
-}
+}
diff --git a/data/COMP/data.json b/data/COMP/data.json
@@ -11,15 +11,6 @@
     },
     "base": {
       "address": "0x9e1028F5F1D5eDE59748FFceE5532509976840E0"
-    },
-    "goerli": {
-      "address": "0x3587b2F7E0E2D6166d6C14230e7Fe160252B0ba4"
-    },
-    "optimism-goerli": {
-      "address": "0x6AF3cb766D6cd37449bfD321D961A61B0515c1BC"
-    },
-    "base-goerli": {
-      "address": "0xA29b548056c3fD0f68BAd9d4829EC4E66f22f796"
     }
   }
 }
diff --git a/data/DAI/data.json b/data/DAI/data.json
@@ -17,26 +17,9 @@
         "bridge": "0x467194771dAe2967Aef3ECbEDD3Bf9a310C76C65"
       }
     },
-    "goerli": {
-      "address": "0x11fE4B6AE13d2a6055C8D9cF65c55bac32B5d844",
-      "overrides": {
-        "bridge": {
-          "optimism-goerli":  "0x05a388Db09C2D44ec0b00Ee188cD42365c42Df23"
-        }
-      }
-    },
-    "optimism-goerli": {
-      "address": "0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1",
-      "overrides": {
-        "bridge": "0x467194771dAe2967Aef3ECbEDD3Bf9a310C76C65"
-      }
-    },
     "base": {
       "address": "0x50c5725949A6F0c72E6C4a641F24049A917DB0Cb"
     },
-    "base-goerli": {
-      "address": "0x174956bDfbCEb6e53089297cce4fE2825E58d92C"
-    },
     "pgn": {
       "address": "0x6C121674ba6736644A7e73A8741407fE8a5eE5BA"
     }

diff --git a/data/ECO/data.json b/data/ECO/data.json
@@ -20,20 +20,6 @@
             "overrides": {
                 "bridge": "0xAa029BbdC947F5205fBa0F3C11b592420B58f824"
             }
-        },
-        "goerli": {
-            "address": "0x3E87d4d9E69163E7590f9b39a70853cf25e5ABE3",
-            "overrides": {
-                "bridge": {
-                    "optimism-goerli": "0x9A4464D6bFE006715382D39D183AAf66c952a3e0"
-                }
-            }
-        },
-        "optimism-goerli": {
-            "address": "0xD2f598c826429EEe7c071C02735549aCd88F2c09",
-            "overrides": {
-                "bridge": "0x6aA809bAeA2e4C057b3994127cB165119c6fc3B2"
-            }
         }
     }
-}
+}
diff --git a/data/ETH+/data.json b/data/ETH+/data.json
diff --git a/data/ETH+/logo.png b/data/ETH+/logo.png
diff --git a/data/ETH/data.json b/data/ETH/data.json
@@ -9,15 +9,9 @@
     "optimism": {
       "address": "0xDeadDeAddeAddEAddeadDEaDDEAdDeaDDeAD0000"
     },
-    "goerli": {
-      "address": "0x0000000000000000000000000000000000000000"
-    },
     "sepolia": {
       "address": "0x0000000000000000000000000000000000000000"
     },
-    "optimism-goerli": {
-      "address": "0xDeadDeAddeAddEAddeadDEaDDEAdDeaDDeAD0000"
-    },
     "optimism-sepolia": {
       "address": "0xDeadDeAddeAddEAddeadDEaDDEAdDeaDDeAD0000"
     }

diff --git a/data/GIV/data.json b/data/GIV/data.json
@@ -14,20 +14,6 @@
       },
       "optimism": {
         "address": "0x528CDc92eAB044E1E39FE43B9514bfdAB4412B98"
-      },
-      "goerli": {
-        "address": "0xB9a344f23792bd2F72D050c2De8ccD6F4e700e4F",
-        "overrides": {
-          "name" : "Giveth Test Token",
-          "symbol": "DRGIV4"
-        }
-      },
-      "optimism-goerli": {
-        "address": "0xEf6301DA234fC7b0545c6E877D3359FE0B9E50a4",
-        "overrides": {
-          "name" : "Giveth Test Token",
-          "symbol": "TGIV"
-        }
       }
     }
-}
+}
diff --git a/data/HAN/data.json b/data/HAN/data.json
@@ -12,17 +12,8 @@
       "optimism": {
         "address": "0x50Bce64397C75488465253c0A034b8097FeA6578"
       },
-      "goerli": {
-        "address": "0x0c90C57aaf95A3A87eadda6ec3974c99D786511F"
-      },
-      "optimism-goerli": {
-        "address": "0x9e1028f5f1d5ede59748ffcee5532509976840e0"
-      },
       "base": {
-      "address": "0x9e5AAC1Ba1a2e6aEd6b32689DFcF62A509Ca96f3"
-      },
-      "base-goerli": {
-        "address": "0xE2B21D4684b2bA62F3BE1FE286eacb90D26E394d"
+        "address": "0x9e5AAC1Ba1a2e6aEd6b32689DFcF62A509Ca96f3"
       }
     }
   }
diff --git a/data/HANeP/data.json b/data/HANeP/data.json
@@ -12,17 +12,8 @@
     "optimism": {
       "address": "0xC3248A1bd9D72fa3DA6E6ba701E58CbF818354eB"
     },
-    "goerli": {
-      "address": "0x13Ed63d6387C54352d2F5893821068b6Cd8f8103"
-    },
-    "optimism-goerli": {
-      "address": "0xFf733b2A3557a7ed6697007ab5D11B79FdD1b76B"
-    },
     "base": {
       "address": "0x3e7eF8f50246f725885102E8238CBba33F276747"
-    },
-    "base-goerli": {
-      "address": "0x35D48A789904E9b15705977192e5d95e2aF7f1D3"
     }
   }
 }
diff --git a/data/INSURE/data.json b/data/INSURE/data.json