move v2_3 out of dev folder (#13504)

smartcontractkit · Jun 12, 2024 · 815c5ea · 815c5ea
1 parent ebd87f7
commit 815c5ea
Show file tree

Hide file tree

Showing 21 changed files with 88 additions and 78 deletions.
diff --git a/.changeset/ten-falcons-suffer.md b/.changeset/ten-falcons-suffer.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+move v23 contracts #bugfix
diff --git a/contracts/.changeset/proud-seals-draw.md b/contracts/.changeset/proud-seals-draw.md
@@ -0,0 +1,5 @@
+---
+"@chainlink/contracts": patch
+---
+
+move v23 contracts #bugfix
diff --git a/contracts/.solhintignore b/contracts/.solhintignore
@@ -22,7 +22,7 @@
 ./src/v0.8/automation/AutomationForwarder.sol
 ./src/v0.8/automation/AutomationForwarderLogic.sol
 ./src/v0.8/automation/interfaces/v2_2/IAutomationRegistryMaster.sol
-./src/v0.8/automation/dev/interfaces/v2_3/IAutomationRegistryMaster2_3.sol
+./src/v0.8/automation/interfaces/v2_3/IAutomationRegistryMaster2_3.sol
 
 
 # Ignore tests / test helpers (for now)

diff --git a/contracts/scripts/generate-automation-master-interface-v2_3.ts b/contracts/scripts/generate-automation-master-interface-v2_3.ts
@@ -10,7 +10,7 @@ import { utils } from 'ethers'
 import fs from 'fs'
 import { exec } from 'child_process'
 
-const dest = 'src/v0.8/automation/dev/interfaces/v2_3'
+const dest = 'src/v0.8/automation/interfaces/v2_3'
 const srcDest = `${dest}/IAutomationRegistryMaster2_3.sol`
 const tmpDest = `${dest}/tmp.txt`
 

diff --git a/contracts/scripts/native_solc_compile_all_automation b/contracts/scripts/native_solc_compile_all_automation
@@ -99,10 +99,10 @@ compileContract automation/interfaces/IChainModule.sol
 compileContract automation/interfaces/IAutomationV21PlusCommon.sol
 compileContract automation/AutomationCompatibleUtils.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
-compileContract automation/dev/v2_3/AutomationRegistryLogicB2_3.sol
-compileContract automation/dev/v2_3/AutomationRegistryLogicC2_3.sol
-compileContract automation/dev/v2_3/AutomationUtils2_3.sol
-compileContract automation/dev/interfaces/v2_3/IAutomationRegistryMaster2_3.sol
+compileContract automation/v2_3/AutomationRegistrar2_3.sol
+compileContract automation/v2_3/AutomationRegistry2_3.sol
+compileContract automation/v2_3/AutomationRegistryLogicA2_3.sol
+compileContract automation/v2_3/AutomationRegistryLogicB2_3.sol
+compileContract automation/v2_3/AutomationRegistryLogicC2_3.sol
+compileContract automation/v2_3/AutomationUtils2_3.sol
+compileContract automation/interfaces/v2_3/IAutomationRegistryMaster2_3.sol
diff --git a/...ces/v2_3/IAutomationRegistryMaster2_3.sol → ...ces/v2_3/IAutomationRegistryMaster2_3.sol b/...ces/v2_3/IAutomationRegistryMaster2_3.sol → ...ces/v2_3/IAutomationRegistryMaster2_3.sol
diff --git a/...on/dev/interfaces/v2_3/IWrappedNative.sol → ...mation/interfaces/v2_3/IWrappedNative.sol b/...on/dev/interfaces/v2_3/IWrappedNative.sol → ...mation/interfaces/v2_3/IWrappedNative.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.0;
 
-import {IERC20Metadata as IERC20} from "../../../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+import {IERC20Metadata as IERC20} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 
 interface IWrappedNative is IERC20 {
   function deposit() external payable;

diff --git a/...ion/dev/test/AutomationRegistrar2_3.t.sol → ...on/test/v2_3/AutomationRegistrar2_3.t.sol b/...ion/dev/test/AutomationRegistrar2_3.t.sol → ...on/test/v2_3/AutomationRegistrar2_3.t.sol
@@ -2,13 +2,13 @@
 pragma solidity 0.8.19;
 
 import {BaseTest} from "./BaseTest.t.sol";
-import {IAutomationRegistryMaster2_3} from "../interfaces/v2_3/IAutomationRegistryMaster2_3.sol";
-import {AutomationRegistrar2_3} from "../v2_3/AutomationRegistrar2_3.sol";
+import {IAutomationRegistryMaster2_3} from "../../interfaces/v2_3/IAutomationRegistryMaster2_3.sol";
+import {AutomationRegistrar2_3} from "../../v2_3/AutomationRegistrar2_3.sol";
 import {IERC20Metadata as IERC20} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-import {AutomationRegistryBase2_3 as AutoBase} from "../v2_3/AutomationRegistryBase2_3.sol";
-import {IWrappedNative} from "../interfaces/v2_3/IWrappedNative.sol";
+import {AutomationRegistryBase2_3 as AutoBase} from "../../v2_3/AutomationRegistryBase2_3.sol";
+import {IWrappedNative} from "../../interfaces/v2_3/IWrappedNative.sol";
 
-// forge test --match-path src/v0.8/automation/dev/test/AutomationRegistrar2_3.t.sol
+// forge test --match-path src/v0.8/automation/test/v2_3/AutomationRegistrar2_3.t.sol
 
 contract SetUp is BaseTest {
   IAutomationRegistryMaster2_3 internal registry;

diff --git a/...tion/dev/test/AutomationRegistry2_3.t.sol → ...ion/test/v2_3/AutomationRegistry2_3.t.sol b/...tion/dev/test/AutomationRegistry2_3.t.sol → ...ion/test/v2_3/AutomationRegistry2_3.t.sol
@@ -3,14 +3,14 @@ pragma solidity 0.8.19;
 
 import {Vm} from "forge-std/Test.sol";
 import {BaseTest} from "./BaseTest.t.sol";
-import {AutomationRegistryBase2_3 as AutoBase} from "../v2_3/AutomationRegistryBase2_3.sol";
-import {AutomationRegistrar2_3 as Registrar} from "../v2_3/AutomationRegistrar2_3.sol";
-import {IAutomationRegistryMaster2_3 as Registry, AutomationRegistryBase2_3, IAutomationV21PlusCommon} from "../interfaces/v2_3/IAutomationRegistryMaster2_3.sol";
+import {AutomationRegistryBase2_3 as AutoBase} from "../../v2_3/AutomationRegistryBase2_3.sol";
+import {AutomationRegistrar2_3 as Registrar} from "../../v2_3/AutomationRegistrar2_3.sol";
+import {IAutomationRegistryMaster2_3 as Registry, AutomationRegistryBase2_3, IAutomationV21PlusCommon} from "../../interfaces/v2_3/IAutomationRegistryMaster2_3.sol";
 import {ChainModuleBase} from "../../chains/ChainModuleBase.sol";
 import {IERC20Metadata as IERC20} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-import {IWrappedNative} from "../interfaces/v2_3/IWrappedNative.sol";
+import {IWrappedNative} from "../../interfaces/v2_3/IWrappedNative.sol";
 
-// forge test --match-path src/v0.8/automation/dev/test/AutomationRegistry2_3.t.sol
+// forge test --match-path src/v0.8/automation/test/v2_3/AutomationRegistry2_3.t.sol
 
 enum Trigger {
   CONDITION,

diff --git a/...c/v0.8/automation/dev/test/BaseTest.t.sol → .../v0.8/automation/test/v2_3/BaseTest.t.sol b/...c/v0.8/automation/dev/test/BaseTest.t.sol → .../v0.8/automation/test/v2_3/BaseTest.t.sol
@@ -8,18 +8,18 @@ import {ERC20Mock} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/
 import {ERC20Mock6Decimals} from "../../mocks/ERC20Mock6Decimals.sol";
 import {MockV3Aggregator} from "../../../tests/MockV3Aggregator.sol";
 import {AutomationForwarderLogic} from "../../AutomationForwarderLogic.sol";
-import {UpkeepTranscoder5_0 as Transcoder} from "../v2_3/UpkeepTranscoder5_0.sol";
-import {AutomationRegistry2_3} from "../v2_3/AutomationRegistry2_3.sol";
-import {AutomationRegistryBase2_3 as AutoBase} 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 {AutomationRegistryLogicC2_3} from "../v2_3/AutomationRegistryLogicC2_3.sol";
-import {IAutomationRegistryMaster2_3 as Registry, AutomationRegistryBase2_3} from "../interfaces/v2_3/IAutomationRegistryMaster2_3.sol";
-import {AutomationRegistrar2_3} from "../v2_3/AutomationRegistrar2_3.sol";
+import {UpkeepTranscoder5_0 as Transcoder} from "../../v2_3/UpkeepTranscoder5_0.sol";
+import {AutomationRegistry2_3} from "../../v2_3/AutomationRegistry2_3.sol";
+import {AutomationRegistryBase2_3 as AutoBase} 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 {AutomationRegistryLogicC2_3} from "../../v2_3/AutomationRegistryLogicC2_3.sol";
+import {IAutomationRegistryMaster2_3 as Registry, AutomationRegistryBase2_3} from "../../interfaces/v2_3/IAutomationRegistryMaster2_3.sol";
+import {AutomationRegistrar2_3} from "../../v2_3/AutomationRegistrar2_3.sol";
 import {ChainModuleBase} from "../../chains/ChainModuleBase.sol";
 import {IERC20Metadata as IERC20} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import {MockUpkeep} from "../../mocks/MockUpkeep.sol";
-import {IWrappedNative} from "../interfaces/v2_3/IWrappedNative.sol";
+import {IWrappedNative} from "../../interfaces/v2_3/IWrappedNative.sol";
 import {WETH9} from "./WETH9.sol";
 
 /**

diff --git a/...ts/src/v0.8/automation/dev/test/WETH9.sol → ...s/src/v0.8/automation/test/v2_3/WETH9.sol b/...ts/src/v0.8/automation/dev/test/WETH9.sol → ...s/src/v0.8/automation/test/v2_3/WETH9.sol
diff --git a/...ation/dev/v2_3/AutomationRegistrar2_3.sol → ...utomation/v2_3/AutomationRegistrar2_3.sol b/...ation/dev/v2_3/AutomationRegistrar2_3.sol → ...utomation/v2_3/AutomationRegistrar2_3.sol
@@ -1,15 +1,15 @@
 // SPDX-License-Identifier: BUSL-1.1
 pragma solidity 0.8.19;
 
-import {LinkTokenInterface} from "../../../shared/interfaces/LinkTokenInterface.sol";
+import {LinkTokenInterface} from "../../shared/interfaces/LinkTokenInterface.sol";
 import {IAutomationRegistryMaster2_3} from "../interfaces/v2_3/IAutomationRegistryMaster2_3.sol";
-import {TypeAndVersionInterface} from "../../../interfaces/TypeAndVersionInterface.sol";
-import {ConfirmedOwner} from "../../../shared/access/ConfirmedOwner.sol";
-import {IERC677Receiver} from "../../../shared/interfaces/IERC677Receiver.sol";
-import {IERC20Metadata as IERC20} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+import {TypeAndVersionInterface} from "../../interfaces/TypeAndVersionInterface.sol";
+import {ConfirmedOwner} from "../../shared/access/ConfirmedOwner.sol";
+import {IERC677Receiver} from "../../shared/interfaces/IERC677Receiver.sol";
+import {IERC20Metadata as IERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import {IWrappedNative} from "../interfaces/v2_3/IWrappedNative.sol";
-import {SafeCast} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/math/SafeCast.sol";
-import {SafeERC20} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/utils/SafeERC20.sol";
+import {SafeCast} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/math/SafeCast.sol";
+import {SafeERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/utils/SafeERC20.sol";
 
 /**
  * @notice Contract to accept requests for upkeep registrations

diff --git a/...mation/dev/v2_3/AutomationRegistry2_3.sol → ...automation/v2_3/AutomationRegistry2_3.sol b/...mation/dev/v2_3/AutomationRegistry2_3.sol → ...automation/v2_3/AutomationRegistry2_3.sol
@@ -1,14 +1,14 @@
 // 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_3} from "./AutomationRegistryBase2_3.sol";
 import {AutomationRegistryLogicA2_3} from "./AutomationRegistryLogicA2_3.sol";
 import {AutomationRegistryLogicC2_3} from "./AutomationRegistryLogicC2_3.sol";
-import {Chainable} from "../../Chainable.sol";
-import {OCR2Abstract} from "../../../shared/ocr2/OCR2Abstract.sol";
-import {IERC20Metadata as IERC20} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+import {Chainable} from "../Chainable.sol";
+import {OCR2Abstract} from "../../shared/ocr2/OCR2Abstract.sol";
+import {IERC20Metadata as IERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 
 /**
  * @notice Registry for adding work for Chainlink nodes to perform on client

diff --git a/...on/dev/v2_3/AutomationRegistryBase2_3.sol → ...mation/v2_3/AutomationRegistryBase2_3.sol b/...on/dev/v2_3/AutomationRegistryBase2_3.sol → ...mation/v2_3/AutomationRegistryBase2_3.sol
@@ -1,18 +1,18 @@
 // 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 {IChainModule} from "../../interfaces/IChainModule.sol";
-import {IERC20Metadata as IERC20} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-import {SafeCast} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/math/SafeCast.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 {IChainModule} from "../interfaces/IChainModule.sol";
+import {IERC20Metadata as IERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+import {SafeCast} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/math/SafeCast.sol";
 import {IWrappedNative} from "../interfaces/v2_3/IWrappedNative.sol";
 
 /**

diff --git a/.../dev/v2_3/AutomationRegistryLogicA2_3.sol → ...tion/v2_3/AutomationRegistryLogicA2_3.sol b/.../dev/v2_3/AutomationRegistryLogicA2_3.sol → ...tion/v2_3/AutomationRegistryLogicA2_3.sol
@@ -1,19 +1,19 @@
 // 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_3} from "./AutomationRegistryBase2_3.sol";
 import {AutomationRegistryLogicC2_3} from "./AutomationRegistryLogicC2_3.sol";
 import {AutomationRegistryLogicB2_3} from "./AutomationRegistryLogicB2_3.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 {IERC20Metadata as IERC20} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-import {SafeERC20} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/utils/SafeERC20.sol";
-import {IERC677Receiver} from "../../../shared/interfaces/IERC677Receiver.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 {IERC20Metadata as IERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+import {SafeERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/utils/SafeERC20.sol";
+import {IERC677Receiver} from "../../shared/interfaces/IERC677Receiver.sol";
 
 /**
  * @notice Logic contract, works in tandem with AutomationRegistry as a proxy

diff --git a/.../dev/v2_3/AutomationRegistryLogicB2_3.sol → ...tion/v2_3/AutomationRegistryLogicB2_3.sol b/.../dev/v2_3/AutomationRegistryLogicB2_3.sol → ...tion/v2_3/AutomationRegistryLogicB2_3.sol
@@ -2,13 +2,13 @@
 pragma solidity 0.8.19;
 
 import {AutomationRegistryBase2_3} from "./AutomationRegistryBase2_3.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 {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 {AutomationRegistryLogicC2_3} from "./AutomationRegistryLogicC2_3.sol";
-import {Chainable} from "../../Chainable.sol";
-import {IERC20Metadata as IERC20} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-import {SafeERC20} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/utils/SafeERC20.sol";
-import {SafeCast} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/math/SafeCast.sol";
+import {Chainable} from "../Chainable.sol";
+import {IERC20Metadata as IERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+import {SafeERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/utils/SafeERC20.sol";
+import {SafeCast} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/utils/math/SafeCast.sol";
 
 contract AutomationRegistryLogicB2_3 is AutomationRegistryBase2_3, Chainable {
   using Address for address;

diff --git a/.../dev/v2_3/AutomationRegistryLogicC2_3.sol → ...tion/v2_3/AutomationRegistryLogicC2_3.sol b/.../dev/v2_3/AutomationRegistryLogicC2_3.sol → ...tion/v2_3/AutomationRegistryLogicC2_3.sol
@@ -2,12 +2,12 @@
 pragma solidity 0.8.19;
 
 import {AutomationRegistryBase2_3} from "./AutomationRegistryBase2_3.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 {IAutomationForwarder} from "../../interfaces/IAutomationForwarder.sol";
-import {IChainModule} from "../../interfaces/IChainModule.sol";
-import {IERC20Metadata as IERC20} from "../../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/extensions/IERC20Metadata.sol";
-import {IAutomationV21PlusCommon} from "../../interfaces/IAutomationV21PlusCommon.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 {IAutomationForwarder} from "../interfaces/IAutomationForwarder.sol";
+import {IChainModule} from "../interfaces/IChainModule.sol";
+import {IERC20Metadata as IERC20} from "../../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/extensions/IERC20Metadata.sol";
+import {IAutomationV21PlusCommon} from "../interfaces/IAutomationV21PlusCommon.sol";
 
 contract AutomationRegistryLogicC2_3 is AutomationRegistryBase2_3 {
   using Address for address;

diff --git a/...utomation/dev/v2_3/AutomationUtils2_3.sol → ....8/automation/v2_3/AutomationUtils2_3.sol b/...utomation/dev/v2_3/AutomationUtils2_3.sol → ....8/automation/v2_3/AutomationUtils2_3.sol
diff --git a/...acts/src/v0.8/automation/dev/v2_3/LICENSE → contracts/src/v0.8/automation/v2_3/LICENSE b/...acts/src/v0.8/automation/dev/v2_3/LICENSE → contracts/src/v0.8/automation/v2_3/LICENSE
diff --git a/...tomation/dev/v2_3/UpkeepTranscoder5_0.sol → ...8/automation/v2_3/UpkeepTranscoder5_0.sol b/...tomation/dev/v2_3/UpkeepTranscoder5_0.sol → ...8/automation/v2_3/UpkeepTranscoder5_0.sol
@@ -2,8 +2,8 @@
 
 pragma solidity 0.8.19;
 
-import {UpkeepTranscoderInterfaceV2} from "../../interfaces/UpkeepTranscoderInterfaceV2.sol";
-import {TypeAndVersionInterface} from "../../../interfaces/TypeAndVersionInterface.sol";
+import {UpkeepTranscoderInterfaceV2} from "../interfaces/UpkeepTranscoderInterfaceV2.sol";
+import {TypeAndVersionInterface} from "../../interfaces/TypeAndVersionInterface.sol";
 
 enum RegistryVersion {
   V12,

diff --git a/contracts/test/v0.8/automation/IAutomationRegistryMaster2_3.test.ts b/contracts/test/v0.8/automation/IAutomationRegistryMaster2_3.test.ts
@@ -36,7 +36,7 @@ describe('IAutomationRegistryMaster2_3', () => {
     const checksum = ethers.utils.id(compositeABIs.join(''))
     const knownChecksum = fs
       .readFileSync(
-        'src/v0.8/automation/dev/interfaces/v2_3/IAutomationRegistryMaster2_3.sol',
+        'src/v0.8/automation/interfaces/v2_3/IAutomationRegistryMaster2_3.sol',
       )
       .toString()
       .slice(17, 83) // checksum located at top of file