iExecBlockchainComputing · zguesmi · Nov 6, 2025 · Oct 28, 2025 · Oct 28, 2025 · Oct 28, 2025
diff --git a/...tracts-v5/access/Ownable.sol/Ownable.json → ...contracts/access/Ownable.sol/Ownable.json b/...tracts-v5/access/Ownable.sol/Ownable.json → ...contracts/access/Ownable.sol/Ownable.json
diff --git a/...-v5/interfaces/IERC1271.sol/IERC1271.json → ...cts/interfaces/IERC1271.sol/IERC1271.json b/...-v5/interfaces/IERC1271.sol/IERC1271.json → ...cts/interfaces/IERC1271.sol/IERC1271.json
diff --git a/...-v5/interfaces/IERC5313.sol/IERC5313.json → ...cts/interfaces/IERC5313.sol/IERC5313.json b/...-v5/interfaces/IERC5313.sol/IERC5313.json → ...cts/interfaces/IERC5313.sol/IERC5313.json
diff --git a/...es/draft-IERC6093.sol/IERC1155Errors.json → ...es/draft-IERC6093.sol/IERC1155Errors.json b/...es/draft-IERC6093.sol/IERC1155Errors.json → ...es/draft-IERC6093.sol/IERC1155Errors.json
diff --git a/...aces/draft-IERC6093.sol/IERC20Errors.json → ...aces/draft-IERC6093.sol/IERC20Errors.json b/...aces/draft-IERC6093.sol/IERC20Errors.json → ...aces/draft-IERC6093.sol/IERC20Errors.json
diff --git a/...ces/draft-IERC6093.sol/IERC721Errors.json → ...ces/draft-IERC6093.sol/IERC721Errors.json b/...ces/draft-IERC6093.sol/IERC721Errors.json → ...ces/draft-IERC6093.sol/IERC721Errors.json
diff --git a/...cts-v5/token/ERC20/IERC20.sol/IERC20.json → ...tracts/token/ERC20/IERC20.sol/IERC20.json b/...cts-v5/token/ERC20/IERC20.sol/IERC20.json → ...tracts/token/ERC20/IERC20.sol/IERC20.json
diff --git a/...ts-v5/token/ERC721/ERC721.sol/ERC721.json → ...racts/token/ERC721/ERC721.sol/ERC721.json b/...ts-v5/token/ERC721/ERC721.sol/ERC721.json → ...racts/token/ERC721/ERC721.sol/ERC721.json
diff --git a/...-v5/token/ERC721/IERC721.sol/IERC721.json → ...cts/token/ERC721/IERC721.sol/IERC721.json b/...-v5/token/ERC721/IERC721.sol/IERC721.json → ...cts/token/ERC721/IERC721.sol/IERC721.json
diff --git a/.../IERC721Receiver.sol/IERC721Receiver.json → .../IERC721Receiver.sol/IERC721Receiver.json b/.../IERC721Receiver.sol/IERC721Receiver.json → .../IERC721Receiver.sol/IERC721Receiver.json
diff --git a/...RC721Enumerable.sol/ERC721Enumerable.json → ...RC721Enumerable.sol/ERC721Enumerable.json b/...RC721Enumerable.sol/ERC721Enumerable.json → ...RC721Enumerable.sol/ERC721Enumerable.json
diff --git a/...C721Enumerable.sol/IERC721Enumerable.json → ...C721Enumerable.sol/IERC721Enumerable.json b/...C721Enumerable.sol/IERC721Enumerable.json → ...C721Enumerable.sol/IERC721Enumerable.json
diff --git a/.../IERC721Metadata.sol/IERC721Metadata.json → .../IERC721Metadata.sol/IERC721Metadata.json b/.../IERC721Metadata.sol/IERC721Metadata.json → .../IERC721Metadata.sol/IERC721Metadata.json
diff --git a/...ntracts-v5/utils/Create2.sol/Create2.json → .../contracts/utils/Create2.sol/Create2.json b/...ntracts-v5/utils/Create2.sol/Create2.json → .../contracts/utils/Create2.sol/Create2.json
diff --git a/...ntracts-v5/utils/Strings.sol/Strings.json → .../contracts/utils/Strings.sol/Strings.json b/...ntracts-v5/utils/Strings.sol/Strings.json → .../contracts/utils/Strings.sol/Strings.json
diff --git a/...5/utils/cryptography/ECDSA.sol/ECDSA.json → ...s/utils/cryptography/ECDSA.sol/ECDSA.json b/...5/utils/cryptography/ECDSA.sol/ECDSA.json → ...s/utils/cryptography/ECDSA.sol/ECDSA.json
diff --git a/...tils/introspection/ERC165.sol/ERC165.json → ...tils/introspection/ERC165.sol/ERC165.json b/...tils/introspection/ERC165.sol/ERC165.json → ...tils/introspection/ERC165.sol/ERC165.json
diff --git a/...ls/introspection/IERC165.sol/IERC165.json → ...ls/introspection/IERC165.sol/IERC165.json b/...ls/introspection/IERC165.sol/IERC165.json → ...ls/introspection/IERC165.sol/IERC165.json
diff --git a/...ontracts-v5/utils/math/Math.sol/Math.json → ...n/contracts/utils/math/Math.sol/Math.json b/...ontracts-v5/utils/math/Math.sol/Math.json → ...n/contracts/utils/math/Math.sol/Math.json
diff --git a/...-v5/utils/math/SafeCast.sol/SafeCast.json → ...cts/utils/math/SafeCast.sol/SafeCast.json b/...-v5/utils/math/SafeCast.sol/SafeCast.json → ...cts/utils/math/SafeCast.sol/SafeCast.json
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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"