diff --git a/contracts/scripts/native_solc_compile_all_automation b/contracts/scripts/native_solc_compile_all_automation
index 248462f421a..cbb78a2cb40 100755
--- a/contracts/scripts/native_solc_compile_all_automation
+++ b/contracts/scripts/native_solc_compile_all_automation
@@ -86,7 +86,6 @@ solc-select use $SOLC_VERSION
 export SOLC_VERSION=$SOLC_VERSION
 
 # v0.8.19
-compileContract automation/dev/v2_2/AutomationRegistrar2_2.sol
 compileContract automation/dev/v2_2/AutomationRegistry2_2.sol
 compileContract automation/dev/v2_2/AutomationRegistryLogicA2_2.sol
 compileContract automation/dev/v2_2/AutomationRegistryLogicB2_2.sol
diff --git a/contracts/src/v0.8/automation/dev/v2_2/AutomationRegistrar2_2.sol b/contracts/src/v0.8/automation/dev/v2_2/AutomationRegistrar2_2.sol
deleted file mode 100644
index 8d2fe775ee8..00000000000
--- a/contracts/src/v0.8/automation/dev/v2_2/AutomationRegistrar2_2.sol
+++ /dev/null
@@ -1,535 +0,0 @@
-// SPDX-License-Identifier: BUSL-1.1
-pragma solidity 0.8.19;
-
-import {LinkTokenInterface} from "../../../shared/interfaces/LinkTokenInterface.sol";
-import {IAutomationRegistryMaster} from "../interfaces/v2_2/IAutomationRegistryMaster.sol";
-import {TypeAndVersionInterface} from "../../../interfaces/TypeAndVersionInterface.sol";
-import {ConfirmedOwner} from "../../../shared/access/ConfirmedOwner.sol";
-import {IERC677Receiver} from "../../../shared/interfaces/IERC677Receiver.sol";
-
-/**
- * @notice Contract to accept requests for upkeep registrations
- * @dev There are 2 registration workflows in this contract
- * Flow 1. auto approve OFF / manual registration - UI calls `register` function on this contract, this contract owner at a later time then manually
- *  calls `approve` to register upkeep and emit events to inform UI and others interested.
- * Flow 2. auto approve ON / real time registration - UI calls `register` function as before, which calls the `registerUpkeep` function directly on
- *  keeper registry and then emits approved event to finish the flow automatically without manual intervention.
- * The idea is to have same interface(functions,events) for UI or anyone using this contract irrespective of auto approve being enabled or not.
- * they can just listen to `RegistrationRequested` & `RegistrationApproved` events and know the status on registrations.
- */
-contract AutomationRegistrar2_2 is TypeAndVersionInterface, ConfirmedOwner, IERC677Receiver {
-  /**
-   * DISABLED: No auto approvals, all new upkeeps should be approved manually.
-   * ENABLED_SENDER_ALLOWLIST: Auto approvals for allowed senders subject to max allowed. Manual for rest.
-   * ENABLED_ALL: Auto approvals for all new upkeeps subject to max allowed.
-   */
-  enum AutoApproveType {
-    DISABLED,
-    ENABLED_SENDER_ALLOWLIST,
-    ENABLED_ALL
-  }
-
-  bytes4 private constant REGISTER_REQUEST_SELECTOR = this.register.selector;
-
-  mapping(bytes32 => PendingRequest) private s_pendingRequests;
-  mapping(uint8 => TriggerRegistrationStorage) private s_triggerRegistrations;
-
-  LinkTokenInterface public immutable LINK;
-
-  /**
-   * @notice versions:
-   * - KeeperRegistrar 2.1.0: Update for compatability with registry 2.1.0
-   *                          Add auto approval levels by type
-   * - KeeperRegistrar 2.0.0: Remove source from register
-   *                          Breaks our example of "Register an Upkeep using your own deployed contract"
-   * - KeeperRegistrar 1.1.0: Add functionality for sender allowlist in auto approve
-   *                        : Remove rate limit and add max allowed for auto approve
-   * - KeeperRegistrar 1.0.0: initial release
-   */
-  string public constant override typeAndVersion = "AutomationRegistrar 2.1.0";
-
-  /**
-   * @notice TriggerRegistrationStorage stores the auto-approval levels for upkeeps by type
-   * @member autoApproveType the auto approval setting (see enum)
-   * @member autoApproveMaxAllowed the max number of upkeeps that can be auto approved of this type
-   * @member approvedCount the count of upkeeps auto approved of this type
-   */
-  struct TriggerRegistrationStorage {
-    AutoApproveType autoApproveType;
-    uint32 autoApproveMaxAllowed;
-    uint32 approvedCount;
-  }
-
-  /**
-   * @notice InitialTriggerConfig configures the auto-approval levels for upkeeps by trigger type
-   * @dev this struct is only used in the constructor to set the initial values for various trigger configs
-   * @member triggerType the upkeep type to configure
-   * @member autoApproveType the auto approval setting (see enum)
-   * @member autoApproveMaxAllowed the max number of upkeeps that can be auto approved of this type
-   */
-  struct InitialTriggerConfig {
-    uint8 triggerType;
-    AutoApproveType autoApproveType;
-    uint32 autoApproveMaxAllowed;
-  }
-
-  struct RegistrarConfig {
-    IAutomationRegistryMaster AutomationRegistry;
-    uint96 minLINKJuels;
-  }
-
-  struct PendingRequest {
-    address admin;
-    uint96 balance;
-  }
-
-  struct RegistrationParams {
-    string name;
-    bytes encryptedEmail;
-    address upkeepContract;
-    uint32 gasLimit;
-    address adminAddress;
-    uint8 triggerType;
-    bytes checkData;
-    bytes triggerConfig;
-    bytes offchainConfig;
-    uint96 amount;
-  }
-
-  RegistrarConfig private s_config;
-  // Only applicable if s_config.configType is ENABLED_SENDER_ALLOWLIST
-  mapping(address => bool) private s_autoApproveAllowedSenders;
-
-  event RegistrationRequested(
-    bytes32 indexed hash,
-    string name,
-    bytes encryptedEmail,
-    address indexed upkeepContract,
-    uint32 gasLimit,
-    address adminAddress,
-    uint8 triggerType,
-    bytes triggerConfig,
-    bytes offchainConfig,
-    bytes checkData,
-    uint96 amount
-  );
-
-  event RegistrationApproved(bytes32 indexed hash, string displayName, uint256 indexed upkeepId);
-
-  event RegistrationRejected(bytes32 indexed hash);
-
-  event AutoApproveAllowedSenderSet(address indexed senderAddress, bool allowed);
-
-  event ConfigChanged(address AutomationRegistry, uint96 minLINKJuels);
-
-  event TriggerConfigSet(uint8 triggerType, AutoApproveType autoApproveType, uint32 autoApproveMaxAllowed);
-
-  error InvalidAdminAddress();
-  error RequestNotFound();
-  error HashMismatch();
-  error OnlyAdminOrOwner();
-  error InsufficientPayment();
-  error RegistrationRequestFailed();
-  error OnlyLink();
-  error AmountMismatch();
-  error SenderMismatch();
-  error FunctionNotPermitted();
-  error LinkTransferFailed(address to);
-  error InvalidDataLength();
-
-  /**
-   * @param LINKAddress Address of Link token
-   * @param AutomationRegistry keeper registry address
-   * @param minLINKJuels minimum LINK that new registrations should fund their upkeep with
-   * @param triggerConfigs the initial config for individual triggers
-   */
-  constructor(
-    address LINKAddress,
-    address AutomationRegistry,
-    uint96 minLINKJuels,
-    InitialTriggerConfig[] memory triggerConfigs
-  ) ConfirmedOwner(msg.sender) {
-    LINK = LinkTokenInterface(LINKAddress);
-    setConfig(AutomationRegistry, minLINKJuels);
-    for (uint256 idx = 0; idx < triggerConfigs.length; idx++) {
-      setTriggerConfig(
-        triggerConfigs[idx].triggerType,
-        triggerConfigs[idx].autoApproveType,
-        triggerConfigs[idx].autoApproveMaxAllowed
-      );
-    }
-  }
-
-  //EXTERNAL
-
-  /**
-   * @notice register can only be called through transferAndCall on LINK contract
-   * @param name string of the upkeep to be registered
-   * @param encryptedEmail email address of upkeep contact
-   * @param upkeepContract address to perform upkeep on
-   * @param gasLimit amount of gas to provide the target contract when performing upkeep
-   * @param adminAddress address to cancel upkeep and withdraw remaining funds
-   * @param triggerType the type of trigger for the upkeep
-   * @param checkData data passed to the contract when checking for upkeep
-   * @param triggerConfig the config for the trigger
-   * @param offchainConfig offchainConfig for upkeep in bytes
-   * @param amount quantity of LINK upkeep is funded with (specified in Juels)
-   * @param sender address of the sender making the request
-   */
-  function register(
-    string memory name,
-    bytes calldata encryptedEmail,
-    address upkeepContract,
-    uint32 gasLimit,
-    address adminAddress,
-    uint8 triggerType,
-    bytes memory checkData,
-    bytes memory triggerConfig,
-    bytes memory offchainConfig,
-    uint96 amount,
-    address sender
-  ) external onlyLINK {
-    _register(
-      RegistrationParams({
-        name: name,
-        encryptedEmail: encryptedEmail,
-        upkeepContract: upkeepContract,
-        gasLimit: gasLimit,
-        adminAddress: adminAddress,
-        triggerType: triggerType,
-        checkData: checkData,
-        triggerConfig: triggerConfig,
-        offchainConfig: offchainConfig,
-        amount: amount
-      }),
-      sender
-    );
-  }
-
-  /**
-   * @notice Allows external users to register upkeeps; assumes amount is approved for transfer by the contract
-   * @param requestParams struct of all possible registration parameters
-   */
-  function registerUpkeep(RegistrationParams calldata requestParams) external returns (uint256) {
-    if (requestParams.amount < s_config.minLINKJuels) {
-      revert InsufficientPayment();
-    }
-
-    LINK.transferFrom(msg.sender, address(this), requestParams.amount);
-
-    return _register(requestParams, msg.sender);
-  }
-
-  /**
-   * @dev register upkeep on AutomationRegistry contract and emit RegistrationApproved event
-   */
-  function approve(
-    string memory name,
-    address upkeepContract,
-    uint32 gasLimit,
-    address adminAddress,
-    uint8 triggerType,
-    bytes calldata checkData,
-    bytes memory triggerConfig,
-    bytes calldata offchainConfig,
-    bytes32 hash
-  ) external onlyOwner {
-    PendingRequest memory request = s_pendingRequests[hash];
-    if (request.admin == address(0)) {
-      revert RequestNotFound();
-    }
-    bytes32 expectedHash = keccak256(
-      abi.encode(upkeepContract, gasLimit, adminAddress, triggerType, checkData, triggerConfig, offchainConfig)
-    );
-    if (hash != expectedHash) {
-      revert HashMismatch();
-    }
-    delete s_pendingRequests[hash];
-    _approve(
-      RegistrationParams({
-        name: name,
-        encryptedEmail: "",
-        upkeepContract: upkeepContract,
-        gasLimit: gasLimit,
-        adminAddress: adminAddress,
-        triggerType: triggerType,
-        checkData: checkData,
-        triggerConfig: triggerConfig,
-        offchainConfig: offchainConfig,
-        amount: request.balance
-      }),
-      expectedHash
-    );
-  }
-
-  /**
-   * @notice cancel will remove a registration request and return the refunds to the request.admin
-   * @param hash the request hash
-   */
-  function cancel(bytes32 hash) external {
-    PendingRequest memory request = s_pendingRequests[hash];
-    if (!(msg.sender == request.admin || msg.sender == owner())) {
-      revert OnlyAdminOrOwner();
-    }
-    if (request.admin == address(0)) {
-      revert RequestNotFound();
-    }
-    delete s_pendingRequests[hash];
-    bool success = LINK.transfer(request.admin, request.balance);
-    if (!success) {
-      revert LinkTransferFailed(request.admin);
-    }
-    emit RegistrationRejected(hash);
-  }
-
-  /**
-   * @notice owner calls this function to set contract config
-   * @param AutomationRegistry new keeper registry address
-   * @param minLINKJuels minimum LINK that new registrations should fund their upkeep with
-   */
-  function setConfig(address AutomationRegistry, uint96 minLINKJuels) public onlyOwner {
-    s_config = RegistrarConfig({
-      minLINKJuels: minLINKJuels,
-      AutomationRegistry: IAutomationRegistryMaster(AutomationRegistry)
-    });
-    emit ConfigChanged(AutomationRegistry, minLINKJuels);
-  }
-
-  /**
-   * @notice owner calls to set the config for this upkeep type
-   * @param triggerType the upkeep type to configure
-   * @param autoApproveType the auto approval setting (see enum)
-   * @param autoApproveMaxAllowed the max number of upkeeps that can be auto approved of this type
-   */
-  function setTriggerConfig(
-    uint8 triggerType,
-    AutoApproveType autoApproveType,
-    uint32 autoApproveMaxAllowed
-  ) public onlyOwner {
-    s_triggerRegistrations[triggerType].autoApproveType = autoApproveType;
-    s_triggerRegistrations[triggerType].autoApproveMaxAllowed = autoApproveMaxAllowed;
-    emit TriggerConfigSet(triggerType, autoApproveType, autoApproveMaxAllowed);
-  }
-
-  /**
-   * @notice owner calls this function to set allowlist status for senderAddress
-   * @param senderAddress senderAddress to set the allowlist status for
-   * @param allowed true if senderAddress needs to be added to allowlist, false if needs to be removed
-   */
-  function setAutoApproveAllowedSender(address senderAddress, bool allowed) external onlyOwner {
-    s_autoApproveAllowedSenders[senderAddress] = allowed;
-
-    emit AutoApproveAllowedSenderSet(senderAddress, allowed);
-  }
-
-  /**
-   * @notice read the allowlist status of senderAddress
-   * @param senderAddress address to read the allowlist status for
-   */
-  function getAutoApproveAllowedSender(address senderAddress) external view returns (bool) {
-    return s_autoApproveAllowedSenders[senderAddress];
-  }
-
-  /**
-   * @notice read the current registration configuration
-   */
-  function getConfig() external view returns (address AutomationRegistry, uint256 minLINKJuels) {
-    RegistrarConfig memory config = s_config;
-    return (address(config.AutomationRegistry), config.minLINKJuels);
-  }
-
-  /**
-   * @notice read the config for this upkeep type
-   * @param triggerType upkeep type to read config for
-   */
-  function getTriggerRegistrationDetails(uint8 triggerType) external view returns (TriggerRegistrationStorage memory) {
-    return s_triggerRegistrations[triggerType];
-  }
-
-  /**
-   * @notice gets the admin address and the current balance of a registration request
-   */
-  function getPendingRequest(bytes32 hash) external view returns (address, uint96) {
-    PendingRequest memory request = s_pendingRequests[hash];
-    return (request.admin, request.balance);
-  }
-
-  /**
-   * @notice Called when LINK is sent to the contract via `transferAndCall`
-   * @param sender Address of the sender transfering LINK
-   * @param amount Amount of LINK sent (specified in Juels)
-   * @param data Payload of the transaction
-   */
-  function onTokenTransfer(
-    address sender,
-    uint256 amount,
-    bytes calldata data
-  )
-    external
-    override
-    onlyLINK
-    permittedFunctionsForLINK(data)
-    isActualAmount(amount, data)
-    isActualSender(sender, data)
-  {
-    if (amount < s_config.minLINKJuels) {
-      revert InsufficientPayment();
-    }
-    (bool success, ) = address(this).delegatecall(data);
-    // calls register
-    if (!success) {
-      revert RegistrationRequestFailed();
-    }
-  }
-
-  // ================================================================
-  // |                           PRIVATE                            |
-  // ================================================================
-
-  /**
-   * @dev verify registration request and emit RegistrationRequested event
-   */
-  function _register(RegistrationParams memory params, address sender) private returns (uint256) {
-    if (params.adminAddress == address(0)) {
-      revert InvalidAdminAddress();
-    }
-    bytes32 hash = keccak256(
-      abi.encode(
-        params.upkeepContract,
-        params.gasLimit,
-        params.adminAddress,
-        params.triggerType,
-        params.checkData,
-        params.triggerConfig,
-        params.offchainConfig
-      )
-    );
-
-    emit RegistrationRequested(
-      hash,
-      params.name,
-      params.encryptedEmail,
-      params.upkeepContract,
-      params.gasLimit,
-      params.adminAddress,
-      params.triggerType,
-      params.triggerConfig,
-      params.offchainConfig,
-      params.checkData,
-      params.amount
-    );
-
-    uint256 upkeepId;
-    if (_shouldAutoApprove(s_triggerRegistrations[params.triggerType], sender)) {
-      s_triggerRegistrations[params.triggerType].approvedCount++;
-      upkeepId = _approve(params, hash);
-    } else {
-      uint96 newBalance = s_pendingRequests[hash].balance + params.amount;
-      s_pendingRequests[hash] = PendingRequest({admin: params.adminAddress, balance: newBalance});
-    }
-
-    return upkeepId;
-  }
-
-  /**
-   * @dev register upkeep on AutomationRegistry contract and emit RegistrationApproved event
-   */
-  function _approve(RegistrationParams memory params, bytes32 hash) private returns (uint256) {
-    IAutomationRegistryMaster AutomationRegistry = s_config.AutomationRegistry;
-    uint256 upkeepId = AutomationRegistry.registerUpkeep(
-      params.upkeepContract,
-      params.gasLimit,
-      params.adminAddress,
-      params.triggerType,
-      params.checkData,
-      params.triggerConfig,
-      params.offchainConfig
-    );
-    bool success = LINK.transferAndCall(address(AutomationRegistry), params.amount, abi.encode(upkeepId));
-    if (!success) {
-      revert LinkTransferFailed(address(AutomationRegistry));
-    }
-    emit RegistrationApproved(hash, params.name, upkeepId);
-    return upkeepId;
-  }
-
-  /**
-   * @dev verify sender allowlist if needed and check max limit
-   */
-  function _shouldAutoApprove(TriggerRegistrationStorage memory config, address sender) private view returns (bool) {
-    if (config.autoApproveType == AutoApproveType.DISABLED) {
-      return false;
-    }
-    if (config.autoApproveType == AutoApproveType.ENABLED_SENDER_ALLOWLIST && (!s_autoApproveAllowedSenders[sender])) {
-      return false;
-    }
-    if (config.approvedCount < config.autoApproveMaxAllowed) {
-      return true;
-    }
-    return false;
-  }
-
-  // ================================================================
-  // |                          MODIFIERS                           |
-  // ================================================================
-
-  /**
-   * @dev Reverts if not sent from the LINK token
-   */
-  modifier onlyLINK() {
-    if (msg.sender != address(LINK)) {
-      revert OnlyLink();
-    }
-    _;
-  }
-
-  /**
-   * @dev Reverts if the given data does not begin with the `register` function selector
-   * @param _data The data payload of the request
-   */
-  modifier permittedFunctionsForLINK(bytes memory _data) {
-    bytes4 funcSelector;
-    assembly {
-      // solhint-disable-next-line avoid-low-level-calls
-      funcSelector := mload(add(_data, 32)) // First 32 bytes contain length of data
-    }
-    if (funcSelector != REGISTER_REQUEST_SELECTOR) {
-      revert FunctionNotPermitted();
-    }
-    _;
-  }
-
-  /**
-   * @dev Reverts if the actual amount passed does not match the expected amount
-   * @param expected amount that should match the actual amount
-   * @param data bytes
-   */
-  modifier isActualAmount(uint256 expected, bytes calldata data) {
-    // decode register function arguments to get actual amount
-    (, , , , , , , , , uint96 amount, ) = abi.decode(
-      data[4:],
-      (string, bytes, address, uint32, address, uint8, bytes, bytes, bytes, uint96, address)
-    );
-    if (expected != amount) {
-      revert AmountMismatch();
-    }
-    _;
-  }
-
-  /**
-   * @dev Reverts if the actual sender address does not match the expected sender address
-   * @param expected address that should match the actual sender address
-   * @param data bytes
-   */
-  modifier isActualSender(address expected, bytes calldata data) {
-    // decode register function arguments to get actual sender
-    (, , , , , , , , , , address sender) = abi.decode(
-      data[4:],
-      (string, bytes, address, uint32, address, uint8, bytes, bytes, bytes, uint96, address)
-    );
-    if (expected != sender) {
-      revert SenderMismatch();
-    }
-    _;
-  }
-}
diff --git a/contracts/test/v0.8/automation/AutomationRegistrar2_2.test.ts b/contracts/test/v0.8/automation/AutomationRegistrar2_2.test.ts
deleted file mode 100644
index b7585462067..00000000000
--- a/contracts/test/v0.8/automation/AutomationRegistrar2_2.test.ts
+++ /dev/null
@@ -1,1013 +0,0 @@
-import { ethers } from 'hardhat'
-import { ContractFactory, Contract } from 'ethers'
-import { assert, expect } from 'chai'
-import { evmRevert } from '../../test-helpers/matchers'
-import { getUsers, Personas } from '../../test-helpers/setup'
-import { BigNumber, Signer } from 'ethers'
-import { MockV3Aggregator__factory as MockV3AggregatorFactory } from '../../../typechain/factories/MockV3Aggregator__factory'
-import { UpkeepMock__factory as UpkeepMockFactory } from '../../../typechain/factories/UpkeepMock__factory'
-import { MockV3Aggregator } from '../../../typechain/MockV3Aggregator'
-import { UpkeepMock } from '../../../typechain/UpkeepMock'
-import { toWei } from '../../test-helpers/helpers'
-import { IKeeperRegistryMaster as IKeeperRegistry } from '../../../typechain/IKeeperRegistryMaster'
-import { AutomationRegistrar2_2 as Registrar } from '../../../typechain/AutomationRegistrar2_2'
-import { deployRegistry21 } from './helpers'
-
-// copied from KeeperRegistryBase2_2.sol
-enum Trigger {
-  CONDITION,
-  LOG,
-}
-
-let linkTokenFactory: ContractFactory
-let mockV3AggregatorFactory: MockV3AggregatorFactory
-let upkeepMockFactory: UpkeepMockFactory
-
-let personas: Personas
-
-before(async () => {
-  personas = (await getUsers()).personas
-
-  linkTokenFactory = await ethers.getContractFactory(
-    'src/v0.4/LinkToken.sol:LinkToken',
-  )
-  mockV3AggregatorFactory = (await ethers.getContractFactory(
-    'src/v0.8/tests/MockV3Aggregator.sol:MockV3Aggregator',
-  )) as unknown as MockV3AggregatorFactory
-  upkeepMockFactory = await ethers.getContractFactory('UpkeepMock')
-})
-
-const errorMsgs = {
-  onlyOwner: 'revert Only callable by owner',
-  onlyAdmin: 'OnlyAdminOrOwner()',
-  hashPayload: 'HashMismatch()',
-  requestNotFound: 'RequestNotFound()',
-}
-
-describe('AutomationRegistrar2_2', () => {
-  const upkeepName = 'SampleUpkeep'
-
-  const linkEth = BigNumber.from(300000000)
-  const gasWei = BigNumber.from(100)
-  const performGas = BigNumber.from(100000)
-  const paymentPremiumPPB = BigNumber.from(250000000)
-  const flatFeeMicroLink = BigNumber.from(0)
-  const maxAllowedAutoApprove = 5
-  const trigger = '0xdeadbeef'
-  const offchainConfig = '0x01234567'
-
-  const emptyBytes = '0x00'
-  const stalenessSeconds = BigNumber.from(43820)
-  const gasCeilingMultiplier = BigNumber.from(1)
-  const checkGasLimit = BigNumber.from(20000000)
-  const fallbackGasPrice = BigNumber.from(200)
-  const fallbackLinkPrice = BigNumber.from(200000000)
-  const maxCheckDataSize = BigNumber.from(10000)
-  const maxPerformDataSize = BigNumber.from(10000)
-  const maxRevertDataSize = BigNumber.from(1000)
-  const maxPerformGas = BigNumber.from(5000000)
-  const minUpkeepSpend = BigNumber.from('1000000000000000000')
-  const amount = BigNumber.from('5000000000000000000')
-  const amount1 = BigNumber.from('6000000000000000000')
-  const transcoder = ethers.constants.AddressZero
-  const upkeepManager = ethers.Wallet.createRandom().address
-
-  // Enum values are not auto exported in ABI so have to manually declare
-  const autoApproveType_DISABLED = 0
-  const autoApproveType_ENABLED_SENDER_ALLOWLIST = 1
-  const autoApproveType_ENABLED_ALL = 2
-
-  let owner: Signer
-  let admin: Signer
-  let someAddress: Signer
-  let registrarOwner: Signer
-  let stranger: Signer
-  let requestSender: Signer
-
-  let linkToken: Contract
-  let linkEthFeed: MockV3Aggregator
-  let gasPriceFeed: MockV3Aggregator
-  let mock: UpkeepMock
-  let registry: IKeeperRegistry
-  let registrar: Registrar
-
-  beforeEach(async () => {
-    owner = personas.Default
-    admin = personas.Neil
-    someAddress = personas.Ned
-    registrarOwner = personas.Nelly
-    stranger = personas.Nancy
-    requestSender = personas.Norbert
-
-    linkToken = await linkTokenFactory.connect(owner).deploy()
-    gasPriceFeed = await mockV3AggregatorFactory
-      .connect(owner)
-      .deploy(0, gasWei)
-    linkEthFeed = await mockV3AggregatorFactory
-      .connect(owner)
-      .deploy(9, linkEth)
-
-    registry = await deployRegistry21(
-      owner,
-      0,
-      linkToken.address,
-      linkEthFeed.address,
-      gasPriceFeed.address,
-    )
-
-    mock = await upkeepMockFactory.deploy()
-
-    const registrarFactory = await ethers.getContractFactory(
-      'AutomationRegistrar2_2',
-    )
-    registrar = await registrarFactory
-      .connect(registrarOwner)
-      .deploy(linkToken.address, registry.address, minUpkeepSpend, [
-        {
-          triggerType: Trigger.CONDITION,
-          autoApproveType: autoApproveType_DISABLED,
-          autoApproveMaxAllowed: 0,
-        },
-        {
-          triggerType: Trigger.LOG,
-          autoApproveType: autoApproveType_DISABLED,
-          autoApproveMaxAllowed: 0,
-        },
-      ])
-
-    await linkToken
-      .connect(owner)
-      .transfer(await requestSender.getAddress(), toWei('1000'))
-
-    const keepers = [
-      await personas.Carol.getAddress(),
-      await personas.Nancy.getAddress(),
-      await personas.Ned.getAddress(),
-      await personas.Neil.getAddress(),
-    ]
-    const onchainConfig = {
-      paymentPremiumPPB,
-      flatFeeMicroLink,
-      checkGasLimit,
-      stalenessSeconds,
-      gasCeilingMultiplier,
-      minUpkeepSpend,
-      maxCheckDataSize,
-      maxPerformDataSize,
-      maxRevertDataSize,
-      maxPerformGas,
-      fallbackGasPrice,
-      fallbackLinkPrice,
-      transcoder,
-      registrars: [registrar.address],
-      upkeepPrivilegeManager: upkeepManager,
-    }
-    await registry
-      .connect(owner)
-      .setConfigTypeSafe(keepers, keepers, 1, onchainConfig, 1, '0x')
-  })
-
-  describe('#typeAndVersion', () => {
-    it('uses the correct type and version', async () => {
-      const typeAndVersion = await registrar.typeAndVersion()
-      assert.equal(typeAndVersion, 'AutomationRegistrar 2.1.0')
-    })
-  })
-
-  describe('#register', () => {
-    it('reverts if not called by the LINK token', async () => {
-      await evmRevert(
-        registrar
-          .connect(someAddress)
-          .register(
-            upkeepName,
-            emptyBytes,
-            mock.address,
-            performGas,
-            await admin.getAddress(),
-            0,
-            emptyBytes,
-            trigger,
-            offchainConfig,
-            amount,
-            await requestSender.getAddress(),
-          ),
-        'OnlyLink()',
-      )
-    })
-
-    it('reverts if the amount passed in data mismatches actual amount sent', async () => {
-      await registrar
-        .connect(registrarOwner)
-        .setTriggerConfig(
-          Trigger.CONDITION,
-          autoApproveType_ENABLED_ALL,
-          maxAllowedAutoApprove,
-        )
-
-      const abiEncodedBytes = registrar.interface.encodeFunctionData(
-        'register',
-        [
-          upkeepName,
-          emptyBytes,
-          mock.address,
-          performGas,
-          await admin.getAddress(),
-          0,
-          emptyBytes,
-          trigger,
-          offchainConfig,
-          amount1,
-          await requestSender.getAddress(),
-        ],
-      )
-
-      await evmRevert(
-        linkToken
-          .connect(requestSender)
-          .transferAndCall(registrar.address, amount, abiEncodedBytes),
-        'AmountMismatch()',
-      )
-    })
-
-    it('reverts if the sender passed in data mismatches actual sender', async () => {
-      const abiEncodedBytes = registrar.interface.encodeFunctionData(
-        'register',
-        [
-          upkeepName,
-          emptyBytes,
-          mock.address,
-          performGas,
-          await admin.getAddress(),
-          0,
-          emptyBytes,
-          trigger,
-          offchainConfig,
-          amount,
-          await admin.getAddress(), // Should have been requestSender.getAddress()
-        ],
-      )
-      await evmRevert(
-        linkToken
-          .connect(requestSender)
-          .transferAndCall(registrar.address, amount, abiEncodedBytes),
-        'SenderMismatch()',
-      )
-    })
-
-    it('reverts if the admin address is 0x0000...', async () => {
-      const abiEncodedBytes = registrar.interface.encodeFunctionData(
-        'register',
-        [
-          upkeepName,
-          emptyBytes,
-          mock.address,
-          performGas,
-          '0x0000000000000000000000000000000000000000',
-          0,
-          emptyBytes,
-          trigger,
-          offchainConfig,
-          amount,
-          await requestSender.getAddress(),
-        ],
-      )
-
-      await evmRevert(
-        linkToken
-          .connect(requestSender)
-          .transferAndCall(registrar.address, amount, abiEncodedBytes),
-        'RegistrationRequestFailed()',
-      )
-    })
-
-    it('Auto Approve ON - registers an upkeep on KeeperRegistry instantly and emits both RegistrationRequested and RegistrationApproved events', async () => {
-      //set auto approve ON with high threshold limits
-      await registrar
-        .connect(registrarOwner)
-        .setTriggerConfig(
-          Trigger.CONDITION,
-          autoApproveType_ENABLED_ALL,
-          maxAllowedAutoApprove,
-        )
-
-      //register with auto approve ON
-      const abiEncodedBytes = registrar.interface.encodeFunctionData(
-        'register',
-        [
-          upkeepName,
-          emptyBytes,
-          mock.address,
-          performGas,
-          await admin.getAddress(),
-          0,
-          emptyBytes,
-          trigger,
-          offchainConfig,
-          amount,
-          await requestSender.getAddress(),
-        ],
-      )
-      const tx = await linkToken
-        .connect(requestSender)
-        .transferAndCall(registrar.address, amount, abiEncodedBytes)
-
-      const [id] = await registry.getActiveUpkeepIDs(0, 1)
-
-      //confirm if a new upkeep has been registered and the details are the same as the one just registered
-      const newupkeep = await registry.getUpkeep(id)
-      assert.equal(newupkeep.target, mock.address)
-      assert.equal(newupkeep.admin, await admin.getAddress())
-      assert.equal(newupkeep.checkData, emptyBytes)
-      assert.equal(newupkeep.balance.toString(), amount.toString())
-      assert.equal(newupkeep.performGas, performGas.toNumber())
-      assert.equal(newupkeep.offchainConfig, offchainConfig)
-
-      await expect(tx).to.emit(registrar, 'RegistrationRequested')
-      await expect(tx).to.emit(registrar, 'RegistrationApproved')
-    })
-
-    it('Auto Approve OFF - does not registers an upkeep on KeeperRegistry, emits only RegistrationRequested event', async () => {
-      //get upkeep count before attempting registration
-      const beforeCount = (await registry.getState()).state.numUpkeeps
-
-      //set auto approve OFF, threshold limits dont matter in this case
-      await registrar
-        .connect(registrarOwner)
-        .setTriggerConfig(
-          Trigger.CONDITION,
-          autoApproveType_DISABLED,
-          maxAllowedAutoApprove,
-        )
-
-      //register with auto approve OFF
-      const abiEncodedBytes = registrar.interface.encodeFunctionData(
-        'register',
-        [
-          upkeepName,
-          emptyBytes,
-          mock.address,
-          performGas,
-          await admin.getAddress(),
-          0,
-          emptyBytes,
-          trigger,
-          offchainConfig,
-          amount,
-          await requestSender.getAddress(),
-        ],
-      )
-      const tx = await linkToken
-        .connect(requestSender)
-        .transferAndCall(registrar.address, amount, abiEncodedBytes)
-      const receipt = await tx.wait()
-
-      //get upkeep count after attempting registration
-      const afterCount = (await registry.getState()).state.numUpkeeps
-      //confirm that a new upkeep has NOT been registered and upkeep count is still the same
-      assert.deepEqual(beforeCount, afterCount)
-
-      //confirm that only RegistrationRequested event is emitted and RegistrationApproved event is not
-      await expect(tx).to.emit(registrar, 'RegistrationRequested')
-      await expect(tx).not.to.emit(registrar, 'RegistrationApproved')
-
-      const hash = receipt.logs[2].topics[1]
-      const pendingRequest = await registrar.getPendingRequest(hash)
-      assert.equal(await admin.getAddress(), pendingRequest[0])
-      assert.ok(amount.eq(pendingRequest[1]))
-    })
-
-    it('Auto Approve ON - Throttle max approvals - does not register an upkeep on KeeperRegistry beyond the max limit, emits only RegistrationRequested event after limit is hit', async () => {
-      assert.equal((await registry.getState()).state.numUpkeeps.toNumber(), 0)
-
-      //set auto approve on, with max 1 allowed
-      await registrar
-        .connect(registrarOwner)
-        .setTriggerConfig(Trigger.CONDITION, autoApproveType_ENABLED_ALL, 1)
-
-      //set auto approve on, with max 1 allowed
-      await registrar
-        .connect(registrarOwner)
-        .setTriggerConfig(Trigger.LOG, autoApproveType_ENABLED_ALL, 1)
-
-      // register within threshold, new upkeep should be registered
-      let abiEncodedBytes = registrar.interface.encodeFunctionData('register', [
-        upkeepName,
-        emptyBytes,
-        mock.address,
-        performGas,
-        await admin.getAddress(),
-        0,
-        emptyBytes,
-        trigger,
-        offchainConfig,
-        amount,
-        await requestSender.getAddress(),
-      ])
-      await linkToken
-        .connect(requestSender)
-        .transferAndCall(registrar.address, amount, abiEncodedBytes)
-      assert.equal((await registry.getState()).state.numUpkeeps.toNumber(), 1) // 0 -> 1
-
-      // try registering another one, new upkeep should not be registered
-      abiEncodedBytes = registrar.interface.encodeFunctionData('register', [
-        upkeepName,
-        emptyBytes,
-        mock.address,
-        performGas.toNumber() + 1, // make unique hash
-        await admin.getAddress(),
-        0,
-        emptyBytes,
-        trigger,
-        offchainConfig,
-        amount,
-        await requestSender.getAddress(),
-      ])
-      await linkToken
-        .connect(requestSender)
-        .transferAndCall(registrar.address, amount, abiEncodedBytes)
-      assert.equal((await registry.getState()).state.numUpkeeps.toNumber(), 1) // Still 1
-
-      // register a second type of upkeep, different limit
-      abiEncodedBytes = registrar.interface.encodeFunctionData('register', [
-        upkeepName,
-        emptyBytes,
-        mock.address,
-        performGas,
-        await admin.getAddress(),
-        Trigger.LOG,
-        emptyBytes,
-        trigger,
-        offchainConfig,
-        amount,
-        await requestSender.getAddress(),
-      ])
-      await linkToken
-        .connect(requestSender)
-        .transferAndCall(registrar.address, amount, abiEncodedBytes)
-      assert.equal((await registry.getState()).state.numUpkeeps.toNumber(), 2) // 1 -> 2
-
-      // Now set new max limit to 2. One more upkeep should get auto approved
-      await registrar
-        .connect(registrarOwner)
-        .setTriggerConfig(Trigger.CONDITION, autoApproveType_ENABLED_ALL, 2)
-
-      abiEncodedBytes = registrar.interface.encodeFunctionData('register', [
-        upkeepName,
-        emptyBytes,
-        mock.address,
-        performGas.toNumber() + 2, // make unique hash
-        await admin.getAddress(),
-        0,
-        emptyBytes,
-        trigger,
-        offchainConfig,
-        amount,
-        await requestSender.getAddress(),
-      ])
-      await linkToken
-        .connect(requestSender)
-        .transferAndCall(registrar.address, amount, abiEncodedBytes)
-      assert.equal((await registry.getState()).state.numUpkeeps.toNumber(), 3) // 2 -> 3
-
-      // One more upkeep should not get registered
-      abiEncodedBytes = registrar.interface.encodeFunctionData('register', [
-        upkeepName,
-        emptyBytes,
-        mock.address,
-        performGas.toNumber() + 3, // make unique hash
-        await admin.getAddress(),
-        0,
-        emptyBytes,
-        trigger,
-        offchainConfig,
-        amount,
-        await requestSender.getAddress(),
-      ])
-      await linkToken
-        .connect(requestSender)
-        .transferAndCall(registrar.address, amount, abiEncodedBytes)
-      assert.equal((await registry.getState()).state.numUpkeeps.toNumber(), 3) // Still 3
-    })
-
-    it('Auto Approve Sender Allowlist - sender in allowlist - registers an upkeep on KeeperRegistry instantly and emits both RegistrationRequested and RegistrationApproved events', async () => {
-      const senderAddress = await requestSender.getAddress()
-
-      //set auto approve to ENABLED_SENDER_ALLOWLIST type with high threshold limits
-      await registrar
-        .connect(registrarOwner)
-        .setTriggerConfig(
-          Trigger.CONDITION,
-          autoApproveType_ENABLED_SENDER_ALLOWLIST,
-          maxAllowedAutoApprove,
-        )
-
-      // Add sender to allowlist
-      await registrar
-        .connect(registrarOwner)
-        .setAutoApproveAllowedSender(senderAddress, true)
-
-      //register with auto approve ON
-      const abiEncodedBytes = registrar.interface.encodeFunctionData(
-        'register',
-        [
-          upkeepName,
-          emptyBytes,
-          mock.address,
-          performGas,
-          await admin.getAddress(),
-          0,
-          emptyBytes,
-          trigger,
-          offchainConfig,
-          amount,
-          await requestSender.getAddress(),
-        ],
-      )
-      const tx = await linkToken
-        .connect(requestSender)
-        .transferAndCall(registrar.address, amount, abiEncodedBytes)
-
-      const [id] = await registry.getActiveUpkeepIDs(0, 1)
-
-      //confirm if a new upkeep has been registered and the details are the same as the one just registered
-      const newupkeep = await registry.getUpkeep(id)
-      assert.equal(newupkeep.target, mock.address)
-      assert.equal(newupkeep.admin, await admin.getAddress())
-      assert.equal(newupkeep.checkData, emptyBytes)
-      assert.equal(newupkeep.balance.toString(), amount.toString())
-      assert.equal(newupkeep.performGas, performGas.toNumber())
-
-      await expect(tx).to.emit(registrar, 'RegistrationRequested')
-      await expect(tx).to.emit(registrar, 'RegistrationApproved')
-    })
-
-    it('Auto Approve Sender Allowlist - sender NOT in allowlist - does not registers an upkeep on KeeperRegistry, emits only RegistrationRequested event', async () => {
-      const beforeCount = (await registry.getState()).state.numUpkeeps
-      const senderAddress = await requestSender.getAddress()
-
-      //set auto approve to ENABLED_SENDER_ALLOWLIST type with high threshold limits
-      await registrar
-        .connect(registrarOwner)
-        .setTriggerConfig(
-          Trigger.CONDITION,
-          autoApproveType_ENABLED_SENDER_ALLOWLIST,
-          maxAllowedAutoApprove,
-        )
-
-      // Explicitly remove sender from allowlist
-      await registrar
-        .connect(registrarOwner)
-        .setAutoApproveAllowedSender(senderAddress, false)
-
-      //register. auto approve shouldn't happen
-      const abiEncodedBytes = registrar.interface.encodeFunctionData(
-        'register',
-        [
-          upkeepName,
-          emptyBytes,
-          mock.address,
-          performGas,
-          await admin.getAddress(),
-          0,
-          emptyBytes,
-          trigger,
-          offchainConfig,
-          amount,
-          await requestSender.getAddress(),
-        ],
-      )
-      const tx = await linkToken
-        .connect(requestSender)
-        .transferAndCall(registrar.address, amount, abiEncodedBytes)
-      const receipt = await tx.wait()
-
-      //get upkeep count after attempting registration
-      const afterCount = (await registry.getState()).state.numUpkeeps
-      //confirm that a new upkeep has NOT been registered and upkeep count is still the same
-      assert.deepEqual(beforeCount, afterCount)
-
-      //confirm that only RegistrationRequested event is emitted and RegistrationApproved event is not
-      await expect(tx).to.emit(registrar, 'RegistrationRequested')
-      await expect(tx).not.to.emit(registrar, 'RegistrationApproved')
-
-      const hash = receipt.logs[2].topics[1]
-      const pendingRequest = await registrar.getPendingRequest(hash)
-      assert.equal(await admin.getAddress(), pendingRequest[0])
-      assert.ok(amount.eq(pendingRequest[1]))
-    })
-  })
-
-  describe('#registerUpkeep', () => {
-    it('reverts with empty message if amount sent is not available in LINK allowance', async () => {
-      await evmRevert(
-        registrar.connect(someAddress).registerUpkeep({
-          name: upkeepName,
-          upkeepContract: mock.address,
-          gasLimit: performGas,
-          adminAddress: await admin.getAddress(),
-          triggerType: 0,
-          checkData: emptyBytes,
-          triggerConfig: trigger,
-          offchainConfig: emptyBytes,
-          amount,
-          encryptedEmail: emptyBytes,
-        }),
-        '',
-      )
-    })
-
-    it('reverts if the amount passed in data is less than configured minimum', async () => {
-      await registrar
-        .connect(registrarOwner)
-        .setTriggerConfig(
-          Trigger.CONDITION,
-          autoApproveType_ENABLED_ALL,
-          maxAllowedAutoApprove,
-        )
-
-      // amt is one order of magnitude less than minUpkeepSpend
-      const amt = BigNumber.from('100000000000000000')
-
-      await evmRevert(
-        registrar.connect(someAddress).registerUpkeep({
-          name: upkeepName,
-          upkeepContract: mock.address,
-          gasLimit: performGas,
-          adminAddress: await admin.getAddress(),
-          triggerType: 0,
-          checkData: emptyBytes,
-          triggerConfig: trigger,
-          offchainConfig: emptyBytes,
-          amount: amt,
-          encryptedEmail: emptyBytes,
-        }),
-        'InsufficientPayment()',
-      )
-    })
-
-    it('Auto Approve ON - registers an upkeep on KeeperRegistry instantly and emits both RegistrationRequested and RegistrationApproved events', async () => {
-      //set auto approve ON with high threshold limits
-      await registrar
-        .connect(registrarOwner)
-        .setTriggerConfig(
-          Trigger.CONDITION,
-          autoApproveType_ENABLED_ALL,
-          maxAllowedAutoApprove,
-        )
-
-      await linkToken.connect(requestSender).approve(registrar.address, amount)
-
-      const tx = await registrar.connect(requestSender).registerUpkeep({
-        name: upkeepName,
-        upkeepContract: mock.address,
-        gasLimit: performGas,
-        adminAddress: await admin.getAddress(),
-        triggerType: 0,
-        checkData: emptyBytes,
-        triggerConfig: trigger,
-        offchainConfig,
-        amount,
-        encryptedEmail: emptyBytes,
-      })
-      assert.equal((await registry.getState()).state.numUpkeeps.toNumber(), 1) // 0 -> 1
-
-      //confirm if a new upkeep has been registered and the details are the same as the one just registered
-      const [id] = await registry.getActiveUpkeepIDs(0, 1)
-      const newupkeep = await registry.getUpkeep(id)
-      assert.equal(newupkeep.target, mock.address)
-      assert.equal(newupkeep.admin, await admin.getAddress())
-      assert.equal(newupkeep.checkData, emptyBytes)
-      assert.equal(newupkeep.balance.toString(), amount.toString())
-      assert.equal(newupkeep.performGas, performGas.toNumber())
-      assert.equal(newupkeep.offchainConfig, offchainConfig)
-
-      await expect(tx).to.emit(registrar, 'RegistrationRequested')
-      await expect(tx).to.emit(registrar, 'RegistrationApproved')
-    })
-  })
-
-  describe('#setAutoApproveAllowedSender', () => {
-    it('reverts if not called by the owner', async () => {
-      const tx = registrar
-        .connect(stranger)
-        .setAutoApproveAllowedSender(await admin.getAddress(), false)
-      await evmRevert(tx, 'Only callable by owner')
-    })
-
-    it('sets the allowed status correctly and emits log', async () => {
-      const senderAddress = await stranger.getAddress()
-      let tx = await registrar
-        .connect(registrarOwner)
-        .setAutoApproveAllowedSender(senderAddress, true)
-      await expect(tx)
-        .to.emit(registrar, 'AutoApproveAllowedSenderSet')
-        .withArgs(senderAddress, true)
-
-      let senderAllowedStatus = await registrar
-        .connect(owner)
-        .getAutoApproveAllowedSender(senderAddress)
-      assert.isTrue(senderAllowedStatus)
-
-      tx = await registrar
-        .connect(registrarOwner)
-        .setAutoApproveAllowedSender(senderAddress, false)
-      await expect(tx)
-        .to.emit(registrar, 'AutoApproveAllowedSenderSet')
-        .withArgs(senderAddress, false)
-
-      senderAllowedStatus = await registrar
-        .connect(owner)
-        .getAutoApproveAllowedSender(senderAddress)
-      assert.isFalse(senderAllowedStatus)
-    })
-  })
-
-  describe('#setTriggerConfig', () => {
-    it('reverts if not called by the owner', async () => {
-      const tx = registrar
-        .connect(stranger)
-        .setTriggerConfig(Trigger.LOG, autoApproveType_ENABLED_ALL, 100)
-      await evmRevert(tx, 'Only callable by owner')
-    })
-
-    it('changes the config', async () => {
-      const tx = await registrar
-        .connect(registrarOwner)
-        .setTriggerConfig(Trigger.LOG, autoApproveType_ENABLED_ALL, 100)
-      await registrar.getTriggerRegistrationDetails(Trigger.LOG)
-      await expect(tx)
-        .to.emit(registrar, 'TriggerConfigSet')
-        .withArgs(Trigger.LOG, autoApproveType_ENABLED_ALL, 100)
-    })
-  })
-
-  describe('#approve', () => {
-    let hash: string
-
-    beforeEach(async () => {
-      await registrar
-        .connect(registrarOwner)
-        .setTriggerConfig(
-          Trigger.CONDITION,
-          autoApproveType_DISABLED,
-          maxAllowedAutoApprove,
-        )
-
-      //register with auto approve OFF
-      const abiEncodedBytes = registrar.interface.encodeFunctionData(
-        'register',
-        [
-          upkeepName,
-          emptyBytes,
-          mock.address,
-          performGas,
-          await admin.getAddress(),
-          0,
-          emptyBytes,
-          trigger,
-          offchainConfig,
-          amount,
-          await requestSender.getAddress(),
-        ],
-      )
-
-      const tx = await linkToken
-        .connect(requestSender)
-        .transferAndCall(registrar.address, amount, abiEncodedBytes)
-      const receipt = await tx.wait()
-      hash = receipt.logs[2].topics[1]
-    })
-
-    it('reverts if not called by the owner', async () => {
-      const tx = registrar
-        .connect(stranger)
-        .approve(
-          upkeepName,
-          mock.address,
-          performGas,
-          await admin.getAddress(),
-          0,
-          emptyBytes,
-          trigger,
-          emptyBytes,
-          hash,
-        )
-      await evmRevert(tx, 'Only callable by owner')
-    })
-
-    it('reverts if the hash does not exist', async () => {
-      const tx = registrar
-        .connect(registrarOwner)
-        .approve(
-          upkeepName,
-          mock.address,
-          performGas,
-          await admin.getAddress(),
-          0,
-          emptyBytes,
-          trigger,
-          emptyBytes,
-          '0x000000000000000000000000322813fd9a801c5507c9de605d63cea4f2ce6c44',
-        )
-      await evmRevert(tx, errorMsgs.requestNotFound)
-    })
-
-    it('reverts if any member of the payload changes', async () => {
-      let tx = registrar
-        .connect(registrarOwner)
-        .approve(
-          upkeepName,
-          ethers.Wallet.createRandom().address,
-          performGas,
-          await admin.getAddress(),
-          0,
-          emptyBytes,
-          trigger,
-          emptyBytes,
-          hash,
-        )
-      await evmRevert(tx, errorMsgs.hashPayload)
-      tx = registrar
-        .connect(registrarOwner)
-        .approve(
-          upkeepName,
-          mock.address,
-          10000,
-          await admin.getAddress(),
-          0,
-          emptyBytes,
-          trigger,
-          emptyBytes,
-          hash,
-        )
-      await evmRevert(tx, errorMsgs.hashPayload)
-      tx = registrar
-        .connect(registrarOwner)
-        .approve(
-          upkeepName,
-          mock.address,
-          performGas,
-          ethers.Wallet.createRandom().address,
-          0,
-          emptyBytes,
-          trigger,
-          emptyBytes,
-          hash,
-        )
-      await evmRevert(tx, errorMsgs.hashPayload)
-      tx = registrar
-        .connect(registrarOwner)
-        .approve(
-          upkeepName,
-          mock.address,
-          performGas,
-          await admin.getAddress(),
-          0,
-          '0x1234',
-          trigger,
-          emptyBytes,
-          hash,
-        )
-      await evmRevert(tx, errorMsgs.hashPayload)
-    })
-
-    it('approves an existing registration request', async () => {
-      const tx = await registrar
-        .connect(registrarOwner)
-        .approve(
-          upkeepName,
-          mock.address,
-          performGas,
-          await admin.getAddress(),
-          0,
-          emptyBytes,
-          trigger,
-          offchainConfig,
-          hash,
-        )
-      await expect(tx).to.emit(registrar, 'RegistrationApproved')
-    })
-
-    it('deletes the request afterwards / reverts if the request DNE', async () => {
-      await registrar
-        .connect(registrarOwner)
-        .approve(
-          upkeepName,
-          mock.address,
-          performGas,
-          await admin.getAddress(),
-          0,
-          emptyBytes,
-          trigger,
-          offchainConfig,
-          hash,
-        )
-      const tx = registrar
-        .connect(registrarOwner)
-        .approve(
-          upkeepName,
-          mock.address,
-          performGas,
-          await admin.getAddress(),
-          0,
-          emptyBytes,
-          trigger,
-          offchainConfig,
-          hash,
-        )
-      await evmRevert(tx, errorMsgs.requestNotFound)
-    })
-  })
-
-  describe('#cancel', () => {
-    let hash: string
-
-    beforeEach(async () => {
-      await registrar
-        .connect(registrarOwner)
-        .setTriggerConfig(
-          Trigger.CONDITION,
-          autoApproveType_DISABLED,
-          maxAllowedAutoApprove,
-        )
-
-      //register with auto approve OFF
-      const abiEncodedBytes = registrar.interface.encodeFunctionData(
-        'register',
-        [
-          upkeepName,
-          emptyBytes,
-          mock.address,
-          performGas,
-          await admin.getAddress(),
-          0,
-          emptyBytes,
-          trigger,
-          offchainConfig,
-          amount,
-          await requestSender.getAddress(),
-        ],
-      )
-      const tx = await linkToken
-        .connect(requestSender)
-        .transferAndCall(registrar.address, amount, abiEncodedBytes)
-      const receipt = await tx.wait()
-      hash = receipt.logs[2].topics[1]
-      // submit duplicate request (increase balance)
-      await linkToken
-        .connect(requestSender)
-        .transferAndCall(registrar.address, amount, abiEncodedBytes)
-    })
-
-    it('reverts if not called by the admin / owner', async () => {
-      const tx = registrar.connect(stranger).cancel(hash)
-      await evmRevert(tx, errorMsgs.onlyAdmin)
-    })
-
-    it('reverts if the hash does not exist', async () => {
-      const tx = registrar
-        .connect(registrarOwner)
-        .cancel(
-          '0x000000000000000000000000322813fd9a801c5507c9de605d63cea4f2ce6c44',
-        )
-      await evmRevert(tx, errorMsgs.requestNotFound)
-    })
-
-    it('refunds the total request balance to the admin address if owner cancels', async () => {
-      const before = await linkToken.balanceOf(await admin.getAddress())
-      const tx = await registrar.connect(registrarOwner).cancel(hash)
-      const after = await linkToken.balanceOf(await admin.getAddress())
-      assert.isTrue(after.sub(before).eq(amount.mul(BigNumber.from(2))))
-      await expect(tx).to.emit(registrar, 'RegistrationRejected')
-    })
-
-    it('refunds the total request balance to the admin address if admin cancels', async () => {
-      const before = await linkToken.balanceOf(await admin.getAddress())
-      const tx = await registrar.connect(admin).cancel(hash)
-      const after = await linkToken.balanceOf(await admin.getAddress())
-      assert.isTrue(after.sub(before).eq(amount.mul(BigNumber.from(2))))
-      await expect(tx).to.emit(registrar, 'RegistrationRejected')
-    })
-
-    it('deletes the request hash', async () => {
-      await registrar.connect(registrarOwner).cancel(hash)
-      let tx = registrar.connect(registrarOwner).cancel(hash)
-      await evmRevert(tx, errorMsgs.requestNotFound)
-      tx = registrar
-        .connect(registrarOwner)
-        .approve(
-          upkeepName,
-          mock.address,
-          performGas,
-          await admin.getAddress(),
-          0,
-          emptyBytes,
-          trigger,
-          emptyBytes,
-          hash,
-        )
-      await evmRevert(tx, errorMsgs.requestNotFound)
-    })
-  })
-})
diff --git a/core/gethwrappers/generation/generated-wrapper-dependency-versions-do-not-edit.txt b/core/gethwrappers/generation/generated-wrapper-dependency-versions-do-not-edit.txt
index 6bf2ad1b4b2..187589d8ee0 100644
--- a/core/gethwrappers/generation/generated-wrapper-dependency-versions-do-not-edit.txt
+++ b/core/gethwrappers/generation/generated-wrapper-dependency-versions-do-not-edit.txt
@@ -7,7 +7,6 @@ authorized_receiver: ../../contracts/solc/v0.8.19/AuthorizedReceiver/AuthorizedR
 automation_consumer_benchmark: ../../contracts/solc/v0.8.16/AutomationConsumerBenchmark/AutomationConsumerBenchmark.abi ../../contracts/solc/v0.8.16/AutomationConsumerBenchmark/AutomationConsumerBenchmark.bin f52c76f1aaed4be541d82d97189d70f5aa027fc9838037dd7a7d21910c8c488e
 automation_forwarder_logic: ../../contracts/solc/v0.8.16/AutomationForwarderLogic/AutomationForwarderLogic.abi ../../contracts/solc/v0.8.16/AutomationForwarderLogic/AutomationForwarderLogic.bin 15ae0c367297955fdab4b552dbb10e1f2be80a8fde0efec4a4d398693e9d72b5
 automation_registrar_wrapper2_1: ../../contracts/solc/v0.8.16/AutomationRegistrar2_1/AutomationRegistrar2_1.abi ../../contracts/solc/v0.8.16/AutomationRegistrar2_1/AutomationRegistrar2_1.bin eb06d853aab39d3196c593b03e555851cbe8386e0fe54a74c2479f62d14b3c42
