feat: clean OpenZeppelin dual-version setup

abis/contracts/facets/IexecPoco2Facet.json

@@ -1,9 +1,4 @@
 [
-  {
-    "inputs": [],
-    "name": "MathOverflowedMulDiv",
-    "type": "error"
-  },
   {
     "anonymous": false,
     "inputs": [

abis/contracts/registries/apps/AppRegistry.json

@@ -9,27 +9,6 @@
     "name": "Create2EmptyBytecode",
     "type": "error"
   },
-  {
-    "inputs": [],
-    "name": "Create2FailedDeployment",
-    "type": "error"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "balance",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "needed",
-        "type": "uint256"
-      }
-    ],
-    "name": "Create2InsufficientBalance",
-    "type": "error"
-  },
   {
     "inputs": [],
     "name": "ERC721EnumerableForbiddenBatchMint",
@@ -154,6 +133,27 @@
     "name": "ERC721OutOfBoundsIndex",
     "type": "error"
   },
+  {
+    "inputs": [],
+    "name": "FailedDeployment",
+    "type": "error"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "balance",
+        "type": "uint256"
+      },
+      {
+        "internalType": "uint256",
+        "name": "needed",
+        "type": "uint256"
+      }
+    ],
+    "name": "InsufficientBalance",
+    "type": "error"
+  },
   {
     "inputs": [
       {

abis/contracts/registries/datasets/DatasetRegistry.json

@@ -9,27 +9,6 @@
     "name": "Create2EmptyBytecode",
     "type": "error"
   },
-  {
-    "inputs": [],
-    "name": "Create2FailedDeployment",
-    "type": "error"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "balance",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "needed",
-        "type": "uint256"
-      }
-    ],
-    "name": "Create2InsufficientBalance",
-    "type": "error"
-  },
   {
     "inputs": [],
     "name": "ERC721EnumerableForbiddenBatchMint",
@@ -154,6 +133,27 @@
     "name": "ERC721OutOfBoundsIndex",
     "type": "error"
   },
+  {
+    "inputs": [],
+    "name": "FailedDeployment",
+    "type": "error"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "balance",
+        "type": "uint256"
+      },
+      {
+        "internalType": "uint256",
+        "name": "needed",
+        "type": "uint256"
+      }
+    ],
+    "name": "InsufficientBalance",
+    "type": "error"
+  },
   {
     "inputs": [
       {

abis/contracts/registries/workerpools/WorkerpoolRegistry.json

@@ -9,27 +9,6 @@
     "name": "Create2EmptyBytecode",
     "type": "error"
   },
-  {
-    "inputs": [],
-    "name": "Create2FailedDeployment",
-    "type": "error"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "balance",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "needed",
-        "type": "uint256"
-      }
-    ],
-    "name": "Create2InsufficientBalance",
-    "type": "error"
-  },
   {
     "inputs": [],
     "name": "ERC721EnumerableForbiddenBatchMint",
@@ -154,6 +133,27 @@
     "name": "ERC721OutOfBoundsIndex",
     "type": "error"
   },
