Merge pull request #618 from tablelandnetwork/bcalza/dropoptsepolia

drop optimism goerli support
tablelandnetwork · Mar 7, 2024 · 37c8ea2 · 37c8ea2
2 parents b9f2099 + 20afd9e
commit 37c8ea2
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 65 deletions.
diff --git a/README.md b/README.md
@@ -336,7 +336,7 @@ CREATE TABLE healthbot_{chainID} (counter INTEGER);
 This would result in having four tables—one per chain:
 
 - `healthbot_11155111_{tableID}` (Ethereum Sepolia)
-- `healthbot_420_{tableID}` (Optimism Goerli)
+- `healthbot_11155420_{tableID}` (Optimism Sepolia)
 - `healthbot_421614_{tableID}` (Arbitrum Sepolia)
 - `healthbot_80001_{tableID}` (Polygon Mumbai)
 - `healthbot_314159_{tableID}` (Filecoin Calibration)
@@ -345,7 +345,7 @@ You should create a file `.env_healthbot` in the `docker/deployed/testnet/health
 
 ```txt
 HEALTHBOT_ETHEREUM_SEPOLIA_TABLE=healthbot_11155111_{tableID}
-HEALTHBOT_OPTIMISM_GOERLI_TABLE=healthbot_420_{tableID}
+HEALTHBOT_OPTIMISM_SEPOLIA_TABLE=healthbot_11155420_{tableID}
 HEALTHBOT_ARBITRUM_SEPOLIA_TABLE=healthbot_421614_{tableID}
 HEALTHBOT_POLYGON_MUMBAI_TABLE=healthbot_80001_{tableID}
 HEALTHBOT_FILECOIN_CALIBRATION_TABLE=healthbot_314159_{tableID}

diff --git a/docker/deployed/staging/api/.env_validator.example b/docker/deployed/staging/api/.env_validator.example
@@ -1,3 +1,2 @@
-VALIDATOR_ALCHEMY_OPTIMISM_GOERLI_API_KEY=
 VALIDATOR_ALCHEMY_OPTIMISM_SEPOLIA_API_KEY=
 METRICS_HUB_API_KEY=
diff --git a/docker/deployed/staging/api/config.json b/docker/deployed/staging/api/config.json
@@ -69,25 +69,6 @@
         "DedupExecutedTxns": true
       },
       "HashCalculationStep": 100
-    },
-    {
-      "Name": "Optimism Goerli",
-      "ChainID": 420,
-      "Registry": {
-        "EthEndpoint": "wss://opt-goerli.g.alchemy.com/v2/${VALIDATOR_ALCHEMY_OPTIMISM_GOERLI_API_KEY}",
-        "ContractAddress": "0xfe79824f6E5894a3DD86908e637B7B4AF57eEE28"
-      },
-      "EventFeed": {
-        "ChainAPIBackoff": "15s",
-        "NewBlockPollFreq": "10s",
-        "MinBlockDepth": 0,
-        "PersistEvents": false
-      },
-      "EventProcessor": {
-        "BlockFailedExecutionBackoff": "10s",
-        "DedupExecutedTxns": true
-      },
-      "HashCalculationStep": 100
     }
   ]
 }
diff --git a/docker/deployed/staging/healthbot/.env_healthbot.example b/docker/deployed/staging/healthbot/.env_healthbot.example
@@ -1,4 +1,4 @@
-HEALTHBOT_OPTIMISM_GOERLI_PRIVATE_KEY=
-HEALTHBOT_OPTIMISM_GOERLI_API_KEY=
-HEALTHBOT_OPTIMISM_GOERLI_TABLE=
+HEALTHBOT_OPTIMISM_SEPOLIA_PRIVATE_KEY=
+HEALTHBOT_OPTIMISM_SEPOLIA_API_KEY=
+HEALTHBOT_OPTIMISM_SEPOLIA_TABLE=
 