-automation_registrar_wrapper2_2: ../../contracts/solc/v0.8.19/AutomationRegistrar2_2/AutomationRegistrar2_2.abi ../../contracts/solc/v0.8.19/AutomationRegistrar2_2/AutomationRegistrar2_2.bin 7c61908c1bb1bfd05a4da22bb73d62c0e2c05240f3f8fb5e06331603ff2246a9
 automation_registrar_wrapper2_3: ../../contracts/solc/v0.8.19/AutomationRegistrar2_3/AutomationRegistrar2_3.abi ../../contracts/solc/v0.8.19/AutomationRegistrar2_3/AutomationRegistrar2_3.bin 8e18d447009546ac8ad15d0d516ad4d663d0e1ca5f723300acb604b5571b63bf
 automation_registry_logic_a_wrapper_2_2: ../../contracts/solc/v0.8.19/AutomationRegistryLogicA2_2/AutomationRegistryLogicA2_2.abi ../../contracts/solc/v0.8.19/AutomationRegistryLogicA2_2/AutomationRegistryLogicA2_2.bin 58d09c16be20a6d3f70be6d06299ed61415b7796c71f176d87ce015e1294e029
 automation_registry_logic_a_wrapper_2_3: ../../contracts/solc/v0.8.19/AutomationRegistryLogicA2_3/AutomationRegistryLogicA2_3.abi ../../contracts/solc/v0.8.19/AutomationRegistryLogicA2_3/AutomationRegistryLogicA2_3.bin 56b9ed9923d0610fcc5c23c7e0d8f013195313138fbd2630b5148aced302582e
