devop: merge conflicts

packages/extension/src/libs/nft-handlers/simplehash.ts

@@ -27,6 +27,7 @@ export default async (
     [NetworkNames.ZkSyncGoerli]: "zksync-era-testnet",
     [NetworkNames.Base]: "base",
     [NetworkNames.Blast]: "blast",
+    [NetworkNames.ImmutableZkevm]: "immutable-zkevm",
   };
   if (!Object.keys(supportedNetworks).includes(network.name))
     throw new Error("Simplehash: network not supported");

packages/extension/src/providers/ethereum/libs/activity-handlers/providers/etherscan/configs.ts

@@ -59,6 +59,7 @@ const NetworkEndpoints: Record<string, string> = {
   [NetworkNames.Sanko]: "https://explorer.sanko.xyz/",
   [NetworkNames.Degen]: "https://explorer.degen.tips/",
   [NetworkNames.Ham]: "https://explorer.ham.fun/",
+  [NetworkNames.ImmutableZkevm]: "https://explorer.immutable.com/",
 };
 
 export { NetworkEndpoints };

packages/extension/src/providers/ethereum/networks/immutable-zkevm.ts

@@ -0,0 +1,26 @@
+import { NetworkNames, CoingeckoPlatform } from "@enkryptcom/types";
+import { EvmNetwork, EvmNetworkOptions } from "../types/evm-network";
+import wrapActivityHandler from "@/libs/activity-state/wrap-activity-handler";
+import { EtherscanActivity } from "../libs/activity-handlers";
+import shNFTHandler from "@/libs/nft-handlers/simplehash";
+
+const immutableZkEvmOptions: EvmNetworkOptions = {
+  name: NetworkNames.ImmutableZkevm,
+  name_long: "Immutable zkEVM",
+  homePage: "https://www.immutable.com/products/immutable-zkevm",
+  blockExplorerTX: "https://explorer.immutable.com/tx/[[txHash]]",
+  blockExplorerAddr: "https://explorer.immutable.com/address/[[address]]",
+  chainID: "0x343b",
+  isTestNetwork: false,
+  currencyName: "IMX",
+  currencyNameLong: "Immutable X",
+  node: "https://rpc.immutable.com",
+  icon: require("./icons/immutable-zkevm.png"),
+  coingeckoPlatform: CoingeckoPlatform.ImmutableZkevm,
+  NFTHandler: shNFTHandler,
+  activityHandler: wrapActivityHandler(EtherscanActivity),
+};
+
+const immutableZkEvm = new EvmNetwork(immutableZkEvmOptions);
+
+export default immutableZkEvm;

packages/extension/src/providers/ethereum/networks/index.ts

@@ -45,6 +45,7 @@ import sankoNode from "./dmt";
 import degenNode from "./degen";
 import hamNode from "./ham";
 import zcdNode from "./zcd";
+import immutableZkevmNode from "./immutable-zkevm";
 
 export default {
   sepolia: sepoliaNode,
@@ -103,4 +104,5 @@ export default {
   degen: degenNode,
   ham: hamNode,
   zcd: zcdNode,
+  immutableZkevm: immutableZkevmNode,
 };

packages/types/src/networks.ts

@@ -79,6 +79,7 @@ export enum NetworkNames {
   Degen = "degen",
   Ham = "ham",
   ZChains = "ZCD",
+  ImmutableZkevm = "ImmutableZkevm",
 }
 
 export enum CoingeckoPlatform {
@@ -126,4 +127,5 @@ export enum CoingeckoPlatform {
   Blast = "blast",
   Sanko = "sanko",
   Degen = "degen",
+  ImmutableZkevm = "immutable",
 }