Some updates

Author: thedriftofwords

public/samples/Automation/tutorials/VRFSubscriptionBalanceMonitor.sol

@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity 0.8.6;
+pragma solidity 0.8.20;
 
+import "@chainlink/contracts/src/v0.8/shared/access/ConfirmedOwner.sol";
 import "@chainlink/contracts/src/v0.8/automation/interfaces/KeeperCompatibleInterface.sol";
-import {ConfirmedOwner} from "@chainlink/contracts/src/v0.8/shared/access/ConfirmedOwner.sol";
-import {VRFCoordinatorV2Interface} from "@chainlink/contracts/src/v0.8/vrf/interfaces/VRFCoordinatorV2Interface.sol";
-import {LinkTokenInterface} from "@chainlink/contracts/src/v0.8/shared/interfaces/LinkTokenInterface.sol";
-import {Pausable} from "@openzeppelin/contracts/security/Pausable.sol";
+import "@chainlink/contracts/src/v0.8/interfaces/VRFCoordinatorV2Interface.sol";
+import "@chainlink/contracts/src/v0.8/shared/interfaces/LinkTokenInterface.sol";
+import "@openzeppelin/contracts/security/Pausable.sol";
 
 /**
  * @title The VRFSubscriptionBalanceMonitor contract.
@@ -26,7 +26,7 @@ contract VRFSubscriptionBalanceMonitor is
     event FundsWithdrawn(uint256 amountWithdrawn, address payee);
     event TopUpSucceeded(uint64 indexed subscriptionId);
     event TopUpFailed(uint64 indexed subscriptionId);
-    event KeeperRegistryAddressUpdated(address oldAddress, address newAddress);
+    event ForwarderAddressUpdated(address oldAddress, address newAddress);
     event VRFCoordinatorV2AddressUpdated(
         address oldAddress,
         address newAddress
@@ -40,6 +40,7 @@ contract VRFSubscriptionBalanceMonitor is
 
     error InvalidWatchList();
     error OnlyKeeperRegistry();
+    error OnlyForwarder();
     error DuplicateSubcriptionId(uint64 duplicate);
 
     struct Target {
@@ -49,26 +50,26 @@ contract VRFSubscriptionBalanceMonitor is
         uint56 lastTopUpTimestamp;
     }
 
-    address public s_keeperRegistryAddress; // the address of the keeper registry
+    address public s_forwarderAddress; // the address of the upkeep's forwarder
     uint256 public s_minWaitPeriodSeconds; // minimum time to wait between top-ups
     uint64[] public s_watchList; // the watchlist on which subscriptions are stored
     mapping(uint64 => Target) internal s_targets;
 
     /**
      * @param linkTokenAddress the Link token address
      * @param coordinatorAddress the address of the vrf coordinator contract
-     * @param keeperRegistryAddress the address of the keeper registry contract
+     * @param forwarderAddress the address of the upkeep's forwarder
      * @param minWaitPeriodSeconds the minimum wait period for addresses between funding
      */
     constructor(
         address linkTokenAddress,
         address coordinatorAddress,
-        address keeperRegistryAddress,
+        address forwarderAddress,
         uint256 minWaitPeriodSeconds
     ) ConfirmedOwner(msg.sender) {
         setLinkTokenAddress(linkTokenAddress);
         setVRFCoordinatorV2Address(coordinatorAddress);
-        setKeeperRegistryAddress(keeperRegistryAddress);
+        setForwarderAddress(forwarderAddress);
         setMinWaitPeriodSeconds(minWaitPeriodSeconds);
     }
 
@@ -218,7 +219,7 @@ contract VRFSubscriptionBalanceMonitor is
      */
     function performUpkeep(
         bytes calldata performData
-    ) external override onlyKeeperRegistry whenNotPaused {
+    ) external override onlyForwarder whenNotPaused {
         uint64[] memory needsFunding = abi.decode(performData, (uint64[]));
         topUp(needsFunding);
     }
@@ -261,17 +262,14 @@ contract VRFSubscriptionBalanceMonitor is
     }
 
     /**
-     * @notice Sets the keeper registry address.
+     * @notice Sets the upkeep's unique forwarder address
+     * for upkeeps in Automation versions 2.0 and later
+     * https://docs.chain.link/chainlink-automation/guides/forwarder
      */