diff --git a/core/gethwrappers/go_generate.go b/core/gethwrappers/go_generate.go
index 2744f14c003..2b903ca9f50 100644
--- a/core/gethwrappers/go_generate.go
+++ b/core/gethwrappers/go_generate.go
@@ -56,7 +56,6 @@ package gethwrappers
 //go:generate go run ./generation/generate/wrap.go ../../contracts/solc/v0.8.16/KeeperRegistryLogicB2_1/KeeperRegistryLogicB2_1.abi ../../contracts/solc/v0.8.16/KeeperRegistryLogicB2_1/KeeperRegistryLogicB2_1.bin KeeperRegistryLogicB keeper_registry_logic_b_wrapper_2_1
 //go:generate go run ./generation/generate/wrap.go ../../contracts/solc/v0.8.16/IKeeperRegistryMaster/IKeeperRegistryMaster.abi ../../contracts/solc/v0.8.16/IKeeperRegistryMaster/IKeeperRegistryMaster.bin IKeeperRegistryMaster i_keeper_registry_master_wrapper_2_1
 //go:generate go run ./generation/generate/wrap.go ../../contracts/solc/v0.8.16/AutomationUtils2_1/AutomationUtils2_1.abi ../../contracts/solc/v0.8.16/AutomationUtils2_1/AutomationUtils2_1.bin AutomationUtils automation_utils_2_1
