diff --git a/abis/human-readable-abis/@openzeppelin/contracts-v5/access/Ownable.sol/Ownable.json b/abis/human-readable-abis/@openzeppelin/contracts/access/Ownable.sol/Ownable.json similarity index 100% rename from abis/human-readable-abis/@openzeppelin/contracts-v5/access/Ownable.sol/Ownable.json rename to abis/human-readable-abis/@openzeppelin/contracts/access/Ownable.sol/Ownable.json diff --git a/abis/human-readable-abis/@openzeppelin/contracts-v5/interfaces/IERC1271.sol/IERC1271.json b/abis/human-readable-abis/@openzeppelin/contracts/interfaces/IERC1271.sol/IERC1271.json similarity index 100% rename from abis/human-readable-abis/@openzeppelin/contracts-v5/interfaces/IERC1271.sol/IERC1271.json rename to abis/human-readable-abis/@openzeppelin/contracts/interfaces/IERC1271.sol/IERC1271.json diff --git a/abis/human-readable-abis/@openzeppelin/contracts-v5/interfaces/IERC5313.sol/IERC5313.json b/abis/human-readable-abis/@openzeppelin/contracts/interfaces/IERC5313.sol/IERC5313.json similarity index 100% rename from abis/human-readable-abis/@openzeppelin/contracts-v5/interfaces/IERC5313.sol/IERC5313.json rename to abis/human-readable-abis/@openzeppelin/contracts/interfaces/IERC5313.sol/IERC5313.json diff --git a/abis/human-readable-abis/@openzeppelin/contracts-v5/interfaces/draft-IERC6093.sol/IERC1155Errors.json b/abis/human-readable-abis/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC1155Errors.json similarity index 100% rename from abis/human-readable-abis/@openzeppelin/contracts-v5/interfaces/draft-IERC6093.sol/IERC1155Errors.json rename to abis/human-readable-abis/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC1155Errors.json diff --git a/abis/human-readable-abis/@openzeppelin/contracts-v5/interfaces/draft-IERC6093.sol/IERC20Errors.json b/abis/human-readable-abis/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC20Errors.json similarity index 100% rename from abis/human-readable-abis/@openzeppelin/contracts-v5/interfaces/draft-IERC6093.sol/IERC20Errors.json rename to abis/human-readable-abis/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC20Errors.json diff --git a/abis/human-readable-abis/@openzeppelin/contracts-v5/interfaces/draft-IERC6093.sol/IERC721Errors.json b/abis/human-readable-abis/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC721Errors.json similarity index 100% rename from abis/human-readable-abis/@openzeppelin/contracts-v5/interfaces/draft-IERC6093.sol/IERC721Errors.json rename to abis/human-readable-abis/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC721Errors.json diff --git a/abis/human-readable-abis/@openzeppelin/contracts-v5/token/ERC20/IERC20.sol/IERC20.json b/abis/human-readable-abis/@openzeppelin/contracts/token/ERC20/IERC20.sol/IERC20.json similarity index 100% rename from abis/human-readable-abis/@openzeppelin/contracts-v5/token/ERC20/IERC20.sol/IERC20.json rename to abis/human-readable-abis/@openzeppelin/contracts/token/ERC20/IERC20.sol/IERC20.json diff --git a/abis/human-readable-abis/@openzeppelin/contracts-v5/token/ERC721/ERC721.sol/ERC721.json b/abis/human-readable-abis/@openzeppelin/contracts/token/ERC721/ERC721.sol/ERC721.json similarity index 100% rename from abis/human-readable-abis/@openzeppelin/contracts-v5/token/ERC721/ERC721.sol/ERC721.json rename to abis/human-readable-abis/@openzeppelin/contracts/token/ERC721/ERC721.sol/ERC721.json diff --git a/abis/human-readable-abis/@openzeppelin/contracts-v5/token/ERC721/IERC721.sol/IERC721.json b/abis/human-readable-abis/@openzeppelin/contracts/token/ERC721/IERC721.sol/IERC721.json similarity index 100% rename from abis/human-readable-abis/@openzeppelin/contracts-v5/token/ERC721/IERC721.sol/IERC721.json rename to abis/human-readable-abis/@openzeppelin/contracts/token/ERC721/IERC721.sol/IERC721.json diff --git a/abis/human-readable-abis/@openzeppelin/contracts-v5/token/ERC721/IERC721Receiver.sol/IERC721Receiver.json b/abis/human-readable-abis/@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol/IERC721Receiver.json similarity index 100% rename from abis/human-readable-abis/@openzeppelin/contracts-v5/token/ERC721/IERC721Receiver.sol/IERC721Receiver.json rename to abis/human-readable-abis/@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol/IERC721Receiver.json diff --git a/abis/human-readable-abis/@openzeppelin/contracts-v5/token/ERC721/extensions/ERC721Enumerable.sol/ERC721Enumerable.json b/abis/human-readable-abis/@openzeppelin/contracts/token/ERC721/extensions/ERC721Enumerable.sol/ERC721Enumerable.json similarity index 100% rename from abis/human-readable-abis/@openzeppelin/contracts-v5/token/ERC721/extensions/ERC721Enumerable.sol/ERC721Enumerable.json rename to abis/human-readable-abis/@openzeppelin/contracts/token/ERC721/extensions/ERC721Enumerable.sol/ERC721Enumerable.json diff --git a/abis/human-readable-abis/@openzeppelin/contracts-v5/token/ERC721/extensions/IERC721Enumerable.sol/IERC721Enumerable.json b/abis/human-readable-abis/@openzeppelin/contracts/token/ERC721/extensions/IERC721Enumerable.sol/IERC721Enumerable.json similarity index 100% rename from abis/human-readable-abis/@openzeppelin/contracts-v5/token/ERC721/extensions/IERC721Enumerable.sol/IERC721Enumerable.json rename to abis/human-readable-abis/@openzeppelin/contracts/token/ERC721/extensions/IERC721Enumerable.sol/IERC721Enumerable.json diff --git a/abis/human-readable-abis/@openzeppelin/contracts-v5/token/ERC721/extensions/IERC721Metadata.sol/IERC721Metadata.json b/abis/human-readable-abis/@openzeppelin/contracts/token/ERC721/extensions/IERC721Metadata.sol/IERC721Metadata.json similarity index 100% rename from abis/human-readable-abis/@openzeppelin/contracts-v5/token/ERC721/extensions/IERC721Metadata.sol/IERC721Metadata.json rename to abis/human-readable-abis/@openzeppelin/contracts/token/ERC721/extensions/IERC721Metadata.sol/IERC721Metadata.json diff --git a/abis/human-readable-abis/@openzeppelin/contracts-v5/utils/Create2.sol/Create2.json b/abis/human-readable-abis/@openzeppelin/contracts/utils/Create2.sol/Create2.json similarity index 100% rename from abis/human-readable-abis/@openzeppelin/contracts-v5/utils/Create2.sol/Create2.json rename to abis/human-readable-abis/@openzeppelin/contracts/utils/Create2.sol/Create2.json diff --git a/abis/human-readable-abis/@openzeppelin/contracts-v5/utils/Strings.sol/Strings.json b/abis/human-readable-abis/@openzeppelin/contracts/utils/Strings.sol/Strings.json similarity index 100% rename from abis/human-readable-abis/@openzeppelin/contracts-v5/utils/Strings.sol/Strings.json rename to abis/human-readable-abis/@openzeppelin/contracts/utils/Strings.sol/Strings.json diff --git a/abis/human-readable-abis/@openzeppelin/contracts-v5/utils/cryptography/ECDSA.sol/ECDSA.json b/abis/human-readable-abis/@openzeppelin/contracts/utils/cryptography/ECDSA.sol/ECDSA.json similarity index 100% rename from abis/human-readable-abis/@openzeppelin/contracts-v5/utils/cryptography/ECDSA.sol/ECDSA.json rename to abis/human-readable-abis/@openzeppelin/contracts/utils/cryptography/ECDSA.sol/ECDSA.json diff --git a/abis/human-readable-abis/@openzeppelin/contracts-v5/utils/introspection/ERC165.sol/ERC165.json b/abis/human-readable-abis/@openzeppelin/contracts/utils/introspection/ERC165.sol/ERC165.json similarity index 100% rename from abis/human-readable-abis/@openzeppelin/contracts-v5/utils/introspection/ERC165.sol/ERC165.json rename to abis/human-readable-abis/@openzeppelin/contracts/utils/introspection/ERC165.sol/ERC165.json diff --git a/abis/human-readable-abis/@openzeppelin/contracts-v5/utils/introspection/IERC165.sol/IERC165.json b/abis/human-readable-abis/@openzeppelin/contracts/utils/introspection/IERC165.sol/IERC165.json similarity index 100% rename from abis/human-readable-abis/@openzeppelin/contracts-v5/utils/introspection/IERC165.sol/IERC165.json rename to abis/human-readable-abis/@openzeppelin/contracts/utils/introspection/IERC165.sol/IERC165.json diff --git a/abis/human-readable-abis/@openzeppelin/contracts-v5/utils/math/Math.sol/Math.json b/abis/human-readable-abis/@openzeppelin/contracts/utils/math/Math.sol/Math.json similarity index 100% rename from abis/human-readable-abis/@openzeppelin/contracts-v5/utils/math/Math.sol/Math.json rename to abis/human-readable-abis/@openzeppelin/contracts/utils/math/Math.sol/Math.json diff --git a/abis/human-readable-abis/@openzeppelin/contracts-v5/utils/math/SafeCast.sol/SafeCast.json b/abis/human-readable-abis/@openzeppelin/contracts/utils/math/SafeCast.sol/SafeCast.json similarity index 100% rename from abis/human-readable-abis/@openzeppelin/contracts-v5/utils/math/SafeCast.sol/SafeCast.json rename to abis/human-readable-abis/@openzeppelin/contracts/utils/math/SafeCast.sol/SafeCast.json diff --git a/contracts/facets/FacetBase.sol b/contracts/facets/FacetBase.sol index ffcf7fe1..cc3b877e 100644 --- a/contracts/facets/FacetBase.sol +++ b/contracts/facets/FacetBase.sol @@ -4,7 +4,7 @@ pragma solidity ^0.8.0; import {PocoStorageLib} from "../libs/PocoStorageLib.sol"; -import {IERC5313} from "@openzeppelin/contracts-v5/interfaces/IERC5313.sol"; +import {IERC5313} from "@openzeppelin/contracts/interfaces/IERC5313.sol"; // TODO use LibDiamond.contractOwner() when migrating all contracts to v8. diff --git a/contracts/facets/IexecConfigurationFacet.sol b/contracts/facets/IexecConfigurationFacet.sol index 99dddaa9..48bebb6a 100644 --- a/contracts/facets/IexecConfigurationFacet.sol +++ b/contracts/facets/IexecConfigurationFacet.sol @@ -3,8 +3,8 @@ pragma solidity ^0.8.0; -import {IERC20} from "@openzeppelin/contracts-v5/token/ERC20/IERC20.sol"; -import {Math} from "@openzeppelin/contracts-v5/utils/math/Math.sol"; +import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; +import {Math} from "@openzeppelin/contracts/utils/math/Math.sol"; import {FacetBase} from "./FacetBase.sol"; import {IexecConfiguration} from "../interfaces/IexecConfiguration.sol"; import {IexecHubV3Interface} from "../interfaces/IexecHubV3Interface.sol"; diff --git a/contracts/facets/IexecOrderManagementFacet.sol b/contracts/facets/IexecOrderManagementFacet.sol index e838eb61..8c51eb7a 100644 --- a/contracts/facets/IexecOrderManagementFacet.sol +++ b/contracts/facets/IexecOrderManagementFacet.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.0; -import {IERC5313} from "@openzeppelin/contracts-v5/interfaces/IERC5313.sol"; +import {IERC5313} from "@openzeppelin/contracts/interfaces/IERC5313.sol"; import {FacetBase} from "./FacetBase.sol"; import {SignatureVerifier} from "./SignatureVerifier.sol"; import {IexecOrderManagement} from "../interfaces/IexecOrderManagement.sol"; diff --git a/contracts/facets/IexecPoco1Facet.sol b/contracts/facets/IexecPoco1Facet.sol index c45c8666..5d10b1e0 100644 --- a/contracts/facets/IexecPoco1Facet.sol +++ b/contracts/facets/IexecPoco1Facet.sol @@ -3,8 +3,8 @@ pragma solidity ^0.8.0; -import {IERC5313} from "@openzeppelin/contracts-v5/interfaces/IERC5313.sol"; -import {Math} from "@openzeppelin/contracts-v5/utils/math/Math.sol"; +import {IERC5313} from "@openzeppelin/contracts/interfaces/IERC5313.sol"; +import {Math} from "@openzeppelin/contracts/utils/math/Math.sol"; import {IexecLibCore_v5} from "../libs/IexecLibCore_v5.sol"; import {IexecLibOrders_v5} from "../libs/IexecLibOrders_v5.sol"; import {IWorkerpool} from "../registries/workerpools/IWorkerpool.v8.sol"; diff --git a/contracts/facets/IexecPoco2Facet.sol b/contracts/facets/IexecPoco2Facet.sol index 22715d82..48f47eb5 100644 --- a/contracts/facets/IexecPoco2Facet.sol +++ b/contracts/facets/IexecPoco2Facet.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.0; -import {Math} from "@openzeppelin/contracts-v5/utils/math/Math.sol"; +import {Math} from "@openzeppelin/contracts/utils/math/Math.sol"; import {PocoStorageLib} from "../libs/PocoStorageLib.sol"; import {IOracleConsumer} from "../external/interfaces/IOracleConsumer.sol"; import {IexecLibCore_v5} from "../libs/IexecLibCore_v5.sol"; diff --git a/contracts/facets/IexecPocoBoostFacet.sol b/contracts/facets/IexecPocoBoostFacet.sol index 929fc868..3189c9ab 100644 --- a/contracts/facets/IexecPocoBoostFacet.sol +++ b/contracts/facets/IexecPocoBoostFacet.sol @@ -3,11 +3,11 @@ pragma solidity ^0.8.0; -import {IERC5313} from "@openzeppelin/contracts-v5/interfaces/IERC5313.sol"; -import {ECDSA} from "@openzeppelin/contracts-v5/utils/cryptography/ECDSA.sol"; -import {MessageHashUtils} from "@openzeppelin/contracts-v5/utils/cryptography/MessageHashUtils.sol"; -import {Math} from "@openzeppelin/contracts-v5/utils/math/Math.sol"; -import {SafeCast} from "@openzeppelin/contracts-v5/utils/math/SafeCast.sol"; +import {IERC5313} from "@openzeppelin/contracts/interfaces/IERC5313.sol"; +import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol"; +import {MessageHashUtils} from "@openzeppelin/contracts/utils/cryptography/MessageHashUtils.sol"; +import {Math} from "@openzeppelin/contracts/utils/math/Math.sol"; +import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol"; import {IOracleConsumer} from "../external/interfaces/IOracleConsumer.sol"; import {IexecLibCore_v5} from "../libs/IexecLibCore_v5.sol"; diff --git a/contracts/facets/IexecPocoCommon.sol b/contracts/facets/IexecPocoCommon.sol index 6c3e4323..0c408428 100644 --- a/contracts/facets/IexecPocoCommon.sol +++ b/contracts/facets/IexecPocoCommon.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.0; -import {Math} from "@openzeppelin/contracts-v5/utils/math/Math.sol"; +import {Math} from "@openzeppelin/contracts/utils/math/Math.sol"; import {PocoStorageLib} from "../libs/PocoStorageLib.sol"; import {IexecLibOrders_v5} from "../libs/IexecLibOrders_v5.sol"; import {FacetBase} from "./FacetBase.sol"; diff --git a/contracts/facets/SignatureVerifier.sol b/contracts/facets/SignatureVerifier.sol index a92ddae0..059ce4fa 100644 --- a/contracts/facets/SignatureVerifier.sol +++ b/contracts/facets/SignatureVerifier.sol @@ -3,9 +3,9 @@ pragma solidity ^0.8.0; -import {IERC1271} from "@openzeppelin/contracts-v5/interfaces/IERC1271.sol"; -import {ECDSA} from "@openzeppelin/contracts-v5/utils/cryptography/ECDSA.sol"; -import {MessageHashUtils} from "@openzeppelin/contracts-v5/utils/cryptography/MessageHashUtils.sol"; +import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol"; +import {ECDSA} from "@openzeppelin/contracts/utils/cryptography/ECDSA.sol"; +import {MessageHashUtils} from "@openzeppelin/contracts/utils/cryptography/MessageHashUtils.sol"; import {FacetBase} from "./FacetBase.sol"; import {IERC734} from "../external/interfaces/IERC734.sol"; import {PocoStorageLib} from "../libs/PocoStorageLib.sol"; diff --git a/contracts/interfaces/IexecAccessorsABILegacy.sol b/contracts/interfaces/IexecAccessorsABILegacy.sol index cfda88d9..cc5a5ea3 100644 --- a/contracts/interfaces/IexecAccessorsABILegacy.sol +++ b/contracts/interfaces/IexecAccessorsABILegacy.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.0; -import "../libs/IexecLibCore_v5.sol"; +import {IexecLibCore_v5} from "../libs/IexecLibCore_v5.sol"; /** * TODO: Remove this interface in the future. diff --git a/contracts/interfaces/IexecConfiguration.sol b/contracts/interfaces/IexecConfiguration.sol index 3d351349..c878273e 100644 --- a/contracts/interfaces/IexecConfiguration.sol +++ b/contracts/interfaces/IexecConfiguration.sol @@ -2,7 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 pragma solidity ^0.8.0; -import "../libs/IexecLibOrders_v5.sol"; + +import {IexecLibOrders_v5} from "../libs/IexecLibOrders_v5.sol"; interface IexecConfiguration { function configure( diff --git a/contracts/interfaces/IexecRelay.sol b/contracts/interfaces/IexecRelay.sol index 0bc2e2cc..333abfd4 100644 --- a/contracts/interfaces/IexecRelay.sol +++ b/contracts/interfaces/IexecRelay.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.0; -import "../libs/IexecLibOrders_v5.sol"; +import {IexecLibOrders_v5} from "../libs/IexecLibOrders_v5.sol"; interface IexecRelay { event BroadcastAppOrder(IexecLibOrders_v5.AppOrder apporder); diff --git a/contracts/libs/PocoStorageLib.sol b/contracts/libs/PocoStorageLib.sol index 7feba499..a7403082 100644 --- a/contracts/libs/PocoStorageLib.sol +++ b/contracts/libs/PocoStorageLib.sol @@ -4,7 +4,7 @@ pragma solidity ^0.8.0; import {IexecHubV3Interface} from "../interfaces/IexecHubV3Interface.sol"; -import {IERC20} from "@openzeppelin/contracts-v5/interfaces/IERC20.sol"; +import {IERC20} from "@openzeppelin/contracts/interfaces/IERC20.sol"; import {IexecLibCore_v5} from "./IexecLibCore_v5.sol"; import {IRegistry} from "../registries/IRegistry.sol"; diff --git a/contracts/registries/IRegistry.sol b/contracts/registries/IRegistry.sol index 5ff34278..3f8c1420 100644 --- a/contracts/registries/IRegistry.sol +++ b/contracts/registries/IRegistry.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.0; -import {IERC721Enumerable} from "@openzeppelin/contracts-v5/token/ERC721/extensions/IERC721Enumerable.sol"; +import {IERC721Enumerable} from "@openzeppelin/contracts/token/ERC721/extensions/IERC721Enumerable.sol"; interface IRegistry is IERC721Enumerable { function isRegistered(address _entry) external view returns (bool); diff --git a/contracts/registries/Registry.sol b/contracts/registries/Registry.sol index cceff82e..e637ad51 100644 --- a/contracts/registries/Registry.sol +++ b/contracts/registries/Registry.sol @@ -3,12 +3,12 @@ pragma solidity ^0.8.0; -import "./proxy/InitializableUpgradeabilityProxy.sol"; -import {Ownable} from "@openzeppelin/contracts-v5/access/Ownable.sol"; -import {ERC721} from "@openzeppelin/contracts-v5/token/ERC721/ERC721.sol"; -import {Create2} from "@openzeppelin/contracts-v5/utils/Create2.sol"; +import {InitializableUpgradeabilityProxy} from "./proxy/InitializableUpgradeabilityProxy.sol"; +import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol"; +import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol"; +import {Create2} from "@openzeppelin/contracts/utils/Create2.sol"; import {IRegistry} from "./IRegistry.sol"; -import {ERC721Enumerable} from "@openzeppelin/contracts-v5/token/ERC721/extensions/ERC721Enumerable.sol"; +import {ERC721Enumerable} from "@openzeppelin/contracts/token/ERC721/extensions/ERC721Enumerable.sol"; // Note: this version of this contract that has been migrated to solidity v0.8 is not the // same version that is currently deployed on live networks. The reason being, registries diff --git a/contracts/registries/RegistryEntry.sol b/contracts/registries/RegistryEntry.sol index 7544768c..a9767b3b 100644 --- a/contracts/registries/RegistryEntry.sol +++ b/contracts/registries/RegistryEntry.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.0; -import "./Registry.sol"; +import {IRegistry} from "./IRegistry.sol"; // Note: this version of this contract that has been migrated to solidity v0.8 is not the // same version that is currently deployed on live networks. The reason being, registries diff --git a/contracts/registries/apps/App.sol b/contracts/registries/apps/App.sol index d8884aed..2d4d3494 100644 --- a/contracts/registries/apps/App.sol +++ b/contracts/registries/apps/App.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.0; -import "../RegistryEntry.sol"; +import {RegistryEntry} from "../RegistryEntry.sol"; /** * @dev Referenced in the SDK with the current path `contracts/registries/apps/AppRegistry.sol`. diff --git a/contracts/registries/apps/AppRegistry.sol b/contracts/registries/apps/AppRegistry.sol index 9e868076..6e146bbb 100644 --- a/contracts/registries/apps/AppRegistry.sol +++ b/contracts/registries/apps/AppRegistry.sol @@ -3,8 +3,8 @@ pragma solidity ^0.8.0; -import "../Registry.sol"; -import "./App.sol"; +import {Registry} from "../Registry.sol"; +import {App} from "./App.sol"; /** * @dev Referenced in the SDK with the current path `contracts/registries/apps/AppRegistry.sol`. diff --git a/contracts/registries/datasets/Dataset.sol b/contracts/registries/datasets/Dataset.sol index 2e6037cb..f26863db 100644 --- a/contracts/registries/datasets/Dataset.sol +++ b/contracts/registries/datasets/Dataset.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.0; -import "../RegistryEntry.sol"; +import {RegistryEntry} from "../RegistryEntry.sol"; /** * @dev Referenced in the SDK with the current path `contracts/registries/datasets/Dataset.sol`. diff --git a/contracts/registries/datasets/DatasetRegistry.sol b/contracts/registries/datasets/DatasetRegistry.sol index fcf580b1..43fc5580 100644 --- a/contracts/registries/datasets/DatasetRegistry.sol +++ b/contracts/registries/datasets/DatasetRegistry.sol @@ -3,8 +3,8 @@ pragma solidity ^0.8.0; -import "../Registry.sol"; -import "./Dataset.sol"; +import {Registry} from "../Registry.sol"; +import {Dataset} from "./Dataset.sol"; /** * @dev Referenced in the SDK with the current path `contracts/registries/datasets/DatasetRegistry.sol`. diff --git a/contracts/registries/proxy/BaseUpgradeabilityProxy.sol b/contracts/registries/proxy/BaseUpgradeabilityProxy.sol index 43f4a8b3..82121534 100644 --- a/contracts/registries/proxy/BaseUpgradeabilityProxy.sol +++ b/contracts/registries/proxy/BaseUpgradeabilityProxy.sol @@ -12,8 +12,8 @@ pragma solidity ^0.8.0; -import './Address.sol'; -import './Proxy.sol'; +import {Address} from "./Address.sol"; +import {Proxy} from "./Proxy.sol"; /** * @title BaseUpgradeabilityProxy diff --git a/contracts/registries/proxy/InitializableUpgradeabilityProxy.sol b/contracts/registries/proxy/InitializableUpgradeabilityProxy.sol index b621080d..944b5d1f 100644 --- a/contracts/registries/proxy/InitializableUpgradeabilityProxy.sol +++ b/contracts/registries/proxy/InitializableUpgradeabilityProxy.sol @@ -11,7 +11,7 @@ pragma solidity ^0.8.0; -import './BaseUpgradeabilityProxy.sol'; +import {BaseUpgradeabilityProxy} from "./BaseUpgradeabilityProxy.sol"; /** * @title InitializableUpgradeabilityProxy diff --git a/contracts/registries/workerpools/Workerpool.sol b/contracts/registries/workerpools/Workerpool.sol index 2c6f1e5e..2489891d 100644 --- a/contracts/registries/workerpools/Workerpool.sol +++ b/contracts/registries/workerpools/Workerpool.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.0; -import "../RegistryEntry.sol"; +import {RegistryEntry} from "../RegistryEntry.sol"; /** * @dev Referenced in the SDK with the current path `contracts/registries/workerpools/Workerpool.sol`. diff --git a/contracts/registries/workerpools/WorkerpoolRegistry.sol b/contracts/registries/workerpools/WorkerpoolRegistry.sol index 91df9dff..dfc58ce0 100644 --- a/contracts/registries/workerpools/WorkerpoolRegistry.sol +++ b/contracts/registries/workerpools/WorkerpoolRegistry.sol @@ -3,8 +3,8 @@ pragma solidity ^0.8.0; -import "../Registry.sol"; -import "./Workerpool.sol"; +import {Registry} from "../Registry.sol"; +import {Workerpool} from "./Workerpool.sol"; /** * @dev Referenced in the SDK with the current path `contracts/registries/workerpools/WorkerpoolRegistry.sol`. diff --git a/contracts/tools/testing/ERC1271Mock.sol b/contracts/tools/testing/ERC1271Mock.sol index a20d9143..2c5313bf 100644 --- a/contracts/tools/testing/ERC1271Mock.sol +++ b/contracts/tools/testing/ERC1271Mock.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.0; -import "@openzeppelin/contracts-v5/interfaces/IERC1271.sol"; +import {IERC1271} from "@openzeppelin/contracts/interfaces/IERC1271.sol"; contract ERC1271Mock is IERC1271 { function isValidSignature( diff --git a/contracts/tools/testing/OwnableMock.sol b/contracts/tools/testing/OwnableMock.sol index 7e396ff6..591aa8fb 100644 --- a/contracts/tools/testing/OwnableMock.sol +++ b/contracts/tools/testing/OwnableMock.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.0; -import "@openzeppelin/contracts-v5/access/Ownable.sol"; +import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol"; contract OwnableMock is Ownable { constructor() Ownable(msg.sender) {} diff --git a/contracts/tools/testing/TestReceiver.sol b/contracts/tools/testing/TestReceiver.sol index 2d282172..96307d4f 100644 --- a/contracts/tools/testing/TestReceiver.sol +++ b/contracts/tools/testing/TestReceiver.sol @@ -3,7 +3,7 @@ pragma solidity ^0.8.0; -import "../../interfaces/IexecTokenSpender.sol"; +import {IexecTokenSpender} from "../../interfaces/IexecTokenSpender.sol"; contract TestReceiver is IexecTokenSpender { event GotApproval(address sender, uint256 value, address token, bytes extraData); diff --git a/hardhat.config.ts b/hardhat.config.ts index efa80d26..dbfb63f5 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -226,7 +226,7 @@ const config: HardhatUserConfig = { '@mudgen/diamond-1/contracts/libraries/LibDiamond.sol', '@mudgen/diamond-1/contracts/upgradeInitializers/DiamondInit.sol', // Used as mock or fake in UTs - '@openzeppelin/contracts-v5/interfaces/IERC1271.sol', + '@openzeppelin/contracts/interfaces/IERC1271.sol', // Used in deployment '@amxx/factory/contracts/v6/GenericFactory.sol', 'createx/src/ICreateX.sol', diff --git a/package-lock.json b/package-lock.json index 5585fdf6..097ead56 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,8 +12,7 @@ "@iexec/interface": "3.0.35-8", "@iexec/solidity": "^0.1.1", "@mudgen/diamond-1": "github:mudgen/diamond-1-hardhat#3da037b", - "@openzeppelin/contracts": "3.3.0", - "@openzeppelin/contracts-v5": "npm:@openzeppelin/contracts@^5.0.2", + "@openzeppelin/contracts": "^5.0.2", "@uniswap/v2-periphery": "1.1.0-beta.0", "createx": "github:pcaversaccio/createx#v1.0.0", "rlc-faucet-contract": "1.0.10" @@ -25,7 +24,6 @@ "@openzeppelin/upgrades-core": "^1.37.1", "dotenv": "^16.5.0", "hardhat": "^2.26.5", - "hardhat": "^2.22.18", "hardhat-abi-exporter": "^2.11.0", "hardhat-dependency-compiler": "^1.2.1", "hardhat-deploy": "^0.11.43", @@ -1632,15 +1630,10 @@ } }, "node_modules/@openzeppelin/contracts": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-3.3.0.tgz", - "integrity": "sha512-AemZEsQYtUp1WRkcmZm1div5ORfTpLquLaziCIrSagjxyKdmObxuaY1yjQ5SHFMctR8rLwp706NXTbiIRJg7pw==" - }, - "node_modules/@openzeppelin/contracts-v5": { - "name": "@openzeppelin/contracts", "version": "5.0.2", "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-5.0.2.tgz", - "integrity": "sha512-ytPc6eLGcHHnapAZ9S+5qsdomhjo6QBHTDRRBFfTxXIpsicMhVPouPgmUPebZZZGX7vt9USA+Z+0M0dSVtSUEA==" + "integrity": "sha512-ytPc6eLGcHHnapAZ9S+5qsdomhjo6QBHTDRRBFfTxXIpsicMhVPouPgmUPebZZZGX7vt9USA+Z+0M0dSVtSUEA==", + "license": "MIT" }, "node_modules/@openzeppelin/upgrades-core": { "version": "1.37.1", @@ -14070,12 +14063,7 @@ "optional": true }, "@openzeppelin/contracts": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-3.3.0.tgz", - "integrity": "sha512-AemZEsQYtUp1WRkcmZm1div5ORfTpLquLaziCIrSagjxyKdmObxuaY1yjQ5SHFMctR8rLwp706NXTbiIRJg7pw==" - }, - "@openzeppelin/contracts-v5": { - "version": "npm:@openzeppelin/contracts@5.0.2", + "version": "5.0.2", "resolved": "https://registry.npmjs.org/@openzeppelin/contracts/-/contracts-5.0.2.tgz", "integrity": "sha512-ytPc6eLGcHHnapAZ9S+5qsdomhjo6QBHTDRRBFfTxXIpsicMhVPouPgmUPebZZZGX7vt9USA+Z+0M0dSVtSUEA==" }, diff --git a/package.json b/package.json index fbfd7132..f1c12993 100644 --- a/package.json +++ b/package.json @@ -48,8 +48,7 @@ "@iexec/interface": "3.0.35-8", "@iexec/solidity": "^0.1.1", "@mudgen/diamond-1": "github:mudgen/diamond-1-hardhat#3da037b", - "@openzeppelin/contracts": "3.3.0", - "@openzeppelin/contracts-v5": "npm:@openzeppelin/contracts@^5.0.2", + "@openzeppelin/contracts": "^5.0.2", "@uniswap/v2-periphery": "1.1.0-beta.0", "createx": "github:pcaversaccio/createx#v1.0.0", "rlc-faucet-contract": "1.0.10"