From 64d9ad85db5ba174cf13cfe1c7d4e0491288449b Mon Sep 17 00:00:00 2001
From: Karim <98668332+khadni@users.noreply.github.com>
Date: Mon, 4 Mar 2024 11:54:53 +0100
Subject: [PATCH] Remove OP Goerli

---
 .../DataConsumerWithSequencerCheck.sol        | 10 ++++----
 .../overview/supported-networks.mdx           |  1 -
 src/content/data-feeds/l2-sequencer-feeds.mdx |  1 -
 .../resources/link-token-contracts.mdx        |  3 +--
 .../v2/direct-funding/supported-networks.mdx  | 18 ++-----------
 .../data/chainlink-automation-addresses.json  |  4 ---
 .../data/chainlink-automation-config.json     | 25 -------------------
 src/features/data/chains.ts                   |  7 ------
 8 files changed, 8 insertions(+), 61 deletions(-)

diff --git a/public/samples/DataFeeds/DataConsumerWithSequencerCheck.sol b/public/samples/DataFeeds/DataConsumerWithSequencerCheck.sol
index 06c6c1a4718..47ef266cdc1 100644
--- a/public/samples/DataFeeds/DataConsumerWithSequencerCheck.sol
+++ b/public/samples/DataFeeds/DataConsumerWithSequencerCheck.sol
@@ -19,19 +19,19 @@ contract DataConsumerWithSequencerCheck {
     error GracePeriodNotOver();
 
     /**
-     * Network: Optimism Goerli testnet
+     * Network: Optimism mainnet
      * Data Feed: BTC/USD
-     * Data Feed address: 0xC16679B963CeB52089aD2d95312A5b85E318e9d2
-     * Uptime Feed address: 0x4C4814aa04433e0FB31310379a4D6946D5e1D353
+     * Data Feed address: 0xD702DD976Fb76Fffc2D3963D037dfDae5b04E593
+     * Uptime Feed address: 0x371EAD81c9102C9BF4874A9075FFFf170F2Ee389
      * For a list of available Sequencer Uptime Feed proxy addresses, see:
      * https://docs.chain.link/docs/data-feeds/l2-sequencer-feeds
      */
     constructor() {
         dataFeed = AggregatorV2V3Interface(
-            0xC16679B963CeB52089aD2d95312A5b85E318e9d2
+            0xD702DD976Fb76Fffc2D3963D037dfDae5b04E593
         );
         sequencerUptimeFeed = AggregatorV2V3Interface(
-            0x4C4814aa04433e0FB31310379a4D6946D5e1D353
+            0x371EAD81c9102C9BF4874A9075FFFf170F2Ee389
         );
     }
 
diff --git a/src/content/chainlink-automation/overview/supported-networks.mdx b/src/content/chainlink-automation/overview/supported-networks.mdx
index 94596fd407f..7ed16029e2f 100644
--- a/src/content/chainlink-automation/overview/supported-networks.mdx
+++ b/src/content/chainlink-automation/overview/supported-networks.mdx
@@ -40,7 +40,6 @@ Chainlink Automation is available on the following networks. All networks operat
   - Sepolia testnet
 - [Optimism](#optimism)
   - Mainnet
-  - Goerli testnet
   - Sepolia testnet
 - [BASE](#base)
   - Mainnet
diff --git a/src/content/data-feeds/l2-sequencer-feeds.mdx b/src/content/data-feeds/l2-sequencer-feeds.mdx
index 13daa7e4dff..add0c2fec20 100644
--- a/src/content/data-feeds/l2-sequencer-feeds.mdx
+++ b/src/content/data-feeds/l2-sequencer-feeds.mdx
@@ -21,7 +21,6 @@ You can find proxy addresses for the L2 sequencer feeds at the following address
   - Arbitrum mainnet: [0xFdB631F5EE196F0ed6FAa767959853A9F217697D](https://arbiscan.io/address/0xFdB631F5EE196F0ed6FAa767959853A9F217697D)
 - Optimism:
   - Optimism mainnet: [0x371EAD81c9102C9BF4874A9075FFFf170F2Ee389](https://optimistic.etherscan.io/address/0x371EAD81c9102C9BF4874A9075FFFf170F2Ee389)
-  - Optimism Goerli testnet: [0x4C4814aa04433e0FB31310379a4D6946D5e1D353](https://goerli-optimism.etherscan.io/address/0x4C4814aa04433e0FB31310379a4D6946D5e1D353)
 - BASE:
   - BASE mainnet: [0xBCF85224fc0756B9Fa45aA7892530B47e10b6433](https://basescan.org/address/0xBCF85224fc0756B9Fa45aA7892530B47e10b6433)
 - Metis:
diff --git a/src/content/resources/link-token-contracts.mdx b/src/content/resources/link-token-contracts.mdx
index 2a0972bfc41..608662d91f2 100644
--- a/src/content/resources/link-token-contracts.mdx
+++ b/src/content/resources/link-token-contracts.mdx
@@ -300,8 +300,7 @@ Testnet LINK is available at [faucets.chain.link](https://faucets.chain.link/sep
 ### Optimism Goerli testnet
 
 <Aside type="note" title="Support Notice">
-  Optimism Goerli testnet will be decommissioned on March 7, 2024. Migrate to the [Optimism
-  Sepolia](#optimism-sepolia-testnet) testnet.
+  Optimism Goerli support has ended. Use the [Optimism Sepolia](#optimism-sepolia-testnet) testnet instead.
 </Aside>
 
 ## Moonriver
diff --git a/src/content/vrf/v2/direct-funding/supported-networks.mdx b/src/content/vrf/v2/direct-funding/supported-networks.mdx
index 6dd37a48b9e..19fa0fac47b 100644
--- a/src/content/vrf/v2/direct-funding/supported-networks.mdx
+++ b/src/content/vrf/v2/direct-funding/supported-networks.mdx
@@ -300,20 +300,6 @@ VRF v2 coordinators for direct funding are available on several networks. To see
 
 ### Arbitrum Goerli testnet
 
-<Aside type="caution" title="Arbitrum Goerli Deprecation">
-  Arbitrum Goerli is being deprecated on November 18, 2023. Please migrate to Arbitrum Sepolia.
+<Aside type="note" title="Arbitrum Goerli support">
+  Arbitrum Goerli support has ended. Use the [Arbitrum Sepolia](#arbitrum-sepolia-testnet) testnet instead.
 </Aside>
-
-| Item                       | Value                                                                                                                                                                                          |
-| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| LINK Token                 | <Address contractUrl="https://testnet.arbiscan.io/address/0xd14838A68E8AFBAdE5efb411d5871ea0011AFd28" urlId="421613_0xd14838A68E8AFBAdE5efb411d5871ea0011AFd28" urlClass="erc-token-address"/> |
-|                            |
-| VRF Coordinator            | <Address contractUrl="https://testnet.arbiscan.io/address/0x6D80646bEAdd07cE68cab36c27c626790bBcf17f" />                                                                                       |
-| VRF Wrapper                | <Address contractUrl="https://goerli.arbiscan.io/address/0x674Cda1Fef7b3aA28c535693D658B42424bb7dBD" />                                                                                        |
-| Wrapper Premium Percentage | 0                                                                                                                                                                                              |
-| Coordinator Flat Fee       | 0.0005 LINK                                                                                                                                                                                    |
-| Minimum Confirmations      | 1                                                                                                                                                                                              |
-| Maximum Confirmations      | 200                                                                                                                                                                                            |
-| Maximum Random Values      | 10                                                                                                                                                                                             |
-| Wrapper Gas overhead       | 40000                                                                                                                                                                                          |
-| Coordinator Gas Overhead   | 90000                                                                                                                                                                                          |
diff --git a/src/features/chainlink-automation/data/chainlink-automation-addresses.json b/src/features/chainlink-automation/data/chainlink-automation-addresses.json
index c7738ccd0ca..9032a265f4f 100644
--- a/src/features/chainlink-automation/data/chainlink-automation-addresses.json
+++ b/src/features/chainlink-automation/data/chainlink-automation-addresses.json
@@ -55,10 +55,6 @@
     "registryAddress": "0x696fB0d7D069cc0bb35a7c36115CE63E55cb9AA6",
     "registrarAddress": "0xe601C5837307f07aB39DEB0f5516602f045BF14f"
   },
-  "OPTIMISM_GOERLI": {
-    "registryAddress": "0x500Fb2e3903D3f296a69E21EC95661db5FE7F31C",
-    "registrarAddress": "0xCA7A0b1F8153EcD3861899d468dC946F22B39114"
-  },
   "OPTIMISM_SEPOLIA": {
     "registryAddress": "0x881918E24290084409DaA91979A30e6f0dB52eBe",
     "registrarAddress": "0x110Bd89F0B62EA1598FfeBF8C0304c9e58510Ee5"
diff --git a/src/features/chainlink-automation/data/chainlink-automation-config.json b/src/features/chainlink-automation/data/chainlink-automation-config.json
index bfdb7b71f16..6804826dfeb 100644
--- a/src/features/chainlink-automation/data/chainlink-automation-config.json
+++ b/src/features/chainlink-automation/data/chainlink-automation-config.json
@@ -349,31 +349,6 @@
     "registrar": "0xe601C5837307f07aB39DEB0f5516602f045BF14f",
     "transcoder": "0x395C8461299c9981E9D1A30d116F0c80a927d2A4"
   },
-  "OPTIMISM_GOERLI": {
-    "paymentPremiumPPB": 500000000,
-    "blockCountPerTurn": "Not Applicable",
-    "maxCheckDataSize": 5000,
-    "checkGasLimit": 10000000,
-    "gasCeilingMultiplier": 5,
-    "minUpkeepSpend": {
-      "type": "BigNumber",
-      "hex": "0x016345785d8a0000"
-    },
-    "maxPerformGas": 5000000,
-    "fallbackGasPrice": {
-      "type": "BigNumber",
-      "hex": "0x3b9aca00"
-    },
-    "fallbackLinkPrice": {
-      "type": "BigNumber",
-      "hex": "0x2386f26fc10000"
-    },
-    "maxPerformDataSize": 2000,
-    "flatFeeMicroLink": 0,
-    "stalenessSeconds": 90000,
-    "registrar": "0xCA7A0b1F8153EcD3861899d468dC946F22B39114",
-    "transcoder": "0x395C8461299c9981E9D1A30d116F0c80a927d2A4"
-  },
   "OPTIMISM_SEPOLIA": {
     "paymentPremiumPPB": 500000000,
     "blockCountPerTurn": "Not Applicable",
diff --git a/src/features/data/chains.ts b/src/features/data/chains.ts
index 23c575c6766..b4c9c606b91 100644
--- a/src/features/data/chains.ts
+++ b/src/features/data/chains.ts
@@ -238,13 +238,6 @@ export const CHAINS: Chain[] = [
         rddUrl: "https://reference-data-directory.vercel.app/feeds-ethereum-testnet-sepolia-optimism-1.json",
         queryString: "optimism-sepolia",
       },
-      {
-        name: "Optimism Goerli",
-        explorerUrl: "https://goerli-optimism.etherscan.io/address/%s",
-        networkType: "testnet",
-        rddUrl: "https://reference-data-directory.vercel.app/feeds-ethereum-testnet-goerli-optimism-1.json",
-        queryString: "optimism-goerli",
-      },
     ],
   },
   {