-//go:generate go run ./generation/generate/wrap.go ../../contracts/solc/v0.8.19/AutomationRegistrar2_2/AutomationRegistrar2_2.abi ../../contracts/solc/v0.8.19/AutomationRegistrar2_2/AutomationRegistrar2_2.bin AutomationRegistrar automation_registrar_wrapper2_2
 //go:generate go run ./generation/generate/wrap.go ../../contracts/solc/v0.8.19/AutomationRegistry2_2/AutomationRegistry2_2.abi ../../contracts/solc/v0.8.19/AutomationRegistry2_2/AutomationRegistry2_2.bin AutomationRegistry automation_registry_wrapper_2_2
 //go:generate go run ./generation/generate/wrap.go ../../contracts/solc/v0.8.19/AutomationRegistryLogicA2_2/AutomationRegistryLogicA2_2.abi ../../contracts/solc/v0.8.19/AutomationRegistryLogicA2_2/AutomationRegistryLogicA2_2.bin AutomationRegistryLogicA automation_registry_logic_a_wrapper_2_2
 //go:generate go run ./generation/generate/wrap.go ../../contracts/solc/v0.8.19/AutomationRegistryLogicB2_2/AutomationRegistryLogicB2_2.abi ../../contracts/solc/v0.8.19/AutomationRegistryLogicB2_2/AutomationRegistryLogicB2_2.bin AutomationRegistryLogicB automation_registry_logic_b_wrapper_2_2