ALL-5266 Remove Goerli Support (#1072)

* ALL-5266 Remove Goerli Support * ALL-5266 Remove Goerli Support
tatumio · Feb 29, 2024 · 6b75baf · 6b75baf
1 parent 42e85da
commit 6b75baf
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## [4.2.13] - 2024.2.29
+
+### Removed
+
+- Removed support for the Goerli network.
+
 ## [4.2.12] - 2024.2.28
 
 ### Added

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tatumio/tatum",
-  "version": "4.2.12",
+  "version": "4.2.13",
   "description": "Tatum JS SDK",
   "author": "Tatum",
   "repository": "https://github.com/tatumio/tatum-js",

diff --git a/src/dto/Network.ts b/src/dto/Network.ts
@@ -65,7 +65,6 @@ export enum Network {
   CELO_ALFAJORES = 'celo-testnet',
   CRONOS_TESTNET = 'cro-testnet',
   DOGECOIN_TESTNET = 'doge-testnet',
-  ETHEREUM_GOERLI = 'ethereum-goerli',
   ETHEREUM_SEPOLIA = 'ethereum-sepolia',
   ETHEREUM_HOLESKY = 'ethereum-holesky',
   EOS_TESTNET = 'eos-testnet',
@@ -104,7 +103,6 @@ export const EVM_BASED_NETWORKS = [
   Network.ETHEREUM,
   Network.ETHEREUM_SEPOLIA,
   Network.ETHEREUM_CLASSIC,
-  Network.ETHEREUM_GOERLI,
   Network.ETHEREUM_HOLESKY,
   Network.AVALANCHE_C,
   Network.AVALANCHE_C_TESTNET,
@@ -181,7 +179,6 @@ export const DATA_API_UTXO_NETWORKS = [
 export const DATA_API_EVM_NETWORKS = [
   Network.ETHEREUM,
   Network.ETHEREUM_SEPOLIA,
-  Network.ETHEREUM_GOERLI,
   Network.POLYGON,
   Network.POLYGON_MUMBAI,
   Network.BINANCE_SMART_CHAIN,
@@ -402,11 +399,6 @@ export const NETWORK_METADATA: Record<Network, NetworkMetadata> = {
     defaultMainnet: true,
     chainId: 1,
   },
-  [Network.ETHEREUM_GOERLI]: {
-    currency: Currency.ETH,
-    testnet: true,
-    chainId: 5,
-  },
   [Network.POLYGON_MUMBAI]: {
     currency: Currency.MATIC,
     testnet: true,

diff --git a/src/e2e/e2e.constant.ts b/src/e2e/e2e.constant.ts
@@ -32,6 +32,7 @@ export const AddressEventNetworks = [
   Network.XRP,
   Network.XRP_TESTNET,
   Network.TEZOS,
+  Network.FLARE,
 ]
 
 export const IncomingNativeTxNetworks = [

diff --git a/src/e2e/rpc/evm/evm.rpc.spec.ts b/src/e2e/rpc/evm/evm.rpc.spec.ts
@@ -25,7 +25,6 @@ const testNetworks = [
   { network: Network.ETHEREUM },
   { network: Network.ETHEREUM_SEPOLIA },
   { network: Network.ETHEREUM_HOLESKY },
-  { network: Network.ETHEREUM_GOERLI, apiKey: process.env.V3_API_KEY_TESTNET },
   { network: Network.FANTOM },
   { network: Network.FANTOM_TESTNET, apiKey: process.env.V3_API_KEY_TESTNET },
   { network: Network.ETHEREUM_CLASSIC },

diff --git a/src/util/constant.ts b/src/util/constant.ts
@@ -38,7 +38,6 @@ export const Constant = {
     [Network.ZCASH_TESTNET]: 8,
     [Network.ETHEREUM]: 18,
     [Network.ETHEREUM_SEPOLIA]: 18,
-    [Network.ETHEREUM_GOERLI]: 18,
     [Network.ETHEREUM_HOLESKY]: 18,
     [Network.POLYGON]: 18,
     [Network.POLYGON_MUMBAI]: 18,
@@ -135,7 +134,6 @@ export const Constant = {
     [Network.ETHEREUM]: 'ETH',
     [Network.ETHEREUM_SEPOLIA]: 'ETH',
     [Network.ETHEREUM_HOLESKY]: 'ETH',
-    [Network.ETHEREUM_GOERLI]: 'ETH',
     [Network.POLYGON]: 'MATIC',
     [Network.POLYGON_MUMBAI]: 'MATIC',
     [Network.CELO]: 'CELO',
@@ -272,7 +270,6 @@ export const Constant = {
       Network.CELO_ALFAJORES,
       Network.CRONOS_TESTNET,
       Network.DOGECOIN_TESTNET,
-      Network.ETHEREUM_GOERLI,
       Network.ETHEREUM_SEPOLIA,
       Network.ETHEREUM_HOLESKY,
       Network.EOS_TESTNET,

diff --git a/src/util/network.utils.spec.ts b/src/util/network.utils.spec.ts
@@ -29,7 +29,6 @@ describe('Network Utils', () => {
       [Network.ETHEREUM, false],
       [Network.ETHEREUM_SEPOLIA, false],
       [Network.ETHEREUM_HOLESKY, true],
-      [Network.ETHEREUM_GOERLI, true],
       [Network.CELO, false],
       [Network.CELO_ALFAJORES, false],
     ])('valid %s -> %s', (network: Network, expected: boolean) => {

diff --git a/src/util/util.shared.ts b/src/util/util.shared.ts
@@ -7,7 +7,8 @@ import {
   isAlgorandAlgodNetwork,
   isAlgorandIndexerNetwork,
   isBnbLoadBalancerNetwork,
-  isCardanoNetwork, isDogecoinLoadBalancedNetwork,
+  isCardanoNetwork,
+  isDogecoinLoadBalancedNetwork,
   isEosLoadBalancerNetwork,
   isEosNetwork,
   isEvmArchiveNonArchiveBeaconLoadBalancerNetwork,
@@ -99,12 +100,12 @@ import { StellarLoadBalancerRpc } from '../service/rpc/other/StellarLoadBalancer
 import { StellarRpc } from '../service/rpc/other/StellarRpc'
 import { TezosLoadBalancerRpc } from '../service/rpc/other/TezosLoadBalancerRpc'
 import { XrpLoadBalancerRpc } from '../service/rpc/other/XrpLoadBalancerRpc'
+import { DogeLoadBalancedRpc } from '../service/rpc/utxo/DogeLoadBalancedRpc'
 import { UtxoLoadBalancerRpc } from '../service/rpc/utxo/UtxoLoadBalancerRpc'
 import { UtxoLoadBalancerRpcEstimateFee } from '../service/rpc/utxo/UtxoLoadBalancerRpcEstimateFee'
 import { UtxoRpcEstimateFee } from '../service/rpc/utxo/UtxoRpcEstimateFee'
 import { Constant } from './constant'
 import { CONFIG, LOGGER } from './di.tokens'
-import { DogeLoadBalancedRpc } from '../service/rpc/utxo/DogeLoadBalancedRpc'
 
 export const Utils = {
   getRpc: <T>(id: string, config: TatumConfig): T => {
@@ -442,7 +443,6 @@ export const Utils = {
         return AddressEventNotificationChain.DOGE
       case Network.ETHEREUM:
       case Network.ETHEREUM_SEPOLIA:
-      case Network.ETHEREUM_GOERLI:
       case Network.ETHEREUM_HOLESKY:
         return AddressEventNotificationChain.ETH
       case Network.POLYGON:
@@ -612,7 +612,6 @@ export const Utils = {
         return new ZCash(id) as T
       case Network.ETHEREUM:
       case Network.ETHEREUM_SEPOLIA:
-      case Network.ETHEREUM_GOERLI:
       case Network.ETHEREUM_HOLESKY:
         return new Ethereum(id) as T
       case Network.ETHEREUM_CLASSIC: