fix: resolve conflicts

gakonst · Apr 25, 2023 · 3419d75 · 3419d75
1 parent df5c8fb
commit 3419d75
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/ethers-core/src/types/chain.rs b/ethers-core/src/types/chain.rs
@@ -89,6 +89,8 @@ pub enum Chain {
 
     ScrollAlphaTestnet = 534353,
 
+    Metis = 1088,
+
     #[strum(to_string = "xdai", serialize = "gnosis", serialize = "gnosis-chain")]
     #[serde(alias = "xdai", alias = "gnosis", alias = "gnosis_chain")]
     XDai = 100,
@@ -286,7 +288,7 @@ impl Chain {
             // Explicitly exhaustive. See NB above.
             Morden | Ropsten | Rinkeby | Goerli | Kovan | XDai | Chiado | Sepolia | Moonbase |
             MoonbeamDev | Optimism | OptimismGoerli | OptimismKovan | Poa | Sokol | Rsk |
-            EmeraldTestnet | Boba | BaseGoerli | ZkSync | PolygonZkEvm | PolygonZkEvmTestnet => {
+            EmeraldTestnet | Boba | BaseGoerli | ZkSync | PolygonZkEvm | PolygonZkEvmTestnet | Metis => {
                 return None
             }
         };
@@ -348,7 +350,7 @@ impl Chain {
             Dev | AnvilHardhat | Morden | Ropsten | Rinkeby | Cronos | CronosTestnet | Kovan |
             Sokol | Poa | XDai | Moonbeam | MoonbeamDev | Moonriver | Moonbase | Evmos |
             EvmosTestnet | Chiado | Aurora | AuroraTestnet | Canto | CantoTestnet |
-            ScrollAlphaTestnet => false,
+            ScrollAlphaTestnet | Metis => false,
         }
     }
 
@@ -445,6 +447,10 @@ impl Chain {
                 ("https://blockscout.scroll.io/api", "https://blockscout.scroll.io/")
             }
 
+            Metis => {
+                ("https://andromeda-explorer.metis.io/api", "https://andromeda-explorer.metis.io/")
+            }
+
             Chiado => {
                 ("https://blockscout.chiadochain.net/api", "https://blockscout.chiadochain.net")
             }
@@ -562,6 +568,7 @@ impl Chain {
             // Explicitly exhaustive. See NB above.
             XDai |
             ScrollAlphaTestnet |
+            Metis |
             Chiado |
             Sepolia |
             Rsk |