no base path (#294)

* env for base path

* delete base path

* redo network type

* debug review workflow

* update values

* update values
Co-authored-by: Yuliya Sharafitdinova <juleek777@gmail.com>

.env.template

@@ -10,7 +10,6 @@ NEXT_PUBLIC_NETWORK_NAME=__PLACEHOLDER_FOR_NEXT_PUBLIC_NETWORK_NAME__
 NEXT_PUBLIC_NETWORK_SHORT_NAME=__PLACEHOLDER_FOR_NEXT_PUBLIC_NETWORK_SHORT_NAME__
 NEXT_PUBLIC_NETWORK_ASSETS_PATHNAME=__PLACEHOLDER_FOR_NEXT_PUBLIC_NETWORK_ASSETS_PATHNAME__
 NEXT_PUBLIC_NETWORK_TYPE=__PLACEHOLDER_FOR_NEXT_PUBLIC_NETWORK_TYPE__
-NEXT_PUBLIC_NETWORK_SUBTYPE=__PLACEHOLDER_FOR_NEXT_PUBLIC_NETWORK_SUBTYPE__
 NEXT_PUBLIC_NETWORK_ID=__PLACEHOLDER_FOR_NEXT_PUBLIC_NETWORK_ID__
 NEXT_PUBLIC_NETWORK_CURRENCY_NAME=__PLACEHOLDER_FOR_NEXT_PUBLIC_NETWORK_CURRENCY_NAME__
 NEXT_PUBLIC_NETWORK_CURRENCY_SYMBOL=__PLACEHOLDER_FOR_NEXT_PUBLIC_NETWORK_CURRENCY_SYMBOL__

README.md

@@ -44,24 +44,21 @@ The app instance could be customized by passing following variables to NodeJS en
 | --- | --- | --- | --- |
 | NEXT_PUBLIC_NETWORK_NAME | `string` | Displayed name of the network | `Gnosis Chain` |
 | NEXT_PUBLIC_NETWORK_SHORT_NAME | `string` *(optional)* | Used for SEO attributes (page title and description) | `OoG` |
-| NEXT_PUBLIC_NETWORK_TYPE | `string` | Network type (used as first part of the base path) | `xdai` |
-| NEXT_PUBLIC_NETWORK_SUBTYPE | `string` | Network subtype (used as second part of the base path) | `mainnet` |
+| NEXT_PUBLIC_NETWORK_TYPE | `string` *(optional)* | Network type (used for matching pre-defined assets, e.g network logo and icon, which are stored in the project). See all possible values here | `xdai_mainnet` |
 | NEXT_PUBLIC_NETWORK_ID | `number` | Chain id, see [https://chainlist.org/](https://chainlist.org/) for the reference | `99` |
 | NEXT_PUBLIC_NETWORK_CURRENCY_NAME | `string` | Network currency name | `Ether` |
 | NEXT_PUBLIC_NETWORK_CURRENCY_SYMBOL | `string` | Network currency symbol | `ETH` |
 | NEXT_PUBLIC_NETWORK_CURRENCY_DECIMALS | `string` | Network currency decimals | `18` |
 | NEXT_PUBLIC_NETWORK_TOKEN_ADDRESS | `string` | Address of network's native token | `0x029a799563238d0e75e20be2f4bda0ea68d00172` |
-| NEXT_PUBLIC_NETWORK_ASSETS_PATHNAME | `string` *(optional)* | Network name for constructing url of token logos according to template `https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/${assetsNamePath}/assets/${tokenAddress}/logo.png`. It should match network name in TrustWallet assets repo, see the full list [here](https://github.com/trustwallet/assets/tree/master/blockchains). If not provided, the network type will be used as its assets path part | `ethereum` |
+| NEXT_PUBLIC_NETWORK_ASSETS_PATHNAME | `string` *(optional)* | Network name for constructing url of token logos according to template `https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/${assetsNamePath}/assets/${tokenAddress}/logo.png`. It should match network name in TrustWallet assets repo, see the full list [here](https://github.com/trustwallet/assets/tree/master/blockchains) | `ethereum` |
 | NEXT_PUBLIC_NETWORK_LOGO | `string` *(optional)* | Network logo; if not provided, will fallback to logo predefined in the project; if the project doesn't have logo for such network then the common placeholder will be shown; *Note* that logo height should be 20px and width less than 120px | `https://www.fillmurray.com/240/40` |
 | NEXT_PUBLIC_IS_ACCOUNT_SUPPORTED | `boolean` *(optional)* | Set to true if network has account feature | `true` |
 
-*Note* the base path for the network is built up from its `type` and `subType` like so `https://blockscout.com/<type>/<subType>`
-
 ### UI configuration
 
 | Variable | Type | Description | Default value
 | --- | --- | --- | --- |
-| NEXT_PUBLIC_FEATURED_NETWORKS | `Array<FeaturedNetwork>` where `FeaturedNetwork` can have following [properties](#featured-network-configuration-properties) | Configuration of featured networks that will be shown in the network menu | `[{'title':'Gnosis Chain','basePath':'/xdai/mainnet','group':'mainnets'}]` |
+| NEXT_PUBLIC_FEATURED_NETWORKS | `Array<FeaturedNetwork>` where `FeaturedNetwork` can have following [properties](#featured-network-configuration-properties) | Configuration of featured networks that will be shown in the network menu | `[{'title':'Gnosis Chain','url':'https://blockscout.com/xdai/mainnet','group':'mainnets'}]` |
 | NEXT_PUBLIC_BLOCKSCOUT_VERSION | `string` *(optional)* | Current running version of Blockscout (used to display link to release in the footer) |
 | NEXT_PUBLIC_FOOTER_GITHUB_LINK | `string` *(optional)* | Link to Github in the footer | `https://github.com/blockscout/blockscout` |
 | NEXT_PUBLIC_FOOTER_TWITTER_LINK | `string` *(optional)* | Link to Twitter in the footer | `https://www.twitter.com/blockscoutcom` |
@@ -97,9 +94,10 @@ The app instance could be customized by passing following variables to NodeJS en
 | Property | Type | Description | Example value
 | --- | --- | --- | --- |
 | title | `string` | Displayed name of the network | `'Gnosis Chain'` |
-| basePath | `string` | Network explorer main page url | `'/xdai/mainnet'` |
+| url | `string` | Network explorer main page url | `'https://blockscout.com/xdai/mainnet'` |
 | group | `mainnets \| testnets \| other` | Indicates in which tab network appears in the menu | `'mainnets'` |
 | icon | `string` *(optional)* | Network icon; if not provided, will fallback to  icon predefined in the project; if the project doesn't have icon for such network then the common placeholder will be shown; *Note* that icon size should be 30px by 30px | `'https://www.fillmurray.com/60/60'` |
+| type | `string` *(optional)* | Network type (used for matching pre-defined network icon, which is stored in the project). See all possible values here | `xdai_mainnet` |
 
 ### Network explorer configuration properties
 

configs/app/config.ts

 /* eslint-disable no-restricted-properties */
 import type { AppItemOverview } from 'types/client/apps';
-import type { FeaturedNetwork, NetworkExplorer } from 'types/networks';
+import type { FeaturedNetwork, NetworkExplorer, PreDefinedNetwork } from 'types/networks';
 
 const getEnvValue = (env: string | undefined) => env?.replaceAll('\'', '"');
 const parseEnvJson = <DataType>(env: string | undefined): DataType | null => {
@@ -42,17 +42,13 @@ const logoutUrl = (() => {
   }
 })();
 
-const networkType = getEnvValue(process.env.NEXT_PUBLIC_NETWORK_TYPE);
-const networkSubType = getEnvValue(process.env.NEXT_PUBLIC_NETWORK_SUBTYPE);
-
 const DEFAULT_CURRENCY_DECIMALS = 18;
 
 const config = Object.freeze({
   env,
   isDev,
   network: {
-    type: networkType,
-    subtype: networkSubType,
+    type: getEnvValue(process.env.NEXT_PUBLIC_NETWORK_TYPE) as PreDefinedNetwork | undefined,
     logo: getEnvValue(process.env.NEXT_PUBLIC_NETWORK_LOGO),
     name: getEnvValue(process.env.NEXT_PUBLIC_NETWORK_NAME),
     id: getEnvValue(process.env.NEXT_PUBLIC_NETWORK_ID),
@@ -64,7 +60,6 @@ const config = Object.freeze({
     },
     assetsPathname: getEnvValue(process.env.NEXT_PUBLIC_NETWORK_ASSETS_PATHNAME),
     nativeTokenAddress: getEnvValue(process.env.NEXT_PUBLIC_NETWORK_TOKEN_ADDRESS),
-    basePath: '/' + [ networkType, networkSubType ].filter(Boolean).join('/'),
     explorers: parseEnvJson<Array<NetworkExplorer>>(getEnvValue(process.env.NEXT_PUBLIC_NETWORK_EXPLORERS)) || [],
     verificationType: process.env.NEXT_PUBLIC_NETWORK_VERIFICATION_TYPE || 'mining',
   },

configs/envs/.env.common

@@ -9,7 +9,6 @@ NEXT_PUBLIC_APP_ENV=development
 NEXT_PUBLIC_BLOCKSCOUT_VERSION=v4.1.7-beta
 NEXT_PUBLIC_FOOTER_GITHUB_LINK=https://github.com/blockscout/blockscout
 NEXT_PUBLIC_FOOTER_TWITTER_LINK=https://www.twitter.com/blockscoutcom
-NEXT_PUBLIC_FEATURED_NETWORKS=[{'title':'Gnosis Chain','basePath':'/xdai/mainnet','group':'mainnets'}]
 
 # api config
 NEXT_PUBLIC_API_ENDPOINT=https://blockscout.com

configs/envs/.env.poa_core

 # ui config
 NEXT_PUBLIC_FOOTER_TELEGRAM_LINK=https://t.me/poa_network
 NEXT_PUBLIC_FOOTER_STAKING_LINK=https://duneanalytics.com/maxaleks/xdai-staking
-NEXT_PUBLIC_FEATURED_NETWORKS=[{'title':'Gnosis Chain','basePath':'/xdai/mainnet','group':'mainnets'},{'title':'Optimism on Gnosis Chain','basePath':'/xdai/optimism','group':'mainnets','icon':'https://www.fillmurray.com/60/60'},{'title':'Arbitrum on xDai','basePath':'/xdai/aox','group':'mainnets'},{'title':'Ethereum','basePath':'/eth/mainnet','group':'mainnets'},{'title':'Ethereum Classic','basePath':'/etx/mainnet','group':'mainnets'},{'title':'POA','basePath':'/poa/core','group':'mainnets'},{'title':'RSK','basePath':'/rsk/mainnet','group':'mainnets'},{'title':'Gnosis Chain Testnet','basePath':'/xdai/testnet','group':'testnets'},{'title':'POA Sokol','basePath':'/poa/sokol','group':'testnets'},{'title':'ARTIS Σ1','basePath':'/artis/sigma1','group':'other'},{'title':'LUKSO L14','basePath':'/lukso/l14','group':'other'},{'title':'Astar','basePath':'/astar','group':'other'}]
+NEXT_PUBLIC_FEATURED_NETWORKS=[{'title':'Gnosis Chain','url':'https://blockscout.com/xdai/mainnet','group':'mainnets','type':'xdai_mainnet'},{'title':'Optimism on Gnosis Chain','url':'https://blockscout.com/xdai/optimism','group':'mainnets','icon':'https://www.fillmurray.com/60/60','type':'xdai_optimism'},{'title':'Arbitrum on xDai','url':'https://blockscout.com/xdai/aox','group':'mainnets'},{'title':'Ethereum','url':'https://blockscout.com/eth/mainnet','group':'mainnets','type':'eth_mainnet'},{'title':'Ethereum Classic','url':'https://blockscout.com/etx/mainnet','group':'mainnets','type':'etc_mainnet'},{'title':'POA','url':'https://blockscout.com/poa/core','group':'mainnets','type':'poa_core'},{'title':'RSK','url':'https://blockscout.com/rsk/mainnet','group':'mainnets','type':'rsk_mainnet'},{'title':'Gnosis Chain Testnet','url':'https://blockscout.com/xdai/testnet','group':'testnets','type':'xdai_testnet'},{'title':'POA Sokol','url':'https://blockscout.com/poa/sokol','group':'testnets','type':'poa_sokol'},{'title':'ARTIS Σ1','url':'https://blockscout.com/artis/sigma1','group':'other','type':'artis_sigma1'},{'title':'LUKSO L14','url':'https://blockscout.com/lukso/l14','group':'other','type':'lukso_l14'},{'title':'Astar','url':'https://blockscout.com/astar','group':'other','type':'astar'}]
 NEXT_PUBLIC_NETWORK_EXPLORERS=[{'title':'Anyblock','baseUrl':'https://explorer.anyblock.tools','paths':{'tx':'/ethereum/poa/core/tx'}}]
 
 # network config
 NEXT_PUBLIC_NETWORK_NAME=POA
 NEXT_PUBLIC_NETWORK_SHORT_NAME=POA
 NEXT_PUBLIC_NETWORK_ASSETS_PATHNAME=poa
-NEXT_PUBLIC_NETWORK_TYPE=poa
-NEXT_PUBLIC_NETWORK_SUBTYPE=core
+NEXT_PUBLIC_NETWORK_TYPE=poa_core
 NEXT_PUBLIC_NETWORK_ID=99
 NEXT_PUBLIC_NETWORK_CURRENCY_NAME=POA
 NEXT_PUBLIC_NETWORK_CURRENCY_SYMBOL=POA

configs/nextjs/redirects.js

-const BASE_PATH = require('../../lib/link/basePath.js');
-const PATHS = require('../../lib/link/paths.js');
+const PATHS = require('../../lib/link/paths');
 
 const oldUrls = [
   {
@@ -41,17 +40,10 @@ const oldUrls = [
 ];
 
 async function redirects() {
-  const homePagePath = '/' + [ process.env.NEXT_PUBLIC_NETWORK_TYPE, process.env.NEXT_PUBLIC_NETWORK_SUBTYPE ].filter(Boolean).join('/');
-
   return [
-    {
-      source: '/',
-      destination: homePagePath,
-      permanent: false,
-    },
     ...oldUrls.map(item => {
-      const source = BASE_PATH.replaceAll('[', ':').replaceAll(']', '') + item.oldPath;
-      const destination = item.newPath.replaceAll('[', ':').replaceAll(']', '');
+      const source = item.oldPath;
+      const destination = item.newPath;
       return { source, destination, permanent: false };
     }),
   ];

configs/nextjs/rewrites.js

 async function rewrites() {
-  // there can be networks without subtype
-  // routing in nextjs allows optional params only at the end of the path
-  // if there are paths with subtype and subsubtype, we will change the routing
-  // but so far we think we're ok with this hack
-  //
-  // UPDATE: as for now I hardcoded all networks without subtype
-  // because we cannot do proper dynamic rewrites in middleware using runtime ENVs
-  // see issue - https://github.com/vercel/next.js/discussions/35231
-  // it seems like it's solved but it's not actually
-
   return [
     { source: '/node-api/:slug*', destination: '/api/:slug*' },
-    { source: '/astar/:slug*', destination: '/astar/mainnet/:slug*' },
-    { source: '/shiden/:slug*', destination: '/shiden/mainnet/:slug*' },
-  ];
+  ].filter(Boolean);
 }
 
 module.exports = rewrites;

deploy/values/e2e/secrets.yaml

@@ -15,9 +15,9 @@ blockscout:
         ACCOUNT_AUTH0_CLIENT_SECRET:
             _default: ENC[AES256_GCM,data:Nmajob/xrOfx3sZgGHWw4/VnSgoyehubNdhJSqasxLFInJeZgxCW/QXpu5KG6j1fDdALLOT89Es+m0IO9VrG8A==,iv:RxYWdOo5G6t0FFwHQfhvUTiCOsxRzJJT0Y1nc0F5sDc=,tag:6v6+yHaHgwnw0cDSD1hXwg==,type:str]
         ACCOUNT_AUTH0_CALLBACK_URL:
-            _default: ENC[AES256_GCM,data:DEyk+7A3zm2R0WXGbqsP5+NXRKQqZ6uaGJvwrniBiB816BCBV27bYWqmXutQPvCga1SLsWzliekc2iUAkTyxopDjODuUxDZlsHmjE5vRaCVTLfGCHf5k6eNN3a0=,iv:RKvqCitIB07FXXKOy8e5HXMkI3wr7HEl695Uylsu3kg=,tag:/3EhIIdlOFMXcbxJZ2N5bg==,type:str]
+            _default: ENC[AES256_GCM,data:+W+7U9imTfuxHGoe4sNGp3eLA6hZeTs85Fo5wL/dsUNDljuVZsysEXp4+5IxS4kRHggXUXOJmE3jfCRsqYBVa05ID9VqxC8gtumjXZhDpPZZzg==,iv:+XVIFV5sPC9O8FNSNozz1532ND65HBqELpU2onJp4h8=,tag:1b5mZn+WphjNaRo4dns0CQ==,type:str]
         ACCOUNT_AUTH0_LOGOUT_RETURN_URL:
-            _default: ENC[AES256_GCM,data:f5O3nHg9ldCDDOZjUtyKqKNI6D+5eQpWjGxf6fKSh3y2neZ1d81M8Ljt4VF50Dy9QV2Rhu3lyZI47kV8E0BhwEqYNYJ24YBoB+cM2cttuCJxlHvI,iv:l75drqjzuNzNqMYPuLeF41D4bEaVskbHtX60liAuqNM=,tag:uGVjlN8kvR4h6VPwhOnZzA==,type:str]
+            _default: ENC[AES256_GCM,data:/AMUKP2k8C7sQVLEWn93xE+cYyWUzK2fh/L4/o5evq2UZFRTxOrqy5FGUMFz4sMc5M+D65lMeCwOYE1sXCdochTgC7IJ1XvNGZc=,iv:5pnFCFtzMcYtf8+llQyFvWdOb5Jb3sBBYLPILsTydXw=,tag:Z1zjefNVZd+StLef2t8B2g==,type:str]
         ACCOUNT_AUTH0_LOGOUT_URL:
             _default: ENC[AES256_GCM,data:6vj0qvxktXptFDX4Tq3kGIyhaJN7Adcwfgb3qWEYH78pWtmFprwfKNdPa/4=,iv:Eb3NcZP9oSmh0ZfY8vCWwR5Ciwe7Lr/QJmcNWXiir9E=,tag:uXoFnMfwo/GD9IPuvs/9Wg==,type:str]
         ACCOUNT_SENDGRID_API_KEY:
@@ -78,8 +78,8 @@ sops:
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2022-10-27T18:39:52Z"
-    mac: ENC[AES256_GCM,data:iOh30zo2Mew+RO/LeXNCVrtMR52cb2RhuvCN99AdiQWXMVShE8PdWWPW6V5m+LVtwPuxusZi1/fGzTCwpE4cOX3BF8HNI9B8sC6t9NR0SO9/g427p2+vevN/fPBZXkO196KosMLB0+SSh+znmtt0U5yTT8l8v9y2B6H+P89VhxI=,iv:kqwGAaJQihvD9vkFVJZuQTR5rb706mWP7gmBFC+0Pas=,tag:Kg9JHoy2s5avDmpnZaO9Ng==,type:str]
+    lastmodified: "2022-11-02T07:59:50Z"
+    mac: ENC[AES256_GCM,data:+qMOXjU+Q9b/a2ix3Z9+pZYayomQmfTBbxcRFPQIVmRguygn2VhRZ1pCQN6dYqb0VFVecV4i1KPqOdTmvukvpUxM5lOt3Gy1PQRgNejdTRr72vWEHqJVEn/oeanypRcrAOQmcPs2tXyJuatRjvhZVpJl4hUoVIw68wXGhSufbL4=,iv:FBp6KFfMzI27UVcB9YzQzUMLHYpB2DJzlBKGrMbj/6g=,tag:27FGRmkXFgNJeVbChdYPew==,type:str]
     pgp:
         - created_at: "2022-09-14T13:42:28Z"
           enc: |

deploy/values/e2e/values.yaml

@@ -5,21 +5,25 @@ blockscout:
   app: blockscout
   enabled: true
   image:
-    _default: blockscout/blockscout-sokol:latest
-    #blockscout/blockscout:review-prerelease-9ad99cc8@sha256:608d335025a135f1cde6608b2449b8988b7cb8bfa6ea38e92ce1f184ec577781
+    _default: blockscout/blockscout:latest
   replicas:
     app: 1
   docker:
     port: 80
     targetPort: 4000
+  # init container
+  init:
+    enabled: true
+    image:
+      _default: blockscout/blockscout:latest
   service:
     # ClusterIP, NodePort or LoadBalancer
     type: ClusterIP
   # enable ingress
   ingress:
     enabled: true
-    annotations:
-      - 'nginx.ingress.kubernetes.io/rewrite-target: /$2'
+    annotations: {}
+      # - 'nginx.ingress.kubernetes.io/rewrite-target: /$2'
     host:
       _default: blockscout.test.blockscout.aws-k8s.blockscout.com
     # enable https
@@ -27,7 +31,7 @@ blockscout:
     tls:
       enabled: true
     path:
-      - "/poa/sokol(/|$)(.*)"
+      # - "/poa/sokol(/|$)(.*)"
       - "/"
   # probes
   livenessProbe:
@@ -93,21 +97,23 @@ blockscout:
     DISABLE_REALTIME_INDEXER:
       _default: 'false'
     SOCKET_ROOT:
-      _default: "/poa/sokol"
+      _default: "/"
     NETWORK_PATH:
-      _default: "/poa/sokol"
+      _default: "/"
     API_PATH:
-      _default: "/poa/sokol"
+      _default: "/"
     ETHEREUM_JSONRPC_DISABLE_ARCHIVE_BALANCES:
       _default: 'true'
     API_BASE_PATH:
-      _default: "/poa/sokol"
+      _default: "/"
     APPS_MENU:
       _default: 'true'
     EXTERNAL_APPS:
-      _default: '[{"title": "Marketplace", "url": "/poa/sokol/apps"}]'
+      _default: '[{"title": "Marketplace", "url": "/apps"}]'
     JSON_RPC:
       _default: https://sokol.poa.network
+    API_V2_ENABLED:
+      _default: 'true'
 
 postgres:
   enabled: true
@@ -275,16 +281,21 @@ frontend:
     targetPort: 3000
   ingress:
     enabled: true
+    # annotations:
+    #   - 'nginx.ingress.kubernetes.io/use-regex: "true"'
     host:
       _default: frontend.test.blockscout.aws-k8s.blockscout.com
     # enable https
     tls:
       enabled: true
     path:
-      - "/poa/sokol/(apps|auth/profile|account)"
+      # - "/(apps|auth/profile|account)"
+      - "/apps"
       - "/_next"
       - "/node-api"
       - "/static"
+      - "/auth/profile"
+      - "/account"
   resources:
     limits:
       memory:
@@ -320,11 +331,9 @@ frontend:
     NEXT_PUBLIC_NETWORK_SHORT_NAME:
       _default: POA
     NEXT_PUBLIC_NETWORK_ASSETS_PATHNAME:
-      _default: sokol
-    NEXT_PUBLIC_NETWORK_TYPE:
       _default: poa
-    NEXT_PUBLIC_NETWORK_SUBTYPE:
-      _default: sokol
+    NEXT_PUBLIC_NETWORK_TYPE:
+      _default: poa_core
     NEXT_PUBLIC_NETWORK_ID:
       _default: 77
     NEXT_PUBLIC_NETWORK_CURRENCY_NAME:
@@ -338,11 +347,11 @@ frontend:
     NEXT_PUBLIC_IS_ACCOUNT_SUPPORTED:
       _default: 'true'
     NEXT_PUBLIC_FEATURED_NETWORKS:
-      _default: "[{'title':'Gnosis Chain','basePath':'/xdai/mainnet','group':'mainnets'},{'title':'Optimism on Gnosis Chain','basePath':'/xdai/optimism','group':'mainnets','icon':'https://www.fillmurray.com/60/60'},{'title':'Arbitrum on xDai','basePath':'/xdai/aox','group':'mainnets'},{'title':'Ethereum','basePath':'/eth/mainnet','group':'mainnets'},{'title':'Ethereum Classic','basePath':'/etx/mainnet','group':'mainnets'},{'title':'POA','basePath':'/poa/core','group':'mainnets'},{'title':'RSK','basePath':'/rsk/mainnet','group':'mainnets'},{'title':'Gnosis Chain Testnet','basePath':'/xdai/testnet','group':'testnets'},{'title':'POA Sokol','basePath':'/poa/sokol','group':'testnets'},{'title':'ARTIS Σ1','basePath':'/artis/sigma1','group':'other'},{'title':'LUKSO L14','basePath':'/lukso/l14','group':'other'},{'title':'Astar','basePath':'/astar','group':'other'}]"
+      _default: "[{'title':'Gnosis Chain','url':'https://blockscout.com/xdai/mainnet','group':'mainnets','type':'xdai_mainnet'},{'title':'Optimism on Gnosis Chain','url':'https://blockscout.com/xdai/optimism','group':'mainnets','icon':'https://www.fillmurray.com/60/60','type':'xdai_optimism'},{'title':'Arbitrum on xDai','url':'https://blockscout.com/xdai/aox','group':'mainnets'},{'title':'Ethereum','url':'https://blockscout.com/eth/mainnet','group':'mainnets','type':'eth_mainnet'},{'title':'Ethereum Classic','url':'https://blockscout.com/etx/mainnet','group':'mainnets','type':'etc_mainnet'},{'title':'POA','url':'https://blockscout.com/poa/core','group':'mainnets','type':'poa_core'},{'title':'RSK','url':'https://blockscout.com/rsk/mainnet','group':'mainnets','type':'rsk_mainnet'},{'title':'Gnosis Chain Testnet','url':'https://blockscout.com/xdai/testnet','group':'testnets','type':'xdai_testnet'},{'title':'POA Sokol','url':'https://blockscout.com/poa/sokol','group':'testnets','type':'poa_sokol'},{'title':'ARTIS Σ1','url':'https://blockscout.com/artis/sigma1','group':'other','type':'artis_sigma1'},{'title':'LUKSO L14','url':'https://blockscout.com/lukso/l14','group':'other','type':'lukso_l14'},{'title':'Astar','url':'https://blockscout.com/astar','group':'other','type':'astar'}]"
     NEXT_PUBLIC_API_ENDPOINT:
       _default: https://blockscout.com
     NEXT_PUBLIC_API_BASE_PATH:
-      _default: /poa/sokol
+      _default: /
     NEXT_PUBLIC_MARKETPLACE_SUBMIT_FORM:
       _default: https://airtable.com/shrqUAcjgGJ4jU88C
     NEXT_PUBLIC_MARKETPLACE_APP_LIST:
@@ -350,4 +359,4 @@ frontend:
     NEXT_PUBLIC_LOGOUT_URL:
       _default: https://blockscoutcom.us.auth0.com/v2/logout
     NEXT_PUBLIC_LOGOUT_RETURN_URL:
-      _default: https://blockscout.com/poa/sokol/auth/logout
+      _default: https://blockscout.com/auth/logout

deploy/values/main/secrets.yaml

@@ -15,9 +15,9 @@ blockscout:
         ACCOUNT_AUTH0_CLIENT_SECRET:
             _default: ENC[AES256_GCM,data:Nmajob/xrOfx3sZgGHWw4/VnSgoyehubNdhJSqasxLFInJeZgxCW/QXpu5KG6j1fDdALLOT89Es+m0IO9VrG8A==,iv:RxYWdOo5G6t0FFwHQfhvUTiCOsxRzJJT0Y1nc0F5sDc=,tag:6v6+yHaHgwnw0cDSD1hXwg==,type:str]
         ACCOUNT_AUTH0_CALLBACK_URL:
-            _default: ENC[AES256_GCM,data:Eopmjs+pJxi0cV9eGzB5cv+uTR+PWd/4WzfEnvQUiwNiswB2G3gP0NoCNBcDR+2+ydeIHYndCcn42RaoM+i96eDbUPy1GWk704IpaYlZoUuhJ8XO9JPPj5ApfH8=,iv:Rc7fgf4rgd+nLh67hOZ9nvSMXZzBBeJ5pkOtybjbz1U=,tag:Xpb1CHELI96KWrpVF7XksQ==,type:str]
+            _default: ENC[AES256_GCM,data:v6LJLRwibjc6QgF1t6QNzy/FfL/i2G0mD2X6oxf0o4Q6A8cwovE03Wd5nXWTSyWrN95rJm0IQY7bjU3fXpDw0p/u4vu8dMpfM2bZMMOalXP4pA==,iv:VtNoyCEsesWn0PyWRXzLgbMcUa+voKa1sjsUY26RKnw=,tag:t02c9NVe4aGGo5feOP1OWQ==,type:str]
         ACCOUNT_AUTH0_LOGOUT_RETURN_URL:
-            _default: ENC[AES256_GCM,data:13zluPWED9xcoPHZgJmhpKsSNR7JjwAYIoF73Dcs7R9rGGg9h++RWM6a0y3DQMYctKcxAm4u7l6jitmfFmkr6Tp6Urjyw+Fsu8+97CyvlBfWpEjc,iv:AC9+6neb4aHQLl1jDmPNtE/CGxEEv4GFe2k4a2QPh1w=,tag:MgiVG2oBMXG08Q4BtxlKhg==,type:str]
+            _default: ENC[AES256_GCM,data:JQylcEDhJUOqXqBCycJ8XLwz6wpa3Uz3p5MhCEVolLnKkYoDFogGuFt1YkKt7EEtbZjqvSjIa0xQhpezX5hvypU9KxRxoVosUQ4=,iv:dbXG4N4t5jQgx68l0r5iLh5FGGg2O/vqbSDpyxzEauI=,tag:upkfr/3h35rZ93oBNJ3Y/w==,type:str]
         ACCOUNT_AUTH0_LOGOUT_URL:
             _default: ENC[AES256_GCM,data:6vj0qvxktXptFDX4Tq3kGIyhaJN7Adcwfgb3qWEYH78pWtmFprwfKNdPa/4=,iv:Eb3NcZP9oSmh0ZfY8vCWwR5Ciwe7Lr/QJmcNWXiir9E=,tag:uXoFnMfwo/GD9IPuvs/9Wg==,type:str]
         ACCOUNT_SENDGRID_API_KEY:
@@ -78,8 +78,8 @@ sops:
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2022-10-27T18:39:43Z"
-    mac: ENC[AES256_GCM,data:dQvWp8uP4LJ58Fagb0+e26UiHX5d27z04ei0Hz7EPBmFdEA2/1WTXFHBzJZhkxAU51JdbQxFLBWchO1Pv/26RqDi2zscZ53Ln1Ulc21gCMeY95/q1xENDEuss8srr9LtIDRVfr+KjpPnSer2t8er7B3lAaxPPtc0FMHVa3kf+Jw=,iv:kIL05arLDhqZQhECIeifyN0eH7EZbWt9/ltzsEuUONk=,tag:qkI3Z4vcnCK4tE+PnxPXfA==,type:str]
+    lastmodified: "2022-11-02T07:59:42Z"
+    mac: ENC[AES256_GCM,data:OrV/dUWOtL23UFQLeIsKsGluTmse42d/4sgFMDs3UXdACsZu8twMt29Y/WaPHyq8Tpn5iYzhBLU6SCUmHxEhBNVzKBd5uCUbav1faS/zW6fSd9bEP7rmbUjaJGHliBkG3T4VCSZn53jR/OMNbSynIxZ0kRpVHr+RTcalaH7dLQ8=,iv:J3gXjFgFyZoPqL+VEnjkuKzA9UIIyK3UsvPWacBZKsY=,tag:/zY1jVjIm5BsDNJlfsg5uw==,type:str]
     pgp:
         - created_at: "2022-09-14T13:42:28Z"
           enc: |

deploy/values/main/values.yaml

@@ -5,21 +5,25 @@ blockscout:
   app: blockscout
   enabled: true
   image:
-    _default: blockscout/blockscout-sokol:latest
-    #blockscout/blockscout:review-prerelease-9ad99cc8@sha256:608d335025a135f1cde6608b2449b8988b7cb8bfa6ea38e92ce1f184ec577781
+    _default: blockscout/blockscout:latest
   replicas:
     app: 1
   docker:
     port: 80
     targetPort: 4000
+  # init container
+  init:
+    enabled: true
+    image:
+      _default: blockscout/blockscout:latest
   service:
     # ClusterIP, NodePort or LoadBalancer
     type: ClusterIP
   # enable ingress
   ingress:
     enabled: true
-    annotations:
-      - 'nginx.ingress.kubernetes.io/rewrite-target: /$2'
+    annotations: {}
+      # - 'nginx.ingress.kubernetes.io/rewrite-target: /$2'
     host:
       _default: blockscout.test.blockscout.aws-k8s.blockscout.com
     # enable https
@@ -27,7 +31,7 @@ blockscout:
     tls:
       enabled: true
     path:
-      - "/poa/sokol(/|$)(.*)"
+      # - "/poa/sokol(/|$)(.*)"
       - "/"
   # probes
   livenessProbe:
@@ -93,21 +97,23 @@ blockscout:
     DISABLE_REALTIME_INDEXER:
       _default: 'false'
     SOCKET_ROOT:
-      _default: "/poa/sokol"
+      _default: "/"
     NETWORK_PATH:
-      _default: "/poa/sokol"
+      _default: "/"
     API_PATH:
-      _default: "/poa/sokol"
+      _default: "/"
     ETHEREUM_JSONRPC_DISABLE_ARCHIVE_BALANCES:
       _default: 'true'
     API_BASE_PATH:
-      _default: "/poa/sokol"
+      _default: "/"
     APPS_MENU:
       _default: 'true'
     EXTERNAL_APPS:
-      _default: '[{"title": "Marketplace", "url": "/poa/sokol/apps"}]'
+      _default: '[{"title": "Marketplace", "url": "/apps"}]'
     JSON_RPC:
       _default: https://sokol.poa.network
+    API_V2_ENABLED:
+      _default: 'true'
 
 postgres:
   enabled: true
@@ -275,16 +281,21 @@ frontend:
     targetPort: 3000
   ingress:
     enabled: true
+    # annotations:
+    #   - 'nginx.ingress.kubernetes.io/use-regex: "true"'
     host:
       _default: frontend.test.blockscout.aws-k8s.blockscout.com
     # enable https
     tls:
       enabled: true
     path:
-      - "/poa/sokol/(apps|auth/profile|account)"
+      # - "/(apps|auth/profile|account)"
+      - "/apps"
       - "/_next"
       - "/node-api"
       - "/static"
+      - "/auth/profile"
+      - "/account"
   resources:
     limits:
       memory:
@@ -320,11 +331,9 @@ frontend:
     NEXT_PUBLIC_NETWORK_SHORT_NAME:
       _default: POA
     NEXT_PUBLIC_NETWORK_ASSETS_PATHNAME:
-      _default: sokol
-    NEXT_PUBLIC_NETWORK_TYPE:
       _default: poa
-    NEXT_PUBLIC_NETWORK_SUBTYPE:
-      _default: sokol
+    NEXT_PUBLIC_NETWORK_TYPE:
+      _default: poa_core
     NEXT_PUBLIC_NETWORK_ID:
       _default: 77
     NEXT_PUBLIC_NETWORK_CURRENCY_NAME:
@@ -338,11 +347,11 @@ frontend:
     NEXT_PUBLIC_IS_ACCOUNT_SUPPORTED:
       _default: 'true'
     NEXT_PUBLIC_FEATURED_NETWORKS:
-      _default: "[{'title':'Gnosis Chain','basePath':'/xdai/mainnet','group':'mainnets'},{'title':'Optimism on Gnosis Chain','basePath':'/xdai/optimism','group':'mainnets','icon':'https://www.fillmurray.com/60/60'},{'title':'Arbitrum on xDai','basePath':'/xdai/aox','group':'mainnets'},{'title':'Ethereum','basePath':'/eth/mainnet','group':'mainnets'},{'title':'Ethereum Classic','basePath':'/etx/mainnet','group':'mainnets'},{'title':'POA','basePath':'/poa/core','group':'mainnets'},{'title':'RSK','basePath':'/rsk/mainnet','group':'mainnets'},{'title':'Gnosis Chain Testnet','basePath':'/xdai/testnet','group':'testnets'},{'title':'POA Sokol','basePath':'/poa/sokol','group':'testnets'},{'title':'ARTIS Σ1','basePath':'/artis/sigma1','group':'other'},{'title':'LUKSO L14','basePath':'/lukso/l14','group':'other'},{'title':'Astar','basePath':'/astar','group':'other'}]"
+      _default: "[{'title':'Gnosis Chain','url':'https://blockscout.com/xdai/mainnet','group':'mainnets','type':'xdai_mainnet'},{'title':'Optimism on Gnosis Chain','url':'https://blockscout.com/xdai/optimism','group':'mainnets','icon':'https://www.fillmurray.com/60/60','type':'xdai_optimism'},{'title':'Arbitrum on xDai','url':'https://blockscout.com/xdai/aox','group':'mainnets'},{'title':'Ethereum','url':'https://blockscout.com/eth/mainnet','group':'mainnets','type':'eth_mainnet'},{'title':'Ethereum Classic','url':'https://blockscout.com/etx/mainnet','group':'mainnets','type':'etc_mainnet'},{'title':'POA','url':'https://blockscout.com/poa/core','group':'mainnets','type':'poa_core'},{'title':'RSK','url':'https://blockscout.com/rsk/mainnet','group':'mainnets','type':'rsk_mainnet'},{'title':'Gnosis Chain Testnet','url':'https://blockscout.com/xdai/testnet','group':'testnets','type':'xdai_testnet'},{'title':'POA Sokol','url':'https://blockscout.com/poa/sokol','group':'testnets','type':'poa_sokol'},{'title':'ARTIS Σ1','url':'https://blockscout.com/artis/sigma1','group':'other','type':'artis_sigma1'},{'title':'LUKSO L14','url':'https://blockscout.com/lukso/l14','group':'other','type':'lukso_l14'},{'title':'Astar','url':'https://blockscout.com/astar','group':'other','type':'astar'}]"
     NEXT_PUBLIC_API_ENDPOINT:
       _default: https://blockscout.com
     NEXT_PUBLIC_API_BASE_PATH:
-      _default: /poa/sokol
+      _default: /
     NEXT_PUBLIC_MARKETPLACE_SUBMIT_FORM:
       _default: https://airtable.com/shrqUAcjgGJ4jU88C
     NEXT_PUBLIC_MARKETPLACE_APP_LIST:
@@ -350,4 +359,4 @@ frontend:
     NEXT_PUBLIC_LOGOUT_URL:
       _default: https://blockscoutcom.us.auth0.com/v2/logout
     NEXT_PUBLIC_LOGOUT_RETURN_URL:
-      _default: https://blockscout.com/poa/sokol/auth/logout
+      _default: https://blockscout.com/auth/logout

deploy/values/review/secrets.yaml

@@ -15,9 +15,9 @@ blockscout:
         ACCOUNT_AUTH0_CLIENT_SECRET:
             _default: ENC[AES256_GCM,data:Nmajob/xrOfx3sZgGHWw4/VnSgoyehubNdhJSqasxLFInJeZgxCW/QXpu5KG6j1fDdALLOT89Es+m0IO9VrG8A==,iv:RxYWdOo5G6t0FFwHQfhvUTiCOsxRzJJT0Y1nc0F5sDc=,tag:6v6+yHaHgwnw0cDSD1hXwg==,type:str]
         ACCOUNT_AUTH0_CALLBACK_URL:
-            _default: ENC[AES256_GCM,data:FgOUi6sp2SAAMQXtsll9HpIIGPcO+7AeOlZgcYHc5uWtDffQmcNtQSHqG72Aw5HeF3PSnwdeg2mLJDUHitE2usrdaE2SSV3ekBebBrobJjw9/4I57z8AJy0exEY=,iv:tqJV1VY4DPVeJBOa/LElmQ2AX5T83qzon4m4w+bGgYg=,tag:Lw0l3tjsZBwnv9Iu9Xxj5w==,type:str]
+            _default: ENC[AES256_GCM,data:dQMvW68eW5EokGgekC1HsozsMAq+eqWwqfocgF6QR9+1VA1z5efNbMjTuWJqaSzXq/yWwfAogP8GJSzpS8T7jKATOeVxZ71I4LmlFO7jR4wMKw==,iv:UA0DcnH7z6y5X9C9Qk3WvRrgI3LT/UvH4Fl7gb765/0=,tag:cn78k5f+L8ed0WV3mDKykg==,type:str]
         ACCOUNT_AUTH0_LOGOUT_RETURN_URL:
-            _default: ENC[AES256_GCM,data:vCwBiNb5aSfeBTY0ozEkxV8RForss9A/WeZ3jVKTHddBIJ73hEzo/QA0c8nktiwil+H2ZfKeTOFgwvvO7AQqMYrCd5erQmXksF8qGu617csDlYcH,iv:SbFuuJbFWYbz+BkUFT9oNYdYXiDThIBWGA7Owb/F+qk=,tag:v5uY+2Be4Z4AHmjd7Ua7FQ==,type:str]
+            _default: ENC[AES256_GCM,data:y4px71aTwkmIcqC5T6ui1wHlhRExyy3Id/Dcy3AaKuGhIHUE0URbghm8niB1Seq08U5NeC4LvSmYsbWsx390lHP2dTuWwTaQ33s=,iv:JR3T7ZXxv3eAUn/XzMEz4/U58vJhB/pPWIutGN9XrSk=,tag:MiKgiyfzTHFjbQYdkFIJ8Q==,type:str]
         ACCOUNT_AUTH0_LOGOUT_URL:
             _default: ENC[AES256_GCM,data:6vj0qvxktXptFDX4Tq3kGIyhaJN7Adcwfgb3qWEYH78pWtmFprwfKNdPa/4=,iv:Eb3NcZP9oSmh0ZfY8vCWwR5Ciwe7Lr/QJmcNWXiir9E=,tag:uXoFnMfwo/GD9IPuvs/9Wg==,type:str]
         ACCOUNT_SENDGRID_API_KEY:
@@ -78,8 +78,8 @@ sops:
     azure_kv: []
     hc_vault: []
     age: []
-    lastmodified: "2022-10-27T08:40:17Z"
-    mac: ENC[AES256_GCM,data:t9Ex5kGubl/kxcHhJK6uoh7BkMXSonHbZAQk9yB9Zm6NdYp9gINmfCrsloMW213KqPfsgBlxTsdYi7CeR96Zj1lnwUB/v4L13hUuA/tyb8G28gzHjQjHcBmD9AIh6UbTL77uAW+UqIOYnjdHX4Snwv1qTK+TWg+wLPClVSMsXcw=,iv:f3h9C77B6vEXhJ3OXHGnFUpiQV7igtiH961K757BKgk=,tag:eAQ8YwH55cDf8wh0wVdWJg==,type:str]
+    lastmodified: "2022-11-01T14:58:11Z"
+    mac: ENC[AES256_GCM,data:3AK4GRnUnAcQrdJ9JrdhSFqMYmYhE2RGiP+NPvO+mqBGDH26pRjN3lkNhHi/uObEQWiQZJLzLEOhSPl0/oDVYRTSGEeEiIlViEm/S5PuD57uFx6ogS9Iz88G/3hnc3HpTAIg2+NVwE7wF1/NK75WlivB1pUGk7OrazhZ+Fhyn5k=,iv:94YFEq/dmS07CqsKFZ2NAKMj3LqqyUB4+2XtHI3UiLg=,tag:4uti1G9eRoL2AwF0n7avdQ==,type:str]
     pgp:
         - created_at: "2022-09-14T13:42:28Z"
           enc: |

deploy/values/review/values.yaml

@@ -5,21 +5,25 @@ blockscout:
   app: blockscout
   enabled: true
   image:
-    _default: blockscout/blockscout-sokol:latest
-    #blockscout/blockscout:review-prerelease-9ad99cc8@sha256:608d335025a135f1cde6608b2449b8988b7cb8bfa6ea38e92ce1f184ec577781
+    _default: blockscout/blockscout:latest
   replicas:
     app: 1
   docker:
     port: 80
     targetPort: 4000
+  # init container
+  init:
+    enabled: true
+    image:
+      _default: blockscout/blockscout:latest
   service:
     # ClusterIP, NodePort or LoadBalancer
     type: ClusterIP
   # enable ingress
   ingress:
     enabled: true
-    annotations:
-      - 'nginx.ingress.kubernetes.io/rewrite-target: /$2'
+    annotations: {}
+      # - 'nginx.ingress.kubernetes.io/rewrite-target: /$2'
     host:
       _default: blockscout.test.blockscout.aws-k8s.blockscout.com
     # enable https
@@ -27,7 +31,7 @@ blockscout:
     tls:
       enabled: true
     path:
-      - "/poa/sokol(/|$)(.*)"
+      # - "/poa/sokol(/|$)(.*)"
       - "/"
   # probes
   livenessProbe:
@@ -93,21 +97,23 @@ blockscout:
     DISABLE_REALTIME_INDEXER:
       _default: 'false'
     SOCKET_ROOT:
-      _default: "/poa/sokol"
+      _default: "/"
     NETWORK_PATH:
-      _default: "/poa/sokol"
+      _default: "/"
     API_PATH:
-      _default: "/poa/sokol"
+      _default: "/"
     ETHEREUM_JSONRPC_DISABLE_ARCHIVE_BALANCES:
       _default: 'true'
     API_BASE_PATH:
-      _default: "/poa/sokol"
+      _default: "/"
     APPS_MENU:
       _default: 'true'
     EXTERNAL_APPS:
-      _default: '[{"title": "Marketplace", "url": "/poa/sokol/apps"}]'
+      _default: '[{"title": "Marketplace", "url": "/apps"}]'
     JSON_RPC:
       _default: https://sokol.poa.network
+    API_V2_ENABLED:
+      _default: 'true'
 
 postgres:
   enabled: true
@@ -275,16 +281,21 @@ frontend:
     targetPort: 3000
   ingress:
     enabled: true
+    # annotations:
+    #   - 'nginx.ingress.kubernetes.io/use-regex: "true"'
     host:
       _default: frontend.test.blockscout.aws-k8s.blockscout.com
     # enable https
     tls:
       enabled: true
     path:
-      - "/poa/sokol/(apps|auth/profile|account)"
+      # - "/(apps|auth/profile|account)"
+      - "/apps"
       - "/_next"
       - "/node-api"
       - "/static"
+      - "/auth/profile"
+      - "/account"
   resources:
     limits:
       memory:
@@ -320,11 +331,9 @@ frontend:
     NEXT_PUBLIC_NETWORK_SHORT_NAME:
       _default: POA
     NEXT_PUBLIC_NETWORK_ASSETS_PATHNAME:
-      _default: sokol
-    NEXT_PUBLIC_NETWORK_TYPE:
       _default: poa
-    NEXT_PUBLIC_NETWORK_SUBTYPE:
-      _default: sokol
+    NEXT_PUBLIC_NETWORK_TYPE:
+      _default: poa_core
     NEXT_PUBLIC_NETWORK_ID:
       _default: 77
     NEXT_PUBLIC_NETWORK_CURRENCY_NAME:
@@ -338,11 +347,11 @@ frontend:
     NEXT_PUBLIC_IS_ACCOUNT_SUPPORTED:
       _default: 'true'
     NEXT_PUBLIC_FEATURED_NETWORKS:
-      _default: "[{'title':'Gnosis Chain','basePath':'/xdai/mainnet','group':'mainnets'},{'title':'Optimism on Gnosis Chain','basePath':'/xdai/optimism','group':'mainnets','icon':'https://www.fillmurray.com/60/60'},{'title':'Arbitrum on xDai','basePath':'/xdai/aox','group':'mainnets'},{'title':'Ethereum','basePath':'/eth/mainnet','group':'mainnets'},{'title':'Ethereum Classic','basePath':'/etx/mainnet','group':'mainnets'},{'title':'POA','basePath':'/poa/core','group':'mainnets'},{'title':'RSK','basePath':'/rsk/mainnet','group':'mainnets'},{'title':'Gnosis Chain Testnet','basePath':'/xdai/testnet','group':'testnets'},{'title':'POA Sokol','basePath':'/poa/sokol','group':'testnets'},{'title':'ARTIS Σ1','basePath':'/artis/sigma1','group':'other'},{'title':'LUKSO L14','basePath':'/lukso/l14','group':'other'},{'title':'Astar','basePath':'/astar','group':'other'}]"
+      _default: "[{'title':'Gnosis Chain','url':'https://blockscout.com/xdai/mainnet','group':'mainnets','type':'xdai_mainnet'},{'title':'Optimism on Gnosis Chain','url':'https://blockscout.com/xdai/optimism','group':'mainnets','icon':'https://www.fillmurray.com/60/60','type':'xdai_optimism'},{'title':'Arbitrum on xDai','url':'https://blockscout.com/xdai/aox','group':'mainnets'},{'title':'Ethereum','url':'https://blockscout.com/eth/mainnet','group':'mainnets','type':'eth_mainnet'},{'title':'Ethereum Classic','url':'https://blockscout.com/etx/mainnet','group':'mainnets','type':'etc_mainnet'},{'title':'POA','url':'https://blockscout.com/poa/core','group':'mainnets','type':'poa_core'},{'title':'RSK','url':'https://blockscout.com/rsk/mainnet','group':'mainnets','type':'rsk_mainnet'},{'title':'Gnosis Chain Testnet','url':'https://blockscout.com/xdai/testnet','group':'testnets','type':'xdai_testnet'},{'title':'POA Sokol','url':'https://blockscout.com/poa/sokol','group':'testnets','type':'poa_sokol'},{'title':'ARTIS Σ1','url':'https://blockscout.com/artis/sigma1','group':'other','type':'artis_sigma1'},{'title':'LUKSO L14','url':'https://blockscout.com/lukso/l14','group':'other','type':'lukso_l14'},{'title':'Astar','url':'https://blockscout.com/astar','group':'other','type':'astar'}]"
     NEXT_PUBLIC_API_ENDPOINT:
       _default: https://blockscout.com
     NEXT_PUBLIC_API_BASE_PATH:
-      _default: /poa/sokol
+      _default: /
     NEXT_PUBLIC_MARKETPLACE_SUBMIT_FORM:
       _default: https://airtable.com/shrqUAcjgGJ4jU88C
     NEXT_PUBLIC_MARKETPLACE_APP_LIST:
@@ -350,4 +359,4 @@ frontend:
     NEXT_PUBLIC_LOGOUT_URL:
       _default: https://blockscoutcom.us.auth0.com/v2/logout
     NEXT_PUBLIC_LOGOUT_RETURN_URL:
-      _default: https://blockscout.com/poa/sokol/auth/logout
+      _default: https://blockscout.com/auth/logout

lib/api/getUrlWithNetwork.ts

-// import * as Sentry from '@sentry/nextjs';
 import type { NextApiRequest } from 'next';
 
 import appConfig from 'configs/app/config';

lib/link/basePath.js

-const BASE_PATH = '/[network_type]/[network_sub_type]';
-
-module.exports = BASE_PATH;

lib/link/link.ts

@@ -15,18 +15,8 @@ export default function link(
     return '';
   }
 
-  const refinedUrlParams: typeof urlParams = {
-    network_type: appConfig.network.type,
-    network_sub_type: appConfig.network.subtype,
-    ...urlParams,
-  };
-
   const path = route.pattern.replace(PATH_PARAM_REGEXP, (_, paramName: string) => {
-    if (paramName === 'network_sub_type' && !refinedUrlParams.network_sub_type) {
-      return '';
-    }
-
-    let paramValue = refinedUrlParams?.[paramName];
+    let paramValue = urlParams?.[paramName];
     if (Array.isArray(paramValue)) {
       // FIXME we don't have yet params as array, but typescript says that we could
       // dunno know how to manage it, fix me if you find an issue
@@ -42,5 +32,5 @@ export default function link(
     url.searchParams.append(key, value);
   });
 
-  return url.toString();
+  return url.pathname;
 }

lib/link/paths.js

-const BASE_PATH = require('./basePath');
-
 const paths = {
-  network_index: `${ BASE_PATH }`,
-  watchlist: `${ BASE_PATH }/account/watchlist`,
-  private_tags: `${ BASE_PATH }/account/tag_address`,
-  public_tags: `${ BASE_PATH }/account/public_tags_request`,
-  api_keys: `${ BASE_PATH }/account/api_key`,
-  custom_abi: `${ BASE_PATH }/account/custom_abi`,
-  profile: `${ BASE_PATH }/auth/profile`,
-  txs: `${ BASE_PATH }/txs`,
-  tx: `${ BASE_PATH }/tx/[id]`,
-  blocks: `${ BASE_PATH }/blocks`,
-  block: `${ BASE_PATH }/block/[id]`,
-  tokens: `${ BASE_PATH }/tokens`,
-  token_index: `${ BASE_PATH }/token/[hash]`,
-  token_instance_item: `${ BASE_PATH }/token/[hash]/instance/[id]`,
-  address_index: `${ BASE_PATH }/address/[id]`,
-  address_contract_verification: `${ BASE_PATH }/address/[id]/contract_verifications/new`,
-  apps: `${ BASE_PATH }/apps`,
-  app_index: `${ BASE_PATH }/apps/[id]`,
-  search_results: `${ BASE_PATH }/search-results`,
-  other: `${ BASE_PATH }/search-results`,
-  auth: `${ BASE_PATH }/auth/auth0`,
+  network_index: `/`,
+  watchlist: `/account/watchlist`,
+  private_tags: `/account/tag_address`,
+  public_tags: `/account/public_tags_request`,
+  api_keys: `/account/api_key`,
+  custom_abi: `/account/custom_abi`,
+  profile: `/auth/profile`,
+  txs: `/txs`,
+  tx: `/tx/[id]`,
+  blocks: `/blocks`,
+  block: `/block/[id]`,
+  tokens: `/tokens`,
+  token_index: `/token/[hash]`,
+  token_instance_item: `/token/[hash]/instance/[id]`,
+  address_index: `/address/[id]`,
+  address_contract_verification: `/address/[id]/contract_verifications/new`,
+  apps: `/apps`,
+  app_index: `/apps/[id]`,
+  search_results: `/search-results`,
+  other: `/search-results`,
+  auth: `/auth/auth0`,
 };
 
 module.exports = paths;

lib/networks/featuredNetworks.ts

-import type { FeaturedNetwork } from 'types/networks';
+import type { FeaturedNetwork, PreDefinedNetwork } from 'types/networks';
 
 import appConfig from 'configs/app/config';
 import arbitrumIcon from 'icons/networks/icons/arbitrum.svg';
@@ -12,88 +12,99 @@ import poaIcon from 'icons/networks/icons/poa.svg';
 import rskIcon from 'icons/networks/icons/rsk.svg';
 
 // predefined network icons
-const ICONS: Record<string, React.FunctionComponent<React.SVGAttributes<SVGElement>>> = {
-  '/xdai/mainnet': gnosisIcon,
-  '/xdai/optimism': optimismIcon,
-  '/xdai/aox': arbitrumIcon,
-  '/eth/mainnet': ethereumIcon,
-  '/etc/mainnet': ethereumClassicIcon,
-  '/poa/core': poaIcon,
-  '/rsk/mainnet': rskIcon,
-  '/xdai/testnet': arbitrumIcon,
-  '/poa/sokol': poaSokolIcon,
-  '/artis/sigma1': artisIcon,
+const ICONS: Partial<Record<PreDefinedNetwork, React.FunctionComponent<React.SVGAttributes<SVGElement>>>> = {
+  xdai_mainnet: gnosisIcon,
+  xdai_optimism: optimismIcon,
+  xdai_aox: arbitrumIcon,
+  eth_mainnet: ethereumIcon,
+  etc_mainnet: ethereumClassicIcon,
+  poa_core: poaIcon,
+  rsk_mainnet: rskIcon,
+  xdai_testnet: arbitrumIcon,
+  poa_sokol: poaSokolIcon,
+  artis_sigma1: artisIcon,
 };
 
 // for easy .env.example update
 // const FEATURED_NETWORKS = JSON.stringify([
 //   {
 //     title: 'Gnosis Chain',
-//     basePath: '/xdai/mainnet',
+//     url: 'https://blockscout.com/xdai/mainnet',
 //     group: 'mainnets',
+//     type: 'xdai_mainnet',
 //   },
 //   {
 //     title: 'Optimism on Gnosis Chain',
-//     basePath: '/xdai/optimism',
+//     url: 'https://blockscout.com/xdai/optimism',
 //     group: 'mainnets',
 //     icon: 'https://www.fillmurray.com/60/60',
+//     type: 'xdai_optimism',
 //   },
 //   {
 //     title: 'Arbitrum on xDai',
-//     basePath: '/xdai/aox',
+//     url: 'https://blockscout.com/xdai/aox',
 //     group: 'mainnets',
 //   },
 //   {
 //     title: 'Ethereum',
-//     basePath: '/eth/mainnet',
+//     url: 'https://blockscout.com/eth/mainnet',
 //     group: 'mainnets',
+//     type: 'eth_mainnet',
 //   },
 //   {
 //     title: 'Ethereum Classic',
-//     basePath: '/etx/mainnet',
+//     url: 'https://blockscout.com/etx/mainnet',
 //     group: 'mainnets',
+//     type: 'etc_mainnet',
 //   },
 //   {
 //     title: 'POA',
-//     basePath: '/poa/core',
+//     url: 'https://blockscout.com/poa/core',
 //     group: 'mainnets',
+//     type: 'poa_core',
 //   },
 //   {
 //     title: 'RSK',
-//     basePath: '/rsk/mainnet',
+//     url: 'https://blockscout.com/rsk/mainnet',
 //     group: 'mainnets',
+//     type: 'rsk_mainnet',
 //   },
 //   {
 //     title: 'Gnosis Chain Testnet',
-//     basePath: '/xdai/testnet',
+//     url: 'https://blockscout.com/xdai/testnet',
 //     group: 'testnets',
+//     type: 'xdai_testnet',
 //   },
 //   {
 //     title: 'POA Sokol',
-//     basePath: '/poa/sokol',
+//     url: 'https://blockscout.com/poa/sokol',
 //     group: 'testnets',
+//     type: 'poa_sokol',
 //   },
 //   {
 //     title: 'ARTIS Σ1',
-//     basePath: '/artis/sigma1',
+//     url: 'https://blockscout.com/artis/sigma1',
 //     group: 'other',
+//     type: 'artis_sigma1',
 //   },
 //   {
 //     title: 'LUKSO L14',
-//     basePath: '/lukso/l14',
+//     url: 'https://blockscout.com/lukso/l14',
 //     group: 'other',
+//     type: 'lukso_l14',
 //   },
 //   {
 //     title: 'Astar',
-//     basePath: '/astar',
+//     url: 'https://blockscout.com/astar',
 //     group: 'other',
+//     type: 'astar',
 //   },
 // ]).replaceAll('"', '\'');
 
 const featuredNetworks: Array<FeaturedNetwork> = (() => {
   return appConfig.featuredNetworks.map((network) => ({
     ...network,
-    icon: network.icon || ICONS[network.basePath],
+    icon: network.icon || (network.type ? ICONS[network.type] : undefined),
   }));
 })();
 

lib/networks/useNetworkNavigationItems.ts

-import { useRouter } from 'next/router';
 import React from 'react';
 
 import appConfig from 'configs/app/config';
-import link from 'lib/link/link';
-import { ROUTES } from 'lib/link/routes';
-import useCurrentRoute from 'lib/link/useCurrentRoute';
 import featuredNetworks from 'lib/networks/featuredNetworks';
 
 export default function useNetworkNavigationItems() {
-  const currentRouteName = useCurrentRoute()();
-  const currentRoute = ROUTES[currentRouteName];
-  const router = useRouter();
 
   return React.useMemo(() => {
     return featuredNetworks.map((network) => {
-      const routeName = 'crossNetworkNavigation' in currentRoute && currentRoute.crossNetworkNavigation ? currentRouteName : 'network_index';
-      const [ , networkType, networkSubtype ] = network.basePath.split('/');
-      const url = link(routeName, { ...router.query, network_type: networkType, network_sub_type: networkSubtype });
-
       return {
         ...network,
-        url: url,
-        isActive: appConfig.network.basePath === network.basePath,
+        isActive: network.type ? appConfig.network.type === network.type : false,
       };
     });
-  }, [ currentRoute, currentRouteName, router.query ]);
+  }, []);
 }

lib/next/block/types.ts

 export type PageParams = {
-  network_type: string;
-  network_sub_type: string;
   id: string;
 }

lib/next/blocks/types.ts

-export type PageParams = {
-  network_type: string;
-  network_sub_type: string;
-}
+export type PageParams = unknown

lib/next/getServerSidePropsDummy.ts

+import type { GetServerSideProps } from 'next';
+
+export const getServerSideProps: GetServerSideProps = async({ res }) => {
+  res.setHeader(
+    'Cache-Control',
+    `public, s-maxage=${ 60 * 60 }, stale-while-revalidate=${ 2 * 60 * 60 }`,
+  );
+
+  return { props: {} };
+};

lib/next/getStaticProps.ts

 import type { GetStaticProps, GetStaticPropsResult } from 'next';
 
-export const getStaticProps: GetStaticProps = async(context): Promise<GetStaticPropsResult<{ [key: string]: unknown }>> => {
+export const getStaticProps: GetStaticProps = async(): Promise<GetStaticPropsResult<{ [key: string]: unknown }>> => {
   return {
-    props: {
-      pageParams: context.params,
-    },
+    props: {},
   };
 };

lib/next/tx/types.ts

 export type PageParams = {
-  network_type: string;
-  network_sub_type: string;
   id: string;
 }

middleware.ts

@@ -15,25 +15,13 @@ export function middleware(req: NextRequest) {
     return;
   }
 
-  const [ , networkType, networkSubtype ] = req.nextUrl.pathname.split('/');
-  const networkParams = {
-    network_type: networkType,
-    network_sub_type: networkSubtype,
-  };
-
-  if (appConfig.network.type !== networkType && appConfig.network.subtype !== networkSubtype) {
-    const url = req.nextUrl.clone();
-    url.pathname = `/404`;
-    return NextResponse.rewrite(url);
-  }
-
   // we don't have any info from router here, so just do straight forward sub-string search (sorry)
   const isAccountRoute = req.nextUrl.pathname.includes('/account/');
   const isProfileRoute = req.nextUrl.pathname.includes('/auth/profile');
   const apiToken = req.cookies.get(NAMES.API_TOKEN);
 
-  if ((isAccountRoute || isProfileRoute) && !apiToken) {
-    const authUrl = link('auth', networkParams);
+  if ((isAccountRoute || isProfileRoute) && !apiToken && appConfig.isAccountSupported) {
+    const authUrl = link('auth');
     return NextResponse.redirect(authUrl);
   }
 

pages/[network_type]/[network_sub_type]/index.tsx

-import type { NextPage } from 'next';
-import Head from 'next/head';
-import React from 'react';
-
-import Home from 'ui/pages/Home';
-
-const HomePage: NextPage = () => {
-  return (
-    <>
-      <Head><title>Home Page</title></Head>
-      <Home/>
-    </>
-  );
-};
-
-export default HomePage;
-
-export { getStaticPaths } from 'lib/next/getStaticPaths';
-export { getStaticProps } from 'lib/next/getStaticProps';

pages/[network_type]/[network_sub_type]/account/api_key.tsx → pages/account/api_key.tsx

@@ -5,16 +5,7 @@ import React from 'react';
 import getNetworkTitle from 'lib/networks/getNetworkTitle';
 import ApiKeys from 'ui/pages/ApiKeys';
 
-type PageParams = {
-  network_type: string;
-  network_sub_type: string;
-}
-
-type Props = {
-  pageParams: PageParams;
-}
-
-const ApiKeysPage: NextPage<Props> = () => {
+const ApiKeysPage: NextPage = () => {
   const title = getNetworkTitle();
   return (
     <>
@@ -26,5 +17,4 @@ const ApiKeysPage: NextPage<Props> = () => {
 
 export default ApiKeysPage;
 
-export { getStaticPaths } from 'lib/next/getStaticPaths';
-export { getStaticProps } from 'lib/next/getStaticProps';
+export { getServerSideProps } from 'lib/next/getServerSidePropsDummy';

pages/[network_type]/[network_sub_type]/account/custom_abi.tsx → pages/account/custom_abi.tsx

@@ -5,16 +5,7 @@ import React from 'react';
 import getNetworkTitle from 'lib/networks/getNetworkTitle';
 import CustomAbi from 'ui/pages/CustomAbi';
 
-type PageParams = {
-  network_type: string;
-  network_sub_type: string;
-}
-
-type Props = {
-  pageParams: PageParams;
-}
-
-const CustomAbiPage: NextPage<Props> = () => {
+const CustomAbiPage: NextPage = () => {
   const title = getNetworkTitle();
   return (
     <>
@@ -26,5 +17,4 @@ const CustomAbiPage: NextPage<Props> = () => {
 
 export default CustomAbiPage;
 
-export { getStaticPaths } from 'lib/next/getStaticPaths';
-export { getStaticProps } from 'lib/next/getStaticProps';
+export { getServerSideProps } from 'lib/next/getServerSidePropsDummy';

pages/[network_type]/[network_sub_type]/account/public_tags_request.tsx → pages/account/public_tags_request.tsx

@@ -5,16 +5,7 @@ import React from 'react';
 import getNetworkTitle from 'lib/networks/getNetworkTitle';
 import PublicTags from 'ui/pages/PublicTags';
 
-type PageParams = {
-  network_type: string;
-  network_sub_type: string;
-}
-
-type Props = {
-  pageParams: PageParams;
-}
-
-const PublicTagsPage: NextPage<Props> = () => {
+const PublicTagsPage: NextPage = () => {
   const title = getNetworkTitle();
   return (
     <>
@@ -26,5 +17,4 @@ const PublicTagsPage: NextPage<Props> = () => {
 
 export default PublicTagsPage;
 
-export { getStaticPaths } from 'lib/next/getStaticPaths';
-export { getStaticProps } from 'lib/next/getStaticProps';
+export { getServerSideProps } from 'lib/next/getServerSidePropsDummy';

pages/[network_type]/[network_sub_type]/account/tag_address.tsx → pages/account/tag_address.tsx

@@ -5,16 +5,7 @@ import React from 'react';
 import getNetworkTitle from 'lib/networks/getNetworkTitle';
 import PrivateTags from 'ui/pages/PrivateTags';
 
-type PageParams = {
-  network_type: string;
-  network_sub_type: string;
-}
-
-type Props = {
-  pageParams: PageParams;
-}
-
-const AddressTagsPage: NextPage<Props> = () => {
+const AddressTagsPage: NextPage = () => {
   const title = getNetworkTitle();
   return (
     <>
@@ -26,5 +17,4 @@ const AddressTagsPage: NextPage<Props> = () => {
 
 export default AddressTagsPage;
 
-export { getStaticPaths } from 'lib/next/getStaticPaths';
-export { getStaticProps } from 'lib/next/getStaticProps';
+export { getServerSideProps } from 'lib/next/getServerSidePropsDummy';

pages/[network_type]/[network_sub_type]/account/watchlist.tsx → pages/account/watchlist.tsx

@@ -5,16 +5,7 @@ import React from 'react';
 import getNetworkTitle from 'lib/networks/getNetworkTitle';
 import WatchList from 'ui/pages/Watchlist';
 
-type PageParams = {
-  network_type: string;
-  network_sub_type: string;
-}
-
-type Props = {
-  pageParams: PageParams;
-}
-
-const WatchListPage: NextPage<Props> = () => {
+const WatchListPage: NextPage = () => {
   const title = getNetworkTitle();
   return (
     <>
@@ -28,5 +19,4 @@ const WatchListPage: NextPage<Props> = () => {
 
 export default WatchListPage;
 
-export { getStaticPaths } from 'lib/next/getStaticPaths';
-export { getStaticProps } from 'lib/next/getStaticProps';
+export { getServerSideProps } from 'lib/next/getServerSidePropsDummy';

pages/[network_type]/[network_sub_type]/apps.tsx → pages/apps.tsx

+import type { NextPage } from 'next';
 import Head from 'next/head';
 import React from 'react';
 
@@ -5,7 +6,7 @@ import Apps from 'ui/pages/Apps';
 import Page from 'ui/shared/Page/Page';
 import PageTitle from 'ui/shared/Page/PageTitle';
 
-const AppsPage = () => {
+const AppsPage: NextPage = () => {
   return (
     <Page>
       <PageTitle text="Apps"/>
@@ -18,5 +19,4 @@ const AppsPage = () => {
 
 export default AppsPage;
 
-export { getStaticPaths } from 'lib/next/getStaticPaths';
-export { getStaticProps } from 'lib/next/getStaticProps';
+export { getServerSideProps } from 'lib/next/getServerSidePropsDummy';

pages/[network_type]/[network_sub_type]/auth/profile.tsx → pages/auth/profile.tsx

@@ -15,5 +15,4 @@ const MyProfilePage: NextPage = () => {
 
 export default MyProfilePage;
 
-export { getStaticPaths } from 'lib/next/getStaticPaths';
-export { getStaticProps } from 'lib/next/getStaticProps';
+export { getServerSideProps } from 'lib/next/getServerSidePropsDummy';

pages/[network_type]/[network_sub_type]/blocks.tsx → pages/blocks.tsx

 import type { NextPage } from 'next';
 import React from 'react';
 
-import type { PageParams } from 'lib/next/tx/types';
-
 import BlocksNextPage from 'lib/next/blocks/BlocksNextPage';
 
-type Props = {
-  pageParams: PageParams;
-}
-
-const BlockPage: NextPage<Props> = () => {
+const BlockPage: NextPage = () => {
   return (
     <BlocksNextPage/>
   );
@@ -17,5 +11,4 @@ const BlockPage: NextPage<Props> = () => {
 
 export default BlockPage;
 
-export { getStaticPaths } from 'lib/next/getStaticPaths';
-export { getStaticProps } from 'lib/next/getStaticProps';
+export { getServerSideProps } from 'lib/next/getServerSidePropsDummy';

pages/index.tsx

 import type { NextPage } from 'next';
+import Head from 'next/head';
+import React from 'react';
 
-const Home: NextPage = () => {
-  return null;
+import Home from 'ui/pages/Home';
+
+const HomePage: NextPage = () => {
+  return (
+    <>
+      <Head><title>Home Page</title></Head>
+      <Home/>
+    </>
+  );
 };
 
-export default Home;
+export default HomePage;
+
+export { getServerSideProps } from 'lib/next/getServerSidePropsDummy';

pages/[network_type]/[network_sub_type]/txs.tsx → pages/txs.tsx

@@ -5,16 +5,7 @@ import React from 'react';
 import getNetworkTitle from 'lib/networks/getNetworkTitle';
 import Transactions from 'ui/pages/Transactions';
 
-type PageParams = {
-  network_type: string;
-  network_sub_type: string;
-}
-
-type Props = {
-  pageParams: PageParams;
-}
-
-const AddressTagsPage: NextPage<Props> = () => {
+const TxsPage: NextPage = () => {
   const title = getNetworkTitle();
   return (
     <>
@@ -24,7 +15,6 @@ const AddressTagsPage: NextPage<Props> = () => {
   );
 };
 
-export default AddressTagsPage;
+export default TxsPage;
 
-export { getStaticPaths } from 'lib/next/getStaticPaths';
-export { getStaticProps } from 'lib/next/getStaticProps';
+export { getServerSideProps } from 'lib/next/getServerSidePropsDummy';

types/networks.ts

@@ -2,11 +2,15 @@ import type { FunctionComponent, SVGAttributes } from 'react';
 
 export type NetworkGroup = 'mainnets' | 'testnets' | 'other';
 
+export type PreDefinedNetwork = 'xdai_mainnet' | 'xdai_optimism' | 'xdai_aox' | 'eth_mainnet' | 'etc_mainnet' | 'poa_core' |
+'rsk_mainnet' | 'xdai_testnet' | 'poa_sokol' | 'artis_sigma1' | 'lukso_l14' | 'astar' | 'shiden' | 'shibuya';
+
 export interface FeaturedNetwork {
   title: string;
-  basePath: string;
+  url: string;
   group: NetworkGroup;
   icon?: FunctionComponent<SVGAttributes<SVGElement>> | string;
+  type?: PreDefinedNetwork;
 }
 
 export interface NetworkExplorer {

ui/pages/Home.tsx

 import { VStack, Textarea, Button, Alert, AlertTitle, AlertDescription, Link, Code } from '@chakra-ui/react';
 import * as Sentry from '@sentry/react';
-import { useRouter } from 'next/router';
 import type { ChangeEvent } from 'react';
 import React from 'react';
 
@@ -11,7 +10,6 @@ import Page from 'ui/shared/Page/Page';
 import PageTitle from 'ui/shared/Page/PageTitle';
 
 const Home = () => {
-  const router = useRouter();
   const toast = useToast();
 
   const [ isFormVisible, setFormVisibility ] = React.useState(false);
@@ -46,7 +44,7 @@ const Home = () => {
     });
   }, [ toast, token ]);
 
-  const prodUrl = new URL(`/${ router.query.network_type }/${ router.query.network_sub_type }`, 'https://blockscout.com').toString();
+  const prodUrl = 'https://blockscout.com/poa/core';
 
   return (
     <Page>

ui/shared/TokenLogo.tsx

@@ -12,13 +12,13 @@ interface Props {
 }
 
 const TokenLogo = ({ hash, name, className }: Props) => {
-  const logoSrc = `
+  const logoSrc = appConfig.network.assetsPathname ? `
     https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/
-    ${ appConfig.network.assetsPathname || appConfig.network.type }
+    ${ appConfig.network.assetsPathname }
     /assets/
     ${ hash }
     /logo.png
-  `;
+  ` : undefined;
 
   return <Image className={ className } src={ logoSrc } alt={ `${ name || 'token' } logo` } fallback={ <EmptyElement/> }/>;
 };

ui/snippets/networkMenu/NetworkLogo.tsx

@@ -2,25 +2,27 @@ import { Icon, Box, Image, useColorModeValue } from '@chakra-ui/react';
 import React from 'react';
 import type { FunctionComponent, SVGAttributes } from 'react';
 
+import type { PreDefinedNetwork } from 'types/networks';
+
 import appConfig from 'configs/app/config';
 import blockscoutLogo from 'icons/logo.svg';
 import link from 'lib/link/link';
 import getDefaultTransitionProps from 'theme/utils/getDefaultTransitionProps';
 
 // predefined network logos
-const LOGOS: Record<string, React.FunctionComponent<React.SVGAttributes<SVGElement>>> = {
-  '/xdai/mainnet': require('icons/networks/logos/gnosis.svg'),
-  '/eth/mainnet': require('icons/networks/logos/eth.svg'),
-  '/etc/mainnet': require('icons/networks/logos/etc.svg'),
-  '/poa/core': require('icons/networks/logos/poa.svg'),
-  '/rsk/mainnet': require('icons/networks/logos/rsk.svg'),
-  '/xdai/testnet': require('icons/networks/logos/gnosis.svg'),
-  '/poa/sokol': require('icons/networks/logos/sokol.svg'),
-  '/artis/sigma1': require('icons/networks/logos/artis.svg'),
-  '/lukso/l14': require('icons/networks/logos/lukso.svg'),
-  '/astar': require('icons/networks/logos/astar.svg'),
-  '/shiden': require('icons/networks/logos/shiden.svg'),
-  '/shibuya': require('icons/networks/logos/shibuya.svg'),
+const LOGOS: Partial<Record<PreDefinedNetwork, React.FunctionComponent<React.SVGAttributes<SVGElement>>>> = {
+  xdai_mainnet: require('icons/networks/logos/gnosis.svg'),
+  eth_mainnet: require('icons/networks/logos/eth.svg'),
+  etc_mainnet: require('icons/networks/logos/etc.svg'),
+  poa_core: require('icons/networks/logos/poa.svg'),
+  rsk_mainnet: require('icons/networks/logos/rsk.svg'),
+  xdai_testnet: require('icons/networks/logos/gnosis.svg'),
+  poa_sokol: require('icons/networks/logos/sokol.svg'),
+  artis_sigma1: require('icons/networks/logos/artis.svg'),
+  lukso_l14: require('icons/networks/logos/lukso.svg'),
+  astar: require('icons/networks/logos/astar.svg'),
+  shiden: require('icons/networks/logos/shiden.svg'),
+  shibuya: require('icons/networks/logos/shibuya.svg'),
 };
 
 interface Props {
@@ -31,7 +33,7 @@ interface Props {
 const NetworkLogo = ({ isCollapsed, onClick }: Props) => {
   const logoColor = useColorModeValue('blue.600', 'white');
   const href = link('network_index');
-  const logo = appConfig.network.logo || LOGOS[appConfig.network.basePath];
+  const logo = appConfig.network.logo || (appConfig.network.type ? LOGOS[appConfig.network.type] : undefined);
 
   const style = useColorModeValue({}, { filter: 'brightness(0) invert(1)' });
 

ui/snippets/networkMenu/NetworkMenuLink.tsx

@@ -11,7 +11,6 @@ import useColors from './useColors';
 interface Props extends FeaturedNetwork {
   isActive: boolean;
   isMobile?: boolean;
-  url: string;
 }
 
 const NetworkMenuLink = ({ title, icon, isActive, isMobile, url }: Props) => {