-    function setKeeperRegistryAddress(
-        address keeperRegistryAddress
-    ) public onlyOwner {
-        require(keeperRegistryAddress != address(0));
-        emit KeeperRegistryAddressUpdated(
-            s_keeperRegistryAddress,
-            keeperRegistryAddress
-        );
-        s_keeperRegistryAddress = keeperRegistryAddress;
+    function setForwarderAddress(address forwarderAddress) public onlyOwner {
+        require(forwarderAddress != address(0));
+        emit ForwarderAddressUpdated(s_forwarderAddress, forwarderAddress);
+        s_forwarderAddress = forwarderAddress;
     }
 
     /**
@@ -327,9 +325,9 @@ contract VRFSubscriptionBalanceMonitor is
         _unpause();
     }
 
-    modifier onlyKeeperRegistry() {
-        if (msg.sender != s_keeperRegistryAddress) {
-            revert OnlyKeeperRegistry();
+    modifier onlyForwarder() {
+        if (msg.sender != s_forwarderAddress) {
+            revert OnlyForwarder();
         }
         _;
     }

src/content/quickstarts/eth-balance-monitor.mdx

@@ -54,7 +54,7 @@ Before you start this tutorial, complete the following items:
 
 <Accordion title="Configure the address watch list" number={2}>
 
-Before your contract will fund an address, you must set the `watchList` address array with `minBalancesWei` and `topUpAmmountsWei` variables. For demonstration purposes, you configure your own wallet as the top-up address. This makes it easy to see the ETH being sent as part of the automated top-up function. After you complete this tutorial, you can configure any wallet or contract address that you want to keep funded.
+Before your contract will fund an address, you must set the `watchList` address array with `minBalancesWei` and `topUpAmountsWei` variables. For demonstration purposes, you configure your own wallet as the top-up address. This makes it easy to see the ETH being sent as part of the automated top-up function. After you complete this tutorial, you can configure any wallet or contract address that you want to keep funded.
 
 1. In the list of functions for your deployed contract, run the `setWatchList` function. This function requires an `addresses` array, a `minBalancesWei` array that maps to the addresses, and a `topUpAmountsWei` array that also maps to the addresses. In Remix, arrays require brackets and quotes around both addresses and integer values. For this example, set the following values:
 
@@ -104,7 +104,7 @@ The upkeep runs the `checkUpkeep` function in your contract, which checks the ba
 
 1. Go to [automation.chain.link](https://automation.chain.link/), view your new upkeep, and confirm that it is performing upkeeps in the **History** list.
 
-1. View your contract address and your wallet address at [mumbai.polygonscan.com](https://mumbai.polygonscan.com/) to see the transactions happening between your contract and your wallet address.
+1. View your contract address and your wallet address at the [Sepolia block explorer](https://sepolia.etherscan.io/) to see the transactions happening between your contract and your wallet address.
 
 The example continues to run until your upkeep runs out of LINK, your contract runs out of ETH, or until you manually pause or cancel the upkeep.
 

src/content/quickstarts/giveaway.mdx

@@ -235,14 +235,14 @@ Set environment variables to run the UI and then view it locally.
    | -------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
    | `UI_GIVEAWAY_MANAGER_CONTRACT_ADDRESS` | The address of the Giveaway Contract Manager contract that you [deployed earlier](#deploy-contract)                                                                                                                                   |
    | `UI_LINK_TOKEN_CONTRACT_ADDRESS`       | For Ethereum Sepolia: <CopyText text="0x779877A7B0D9E8603169DdbD7836e478b4624789" code/> <br/> See all [LINK token contract addresses](/resources/link-token-contracts)                                                                 |
-   | `UI_KEEPER_REGISTRY_CONTRACT_ADDRESS`  | For Ethereum Sepolia: <CopyText text="0x86EFBD0b6736Bed994962f9797049422A3A8E8Ad" code/> <br/> This app currently supports Automation v1.2. See all [Automation registry contract addresses](/chainlink-automation/overview/supported-networks/) |
+   | `UI_KEEPER_REGISTRY_CONTRACT_ADDRESS`  | For Ethereum Sepolia: <CopyText text="0xE16Df59B887e3Caa439E0b29B42bA2e7976FD8b2" code/> <br/> This app currently supports Automation v1.2. See all [Automation registry contract addresses](/chainlink-automation/overview/supported-networks/) |
 
 1. Navigate to the `/client/packages/ui` directory, and run these commands to set up your UI environment variables. Do not use quotes to assign values:
    ```bash
    # <root>/client/packages/ui
    export UI_GIVEAWAY_MANAGER_CONTRACT_ADDRESS=
-   export UI_LINK_TOKEN_CONTRACT_ADDRESS=
-   export UI_KEEPER_REGISTRY_CONTRACT_ADDRESS=
+   export UI_LINK_TOKEN_CONTRACT_ADDRESS=0x779877A7B0D9E8603169DdbD7836e478b4624789
+   export UI_KEEPER_REGISTRY_CONTRACT_ADDRESS=0xE16Df59B887e3Caa439E0b29B42bA2e7976FD8b2
    ```
 1. After setting the environment variables, run the UI locally:
    ```bash

src/content/quickstarts/vrf-subscription-monitor.mdx

@@ -163,22 +163,35 @@ Registering an upkeep on Chainlink Automation creates a smart contract that will
 
 1. Click **Register new Upkeep**.
 
-1. Select the _Custom logic_ trigger.
+1. Select the _Custom logic_ trigger option.
 
-1. Input the address of your deployed subscription balance monitor contract.
+1. Copy your contract address from Remix and paste it into the **Target contract address** field.
 
-1. Get the ABI from Remix.
+1. Specify a name for your upkeep and set a **Starting balance** of 5 LINK for this demo. Leave the other settings at their default values.
 
-1. Enter the values for the constructor.
+1. Go to the **Upkeep details** page and copy your **Forwarder address**.
 
-   | Item                    | Value                                                              |
-   | ----------------------- | ------------------------------------------------------------------ |
-   | `LINKTOKENADDRESS`      | <CopyText text="0x779877A7B0D9E8603169DdbD7836e478b4624789" code/> |
-   | `COORDINATORADDRESS`    | <CopyText text="0x8103B0A8A00be2DDC778e6e7eaa21791Cd364625" code/> |
-   | `KEEPERREGISTRYADDRESS` | <CopyText text="0xE16Df59B887e3Caa439E0b29B42bA2e7976FD8b2" code/> |
-   | `MINWAITPERIODSECONDS`  | <CopyText text="60" code/>                                         |
+1. Navigate back to Remix and find the `setForwarderAddress` function. Paste your forwarder address and click click **transact** to run the function. MetaMask asks you to confirm the transaction.
+
+Now that you've registered the upkeep and configured your contract with your new upkeep's forwarder address, Chainlink Automation handles the rest of the process.
+
+</Accordion>
+
+<Accordion title="Configure the subscription watch list" number={5}>
+
+Before your contract will fund a subscription, you must set the `watchList` address array with `minBalancesJuels` and `topUpAmountsJuels` variables. For demonstration purposes, you configure your own wallet as the top-up address. This makes it easy to see the ETH being sent as part of the automated top-up function. After you complete this tutorial, you can configure any wallet or contract address that you want to keep funded.
+
+1. In the list of functions for your deployed contract, run the `setWatchList` function. This function requires an `subscriptionIds` array, a `minBalancesJuels` array that maps to the subscriptions, and a `topUpAmountsJuels` array that also maps to the subscriptions. In Remix, arrays require brackets and quotes around integer values. For this example, set the following values:
+
+   - **subscriptionIds**: `["SUB_ID_1", "SUB_ID_2"]`
+   - **minBalancesJuels**: `["2000000000000000000"]`
+   - **topUpAmountsJuels**: `["10000000000000000"]`
+
+   These values tell the top up contract to top up the specified address with 0.01 LINK if the address balance is less than 2 LINK. These settings are intended to demonstrate the example using testnet faucet funds. For a production application, you might set more reasonable values that top up a smart contract with 10 LINK if the balance is less than 1 LINK.
+
+1. After you configure the function values, click **transact** to run the function. MetaMask asks you to confirm the transaction.
 
-1. Fund the upkeep with enough LINK to monitor your VRF subscriptions.
+1. In the functions list, click the `getWatchList` function to confirm your settings are correct.
 
 </Accordion>