move registry 2.2 and chain modules out of dev (#12327)

* remove unused registrar 2_2

* move registry 2.2 and chain modules out of dev

* fix foundry test path

* fix foundry test

contracts/scripts/generate-automation-master-interface.ts

@@ -9,7 +9,7 @@ import { utils } from 'ethers'
 import fs from 'fs'
 import { exec } from 'child_process'
 
-const dest = 'src/v0.8/automation/dev/interfaces/v2_2'
+const dest = 'src/v0.8/automation/interfaces/v2_2'
 const srcDest = `${dest}/IAutomationRegistryMaster.sol`
 const tmpDest = `${dest}/tmp.txt`
 

contracts/scripts/native_solc_compile_all_automation

@@ -86,17 +86,17 @@ solc-select use $SOLC_VERSION
 export SOLC_VERSION=$SOLC_VERSION
 
 # v0.8.19
-compileContract automation/dev/v2_2/AutomationRegistry2_2.sol
-compileContract automation/dev/v2_2/AutomationRegistryLogicA2_2.sol
-compileContract automation/dev/v2_2/AutomationRegistryLogicB2_2.sol
-compileContract automation/dev/v2_2/AutomationUtils2_2.sol
-compileContract automation/dev/interfaces/v2_2/IAutomationRegistryMaster.sol
-compileContract automation/dev/chains/ArbitrumModule.sol
-compileContract automation/dev/chains/ChainModuleBase.sol
-compileContract automation/dev/chains/OptimismModule.sol
-compileContract automation/dev/chains/ScrollModule.sol
-
-compileContract automation/dev/interfaces/IChainModule.sol
+compileContract automation/v2_2/AutomationRegistry2_2.sol
+compileContract automation/v2_2/AutomationRegistryLogicA2_2.sol
+compileContract automation/v2_2/AutomationRegistryLogicB2_2.sol
+compileContract automation/v2_2/AutomationUtils2_2.sol
+compileContract automation/interfaces/v2_2/IAutomationRegistryMaster.sol
+compileContract automation/chains/ArbitrumModule.sol
+compileContract automation/chains/ChainModuleBase.sol
+compileContract automation/chains/OptimismModule.sol
+compileContract automation/chains/ScrollModule.sol
+compileContract automation/interfaces/IChainModule.sol
+
 compileContract automation/dev/v2_3/AutomationRegistrar2_3.sol
 compileContract automation/dev/v2_3/AutomationRegistry2_3.sol
 compileContract automation/dev/v2_3/AutomationRegistryLogicA2_3.sol

contracts/src/v0.8/automation/dev/chains/ArbitrumModule.sol → contracts/src/v0.8/automation/chains/ArbitrumModule.sol

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity 0.8.19;
 
-import {ArbSys} from "../../../vendor/@arbitrum/nitro-contracts/src/precompiles/ArbSys.sol";
-import {ArbGasInfo} from "../../../vendor/@arbitrum/nitro-contracts/src/precompiles/ArbGasInfo.sol";
+import {ArbSys} from "../../vendor/@arbitrum/nitro-contracts/src/precompiles/ArbSys.sol";
+import {ArbGasInfo} from "../../vendor/@arbitrum/nitro-contracts/src/precompiles/ArbGasInfo.sol";
 import {ChainModuleBase} from "./ChainModuleBase.sol";
 
 contract ArbitrumModule is ChainModuleBase {

contracts/src/v0.8/automation/dev/chains/OptimismModule.sol → contracts/src/v0.8/automation/chains/OptimismModule.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity 0.8.19;
 
-import {OVM_GasPriceOracle} from "../../../vendor/@eth-optimism/contracts/v0.8.9/contracts/L2/predeploys/OVM_GasPriceOracle.sol";
+import {OVM_GasPriceOracle} from "../../vendor/@eth-optimism/contracts/v0.8.9/contracts/L2/predeploys/OVM_GasPriceOracle.sol";
 import {ChainModuleBase} from "./ChainModuleBase.sol";
 
 contract OptimismModule is ChainModuleBase {

contracts/src/v0.8/automation/dev/chains/ScrollModule.sol → contracts/src/v0.8/automation/chains/ScrollModule.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity 0.8.19;
 
-import {IScrollL1GasPriceOracle} from "../../../vendor/@scroll-tech/contracts/src/L2/predeploys/IScrollL1GasPriceOracle.sol";
+import {IScrollL1GasPriceOracle} from "../../vendor/@scroll-tech/contracts/src/L2/predeploys/IScrollL1GasPriceOracle.sol";
 import {ChainModuleBase} from "./ChainModuleBase.sol";
 
 contract ScrollModule is ChainModuleBase {

contracts/src/v0.8/automation/dev/test/AutomationRegistry2_3.t.sol

@@ -8,7 +8,7 @@ import {AutomationRegistryBase2_3} from "../v2_3/AutomationRegistryBase2_3.sol";
 import {AutomationRegistryLogicA2_3} from "../v2_3/AutomationRegistryLogicA2_3.sol";
 import {AutomationRegistryLogicB2_3} from "../v2_3/AutomationRegistryLogicB2_3.sol";
 import {IAutomationRegistryMaster} from "../interfaces/v2_3/IAutomationRegistryMaster2_3.sol";
-import {ChainModuleBase} from "../chains/ChainModuleBase.sol";
+import {ChainModuleBase} from "../../chains/ChainModuleBase.sol";
 
 contract AutomationRegistry2_3_SetUp is BaseTest {
   address internal constant LINK_ETH_FEED = 0x1111111111111111111111111111111111111110;

contracts/src/v0.8/automation/dev/v2_3/AutomationRegistryBase2_3.sol

@@ -11,7 +11,7 @@ import {AggregatorV3Interface} from "../../../shared/interfaces/AggregatorV3Inte
 import {LinkTokenInterface} from "../../../shared/interfaces/LinkTokenInterface.sol";
 import {KeeperCompatibleInterface} from "../../interfaces/KeeperCompatibleInterface.sol";
 import {UpkeepFormat} from "../../interfaces/UpkeepTranscoderInterface.sol";
-import {IChainModule} from "../interfaces/IChainModule.sol";
+import {IChainModule} from "../../interfaces/IChainModule.sol";
 
 /**
  * @notice Base Keeper Registry contract, contains shared logic between

contracts/src/v0.8/automation/dev/v2_3/AutomationRegistryLogicB2_3.sol

@@ -6,7 +6,7 @@ import {EnumerableSet} from "../../../vendor/openzeppelin-solidity/v4.7.3/contra
 import {Address} from "../../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/Address.sol";
 import {UpkeepFormat} from "../../interfaces/UpkeepTranscoderInterface.sol";
 import {IAutomationForwarder} from "../../interfaces/IAutomationForwarder.sol";
-import {IChainModule} from "../interfaces/IChainModule.sol";
+import {IChainModule} from "../../interfaces/IChainModule.sol";
 
 contract AutomationRegistryLogicB2_3 is AutomationRegistryBase2_3 {
   using Address for address;

contracts/src/v0.8/automation/dev/test/AutomationRegistry2_2.t.sol → contracts/src/v0.8/automation/test/AutomationRegistry2_2.t.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity 0.8.19;
 
-import {AutomationForwarderLogic} from "../../AutomationForwarderLogic.sol";
+import {AutomationForwarderLogic} from "../AutomationForwarderLogic.sol";
 import {BaseTest} from "./BaseTest.t.sol";
 import {AutomationRegistry2_2} from "../v2_2/AutomationRegistry2_2.sol";
 import {AutomationRegistryBase2_2} from "../v2_2/AutomationRegistryBase2_2.sol";

contracts/src/v0.8/automation/dev/v2_2/AutomationRegistry2_2.sol → contracts/src/v0.8/automation/v2_2/AutomationRegistry2_2.sol

@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity 0.8.19;
 
-import {EnumerableSet} from "../../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/structs/EnumerableSet.sol";
-import {Address} from "../../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/Address.sol";
+import {EnumerableSet} from "../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/structs/EnumerableSet.sol";
+import {Address} from "../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/Address.sol";
 import {AutomationRegistryBase2_2} from "./AutomationRegistryBase2_2.sol";
 import {AutomationRegistryLogicB2_2} from "./AutomationRegistryLogicB2_2.sol";
-import {Chainable} from "../../Chainable.sol";
-import {IERC677Receiver} from "../../../shared/interfaces/IERC677Receiver.sol";
-import {OCR2Abstract} from "../../../shared/ocr2/OCR2Abstract.sol";
+import {Chainable} from "../Chainable.sol";
+import {IERC677Receiver} from "../../shared/interfaces/IERC677Receiver.sol";
+import {OCR2Abstract} from "../../shared/ocr2/OCR2Abstract.sol";
 
 /**
  * @notice Registry for adding work for Chainlink nodes to perform on client

contracts/src/v0.8/automation/dev/v2_2/AutomationRegistryBase2_2.sol → contracts/src/v0.8/automation/v2_2/AutomationRegistryBase2_2.sol

@@ -1,16 +1,16 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity 0.8.19;
 
-import {EnumerableSet} from "../../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/structs/EnumerableSet.sol";
-import {Address} from "../../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/Address.sol";
-import {StreamsLookupCompatibleInterface} from "../../interfaces/StreamsLookupCompatibleInterface.sol";
-import {ILogAutomation, Log} from "../../interfaces/ILogAutomation.sol";
-import {IAutomationForwarder} from "../../interfaces/IAutomationForwarder.sol";
-import {ConfirmedOwner} from "../../../shared/access/ConfirmedOwner.sol";
-import {AggregatorV3Interface} from "../../../shared/interfaces/AggregatorV3Interface.sol";
-import {LinkTokenInterface} from "../../../shared/interfaces/LinkTokenInterface.sol";
-import {KeeperCompatibleInterface} from "../../interfaces/KeeperCompatibleInterface.sol";
-import {UpkeepFormat} from "../../interfaces/UpkeepTranscoderInterface.sol";
+import {EnumerableSet} from "../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/structs/EnumerableSet.sol";
+import {Address} from "../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/Address.sol";
+import {StreamsLookupCompatibleInterface} from "../interfaces/StreamsLookupCompatibleInterface.sol";
+import {ILogAutomation, Log} from "../interfaces/ILogAutomation.sol";
+import {IAutomationForwarder} from "../interfaces/IAutomationForwarder.sol";
+import {ConfirmedOwner} from "../../shared/access/ConfirmedOwner.sol";
+import {AggregatorV3Interface} from "../../shared/interfaces/AggregatorV3Interface.sol";
+import {LinkTokenInterface} from "../../shared/interfaces/LinkTokenInterface.sol";
+import {KeeperCompatibleInterface} from "../interfaces/KeeperCompatibleInterface.sol";
+import {UpkeepFormat} from "../interfaces/UpkeepTranscoderInterface.sol";
 import {IChainModule} from "../interfaces/IChainModule.sol";
 
 /**

contracts/src/v0.8/automation/dev/v2_2/AutomationRegistryLogicA2_2.sol → contracts/src/v0.8/automation/v2_2/AutomationRegistryLogicA2_2.sol

@@ -1,15 +1,15 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity 0.8.19;
 
-import {EnumerableSet} from "../../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/structs/EnumerableSet.sol";
-import {Address} from "../../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/Address.sol";
+import {EnumerableSet} from "../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/structs/EnumerableSet.sol";
+import {Address} from "../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/Address.sol";
 import {AutomationRegistryBase2_2} from "./AutomationRegistryBase2_2.sol";
 import {AutomationRegistryLogicB2_2} from "./AutomationRegistryLogicB2_2.sol";
-import {Chainable} from "../../Chainable.sol";
-import {AutomationForwarder} from "../../AutomationForwarder.sol";
-import {IAutomationForwarder} from "../../interfaces/IAutomationForwarder.sol";
-import {UpkeepTranscoderInterfaceV2} from "../../interfaces/UpkeepTranscoderInterfaceV2.sol";
-import {MigratableKeeperRegistryInterfaceV2} from "../../interfaces/MigratableKeeperRegistryInterfaceV2.sol";
+import {Chainable} from "../Chainable.sol";
+import {AutomationForwarder} from "../AutomationForwarder.sol";
+import {IAutomationForwarder} from "../interfaces/IAutomationForwarder.sol";
+import {UpkeepTranscoderInterfaceV2} from "../interfaces/UpkeepTranscoderInterfaceV2.sol";
+import {MigratableKeeperRegistryInterfaceV2} from "../interfaces/MigratableKeeperRegistryInterfaceV2.sol";
 
 /**
  * @notice Logic contract, works in tandem with AutomationRegistry as a proxy

contracts/src/v0.8/automation/dev/v2_2/AutomationRegistryLogicB2_2.sol → contracts/src/v0.8/automation/v2_2/AutomationRegistryLogicB2_2.sol

@@ -2,10 +2,10 @@
 pragma solidity 0.8.19;
 
 import {AutomationRegistryBase2_2} from "./AutomationRegistryBase2_2.sol";
-import {EnumerableSet} from "../../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/structs/EnumerableSet.sol";
-import {Address} from "../../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/Address.sol";
-import {UpkeepFormat} from "../../interfaces/UpkeepTranscoderInterface.sol";
-import {IAutomationForwarder} from "../../interfaces/IAutomationForwarder.sol";
+import {EnumerableSet} from "../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/structs/EnumerableSet.sol";
+import {Address} from "../../vendor/openzeppelin-solidity/v4.7.3/contracts/utils/Address.sol";
+import {UpkeepFormat} from "../interfaces/UpkeepTranscoderInterface.sol";
+import {IAutomationForwarder} from "../interfaces/IAutomationForwarder.sol";
 import {IChainModule} from "../interfaces/IChainModule.sol";
 
 contract AutomationRegistryLogicB2_2 is AutomationRegistryBase2_2 {

contracts/src/v0.8/automation/dev/v2_2/AutomationUtils2_2.sol → contracts/src/v0.8/automation/v2_2/AutomationUtils2_2.sol

@@ -2,7 +2,7 @@
 pragma solidity 0.8.19;
 
 import {AutomationRegistryBase2_2} from "./AutomationRegistryBase2_2.sol";
-import {Log} from "../../interfaces/ILogAutomation.sol";
+import {Log} from "../interfaces/ILogAutomation.sol";
 
 /**
  * @notice this file exposes structs that are otherwise internal to the automation registry