From b0e08631435cf82e7d11232b7926e9e42b06f42d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bego=C3=B1a=20Alvarez?= Date: Wed, 8 May 2024 13:26:48 +0200 Subject: [PATCH 1/4] chore: bump version to v3.3.10 --- api/package-lock.json | 4 ++-- api/package.json | 2 +- client/package-lock.json | 4 ++-- client/package.json | 2 +- package.json | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/api/package-lock.json b/api/package-lock.json index 238c1610b..8b9243e10 100644 --- a/api/package-lock.json +++ b/api/package-lock.json @@ -1,12 +1,12 @@ { "name": "explorer-api", - "version": "3.3.10-rc.2", + "version": "3.3.10", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "explorer-api", - "version": "3.3.10-rc.2", + "version": "3.3.10", "license": "Apache-2.0", "dependencies": { "@google-cloud/logging-winston": "^6.0.0", diff --git a/api/package.json b/api/package.json index dc1c930b5..489becfd5 100644 --- a/api/package.json +++ b/api/package.json @@ -1,7 +1,7 @@ { "name": "explorer-api", "description": "API for Tangle Explorer", - "version": "3.3.10-rc.2", + "version": "3.3.10", "author": "Martyn Janes ", "repository": { "type": "git", diff --git a/client/package-lock.json b/client/package-lock.json index 7244c32f2..46d80ed02 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1,12 +1,12 @@ { "name": "explorer-client", - "version": "3.3.10-rc.2", + "version": "3.3.10", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "explorer-client", - "version": "3.3.10-rc.2", + "version": "3.3.10", "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { diff --git a/client/package.json b/client/package.json index 9f144d63e..ecb65618c 100644 --- a/client/package.json +++ b/client/package.json @@ -1,7 +1,7 @@ { "name": "explorer-client", "description": "Tangle Explorer UI", - "version": "3.3.10-rc.2", + "version": "3.3.10", "author": "Martyn Janes ", "type": "module", "repository": { diff --git a/package.json b/package.json index 321d148a0..9d07f30d7 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "explorer", "description": "Tangle Explorer", - "version": "3.3.10-rc.2", + "version": "3.3.10", "scripts": { "setup:client": "cd client && npm install && npm run postinstall", "setup:api": "cd api && npm install && npm run build-compile && npm run build-config", From a25f32a90520f73cf8fd76184596c6fc3ec78ac3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bego=C3=B1a=20=C3=81lvarez=20de=20la=20Cruz?= Date: Thu, 9 May 2024 15:12:04 +0200 Subject: [PATCH 2/4] feat: add IOTA EVM Testnet explorer link to navbar (#1472) --- client/src/app/AppUtils.tsx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/client/src/app/AppUtils.tsx b/client/src/app/AppUtils.tsx index 13abfafc6..9f9afad62 100644 --- a/client/src/app/AppUtils.tsx +++ b/client/src/app/AppUtils.tsx @@ -75,6 +75,11 @@ export const getPages = (currentNetwork: INetwork | undefined, networks: INetwor url: "https://explorer.evm.testnet.shimmer.network/", isExternal: true, }, + { + label: "IOTA EVM Testnet Explorer", + url: "https://explorer.evm.testnet.iotaledger.net/", + isExternal: true, + }, ], }, ]; From bf0a1a480b712c17fed67f0861b55b6954305f4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bego=C3=B1a=20Alvarez?= Date: Thu, 9 May 2024 15:12:52 +0200 Subject: [PATCH 3/4] chore: bump version to v3.3.11 --- api/package-lock.json | 4 ++-- api/package.json | 2 +- client/package-lock.json | 4 ++-- client/package.json | 2 +- package.json | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/api/package-lock.json b/api/package-lock.json index 8b9243e10..ff30738cf 100644 --- a/api/package-lock.json +++ b/api/package-lock.json @@ -1,12 +1,12 @@ { "name": "explorer-api", - "version": "3.3.10", + "version": "3.3.11", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "explorer-api", - "version": "3.3.10", + "version": "3.3.11", "license": "Apache-2.0", "dependencies": { "@google-cloud/logging-winston": "^6.0.0", diff --git a/api/package.json b/api/package.json index 489becfd5..8c270684f 100644 --- a/api/package.json +++ b/api/package.json @@ -1,7 +1,7 @@ { "name": "explorer-api", "description": "API for Tangle Explorer", - "version": "3.3.10", + "version": "3.3.11", "author": "Martyn Janes ", "repository": { "type": "git", diff --git a/client/package-lock.json b/client/package-lock.json index 46d80ed02..bcb5e6363 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1,12 +1,12 @@ { "name": "explorer-client", - "version": "3.3.10", + "version": "3.3.11", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "explorer-client", - "version": "3.3.10", + "version": "3.3.11", "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { diff --git a/client/package.json b/client/package.json index ecb65618c..fca6d8a27 100644 --- a/client/package.json +++ b/client/package.json @@ -1,7 +1,7 @@ { "name": "explorer-client", "description": "Tangle Explorer UI", - "version": "3.3.10", + "version": "3.3.11", "author": "Martyn Janes ", "type": "module", "repository": { diff --git a/package.json b/package.json index 9d07f30d7..1358ccc62 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "explorer", "description": "Tangle Explorer", - "version": "3.3.10", + "version": "3.3.11", "scripts": { "setup:client": "cd client && npm install && npm run postinstall", "setup:api": "cd api && npm install && npm run build-compile && npm run build-config", From 9389db49f8110cdcc076182175c1a909a288dbeb Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 13 May 2024 12:11:13 +0200 Subject: [PATCH 4/4] chore: Add new network type (#1473) --- api/src/models/db/networkType.ts | 2 ++ client/src/app/AppUtils.tsx | 15 +++++++++++++-- client/src/helpers/networkHelper.ts | 4 +++- client/src/models/config/networkType.ts | 2 ++ 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/api/src/models/db/networkType.ts b/api/src/models/db/networkType.ts index 0aed62d29..9e7a069eb 100644 --- a/api/src/models/db/networkType.ts +++ b/api/src/models/db/networkType.ts @@ -7,6 +7,7 @@ export const SHIMMER = "shimmer"; const TESTNET = "testnet"; const IOTA_TESTNET = "iota-testnet"; const SHIMMER_TESTNET = "shimmer-testnet"; +const IOTA2_TESTNET = "iota2-testnet"; const ALPHANET = "alphanet"; const CUSTOM = "custom"; @@ -19,6 +20,7 @@ const networkTypes = [ TESTNET, IOTA_TESTNET, SHIMMER_TESTNET, + IOTA2_TESTNET, ALPHANET, CUSTOM, ] as const; diff --git a/client/src/app/AppUtils.tsx b/client/src/app/AppUtils.tsx index 959576e86..5002ca030 100644 --- a/client/src/app/AppUtils.tsx +++ b/client/src/app/AppUtils.tsx @@ -2,7 +2,17 @@ import React, { ReactNode } from "react"; import { Helmet } from "react-helmet"; import NetworkContext from "./context/NetworkContext"; import { INetwork } from "~models/config/INetwork"; -import { ALPHANET, CHRYSALIS_MAINNET, DEVNET, LEGACY_MAINNET, MAINNET, NetworkType, SHIMMER, TESTNET } from "~models/config/networkType"; +import { + ALPHANET, + CHRYSALIS_MAINNET, + DEVNET, + IOTA2_TESTNET, + LEGACY_MAINNET, + MAINNET, + NetworkType, + SHIMMER, + TESTNET, +} from "~models/config/networkType"; import { IOTA_UI, Theme } from "~models/config/uiTheme"; import { IStardustNodeInfo } from "~services/stardust/nodeInfoService"; import { ServiceFactory } from "~/factories/serviceFactory"; @@ -132,7 +142,8 @@ export const buildMetaLabel = (network: NetworkType | undefined): string => { metaLabel = "Shimmer Explorer"; break; } - case TESTNET: { + case TESTNET: + case IOTA2_TESTNET: { metaLabel = "Testnet Explorer"; break; } diff --git a/client/src/helpers/networkHelper.ts b/client/src/helpers/networkHelper.ts index 96812d5db..ff5e14aff 100644 --- a/client/src/helpers/networkHelper.ts +++ b/client/src/helpers/networkHelper.ts @@ -3,6 +3,7 @@ import { CHRYSALIS_MAINNET, CUSTOM, DEVNET, + IOTA2_TESTNET, IOTA_TESTNET, LEGACY_MAINNET, MAINNET, @@ -26,7 +27,8 @@ export const getNetworkOrder = (networkType: NetworkType) => { case SHIMMER: { return 1; } - case IOTA_TESTNET: { + case IOTA_TESTNET: + case IOTA2_TESTNET: { return 2; } case SHIMMER_TESTNET: { diff --git a/client/src/models/config/networkType.ts b/client/src/models/config/networkType.ts index 19a3d38b8..a5738542a 100644 --- a/client/src/models/config/networkType.ts +++ b/client/src/models/config/networkType.ts @@ -6,6 +6,7 @@ export const SHIMMER = "shimmer"; export const TESTNET = "testnet"; export const IOTA_TESTNET = "iota-testnet"; export const SHIMMER_TESTNET = "shimmer-testnet"; +export const IOTA2_TESTNET = "iota2-testnet"; export const ALPHANET = "alphanet"; export const CUSTOM = "custom"; @@ -20,6 +21,7 @@ export type NetworkType = | typeof SHIMMER | typeof TESTNET | typeof IOTA_TESTNET + | typeof IOTA2_TESTNET | typeof SHIMMER_TESTNET | typeof ALPHANET | typeof CUSTOM;