+  {
+    "inputs": [],
+    "name": "FailedDeployment",
+    "type": "error"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "balance",
+        "type": "uint256"
+      },
+      {
+        "internalType": "uint256",
+        "name": "needed",
+        "type": "uint256"
+      }
+    ],
+    "name": "InsufficientBalance",
+    "type": "error"
+  },
   {
     "inputs": [
       {

abis/human-readable-abis/@openzeppelin/contracts/utils/Create2.sol/Create2.json

@@ -0,0 +1,3 @@
+[
+  "error Create2EmptyBytecode()"
+]

abis/human-readable-abis/@openzeppelin/contracts/utils/Errors.sol/Errors.json

@@ -0,0 +1,6 @@
+[
+  "error FailedCall()",
+  "error FailedDeployment()",
+  "error InsufficientBalance(uint256,uint256)",
+  "error MissingPrecompile(address)"
+]

abis/human-readable-abis/@openzeppelin/contracts/utils/Strings.sol/Strings.json

@@ -0,0 +1,5 @@
+[
+  "error StringsInsufficientHexLength(uint256,uint256)",
+  "error StringsInvalidAddressFormat()",
+  "error StringsInvalidChar()"
+]

abis/human-readable-abis/contracts/facets/IexecPoco2Facet.sol/IexecPoco2Facet.json

@@ -1,5 +1,4 @@
 [
-  "error MathOverflowedMulDiv()",
   "event AccurateContribution(address indexed,bytes32 indexed)",
   "event FaultyContribution(address indexed,bytes32 indexed)",
   "event Lock(address,uint256)",

abis/human-readable-abis/contracts/registries/apps/AppRegistry.sol/AppRegistry.json

@@ -1,8 +1,6 @@
 [
   "constructor()",
   "error Create2EmptyBytecode()",
-  "error Create2FailedDeployment()",
-  "error Create2InsufficientBalance(uint256,uint256)",
   "error ERC721EnumerableForbiddenBatchMint()",
   "error ERC721IncorrectOwner(address,uint256,address)",
   "error ERC721InsufficientApproval(address,uint256)",
@@ -13,6 +11,8 @@
   "error ERC721InvalidSender(address)",
   "error ERC721NonexistentToken(uint256)",
   "error ERC721OutOfBoundsIndex(address,uint256)",
+  "error FailedDeployment()",
+  "error InsufficientBalance(uint256,uint256)",
   "error OwnableInvalidOwner(address)",
   "error OwnableUnauthorizedAccount(address)",
   "event Approval(address indexed,address indexed,uint256 indexed)",

abis/human-readable-abis/contracts/registries/datasets/DatasetRegistry.sol/DatasetRegistry.json

@@ -1,8 +1,6 @@
 [
   "constructor()",
   "error Create2EmptyBytecode()",
-  "error Create2FailedDeployment()",
-  "error Create2InsufficientBalance(uint256,uint256)",
   "error ERC721EnumerableForbiddenBatchMint()",
   "error ERC721IncorrectOwner(address,uint256,address)",
   "error ERC721InsufficientApproval(address,uint256)",
@@ -13,6 +11,8 @@
   "error ERC721InvalidSender(address)",
   "error ERC721NonexistentToken(uint256)",
   "error ERC721OutOfBoundsIndex(address,uint256)",
+  "error FailedDeployment()",
+  "error InsufficientBalance(uint256,uint256)",
   "error OwnableInvalidOwner(address)",
   "error OwnableUnauthorizedAccount(address)",
   "event Approval(address indexed,address indexed,uint256 indexed)",

abis/human-readable-abis/contracts/registries/workerpools/WorkerpoolRegistry.sol/WorkerpoolRegistry.json

@@ -1,8 +1,6 @@
 [
   "constructor()",
   "error Create2EmptyBytecode()",
-  "error Create2FailedDeployment()",
-  "error Create2InsufficientBalance(uint256,uint256)",
   "error ERC721EnumerableForbiddenBatchMint()",
   "error ERC721IncorrectOwner(address,uint256,address)",
   "error ERC721InsufficientApproval(address,uint256)",
@@ -13,6 +11,8 @@
   "error ERC721InvalidSender(address)",
   "error ERC721NonexistentToken(uint256)",
   "error ERC721OutOfBoundsIndex(address,uint256)",
+  "error FailedDeployment()",
+  "error InsufficientBalance(uint256,uint256)",
   "error OwnableInvalidOwner(address)",
   "error OwnableUnauthorizedAccount(address)",
   "event Approval(address indexed,address indexed,uint256 indexed)",

abis/human-readable-abis/contracts/tools/testing/slither/Slither.sol/Slither.json

@@ -1,6 +1,5 @@
 [
   "error IncompatibleDatasetOrder(string)",
-  "error MathOverflowedMulDiv()",
   "event AccurateContribution(address indexed,bytes32 indexed)",
   "event DealSponsored(bytes32,address)",
   "event FaultyContribution(address indexed,bytes32 indexed)",

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.
 

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";

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";

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";

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";

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";

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";

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";

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.

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(

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);