From 815c5ea8715462e00f6ea10cdc0b93ec3e1ba505 Mon Sep 17 00:00:00 2001 From: Lei Date: Wed, 12 Jun 2024 22:13:44 +0800 Subject: [PATCH] move v2_3 out of dev folder (#13504) --- .changeset/ten-falcons-suffer.md | 5 ++++ contracts/.changeset/proud-seals-draw.md | 5 ++++ contracts/.solhintignore | 2 +- ...nerate-automation-master-interface-v2_3.ts | 2 +- .../native_solc_compile_all_automation | 14 +++++------ .../v2_3/IAutomationRegistryMaster2_3.sol | 0 .../interfaces/v2_3/IWrappedNative.sol | 2 +- .../v2_3}/AutomationRegistrar2_3.t.sol | 10 ++++---- .../v2_3}/AutomationRegistry2_3.t.sol | 10 ++++---- .../{dev/test => test/v2_3}/BaseTest.t.sol | 18 +++++++------- .../{dev/test => test/v2_3}/WETH9.sol | 0 .../{dev => }/v2_3/AutomationRegistrar2_3.sol | 14 +++++------ .../{dev => }/v2_3/AutomationRegistry2_3.sol | 10 ++++---- .../v2_3/AutomationRegistryBase2_3.sol | 24 +++++++++---------- .../v2_3/AutomationRegistryLogicA2_3.sol | 20 ++++++++-------- .../v2_3/AutomationRegistryLogicB2_3.sol | 12 +++++----- .../v2_3/AutomationRegistryLogicC2_3.sol | 12 +++++----- .../{dev => }/v2_3/AutomationUtils2_3.sol | 0 .../v0.8/automation/{dev => }/v2_3/LICENSE | 0 .../{dev => }/v2_3/UpkeepTranscoder5_0.sol | 4 ++-- .../IAutomationRegistryMaster2_3.test.ts | 2 +- 21 files changed, 88 insertions(+), 78 deletions(-) create mode 100644 .changeset/ten-falcons-suffer.md create mode 100644 contracts/.changeset/proud-seals-draw.md rename contracts/src/v0.8/automation/{dev => }/interfaces/v2_3/IAutomationRegistryMaster2_3.sol (100%) rename contracts/src/v0.8/automation/{dev => }/interfaces/v2_3/IWrappedNative.sol (55%) rename contracts/src/v0.8/automation/{dev/test => test/v2_3}/AutomationRegistrar2_3.t.sol (96%) rename contracts/src/v0.8/automation/{dev/test => test/v2_3}/AutomationRegistry2_3.t.sol (99%) rename contracts/src/v0.8/automation/{dev/test => test/v2_3}/BaseTest.t.sol (96%) rename contracts/src/v0.8/automation/{dev/test => test/v2_3}/WETH9.sol (100%) rename contracts/src/v0.8/automation/{dev => }/v2_3/AutomationRegistrar2_3.sol (96%) rename contracts/src/v0.8/automation/{dev => }/v2_3/AutomationRegistry2_3.sol (97%) rename contracts/src/v0.8/automation/{dev => }/v2_3/AutomationRegistryBase2_3.sol (97%) rename contracts/src/v0.8/automation/{dev => }/v2_3/AutomationRegistryLogicA2_3.sol (92%) rename contracts/src/v0.8/automation/{dev => }/v2_3/AutomationRegistryLogicB2_3.sol (96%) rename contracts/src/v0.8/automation/{dev => }/v2_3/AutomationRegistryLogicC2_3.sol (97%) rename contracts/src/v0.8/automation/{dev => }/v2_3/AutomationUtils2_3.sol (100%) rename contracts/src/v0.8/automation/{dev => }/v2_3/LICENSE (100%) rename contracts/src/v0.8/automation/{dev => }/v2_3/UpkeepTranscoder5_0.sol (88%) diff --git a/.changeset/ten-falcons-suffer.md b/.changeset/ten-falcons-suffer.md new file mode 100644 index 00000000000..e4476b10457 --- /dev/null +++ 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 new file mode 100644 index 00000000000..6bda7ed255d --- /dev/null +++ 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 index ed395d93657..bab41a57940 100644 --- 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 index cb566d744bb..1e2d713cab1 100644 --- 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 index 60b57e71cef..84656917d8f 100755 --- 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/contracts/src/v0.8/automation/dev/interfaces/v2_3/IAutomationRegistryMaster2_3.sol b/contracts/src/v0.8/automation/interfaces/v2_3/IAutomationRegistryMaster2_3.sol similarity index 100% rename from contracts/src/v0.8/automation/dev/interfaces/v2_3/IAutomationRegistryMaster2_3.sol rename to contracts/src/v0.8/automation/interfaces/v2_3/IAutomationRegistryMaster2_3.sol diff --git a/contracts/src/v0.8/automation/dev/interfaces/v2_3/IWrappedNative.sol b/contracts/src/v0.8/automation/interfaces/v2_3/IWrappedNative.sol similarity index 55% rename from contracts/src/v0.8/automation/dev/interfaces/v2_3/IWrappedNative.sol rename to contracts/src/v0.8/automation/interfaces/v2_3/IWrappedNative.sol index dd371033023..fdbd7ddad65 100644 --- a/contracts/src/v0.8/automation/dev/interfaces/v2_3/IWrappedNative.sol +++ b/contracts/src/v0.8/automation/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/contracts/src/v0.8/automation/dev/test/AutomationRegistrar2_3.t.sol b/contracts/src/v0.8/automation/test/v2_3/AutomationRegistrar2_3.t.sol similarity index 96% rename from contracts/src/v0.8/automation/dev/test/AutomationRegistrar2_3.t.sol rename to contracts/src/v0.8/automation/test/v2_3/AutomationRegistrar2_3.t.sol index 2b55651dbe8..171e4e37185 100644 --- a/contracts/src/v0.8/automation/dev/test/AutomationRegistrar2_3.t.sol +++ b/contracts/src/v0.8/automation/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/contracts/src/v0.8/automation/dev/test/AutomationRegistry2_3.t.sol b/contracts/src/v0.8/automation/test/v2_3/AutomationRegistry2_3.t.sol similarity index 99% rename from contracts/src/v0.8/automation/dev/test/AutomationRegistry2_3.t.sol rename to contracts/src/v0.8/automation/test/v2_3/AutomationRegistry2_3.t.sol index 915972d7034..dbc0c203c07 100644 --- a/contracts/src/v0.8/automation/dev/test/AutomationRegistry2_3.t.sol +++ b/contracts/src/v0.8/automation/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/contracts/src/v0.8/automation/dev/test/BaseTest.t.sol b/contracts/src/v0.8/automation/test/v2_3/BaseTest.t.sol similarity index 96% rename from contracts/src/v0.8/automation/dev/test/BaseTest.t.sol rename to contracts/src/v0.8/automation/test/v2_3/BaseTest.t.sol index bba195b83e6..9016f52c55d 100644 --- a/contracts/src/v0.8/automation/dev/test/BaseTest.t.sol +++ b/contracts/src/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/contracts/src/v0.8/automation/dev/test/WETH9.sol b/contracts/src/v0.8/automation/test/v2_3/WETH9.sol similarity index 100% rename from contracts/src/v0.8/automation/dev/test/WETH9.sol rename to contracts/src/v0.8/automation/test/v2_3/WETH9.sol diff --git a/contracts/src/v0.8/automation/dev/v2_3/AutomationRegistrar2_3.sol b/contracts/src/v0.8/automation/v2_3/AutomationRegistrar2_3.sol similarity index 96% rename from contracts/src/v0.8/automation/dev/v2_3/AutomationRegistrar2_3.sol rename to contracts/src/v0.8/automation/v2_3/AutomationRegistrar2_3.sol index fabedd94477..2effb8d4d2f 100644 --- a/contracts/src/v0.8/automation/dev/v2_3/AutomationRegistrar2_3.sol +++ b/contracts/src/v0.8/automation/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/contracts/src/v0.8/automation/dev/v2_3/AutomationRegistry2_3.sol b/contracts/src/v0.8/automation/v2_3/AutomationRegistry2_3.sol similarity index 97% rename from contracts/src/v0.8/automation/dev/v2_3/AutomationRegistry2_3.sol rename to contracts/src/v0.8/automation/v2_3/AutomationRegistry2_3.sol index ba19fa2d556..6113cbf9fd1 100644 --- a/contracts/src/v0.8/automation/dev/v2_3/AutomationRegistry2_3.sol +++ b/contracts/src/v0.8/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/contracts/src/v0.8/automation/dev/v2_3/AutomationRegistryBase2_3.sol b/contracts/src/v0.8/automation/v2_3/AutomationRegistryBase2_3.sol similarity index 97% rename from contracts/src/v0.8/automation/dev/v2_3/AutomationRegistryBase2_3.sol rename to contracts/src/v0.8/automation/v2_3/AutomationRegistryBase2_3.sol index 5e979b9e3f9..fa8f06ffc02 100644 --- a/contracts/src/v0.8/automation/dev/v2_3/AutomationRegistryBase2_3.sol +++ b/contracts/src/v0.8/automation/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/contracts/src/v0.8/automation/dev/v2_3/AutomationRegistryLogicA2_3.sol b/contracts/src/v0.8/automation/v2_3/AutomationRegistryLogicA2_3.sol similarity index 92% rename from contracts/src/v0.8/automation/dev/v2_3/AutomationRegistryLogicA2_3.sol rename to contracts/src/v0.8/automation/v2_3/AutomationRegistryLogicA2_3.sol index e5486fc289d..1ef399176bc 100644 --- a/contracts/src/v0.8/automation/dev/v2_3/AutomationRegistryLogicA2_3.sol +++ b/contracts/src/v0.8/automation/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/contracts/src/v0.8/automation/dev/v2_3/AutomationRegistryLogicB2_3.sol b/contracts/src/v0.8/automation/v2_3/AutomationRegistryLogicB2_3.sol similarity index 96% rename from contracts/src/v0.8/automation/dev/v2_3/AutomationRegistryLogicB2_3.sol rename to contracts/src/v0.8/automation/v2_3/AutomationRegistryLogicB2_3.sol index 29f253f8ce3..d85484812f2 100644 --- a/contracts/src/v0.8/automation/dev/v2_3/AutomationRegistryLogicB2_3.sol +++ b/contracts/src/v0.8/automation/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/contracts/src/v0.8/automation/dev/v2_3/AutomationRegistryLogicC2_3.sol b/contracts/src/v0.8/automation/v2_3/AutomationRegistryLogicC2_3.sol similarity index 97% rename from contracts/src/v0.8/automation/dev/v2_3/AutomationRegistryLogicC2_3.sol rename to contracts/src/v0.8/automation/v2_3/AutomationRegistryLogicC2_3.sol index 298ee17a0fa..8fc944829f9 100644 --- a/contracts/src/v0.8/automation/dev/v2_3/AutomationRegistryLogicC2_3.sol +++ b/contracts/src/v0.8/automation/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/contracts/src/v0.8/automation/dev/v2_3/AutomationUtils2_3.sol b/contracts/src/v0.8/automation/v2_3/AutomationUtils2_3.sol similarity index 100% rename from contracts/src/v0.8/automation/dev/v2_3/AutomationUtils2_3.sol rename to contracts/src/v0.8/automation/v2_3/AutomationUtils2_3.sol diff --git a/contracts/src/v0.8/automation/dev/v2_3/LICENSE b/contracts/src/v0.8/automation/v2_3/LICENSE similarity index 100% rename from contracts/src/v0.8/automation/dev/v2_3/LICENSE rename to contracts/src/v0.8/automation/v2_3/LICENSE diff --git a/contracts/src/v0.8/automation/dev/v2_3/UpkeepTranscoder5_0.sol b/contracts/src/v0.8/automation/v2_3/UpkeepTranscoder5_0.sol similarity index 88% rename from contracts/src/v0.8/automation/dev/v2_3/UpkeepTranscoder5_0.sol rename to contracts/src/v0.8/automation/v2_3/UpkeepTranscoder5_0.sol index 6f3d5567555..32530c71257 100644 --- a/contracts/src/v0.8/automation/dev/v2_3/UpkeepTranscoder5_0.sol +++ b/contracts/src/v0.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 index 0a46b4805e2..8bc4f695672 100644 --- 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