Merge pull request #608 from tablelandnetwork/avichalp/remove-arb-goerli

remove arb and eth goerli networks
tablelandnetwork · Nov 17, 2023 · bd7c3ab · bd7c3ab
2 parents 1d25138 + 47a0a1c
commit bd7c3ab
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 58 deletions.
diff --git a/docker/deployed/testnet/api/.env_validator.example b/docker/deployed/testnet/api/.env_validator.example
@@ -1,8 +1,6 @@
 VALIDATOR_ALCHEMY_ETHEREUM_SEPOLIA_API_KEY=
 VALIDATOR_GLIF_FILECOIN_CALIBRATION_API_KEY=
 VALIDATOR_ALCHEMY_POLYGON_MUMBAI_API_KEY=
-VALIDATOR_ALCHEMY_ETHEREUM_GOERLI_API_KEY=
-VALIDATOR_ALCHEMY_ARBITRUM_GOERLI_API_KEY=
 VALIDATOR_ALCHEMY_ARBITRUM_SEPOLIA_API_KEY=
 VALIDATOR_ALCHEMY_OPTIMISM_GOERLI_API_KEY=
 METRICS_HUB_API_KEY=
diff --git a/docker/deployed/testnet/api/config.json b/docker/deployed/testnet/api/config.json
@@ -52,25 +52,6 @@
         "ChainStackCollectFrequency": "15m"
     },
     "Chains": [
-        {
-            "Name": "Ethereum Goerli",
-            "ChainID": 5,
-            "Registry": {
-                "EthEndpoint": "wss://eth-goerli.alchemyapi.io/v2/${VALIDATOR_ALCHEMY_ETHEREUM_GOERLI_API_KEY}",
-                "ContractAddress": "0xDA8EA22d092307874f30A1F277D1388dca0BA97a"
-            },
-            "EventFeed": {
-                "ChainAPIBackoff": "15s",
-                "NewBlockPollFreq": "10s",
-                "MinBlockDepth": 1,
-                "PersistEvents": true
-            },
-            "EventProcessor": {
-                "BlockFailedExecutionBackoff": "10s",
-                "DedupExecutedTxns": true
-            },
-            "HashCalculationStep": 150
-        },
         {
             "Name": "Ethereum Sepolia",
             "ChainID": 11155111,
@@ -108,26 +89,7 @@
                 "DedupExecutedTxns": true
             },
             "HashCalculationStep": 360
-        },
-        {
-            "Name": "Arbitrum Goerli",
-            "ChainID": 421613,
-            "Registry": {
-                "EthEndpoint": "wss://arb-goerli.g.alchemy.com/v2/${VALIDATOR_ALCHEMY_ARBITRUM_GOERLI_API_KEY}",
-                "ContractAddress": "0x033f69e8d119205089Ab15D340F5b797732f646b"
-            },
-            "EventFeed": {
-                "ChainAPIBackoff": "15s",
-                "NewBlockPollFreq": "5s",
-                "MinBlockDepth": 0,
-                "PersistEvents": true
-            },
-            "EventProcessor": {
-                "BlockFailedExecutionBackoff": "10s",
-                "DedupExecutedTxns": true
-            },
-            "HashCalculationStep": 360
-        },
+        },        
         {
             "Name": "Arbitrum Sepolia",
             "ChainID": 421614,

diff --git a/pkg/client/chains.go b/pkg/client/chains.go
@@ -36,10 +36,8 @@ var ChainIDs = struct {
 	Arbitrum:            42161,
 	ArbitrumNova:        42170,
 	Filecoin:            314,
-	EthereumGoerli:      5,
 	EthereumSepolia:     11155111,
 	OptimismGoerli:      420,
-	ArbitrumGoerli:      421613,
 	ArbitrumSepolia:     421614,
 	FilecoinCalibration: 314159,
 	PolygonMumbai:       80001,
@@ -92,12 +90,6 @@ var Chains = map[ChainID]Chain{
 		Name:         "Filecoin",
 		ContractAddr: common.HexToAddress("0x59EF8Bf2d6c102B4c42AEf9189e1a9F0ABfD652d"),
 	},
-	ChainIDs.EthereumGoerli: {
-		Endpoint:     testnetURL,
-		ID:           ChainIDs.EthereumGoerli,
-		Name:         "Ethereum Goerli",
-		ContractAddr: common.HexToAddress("0xDA8EA22d092307874f30A1F277D1388dca0BA97a"),
-	},
 	ChainIDs.EthereumSepolia: {
 		Endpoint:     testnetURL,
 		ID:           ChainIDs.EthereumSepolia,
@@ -110,12 +102,6 @@ var Chains = map[ChainID]Chain{
 		Name:         "Optimism Goerli",
 		ContractAddr: common.HexToAddress("0xC72E8a7Be04f2469f8C2dB3F1BdF69A7D516aBbA"),
 	},
-	ChainIDs.ArbitrumGoerli: {
-		Endpoint:     testnetURL,
-		ID:           ChainIDs.ArbitrumGoerli,
-		Name:         "Arbitrum Goerli",
-		ContractAddr: common.HexToAddress("0x033f69e8d119205089Ab15D340F5b797732f646b"),
-	},
 	ChainIDs.ArbitrumSepolia: {
 		Endpoint:     testnetURL,
 		ID:           ChainIDs.ArbitrumSepolia,
@@ -144,7 +130,6 @@ var Chains = map[ChainID]Chain{
 
 // InfuraURLs contains the URLs for supported chains for Infura.
 var InfuraURLs = map[ChainID]string{
-	ChainIDs.EthereumGoerli: "https://goerli.infura.io/v3/%s",
 	ChainIDs.Ethereum:       "https://mainnet.infura.io/v3/%s",
 	ChainIDs.OptimismGoerli: "https://optimism-goerli.infura.io/v3/%s",
 	ChainIDs.Optimism:       "https://optimism-mainnet.infura.io/v3/%s",
@@ -155,12 +140,10 @@ var InfuraURLs = map[ChainID]string{
 
 // AlchemyURLs contains the URLs for supported chains for Alchemy.
 var AlchemyURLs = map[ChainID]string{
-	ChainIDs.EthereumGoerli:  "https://eth-goerli.g.alchemy.com/v2/%s",
 	ChainIDs.EthereumSepolia: "https://eth-sepolia.g.alchemy.com/v2/%s",
 	ChainIDs.Ethereum:        "https://eth-mainnet.g.alchemy.com/v2/%s",
 	ChainIDs.OptimismGoerli:  "https://opt-goerli.g.alchemy.com/v2/%s",
 	ChainIDs.Optimism:        "https://opt-mainnet.g.alchemy.com/v2/%s",
-	ChainIDs.ArbitrumGoerli:  "https://arb-goerli.g.alchemy.com/v2/%s",
 	ChainIDs.ArbitrumSepolia: "https://arb-sepolia.g.alchemy.com/v2/%s",
 	ChainIDs.Arbitrum:        "https://arb-mainnet.g.alchemy.com/v2/%s",
 	ChainIDs.PolygonMumbai:   "https://polygon-mumbai.g.alchemy.com/v2/%s",