diff --git a/docker/deployed/staging/healthbot/config.json b/docker/deployed/staging/healthbot/config.json
@@ -9,12 +9,12 @@
     "Chains": [
         {
             "ChainID": 420,
-            "WalletPrivateKey": "${HEALTHBOT_OPTIMISM_GOERLI_PRIVATE_KEY}",
-            "AlchemyAPIKey": "${HEALTHBOT_OPTIMISM_GOERLI_API_KEY}",
+            "WalletPrivateKey": "${HEALTHBOT_OPTIMISM_SEPOLIA_PRIVATE_KEY}",
+            "AlchemyAPIKey": "${HEALTHBOT_OPTIMISM_SEPOLIA_API_KEY}",
             "Probe": {
                 "CheckInterval": "360s",
                 "ReceiptTimeout": "20s",
-                "Tablename": "${HEALTHBOT_OPTIMISM_GOERLI_TABLE}"
+                "Tablename": "${HEALTHBOT_OPTIMISM_SEPOLIA_TABLE}"
             },
             "OverrideClient" : {
                 "GatewayEndpoint": "https://staging.tableland.network",

diff --git a/docker/deployed/testnet/api/.env_validator.example b/docker/deployed/testnet/api/.env_validator.example
@@ -2,6 +2,5 @@ VALIDATOR_ALCHEMY_ETHEREUM_SEPOLIA_API_KEY=
 VALIDATOR_GLIF_FILECOIN_CALIBRATION_API_KEY=
 VALIDATOR_ALCHEMY_POLYGON_MUMBAI_API_KEY=
 VALIDATOR_ALCHEMY_ARBITRUM_SEPOLIA_API_KEY=
-VALIDATOR_ALCHEMY_OPTIMISM_GOERLI_API_KEY=
 VALIDATOR_ALCHEMY_OPTIMISM_SEPOLIA_API_KEY=
 METRICS_HUB_API_KEY=
diff --git a/docker/deployed/testnet/api/config.json b/docker/deployed/testnet/api/config.json
@@ -109,25 +109,6 @@
             },
             "HashCalculationStep": 360
         },
-        {
-            "Name": "Optimism Goerli",
-            "ChainID": 420,
-            "Registry": {
-                "EthEndpoint": "wss://opt-goerli.g.alchemy.com/v2/${VALIDATOR_ALCHEMY_OPTIMISM_GOERLI_API_KEY}",
-                "ContractAddress": "0xC72E8a7Be04f2469f8C2dB3F1BdF69A7D516aBbA"
-            },
-            "EventFeed": {
-                "ChainAPIBackoff": "15s",
-                "NewBlockPollFreq": "5s",
-                "MinBlockDepth": 0,
-                "PersistEvents": true
-            },
-            "EventProcessor": {
-                "BlockFailedExecutionBackoff": "10s",
-                "DedupExecutedTxns": true
-            },
-            "HashCalculationStep": 1800
-        },
         {
             "Name": "Optimism Sepolia",
             "ChainID": 11155420,

diff --git a/pkg/client/chains.go b/pkg/client/chains.go
@@ -21,11 +21,8 @@ var ChainIDs = struct {
 	Arbitrum            ChainID
 	ArbitrumNova        ChainID
 	Filecoin            ChainID
-	EthereumGoerli      ChainID
 	EthereumSepolia     ChainID
-	OptimismGoerli      ChainID
 	OptimismSepolia     ChainID
-	ArbitrumGoerli      ChainID
 	ArbitrumSepolia     ChainID
 	FilecoinCalibration ChainID
 	PolygonMumbai       ChainID
@@ -38,7 +35,6 @@ var ChainIDs = struct {
 	ArbitrumNova:        42170,
 	Filecoin:            314,
 	EthereumSepolia:     11155111,
-	OptimismGoerli:      420,
 	OptimismSepolia:     11155420,
 	ArbitrumSepolia:     421614,
 	FilecoinCalibration: 314159,
@@ -98,12 +94,6 @@ var Chains = map[ChainID]Chain{
 		Name:         "Ethereum Sepolia",
 		ContractAddr: common.HexToAddress("0xc50C62498448ACc8dBdE43DA77f8D5D2E2c7597D"),
 	},
-	ChainIDs.OptimismGoerli: {
-		Endpoint:     testnetURL,
-		ID:           ChainIDs.OptimismGoerli,
-		Name:         "Optimism Goerli",
-		ContractAddr: common.HexToAddress("0xC72E8a7Be04f2469f8C2dB3F1BdF69A7D516aBbA"),
-	},
 	ChainIDs.OptimismSepolia: {
 		Endpoint:     testnetURL,
 		ID:           ChainIDs.OptimismSepolia,
@@ -138,19 +128,17 @@ var Chains = map[ChainID]Chain{
 
 // InfuraURLs contains the URLs for supported chains for Infura.
 var InfuraURLs = map[ChainID]string{
-	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",
-	ChainIDs.Arbitrum:       "https://arbitrum-mainnet.infura.io/v3/%s",
-	ChainIDs.PolygonMumbai:  "https://polygon-mumbai.infura.io/v3/%s",
-	ChainIDs.Polygon:        "https://polygon-mainnet.infura.io/v3/%s",
+	ChainIDs.Ethereum:      "https://mainnet.infura.io/v3/%s",
+	ChainIDs.Optimism:      "https://optimism-mainnet.infura.io/v3/%s",
+	ChainIDs.Arbitrum:      "https://arbitrum-mainnet.infura.io/v3/%s",
+	ChainIDs.PolygonMumbai: "https://polygon-mumbai.infura.io/v3/%s",
+	ChainIDs.Polygon:       "https://polygon-mainnet.infura.io/v3/%s",
 }
 
 // AlchemyURLs contains the URLs for supported chains for Alchemy.
 var AlchemyURLs = map[ChainID]string{
 	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.OptimismSepolia: "https://opt-sepolia.g.alchemy.com/v2/%s",
 	ChainIDs.Optimism:        "https://opt-mainnet.g.alchemy.com/v2/%s",
 	ChainIDs.ArbitrumSepolia: "https://arb-sepolia.g.alchemy.com/v2/%s",