fix: remove portal from header

matter-labs · Jan 30, 2024 · 775228e · 775228e
1 parent 7c8cab5
commit 775228e
Show file tree

Hide file tree

Showing 15 changed files with 16 additions and 42 deletions.
diff --git a/docker-compose-cli.yaml b/docker-compose-cli.yaml
@@ -1,6 +1,3 @@
-version: "3.2"
-name: "zkcli-block-explorer"
-
 services:
   app:
     platform: linux/amd64
@@ -26,6 +23,8 @@ services:
       - DATA_FETCHER_URL=http://data-fetcher:3040
       - BATCHES_PROCESSING_POLLING_INTERVAL=1000
     restart: unless-stopped
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
 
   data-fetcher:
     platform: linux/amd64
@@ -38,6 +37,8 @@ services:
     ports:
       - '3040:3040'
     restart: unless-stopped
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
 
   api:
     platform: linux/amd64

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -1,4 +1,3 @@
-name: block-explorer
 services:
   app:
     build:

diff --git a/packages/app/README.md b/packages/app/README.md
@@ -46,7 +46,6 @@ const config: EnvironmentConfig = {
       icon: "/images/icons/zksync-arrows.svg",
       l2ChainId: 270,
       l2NetworkName: "Local",
-      l2WalletUrl: "https://goerli.staging-portal.zksync.dev/",
       maintenance: false,
       name: "local",
       published: true,
@@ -60,7 +59,6 @@ const config: EnvironmentConfig = {
       icon: "/images/icons/zksync-arrows.svg",
       l2ChainId: 270,
       l2NetworkName: "Local Hyperchain",
-      l2WalletUrl: "https://goerli.staging-portal.zksync.dev/",
       maintenance: false,
       name: "local-hyperchain",
       published: true,

diff --git a/packages/app/src/components/header/TheHeader.vue b/packages/app/src/components/header/TheHeader.vue
@@ -191,10 +191,6 @@ const links = [
     label: computed(() => t("header.nav.contractVerification")),
     to: { name: "contract-verification" },
   },
-  {
-    label: computed(() => t("header.nav.portal")),
-    url: computed(() => currentNetwork.value.l2WalletUrl),
-  },
 ];
 
 if (currentNetwork.value.bridgeUrl) {

diff --git a/packages/app/src/components/transactions/infoTable/GeneralInfo.vue b/packages/app/src/components/transactions/infoTable/GeneralInfo.vue
@@ -30,7 +30,7 @@
           />
         </TableBodyColumn>
       </tr>
-      <tr v-if="transaction?.status === 'failed'" class="transaction-table-row">
+      <tr v-if="transaction?.error || transaction?.revertReason" class="transaction-table-row">
         <TableBodyColumn class="transaction-table-label">
           <span class="transaction-info-field-label transaction-reason-label">
             {{ t("transactions.table.reason") }}

diff --git a/packages/app/src/composables/useRuntimeConfig.ts b/packages/app/src/composables/useRuntimeConfig.ts
@@ -3,13 +3,12 @@ import type { NetworkConfig, RuntimeConfig } from "@/configs";
 export const DEFAULT_NETWORK: NetworkConfig = {
   apiUrl: "https://block-explorer-api.testnets.zksync.dev",
   verificationApiUrl: "https://zksync2-testnet-explorer.zksync.dev",
-  bridgeUrl: "https://goerli.bridge.zksync.io",
+  bridgeUrl: "https://portal.zksync.io/bridge/?network=goerli",
   hostnames: ["https://goerli.explorer.zksync.io"],
   icon: "/images/icons/zksync-arrows.svg",
   l1ExplorerUrl: "https://goerli.etherscan.io",
   l2ChainId: 280,
   l2NetworkName: "zkSync Era Goerli Testnet",
-  l2WalletUrl: "https://goerli.portal.zksync.io/",
   maintenance: false,
   name: "goerli",
   published: true,

diff --git a/packages/app/src/configs/dev.config.json b/packages/app/src/configs/dev.config.json
@@ -9,7 +9,6 @@
       "icon": "/images/icons/zksync-arrows.svg",
       "l2ChainId": 270,
       "l2NetworkName": "Local",
-      "l2WalletUrl": "http://localhost:3000",
       "maintenance": false,
       "name": "local",
       "published": true,
@@ -18,15 +17,14 @@
     {
       "apiUrl": "https://block-explorer-api.testnets.zksync.dev",
       "verificationApiUrl": "https://zksync2-testnet-explorer.zksync.dev",
-      "bridgeUrl": "https://staging.goerli.bridge.zksync.dev",
+      "bridgeUrl": "https://portal.zksync.io/bridge/?network=goerli",
       "hostnames": [
         "https://goerli.staging-scan-v2.zksync.dev"
       ],
       "icon": "/images/icons/zksync-arrows.svg",
       "l1ExplorerUrl": "https://goerli.etherscan.io",
       "l2ChainId": 280,
       "l2NetworkName": "zkSync Era Goerli Testnet",
-      "l2WalletUrl": "https://goerli.staging-portal.zksync.dev/",
       "maintenance": false,
       "name": "goerli",
       "published": true,
@@ -35,13 +33,12 @@
     {
       "apiUrl": "https://block-explorer-api.sepolia.zksync.dev",
       "verificationApiUrl": "https://explorer.sepolia.era.zksync.dev",
-      "bridgeUrl": "https://staging.goerli.bridge.zksync.dev",
+      "bridgeUrl": "https://portal.zksync.io/bridge/?network=sepolia",
       "hostnames": [],
       "icon": "/images/icons/zksync-arrows.svg",
       "l1ExplorerUrl": "https://sepolia.etherscan.io",
       "l2ChainId": 300,
       "l2NetworkName": "zkSync Era Sepolia Testnet",
-      "l2WalletUrl": "https://staging-portal.zksync.dev/?network=era-boojnet",
       "maintenance": false,
       "name": "sepolia",
       "published": true,
@@ -57,7 +54,6 @@
       "l1ExplorerUrl": "https://goerli.etherscan.io",
       "l2ChainId": 270,
       "l2NetworkName": "Goerli (Stage2)",
-      "l2WalletUrl": "https://goerli-beta.staging-portal.zksync.dev/",
       "maintenance": false,
       "name": "goerli-beta",
       "published": true,
@@ -66,15 +62,14 @@
     {
       "apiUrl": "https://block-explorer-api.mainnet.zksync.io",
       "verificationApiUrl": "https://zksync2-mainnet-explorer.zksync.io",
-      "bridgeUrl": "https://staging.bridge.zksync.dev",
+      "bridgeUrl": "https://portal.zksync.io/bridge/?network=mainnet",
       "hostnames": [
         "https://staging-scan-v2.zksync.dev"
       ],
       "icon": "/images/icons/zksync-arrows.svg",
       "l1ExplorerUrl": "https://etherscan.io",
       "l2ChainId": 324,
       "l2NetworkName": "zkSync Era Mainnet",
-      "l2WalletUrl": "https://staging-portal.zksync.dev/",
       "maintenance": false,
       "name": "mainnet",
       "published": true,

diff --git a/packages/app/src/configs/index.ts b/packages/app/src/configs/index.ts
@@ -6,7 +6,6 @@ export type NetworkConfig = {
   rpcUrl: string;
   bridgeUrl?: string;
   l2NetworkName: string;
-  l2WalletUrl: string;
   l2ChainId: 270 | 280 | 324;
   l1ExplorerUrl?: string;
   maintenance: boolean;

diff --git a/packages/app/src/configs/local.config.json b/packages/app/src/configs/local.config.json
@@ -9,7 +9,6 @@
       "icon": "/images/icons/zksync-arrows.svg",
       "l2ChainId": 270,
       "l2NetworkName": "Local",
-      "l2WalletUrl": "http://localhost:3000",
       "maintenance": false,
       "name": "local",
       "published": true,

diff --git a/packages/app/src/configs/production.config.json b/packages/app/src/configs/production.config.json
@@ -3,15 +3,14 @@
     {
       "apiUrl": "https://block-explorer-api.testnets.zksync.dev",
       "verificationApiUrl": "https://zksync2-testnet-explorer.zksync.dev",
-      "bridgeUrl": "https://goerli.bridge.zksync.io",
+      "bridgeUrl": "https://portal.zksync.io/bridge/?network=goerli",
       "hostnames": [
         "https://goerli.explorer.zksync.io"
       ],
       "icon": "/images/icons/zksync-arrows.svg",
       "l1ExplorerUrl": "https://goerli.etherscan.io",
       "l2ChainId": 280,
       "l2NetworkName": "zkSync Era Goerli Testnet",
-      "l2WalletUrl": "https://goerli.portal.zksync.io/",
       "maintenance": false,
       "name": "goerli",
       "published": true,
@@ -20,15 +19,14 @@
     {
       "apiUrl": "https://block-explorer-api.sepolia.zksync.dev",
       "verificationApiUrl": "https://explorer.sepolia.era.zksync.dev",
-      "bridgeUrl": "https://bridge.zksync.io",
+      "bridgeUrl": "https://portal.zksync.io/bridge/?network=sepolia",
       "hostnames": [
         "https://sepolia.explorer.zksync.io"
       ],
       "icon": "/images/icons/zksync-arrows.svg",
       "l1ExplorerUrl": "https://sepolia.etherscan.io",
       "l2ChainId": 300,
       "l2NetworkName": "zkSync Era Sepolia Testnet",
-      "l2WalletUrl": "https://portal.zksync.io/",
       "maintenance": false,
       "name": "sepolia",
       "published": true,
@@ -37,15 +35,14 @@
     {
       "apiUrl": "https://block-explorer-api.mainnet.zksync.io",
       "verificationApiUrl": "https://zksync2-mainnet-explorer.zksync.io",
-      "bridgeUrl": "https://bridge.zksync.io",
+      "bridgeUrl": "https://portal.zksync.io/bridge/?network=mainnet",
       "hostnames": [
         "https://explorer.zksync.io"
       ],
       "icon": "/images/icons/zksync-arrows.svg",
       "l1ExplorerUrl": "https://etherscan.io",
       "l2ChainId": 324,
       "l2NetworkName": "zkSync Era Mainnet",
-      "l2WalletUrl": "https://portal.zksync.io/",
       "maintenance": false,
       "name": "mainnet",
       "published": true,

diff --git a/packages/app/src/configs/staging.config.json b/packages/app/src/configs/staging.config.json
@@ -3,15 +3,14 @@
     {
       "apiUrl": "https://block-explorer-api.testnets.zksync.dev",
       "verificationApiUrl": "https://zksync2-testnet-explorer.zksync.dev",
-      "bridgeUrl": "https://staging.goerli.bridge.zksync.dev",
+      "bridgeUrl": "https://portal.zksync.io/bridge/?network=goerli",
       "hostnames": [
         "https://goerli.staging-scan-v2.zksync.dev"
       ],
       "icon": "/images/icons/zksync-arrows.svg",
       "l1ExplorerUrl": "https://goerli.etherscan.io",
       "l2ChainId": 280,
       "l2NetworkName": "zkSync Era Goerli Testnet",
-      "l2WalletUrl": "https://goerli.staging-portal.zksync.dev/",
       "maintenance": false,
       "name": "goerli",
       "published": true,
@@ -20,15 +19,14 @@
     {
       "apiUrl": "https://block-explorer-api.sepolia.zksync.dev",
       "verificationApiUrl": "https://explorer.sepolia.era.zksync.dev",
-      "bridgeUrl": "https://staging.goerli.bridge.zksync.dev",
+      "bridgeUrl": "https://portal.zksync.io/bridge/?network=sepolia",
       "hostnames": [
         "https://sepolia.staging-scan-v2.zksync.dev"
       ],
       "icon": "/images/icons/zksync-arrows.svg",
       "l1ExplorerUrl": "https://sepolia.etherscan.io",
       "l2ChainId": 300,
       "l2NetworkName": "zkSync Era Sepolia Testnet",
-      "l2WalletUrl": "https://staging-portal.zksync.dev/?network=era-boojnet",
       "maintenance": false,
       "name": "sepolia",
       "published": true,
@@ -44,7 +42,6 @@
       "l1ExplorerUrl": "https://goerli.etherscan.io",
       "l2ChainId": 270,
       "l2NetworkName": "Goerli (Stage2)",
-      "l2WalletUrl": "https://goerli-beta.staging-portal.zksync.dev/",
       "maintenance": false,
       "name": "goerli-beta",
       "published": true,
@@ -53,15 +50,14 @@
     {
       "apiUrl": "https://block-explorer-api.mainnet.zksync.io",
       "verificationApiUrl": "https://zksync2-mainnet-explorer.zksync.io",
-      "bridgeUrl": "https://staging.bridge.zksync.dev",
+      "bridgeUrl": "https://portal.zksync.io/bridge/?network=mainnet",
       "hostnames": [
         "https://staging-scan-v2.zksync.dev"
       ],
       "icon": "/images/icons/zksync-arrows.svg",
       "l1ExplorerUrl": "https://etherscan.io",
       "l2ChainId": 324,
       "l2NetworkName": "zkSync Era Mainnet",
-      "l2WalletUrl": "https://staging-portal.zksync.dev/",
       "maintenance": false,
       "name": "mainnet",
       "published": true,

diff --git a/packages/app/src/locales/en.json b/packages/app/src/locales/en.json
@@ -281,7 +281,6 @@
     "header": {
         "nav": {
             "blockExplorer": "Block Explorer",
-            "portal": "Portal",
             "documentation": "Documentation",
             "tools": "Tools",
             "apiDocs": "API Documentation",

diff --git a/packages/app/src/locales/uk.json b/packages/app/src/locales/uk.json
@@ -152,7 +152,6 @@
             "contractVerification": "Верифікація Смарт контракту",
             "debugger": "zkEVM Налагоджувач",
             "blockExplorer": "Провідник",
-            "portal": "Портал",
             "documentation": "Документація"
         }
     },

diff --git a/packages/app/tests/components/TheHeader.spec.ts b/packages/app/tests/components/TheHeader.spec.ts
@@ -23,7 +23,6 @@ vi.mock("@/composables/useContext", () => {
     default: () => ({
       currentNetwork: computed(() => ({
         maintenance: maintenanceMock(),
-        l2WalletUrl: "https://portal.zksync.io/",
         bridgeUrl: "https://bridge.zksync.io/",
         apiUrl: "https://api-url",
       })),
@@ -60,7 +59,7 @@ describe("TheHeader:", () => {
     const toolsLinks = dropdown[1].findAll("a");
     expect(toolsLinks[0].attributes("href")).toBe("https://api-url/docs");
     expect(toolsLinksRouter[0].props().to.name).toBe("contract-verification");
-    expect(toolsLinks[2].attributes("href")).toBe("https://portal.zksync.io/");
+    expect(toolsLinks[2].attributes("href")).toBe("https://bridge.zksync.io/");
 
     expect(wrapper.findAll(".navigation-container > .navigation-link")[0].attributes("href")).toBe(
       "https://docs.zksync.io/build/tooling/block-explorer/getting-started.html"

diff --git a/packages/app/tests/mocks.ts b/packages/app/tests/mocks.ts
@@ -42,7 +42,6 @@ export const GOERLI_NETWORK: NetworkConfig = {
   l2ChainId: 280,
   rpcUrl: "",
   l2NetworkName: "Goerli",
-  l2WalletUrl: "",
   l1ExplorerUrl: "http://goerli-block-explorer",
   maintenance: false,
   published: true,
@@ -56,7 +55,6 @@ export const GOERLI_BETA_NETWORK: NetworkConfig = {
   l2ChainId: 270,
   rpcUrl: "",
   l2NetworkName: "Goerli Beta",
-  l2WalletUrl: "",
   l1ExplorerUrl: "http://goerli-beta-block-explorer",
   maintenance: false,
   published: true,